Ejercicio previo terminado DAAExample

db/mysql-with-inserts.sql

@@ -14,6 +14,14 @@ CREATE TABLE `daaexample`.`users` (
 	PRIMARY KEY (`login`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+CREATE TABLE `daaexample`.`pets`(
+	`id` int NOT NULL AUTO_INCREMENT,
+	`name` varchar(50) NOT NULL,
+	`owner_id` int NOT NULL,
+	PRIMARY KEY (`id`),
+	FOREIGN KEY (`owner_id`) REFERENCES `people`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
 CREATE USER 'daa'@'localhost' IDENTIFIED BY 'daa';
 GRANT ALL ON `daaexample`.* TO 'daa'@'localhost';
 

db/mysql.sql

@@ -14,5 +14,13 @@ CREATE TABLE `daaexample`.`users` (
 	PRIMARY KEY (`login`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+CREATE TABLE `daaexample`.`pets`(
+	`id` int NOT NULL AUTO_INCREMENT,
+	`name` varchar(50) NOT NULL,
+	`owner_id` int NOT NULL,
+	PRIMARY KEY (`id`),
+	FOREIGN KEY (`owner_id`) REFERENCES `people`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
 CREATE USER 'daa'@'localhost' IDENTIFIED BY 'daa';
 GRANT ALL ON `daaexample`.* TO 'daa'@'localhost';

src/main/java/es/uvigo/esei/daa/DAAExampleApplication.java

@@ -11,6 +11,7 @@ import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
 import es.uvigo.esei.daa.rest.PeopleResource;
+import es.uvigo.esei.daa.rest.PetsResource;
 import es.uvigo.esei.daa.rest.UsersResource;
 
 /**
@@ -26,7 +27,8 @@ public class DAAExampleApplication extends Application {
 	public Set<Class<?>> getClasses() {
 		return Stream.of(
 			PeopleResource.class,
-			UsersResource.class
+			UsersResource.class,
+			PetsResource.class
 		).collect(toSet());
 	}
 	

src/main/java/es/uvigo/esei/daa/dao/PeopleDAO.java

 package es.uvigo.esei.daa.dao;
 
+import java.sql.Statement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.logging.Level;

src/main/java/es/uvigo/esei/daa/rest/PeopleResource.java

@@ -17,6 +17,7 @@ import javax.ws.rs.core.Response;
 import es.uvigo.esei.daa.dao.DAOException;
 import es.uvigo.esei.daa.dao.PeopleDAO;
 import es.uvigo.esei.daa.entities.Person;
+import es.uvigo.esei.daa.dao.PetsDAO;
 
 /**
  * REST resource for managing people.
@@ -34,11 +35,11 @@ public class PeopleResource {
 	 * Constructs a new instance of {@link PeopleResource}.
 	 */
 	public PeopleResource() {
-		this(new PeopleDAO());
+		this(new PeopleDAO(), new PetsDAO());
 	}
 	
 	// Needed for testing purposes
-	PeopleResource(PeopleDAO dao) {
+	PeopleResource(PeopleDAO dao, PetsDAO petsDao) {
 		this.dao = dao;
 	}
 	

src/main/webapp/js/view/people.js

@@ -106,6 +106,13 @@ var PeopleView = (function() {
 			}
 		};
 		
+		this.listPets = function(id){
+			var person = this.getPersonInRow(id);
+			var petsView = new PetsView(new PetsDAO(id), 'modal-pets', person.name + ' ' + person.surname);
+			petsView.init();
+			$('#modal-pets').modal('show');
+		};
+
 		this.isEditing = function() {
 			return $(formQuery + ' input[name="id"]').val() != "";
 		};
@@ -166,6 +173,7 @@ var PeopleView = (function() {
 			<td class="name col-sm-4">' + person.name + '</td>\
 			<td class="surname col-sm-5">' + person.surname + '</td>\
 			<td class="col-sm-3">\
+				<a class="pets btn btn-primary" href="#">Mascotas</a>\
 				<a class="edit btn btn-primary" href="#">Editar</a>\
 				<a class="delete btn btn-warning" href="#">Eliminar</a>\
 			</td>\
@@ -184,6 +192,10 @@ var PeopleView = (function() {
 		$('#person-' + person.id + ' a.delete').click(function() {
 			self.deletePerson(person.id);
 		});
+		
+		$('#person-' + person.id + ' a.pets').click(function() {
+			self.listPets(person.id);
+		});
 	};
 
 	var appendToTable = function(person) {

src/main/webapp/main.html

@@ -26,10 +26,32 @@
 		</div>
 	</div>
 	
+	<div class="modal fade" id="modal-pets" tabindex="-1" role="dialog" aria-labelledby="modal-pets-title" aria-hidden="true">
+		<div class="modal-dialog" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h5 class="modal-title" id="modal-pets-title"></h5>
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+				</div>
+				<div class="modal-body" id="modal-pets-body">
+				
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn btn-secondary" data-dismiss="modal">Cerrar</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	
 	<script type="text/javascript"
 		src="http://code.jquery.com/jquery-2.2.4.min.js"></script>
+	<script type="text/javascript" src="js/boostrap/js/bootstrap.js"></script>
 	<script type="text/javascript" src="js/dao/people.js"></script>
 	<script type="text/javascript" src="js/view/people.js"></script>
+	<script type="text/javascript" src="js/dao/pets.js"></script>
+	<script type="text/javascript" src="js/view/pets.js"></script>	
 	<script type="text/javascript" src="js/login.js"></script>
 	<script type="text/javascript">
 	$(document).ready(

src/test/java/es/uvigo/esei/daa/filters/AuthorizationFilter.java

@@ -54,7 +54,7 @@ public class AuthorizationFilter implements ContainerRequestFilter {
 					if (this.dao.checkLogin(userPass[0], userPass[1])) {
 						final User user = this.dao.get(userPass[0]);
 						
-						if (isPeoplePath(requestContext) && !user.getRole().equals("ADMIN")) {
+						if ((isPeoplePath(requestContext) || isPetsPath(requestContext)) && !user.getRole().equals("ADMIN")) {
 							requestContext.abortWith(createResponse());
 						} else {
 							requestContext.setSecurityContext(new UserSecurityContext(user));
@@ -76,6 +76,11 @@ public class AuthorizationFilter implements ContainerRequestFilter {
 		return !pathSegments.isEmpty() && pathSegments.get(0).getPath().equals("people");
 	}
 	
+	private static boolean isPetsPath(ContainerRequestContext context) {
+		final List<PathSegment> pathSegments = context.getUriInfo().getPathSegments();
+		return !pathSegments.isEmpty() && pathSegments.get(2).getPath().equals("pets");
+	}
+	
 	private static Response createResponse() {
 		return Response.status(Status.UNAUTHORIZED)
 			.header(HttpHeaders.WWW_AUTHENTICATE, "Basic realm=\"DAAExample\"")

src/test/java/es/uvigo/esei/daa/suites/IntegrationTestSuite.java

@@ -5,11 +5,13 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 import es.uvigo.esei.daa.rest.PeopleResourceTest;
+import es.uvigo.esei.daa.rest.PetsResourceTest;
 import es.uvigo.esei.daa.rest.UsersResourceTest;
 
 @SuiteClasses({ 
 	PeopleResourceTest.class,
-	UsersResourceTest.class
+	UsersResourceTest.class,
+	PetsResourceTest.class
 })
 @RunWith(Suite.class)
 public class IntegrationTestSuite {

src/test/java/es/uvigo/esei/daa/suites/UnitTestSuite.java

@@ -5,9 +5,11 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 import es.uvigo.esei.daa.entities.PersonUnitTest;
+import es.uvigo.esei.daa.entities.PetUnitTest;
 
 @SuiteClasses({
-	PersonUnitTest.class
+	PersonUnitTest.class,
+	PetUnitTest.class
 })
 @RunWith(Suite.class)
 public class UnitTestSuite {

src/test/resources/datasets/dataset-add.xml

@@ -16,4 +16,9 @@
 
 	<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
 	<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
+
+	<pets id="1" name="Micifu" owner_id="1"/>
+	<pets id="2" name="Tobi" owner_id="1"/>
+	<pets id="3" name="Guantes" owner_id="1"/>
+	<pets id="4" name="Pecas" owner_id="1"/>
 </dataset>
\ No newline at end of file

src/test/resources/datasets/dataset-delete.xml

@@ -14,4 +14,10 @@
 
 	<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
 	<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
+	
+	<pets id="1" name="Micifu" owner_id="1"/>
+	<pets id="2" name="Tobi" owner_id="1"/>
+	<pets id="3" name="Guantes" owner_id="1"/>
+	<pets id="4" name="Pecas" owner_id="1"/>
+
 </dataset>
\ No newline at end of file

src/test/resources/datasets/dataset-modify.xml

@@ -15,4 +15,10 @@
 
 	<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
 	<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
+	
+	<pets id="1" name="Micifu" owner_id="1"/>
+	<pets id="2" name="Tobi" owner_id="1"/>
+	<pets id="3" name="Guantes" owner_id="1"/>
+	<pets id="4" name="Pecas" owner_id="1"/>
+
 </dataset>
\ No newline at end of file

src/test/resources/datasets/dataset.dtd

 <?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT dataset (people*, users*)>
+<!ELEMENT dataset (people*, users*, pets*)>
 <!ELEMENT people EMPTY>
 <!ELEMENT users EMPTY>
+<!ELEMENT pets EMPTY>
 <!ATTLIST people
     id CDATA #IMPLIED
     name CDATA #IMPLIED
@@ -12,3 +13,9 @@
     password CDATA #IMPLIED
     role CDATA #IMPLIED
 >
+
+<!ATTLIST pets
+    id CDATA #IMPLIED
+    name CDATA #IMPLIED
+    owner_id CDATA #IMPLIED
+>

src/test/resources/datasets/dataset.xml

@@ -15,4 +15,9 @@
 
 	<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
 	<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
+	
+	<pets id="1" name="Micifu" owner_id="1"/>
+	<pets id="2" name="Tobi" owner_id="1"/>
+	<pets id="3" name="Guantes" owner_id="1"/>
+	<pets id="4" name="Pecas" owner_id="1"/>
 </dataset>
\ No newline at end of file

src/test/resources/db/hsqldb-drop.sql

+DROP TABLE Pets IF EXISTS;
 DROP TABLE People IF EXISTS;
 DROP TABLE Users IF EXISTS;
\ No newline at end of file

src/test/resources/db/hsqldb.sql

@@ -11,3 +11,11 @@ CREATE TABLE users (
 	role VARCHAR(5) NOT NULL,
 	PRIMARY KEY (login)
 );
+
+CREATE TABLE pets(
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1) NOT NULL,
+	name varchar(50) NOT NULL,
+	owner_id int NOT NULL,
+	PRIMARY KEY (id),
+	FOREIGN KEY (owner_id) REFERENCES people(id) ON DELETE CASCADE
+);
\ No newline at end of file