[ALS-4980] Update PicSureService to match contract with PIC-SURe API

hms-dbmi · Sep 18, 2023 · a43a209 · a43a209
1 parent 3dc96b5
commit a43a209
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/PicSureService.java b/service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/PicSureService.java
@@ -225,8 +225,8 @@ private QueryStatus convertToQueryStatus(AsyncResult entity) {
 	@Path("/query/{resourceQueryId}/result")
 	@Produces(MediaType.TEXT_PLAIN_VALUE)
 	@Override
-	public Response queryResult(@PathParam("resourceQueryId") String queryId, QueryRequest resultRequest) {
-		AsyncResult result = queryService.getResultFor(queryId);
+	public Response queryResult(@PathParam("resourceQueryId") UUID queryId, QueryRequest resultRequest) {
+		AsyncResult result = queryService.getResultFor(queryId.toString());
 		if (result == null) {
 			// This happens sometimes when users immediately request the status for a query
 			// before it can be initialized. We wait a bit and try again before throwing an
@@ -237,7 +237,7 @@ public Response queryResult(@PathParam("resourceQueryId") String queryId, QueryR
 				return Response.status(500).build();
 			}
 
-			result = queryService.getResultFor(queryId);
+			result = queryService.getResultFor(queryId.toString());
 			if (result == null) {
 				return Response.status(404).build();
 			}
@@ -253,8 +253,8 @@ public Response queryResult(@PathParam("resourceQueryId") String queryId, QueryR
 	@POST
 	@Path("/query/{resourceQueryId}/status")
 	@Override
-	public QueryStatus queryStatus(@PathParam("resourceQueryId") String queryId, QueryRequest request) {
-		return convertToQueryStatus(queryService.getStatusFor(queryId));
+	public QueryStatus queryStatus(@PathParam("resourceQueryId") UUID queryId, QueryRequest request) {
+		return convertToQueryStatus(queryService.getStatusFor(queryId.toString()));
 	}
 
 	@POST
@@ -328,7 +328,7 @@ private Response _querySync(QueryRequest resultRequest) throws IOException {
 			QueryStatus status = query(resultRequest);
 			while (status.getResourceStatus().equalsIgnoreCase("RUNNING")
 					|| status.getResourceStatus().equalsIgnoreCase("PENDING")) {
-				status = queryStatus(status.getResourceResultId(), null);
+				status = queryStatus(UUID.fromString(status.getResourceResultId()), null);
 			}
 			log.info(status.toString());