Merge pull request #145 from cvazquezlos/dev

Pre-release changes.

Author: cvazquezlos

API.md

@@ -35,19 +35,14 @@ All Request URLs can be send by typing http://localhost:8443 followed by the req
   "title": newTitle,
   "author": newAuthor,
   "editorial": newEditorial,
+  "resourceCopiesNumber": numberOfCopies,
   "description": newDescription,
   "resourceType": {
      "id": typeId
   },
   "genre": {
     "id": genreId
-  },
-  "copies": [
-    {
-      "id": newAndUniqueCopyId,
-      "locationCode": newLocationCode
-    }
-  ]
+  }
 }
 ```
 #### DELETE method

backend/src/main/java/appSpring/model/Resource.java

@@ -40,6 +40,7 @@ public interface ResoCopy {}
 	private ArrayList<String> noReservedCopies;
 	@JsonView(Basic.class)
 	private Boolean avaiblereserve;
+	private Integer resourceCopiesNumber;
 
 	@Column(length = 1024)
 	@JsonView(Basic.class)
@@ -177,4 +178,12 @@ public void setHasPhoto(boolean hasPhoto) {
 		this.hasPhoto = hasPhoto;
 	}
 
+	public int getResourceCopiesNumber() {
+		return this.resourceCopiesNumber;
+	}
+	
+	public void setResourceCopiesNumber(int resourceCopiesNumber) {
+		this.resourceCopiesNumber = resourceCopiesNumber;
+	}
+	
 }

backend/src/main/java/appSpring/restController/FileRestController.java

@@ -14,28 +14,18 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.fasterxml.jackson.annotation.JsonView;
-
-import appSpring.model.Fine;
-import appSpring.model.ResourceCopy;
-import appSpring.model.User;
-
 import appSpring.service.UserService;
 import appSpring.service.ResourceService;
 
 @RestController
 @RequestMapping("/api/files")
 public class FileRestController {
-
-	public interface FineDetail extends Fine.Basic, Fine.ResoCopy, Fine.Usr, ResourceCopy.Basic, User.Basic {
-	}
 
 	@Autowired
 	private UserService userService;
 	@Autowired
 	private ResourceService resourceService;
 
-	@JsonView(FineDetail.class)
 	@RequestMapping(value = "/user/{id}", method = RequestMethod.GET)
 	public ResponseEntity<String> getUserfile(@PathVariable int id, Authentication authentication, HttpSession session,
 			HttpServletRequest request) throws IOException {
@@ -48,7 +38,6 @@ public ResponseEntity<String> getUserfile(@PathVariable int id, Authentication a
 		}
 	}
 
-	@JsonView(FineDetail.class)
 	@RequestMapping(value = "/resource/{id}", method = RequestMethod.GET)
 	public ResponseEntity<String> getResourceFile(@PathVariable int id, Authentication authentication, HttpSession session,
 			HttpServletRequest request) throws IOException {

backend/src/main/java/appSpring/restController/ResourceRestController.java

@@ -51,17 +51,19 @@ public ResponseEntity<Resource> postResource(@RequestBody Resource resource, Htt
 		newResource.setGenre(resource.getGenre());
 		newResource.setProductType(resource.getProductType());
 		resourceService.save(newResource);
-		for (ResourceCopy resourceCopy : resource.getResourceCopies()) {
-			if (resourceCopyService.findOne(resourceCopy.getID()) == null) {
-				resourceCopy.setResource(newResource);
-				resourceCopyService.save(resourceCopy);
-				newResource.getNoReservedCopies().add(resourceCopy.getLocationCode());
-			} else {
-				return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-			}
+		ResourceCopy copy;
+		for (int i = 0; i < resource.getResourceCopiesNumber(); i++) {
+			copy = new ResourceCopy();
+			copy.setResource(newResource);
+			copy.generatorCode();
+			resourceCopyService.save(copy);
+			copy.setLocationCode(copy.getLocationCode() + copy.getID());
+			resourceCopyService.save(copy);
+			newResource.getNoReservedCopies().add(copy.getLocationCode());
+			newResource.getResourceCopies().add(copy);
 		}
 		resourceService.save(newResource);
-		return new ResponseEntity<>(resource, HttpStatus.OK);
+		return new ResponseEntity<>(newResource, HttpStatus.OK);
 	}
 
 	@JsonView(ResourceDetail.class)
@@ -151,5 +153,15 @@ public ResponseEntity<Resource> putUserImage(@PathVariable Integer id,
 			return new ResponseEntity<>(HttpStatus.NOT_FOUND);
 		}
 	}
+	
+	@JsonView(ResourceDetail.class)
+	@RequestMapping(value = "/all", method = RequestMethod.GET)
+	public ResponseEntity<List<Resource>> getAllResources(HttpSession session) {
+		
+		session.setMaxInactiveInterval(-1);
+		
+		List<Resource> resources = resourceService.findAll();
+		return new ResponseEntity<>(resources, HttpStatus.OK);
+	}
 
 }

backend/src/main/java/appSpring/security/RestSecurityConfiguration.java

@@ -27,7 +27,7 @@ protected void configure(HttpSecurity http) throws Exception {
 				"/api/genres/{id}", "/api/resourcetypes", "/api/resourcetypes/{id}").permitAll();
 		http.authorizeRequests().antMatchers(HttpMethod.GET, "/api/users/{id}", "/api/loans", "/api/loans/{id}",
 				"/api/fines", "/api/fines/{id}", "/api/resourcecopies", "/api/resourcecopies/{id}").hasAnyRole("USER");
-		http.authorizeRequests().antMatchers(HttpMethod.GET, "/api/users").hasAnyRole("ADMIN");
+		http.authorizeRequests().antMatchers(HttpMethod.GET, "/api/users", "/api/resources/all").hasAnyRole("ADMIN");
 		http.authorizeRequests().antMatchers(HttpMethod.POST, "/api/users").hasAnyRole("ADMIN");
 		http.authorizeRequests().antMatchers(HttpMethod.POST, "/api/loans").hasAnyRole("USER", "ADMIN");
 		http.authorizeRequests().antMatchers(HttpMethod.POST, "/api/resources", "/api/genres", "/api/resourcetypes",

backend/target/appSpring-0.0.1.jar

@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Implementation-Title: appSpring
+Implementation-Version: 0.0.1
+Built-By: c.vazquezlos
+Implementation-Vendor-Id: es.urjc.daw
+Build-Jdk: 1.8.0_121
+Implementation-URL: http://projects.spring.io/spring-boot/appSpring/
+Created-By: Maven Integration for Eclipse
+Implementation-Vendor: Pivotal Software, Inc.
+Main-Class: appSpring.Application
+

backend/target/appSpring-0.0.1.jar.original

@@ -0,0 +1,23 @@
+server.port = 8443
+server.ssl.key-store = classpath:keystore.jks
+server.ssl.key-store-password = password
+server.ssl.key-password = secret
+spring.h2.console.enabled=true
+
+spring.datasource.url = jdbc:mysql://localhost/brems?verifyServerCertificate=false&useSSL=true
+spring.datasource.username = root
+spring.datasource.password = 1234
+spring.datasource.driverClassName = com.mysql.jdbc.Driver
+spring.jpa.hibernate.ddl-auto = create-drop
+
+spring.mail.host = smtp.gmail.com
+spring.mail.port = 587
+spring.mail.username = bremslibrerias@gmail.com
+spring.mail.password = BrEmSbReMs7102
+
+spring.mail.properties.mail.smtp.auth = true
+spring.mail.properties.mail.smtp.socketFactory.port = 465
+spring.mail.properties.mail.smtp.starttls.required = false
+spring.mail.properties.mail.smtp.starttls.enable = true
+spring.mail.properties.mail.smtp.socketFactory.class = javax.net.ssl.SSLSocketFactory
+spring.mail.properties.mail.smtp.socketFactory.fallback = false