Merge pull request #294 from olofsvensson/issue_293

Issue #293 : New web services getAutoProcAttachmentPdf and getAutoProcAttachmentHtml
ispyb · May 18, 2018 · f2b05d8 · f2b05d8
2 parents 59c91b1 + 050de4a
commit f2b05d8
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/ispyb-ws/src/main/java/ispyb/ws/rest/mx/AutoprocintegrationRestWebService.java b/ispyb-ws/src/main/java/ispyb/ws/rest/mx/AutoprocintegrationRestWebService.java
@@ -385,8 +385,29 @@ public Response downloadAutoProcAttachment(@PathParam("token") String token, @Pa
 	@Produces("text/plain")
 	public Response getAutoProcAttachment(@PathParam("token") String token, @PathParam("proposal") String proposal,
 			@PathParam("autoProcAttachmentId") int autoProcAttachmentId) {
+		return this.getFile(token, proposal, autoProcAttachmentId);
+	}
+
+	@RolesAllowed({ "User", "Manager", "Industrial", "Localcontact" })
+	@GET
+	@Path("{token}/proposal/{proposal}/mx/autoprocintegration/autoprocattachmentid/{autoProcAttachmentId}/getPdf")
+	@Produces("application/pdf")
+	public Response getAutoProcAttachmentPdf(@PathParam("token") String token, @PathParam("proposal") String proposal,
+			@PathParam("autoProcAttachmentId") int autoProcAttachmentId) {
+		return this.getFile(token, proposal, autoProcAttachmentId);
+	}
 
-		String methodName = "getAutoProcAttachment";
+	@RolesAllowed({ "User", "Manager", "Industrial", "Localcontact" })
+	@GET
+	@Path("{token}/proposal/{proposal}/mx/autoprocintegration/autoprocattachmentid/{autoProcAttachmentId}/getHtml")
+	@Produces("text/html")
+	public Response getAutoProcAttachmentHtml(@PathParam("token") String token, @PathParam("proposal") String proposal,
+			@PathParam("autoProcAttachmentId") int autoProcAttachmentId) {
+		return this.getFile(token, proposal, autoProcAttachmentId);
+	}
+
+	private Response getFile(String token, String proposal,  int autoProcAttachmentId) {
+		String methodName = "getFile";
 		long start = this.logInit(methodName, logger, token, proposal);
 		try {
 			/** Checking that attachment is linked to the proposal **/
@@ -404,5 +425,4 @@ public Response getAutoProcAttachment(@PathParam("token") String token, @PathPar
 		}
 	}
 
-
 }