Se corrigen errores en test capa rest

También se añade las restricciones en web.xml para pets
parent abf9257a
<?xml version="1.0" encoding="UTF-8"?>
<project-shared-configuration>
<!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
<!--
Properties that influence various parts of the IDE, especially code formatting and the like.
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
That way multiple projects can share the same settings (useful for formatting rules for example).
Any value defined here will override the pom.xml file value but is only applicable to the current project.
-->
<org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
</properties>
</project-shared-configuration>
......@@ -87,8 +87,13 @@ public class PetDAO extends DAO {
}
public Pet add(String name, String type, int peopleID) throws DAOException, IllegalArgumentException {
if (name == null || type==null) {
throw new IllegalArgumentException("name and type can't be null");
/*Debido a la forma en la que se generan las PK de people nunca puede
existir una persona con ID igual a 0 que es el caso de si faltase el
valor peopleID en el formulario de añadir de pets
*/
if (name == null || type==null || peopleID==0) {
throw new IllegalArgumentException("name, type or peopleID can't be null");
}
try (Connection conn = this.getConnection()) {
......
......@@ -49,7 +49,7 @@ public class Pet {
}
public void setPeopleID(int peopleID) {
this.peopleID = requireNonNull(peopleID, "PeopleID can't be null");
this.peopleID = requireNonNull(peopleID, "PeopleID can't be null");
}
@Override
......
......@@ -20,155 +20,155 @@ import es.uvigo.esei.daa.entities.Pet;
/**
* REST resource for managing people.
*
*
* @author Imanol Cobian Martinez
*/
@Path("/pets")
@Produces(MediaType.APPLICATION_JSON)
public class PetResource {
private final static Logger LOG = Logger.getLogger(PeopleResource.class.getName());
private final PetDAO dao;
public PetResource() {
this(new PetDAO());
}
PetResource(PetDAO dao) {
this.dao = dao;
}
@GET
@Path("/{id}")
public Response get(
@PathParam("id") int id
) {
try {
final Pet pet = this.dao.get(id);
return Response.ok(pet).build();
} catch (IllegalArgumentException iae) {
LOG.log(Level.FINE, "Invalid pet id in get method", iae);
return Response.status(Response.Status.BAD_REQUEST)
.entity(iae.getMessage())
.build();
} catch (DAOException e) {
LOG.log(Level.SEVERE, "Error getting a pet", e);
return Response.serverError()
.entity(e.getMessage())
.build();
}
}
@GET
public Response listAll() {
try {
return Response.ok(this.dao.listAll()).build();
} catch (DAOException e) {
LOG.log(Level.SEVERE, "Error listing pets", e);
return Response.serverError().entity(e.getMessage()).build();
}
}
@GET
@Path("/people{peopleID}")
public Response listByPeopleID(
@PathParam("peopleID") int peopleID
) {
try {
return Response.ok(this.dao.listByPeopleID(peopleID)).build();
} catch (DAOException e) {
LOG.log(Level.SEVERE, "Error listing pets", e);
return Response.serverError().entity(e.getMessage()).build();
}
}
@POST
public Response add(
@FormParam("name") String name,
@FormParam("type") String type,
@FormParam("peopleID") int peopleID
) {
try {
final Pet newPet = this.dao.add(name,type,peopleID);
return Response.ok(newPet).build();
} catch (IllegalArgumentException iae) {
LOG.log(Level.FINE, "Invalid pet id in add method", iae);
return Response.status(Response.Status.BAD_REQUEST)
.entity(iae.getMessage())
.build();
} catch (DAOException e) {
LOG.log(Level.SEVERE, "Error adding a pet", e);
return Response.serverError()
.entity(e.getMessage())
.build();
}
}
@PUT
@Path("/{id}")
public Response modify(
@PathParam("id") int id,
@FormParam("name") String name,
@FormParam("type") String type,
@FormParam("peopleID") int peopleID
) {
try {
final Pet modifiedPet = new Pet(id, name,type,peopleID);
this.dao.modify(modifiedPet);
return Response.ok(modifiedPet).build();
} catch (NullPointerException npe) {
final String message = String.format("Invalid data for person (name: %s, peopleID: %s)", name, peopleID);
LOG.log(Level.FINE, message);
return Response.status(Response.Status.BAD_REQUEST)
.entity(message)
.build();
} catch (IllegalArgumentException iae) {
LOG.log(Level.FINE, "Invalid pet id in modify method", iae);
return Response.status(Response.Status.BAD_REQUEST)
.entity(iae.getMessage())
.build();
} catch (DAOException e) {
LOG.log(Level.SEVERE, "Error modifying a pet", e);
return Response.serverError()
.entity(e.getMessage())
.build();
}
}
@DELETE
@Path("/{id}")
public Response delete(
@PathParam("id") int id
) {
try {
this.dao.delete(id);
return Response.ok(id).build();
} catch (IllegalArgumentException iae) {
LOG.log(Level.FINE, "Invalid pet id in delete method", iae);
return Response.status(Response.Status.BAD_REQUEST)
.entity(iae.getMessage())
.build();
} catch (DAOException e) {
LOG.log(Level.SEVERE, "Error deleting a pet", e);
return Response.serverError()
.entity(e.getMessage())
.build();
}
}
private final static Logger LOG = Logger.getLogger(PeopleResource.class.getName());
private final PetDAO dao;
public PetResource() {
this(new PetDAO());
}
PetResource(PetDAO dao) {
this.dao = dao;
}
@GET
@Path("/{id}")
public Response get(
@PathParam("id") int id
) {
try {
final Pet pet = this.dao.get(id);
return Response.ok(pet).build();
} catch (IllegalArgumentException iae) {
LOG.log(Level.FINE, "Invalid pet id in get method", iae);
return Response.status(Response.Status.BAD_REQUEST)
.entity(iae.getMessage())
.build();
} catch (DAOException e) {
LOG.log(Level.SEVERE, "Error getting a pet", e);
return Response.serverError()
.entity(e.getMessage())
.build();
}
}
@GET
public Response listAll() {
try {
return Response.ok(this.dao.listAll()).build();
} catch (DAOException e) {
LOG.log(Level.SEVERE, "Error listing pets", e);
return Response.serverError().entity(e.getMessage()).build();
}
}
@GET
@Path("/people{peopleID}")
public Response listByPeopleID(
@PathParam("peopleID") int peopleID
) {
try {
return Response.ok(this.dao.listByPeopleID(peopleID)).build();
} catch (DAOException e) {
LOG.log(Level.SEVERE, "Error listing pets", e);
return Response.serverError().entity(e.getMessage()).build();
}
}
@POST
public Response add(
@FormParam("name") String name,
@FormParam("type") String type,
@FormParam("peopleID") int peopleID
) {
try {
System.out.println("Esto es el nombre:"+name);
final Pet newPet = this.dao.add(name, type, peopleID);
return Response.ok(newPet).build();
} catch (IllegalArgumentException iae) {
LOG.log(Level.FINE, "Invalid pet id in add method", iae);
return Response.status(Response.Status.BAD_REQUEST)
.entity(iae.getMessage())
.build();
} catch (DAOException e) {
LOG.log(Level.SEVERE, "Error adding a pet", e);
return Response.serverError()
.entity(e.getMessage())
.build();
}
}
@PUT
@Path("/{id}")
public Response modify(
@PathParam("id") int id,
@FormParam("name") String name,
@FormParam("type") String type,
@FormParam("peopleID") int peopleID
) {
try {
final Pet modifiedPet = new Pet(id, name, type, peopleID);
this.dao.modify(modifiedPet);
return Response.ok(modifiedPet).build();
} catch (NullPointerException npe) {
final String message = String.format("Invalid data for person (name: %s, peopleID: %s)", name, peopleID);
LOG.log(Level.FINE, message);
return Response.status(Response.Status.BAD_REQUEST)
.entity(message)
.build();
} catch (IllegalArgumentException iae) {
LOG.log(Level.FINE, "Invalid pet id in modify method", iae);
return Response.status(Response.Status.BAD_REQUEST)
.entity(iae.getMessage())
.build();
} catch (DAOException e) {
LOG.log(Level.SEVERE, "Error modifying a pet", e);
return Response.serverError()
.entity(e.getMessage())
.build();
}
}
@DELETE
@Path("/{id}")
public Response delete(
@PathParam("id") int id
) {
try {
this.dao.delete(id);
return Response.ok(id).build();
} catch (IllegalArgumentException iae) {
LOG.log(Level.FINE, "Invalid pet id in delete method", iae);
return Response.status(Response.Status.BAD_REQUEST)
.entity(iae.getMessage())
.build();
} catch (DAOException e) {
LOG.log(Level.SEVERE, "Error deleting a pet", e);
return Response.serverError()
.entity(e.getMessage())
.build();
}
}
}
......@@ -59,6 +59,20 @@
<role-name>ADMIN</role-name>
</auth-constraint>
</security-constraint>
<security-constraint>
<web-resource-collection>
<web-resource-name>Admin Area</web-resource-name>
<url-pattern>/rest/pets/*</url-pattern>
<http-method>GET</http-method>
<http-method>PUT</http-method>
<http-method>DELETE</http-method>
<http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
<role-name>ADMIN</role-name>
</auth-constraint>
</security-constraint>
<!-- Security roles referenced by this web application -->
<security-role>
......
......@@ -22,6 +22,14 @@ var PeopleDAO = (function() {
type : 'GET'
}, done, fail, always);
};
this.listPeopleSync = function(done, fail, always) {
requestByAjax({
url : resourcePath,
type : 'GET',
async:false
}, done, fail, always);
};
this.addPerson = function(person, done, fail, always) {
requestByAjax({
......
......@@ -21,7 +21,8 @@ var PetDAO = (function () {
this.listPetsByPeopleID = function (peopleID,done, fail, always) {
requestByAjax({
url: resourcePath + 'people' + peopleID,
type: 'GET'
type: 'GET',
async:false
}, done, fail, always);
};
......
This diff is collapsed.
var PetView = (function () {
var dao;
// Referencia a this que permite acceder a las funciones públicas desde las funciones de jQuery.
var self;
var peopleID;
var formId = 'people-form';
var listId = 'people-list';
var formQuery = '#' + formId;
var listQuery = '#' + listId;
function PetView(petDao, formContainerId, listContainerId, paramID) {
peopleID = paramID;
dao = petDao;
self = this;
this.init = function () {
var cont = 0;
var humans = []
var humans_list = []
var humans_list = []
var daoPeople = new PeopleDAO();
function Human(id, name, surname) {
this.id = id;
this.name = name;
this.surname = surname;
}
var cont=0;
var daoPeople = new PeopleDAO();
daoPeople.listPeople(function (people) {
daoPeople.listPeopleSync(function (people) {
$.each(people, function (key, human) {
humans[human.id] = new Human(human.id, human.name, human.surname);
humans_list[cont] = new Human(human.id, human.name, human.surname);
cont++;
cont++;
});
},
function () {
alert('No has sido posible acceder al listado de personas.');
alert('No has sido posible acceder al listado de mascotas.');
});
function PetView(petDao, formContainerId, listContainerId,paramID) {
peopleID=paramID;
dao = petDao;
self = this;
insertPetForm($('#' + formContainerId), humans_list,humans);
insertPetForm($('#' + formContainerId), humans_list, humans);
insertPetList($('#' + listContainerId));
console.log(humans);
this.init = function () {
if(peopleID==="all"){
dao.listAll(function (people) {
$.each(people, function (key, pet) {
appendToTable(pet, humans);
});
},
function () {
alert('No has sido posible acceder al listado de mascotas.');
if (peopleID === "all") {
dao.listAll(function (people) {
$.each(people, function (key, pet) {
appendToTable(pet, humans);
});
}else{
dao.listPetsByPeopleID(peopleID,function (people) {
$.each(people, function (key, pet) {
appendToTable(pet, humans);
});
},function () {
alert('No has sido posible acceder al listado de mascotas.');
},
function () {
alert('No has sido posible acceder al listado de mascotas.');
});
} else {
dao.listPetsByPeopleID(peopleID, function (people) {
$.each(people, function (key, pet) {
appendToTable(pet, humans);
});
}
}, function () {
alert('No has sido posible acceder al listado de mascotas.');
});
}
// La acción por defecto de enviar formulario (submit) se sobreescribe
// para que el envío sea a través de AJAX
$(formQuery).submit(function (event) {
var pet = self.getPetInForm();
if (self.isEditing()) {
dao.modifyPet(pet,
function (pet) {
$('#person-' + pet.id + ' td.name').text(pet.name);
$('#person-' + pet.id + ' td.surname').text(humans[pet.peopleID].name+" "+humans[pet.peopleID].surname);
$('#person-' + pet.id + ' td.surname').text(humans[pet.peopleID].name + " " + humans[pet.peopleID].surname);
$('#person-' + pet.id + ' td.pet_type').text(pet.type);
self.resetForm();
},
......@@ -77,7 +71,7 @@ var PetView = (function () {
} else {
dao.addPet(pet,
function (pet) {
appendToTable(pet,humans);
appendToTable(pet, humans);
self.resetForm();
},
showErrorMessage,
......@@ -87,7 +81,6 @@ var PetView = (function () {
return false;
});
$('#btnClear').click(this.resetForm);
};
......@@ -132,7 +125,7 @@ var PetView = (function () {
};
this.deletePet = function (id) {
if (confirm('Está a punto de eliminar a una persona. ¿Está seguro de que desea continuar?')) {
if (confirm('Está a punto de eliminar a una mascota. ¿Está seguro de que desea continuar?')) {
dao.deletePet(id,
function () {
$('tr#person-' + id).remove();
......@@ -162,32 +155,31 @@ var PetView = (function () {
}
;
var returnHumansSelect = function (humans) {
var toret = "<select id=dueno class=form-control>";
var cont = 0
var i=0;
for (i=0;i<humans.length;i++){
toret+="<option value="+humans[i].id+">"+humans[i].name+" "+humans[i].surname+"</option>";
var i = 0;
for (i = 0; i < humans.length; i++) {
toret += "<option value=" + humans[i].id + ">" + humans[i].name + " " + humans[i].surname + "</option>";
}
toret+="</select>";
toret += "</select>";
return toret;
};
var returnHumanTextBox = function (human) {
var toret ="<input type=hidden id=dueno value=\""+human.id+"\"/><input name=owner type=text value=\""+human.name+" "
+human.surname+"\" placeholder=Dueño class=form-control readonly/>";
var toret = "<input type=hidden id=dueno value=\"" + human.id + "\"/><input name=owner type=text value=\"" + human.name + " "
+ human.surname + "\" placeholder=Dueño class=form-control readonly/>";
return toret;
};
var insertPetForm = function (parent, humans,humans_map) {
var txtToAppend="";
if(peopleID==='all'){
txtToAppend=returnHumansSelect(humans);
}else{
alert(peopleID);
txtToAppend=returnHumanTextBox(humans_map[peopleID]);
var insertPetForm = function (parent, humans, humans_map) {
var txtToAppend = "";
if (peopleID === 'all') {
txtToAppend = returnHumansSelect(humans);
} else {
txtToAppend = returnHumanTextBox(humans_map[peopleID]);
}
parent.append(
'<form id="' + formId + '" class="mb-5 mb-10">\
......@@ -200,7 +192,7 @@ var PetView = (function () {
<input name="type" type="text" value="" placeholder="Tipo" class="form-control" required/>\
</div>\
<div class="col-sm-1">Dueño:</div>\
<div class="col-sm-3">'+ txtToAppend +'</div>\
<div class="col-sm-3">' + txtToAppend + '</div>\
<div class="col-sm-3">\
<input id="btnSubmit" type="submit" value="Crear" class="btn btn-primary" />\
<input id="btnClear" type="reset" value="Limpiar" class="btn" />\
......
......@@ -134,7 +134,7 @@ public class PetResourceTest extends JerseyTest {
}
@Test
@ExpectedDatabase("/datasets/dataset-add.xml")
@ExpectedDatabase("/datasets/dataset-add_pets.xml")
public void testAdd() throws IOException {
final Form form = new Form();
form.param("name", newName());
......@@ -205,7 +205,7 @@ public class PetResourceTest extends JerseyTest {
}
@Test
@ExpectedDatabase("/datasets/dataset-modify.xml")
@ExpectedDatabase("/datasets/dataset-modify_pets.xml")
public void testModify() throws IOException {
final Form form = new Form();
form.param("name", newName());
......@@ -292,7 +292,7 @@ public class PetResourceTest extends JerseyTest {
}
@Test
@ExpectedDatabase("/datasets/dataset-delete.xml")
@ExpectedDatabase("/datasets/dataset-delete_pets.xml")
public void testDelete() throws IOException {
final Response response = target("pets/" + existentId()).request()
.header("Authorization", "Basic " + userToken(adminLogin()))
......
......@@ -17,9 +17,8 @@
<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
<pets id="1" name="Trotsky" type="Perro" peopleID="1"/>
<pets id="2" name="Cato" type="Gato" peopleID="2"/>
<pets id="3" name="Hiroshi" type="Conejo" peopleID="1"/>
<pets id="4" name="Jael" type="Perro" peopleID="3"/>
<pets id="5" name="Lucky" type="Anaconda" peopleID="3"/>
<pets id="1" name="Trotsky" type="Perro" peopleID="1" />
<pets id="2" name="Cato" type="Gato" peopleID="2" />
<pets id="3" name="Hiroshi" type="Conejo" peopleID="1" />
<pets id="4" name="Jael" type="Perro" peopleID="3" />
</dataset>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dataset SYSTEM "dataset.dtd">
<dataset>
<people id="1" name="Antón" surname="Álvarez" />
<people id="2" name="Ana" surname="Amargo" />
<people id="3" name="Manuel" surname="Martínez" />
<people id="4" name="María" surname="Márquez" />
<people id="5" name="Lorenzo" surname="López" />
<people id="6" name="Laura" surname="Laredo" />
<people id="7" name="Perico" surname="Palotes" />
<people id="8" name="Patricia" surname="Pérez" />
<people id="9" name="Julia" surname="Justa" />
<people id="10" name="Juan" surname="Jiménez" />
<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
<pets id="1" name="Trotsky" type="Perro" peopleID="1" />
<pets id="2" name="Cato" type="Gato" peopleID="2" />
<pets id="3" name="Hiroshi" type="Conejo" peopleID="1" />
<pets id="4" name="Jael" type="Perro" peopleID="3" />
<pets id="5" name="Lucky" type="Anaconda" peopleID="5" />
</dataset>
\ No newline at end of file
......@@ -15,7 +15,8 @@
<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
<pets id="1" name="Trotsky" type="Perro" peopleID="1"/>
<pets id="2" name="Cato" type="Gato" peopleID="2"/>
<pets id="3" name="Hiroshi" type="Conejo" peopleID="1"/>
<pets id="1" name="Trotsky" type="Perro" peopleID="1" />
<pets id="2" name="Cato" type="Gato" peopleID="2" />
<pets id="3" name="Hiroshi" type="Conejo" peopleID="1" />
<pets id="4" name="Jael" type="Perro" peopleID="3" />
</dataset>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dataset SYSTEM "dataset.dtd">
<dataset>
<people id="1" name="Antón" surname="Álvarez" />
<people id="2" name="Ana" surname="Amargo" />
<people id="3" name="Manuel" surname="Martínez" />
<people id="4" name="María" surname="Márquez" />
<people id="5" name="Lorenzo" surname="López" />
<people id="6" name="Laura" surname="Laredo" />
<people id="7" name="Perico" surname="Palotes" />
<people id="8" name="Patricia" surname="Pérez" />
<people id="9" name="Julia" surname="Justa" />
<people id="10" name="Juan" surname="Jiménez" />
<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
<pets id="1" name="Trotsky" type="Perro" peopleID="1" />
<pets id="2" name="Cato" type="Gato" peopleID="2" />
<pets id="3" name="Hiroshi" type="Conejo" peopleID="1" />
</dataset>
\ No newline at end of file
......@@ -16,8 +16,8 @@
<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
<pets id="1" name="Trotsky" type="Perro" peopleID="1"/>
<pets id="2" name="Cato" type="Gato" peopleID="2"/>
<pets id="3" name="Hiroshi" type="Conejo" peopleID="1"/>
<pets id="4" name="Lucky" type="Anaconda" peopleID="5"/>
<pets id="1" name="Trotsky" type="Perro" peopleID="1" />
<pets id="2" name="Cato" type="Gato" peopleID="2" />
<pets id="3" name="Hiroshi" type="Conejo" peopleID="1" />
<pets id="4" name="Jael" type="Perro" peopleID="3" />
</dataset>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dataset SYSTEM "dataset.dtd">
<dataset>
<people id="1" name="Antón" surname="Álvarez" />
<people id="2" name="Ana" surname="Amargo" />
<people id="3" name="Manuel" surname="Martínez" />
<people id="4" name="María" surname="Márquez" />
<people id="5" name="Lorenzo" surname="López" />
<people id="6" name="Laura" surname="Laredo" />
<people id="7" name="Perico" surname="Palotes" />
<people id="8" name="Patricia" surname="Pérez" />
<people id="9" name="Julia" surname="Justa" />
<people id="10" name="Juan" surname="Jiménez" />
<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
<pets id="1" name="Trotsky" type="Perro" peopleID="1" />
<pets id="2" name="Cato" type="Gato" peopleID="2" />
<pets id="3" name="Hiroshi" type="Conejo" peopleID="1" />
<pets id="4" name="Lucky" type="Anaconda" peopleID="5" />
</dataset>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment