Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ALS-4980] Update PicSureService to match contract #79

Merged
merged 1 commit into from
Sep 18, 2023
Merged

[ALS-4980] Update PicSureService to match contract #79

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/PicSureService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
Expand All @@ -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
Expand Down Expand Up @@ -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());

Expand Down
Loading