Skip to content

If requested ID maps to itself and others, use only itself (not multiple options response) #146

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

Merged
ryanrdoherty merged 1 commit into from
Oct 16, 2026
Merged

If requested ID maps to itself and others, use only itself (not multiple options response) #146

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
50 changes: 31 additions & 19 deletions Service/src/main/java/org/gusdb/wdk/service/service/RecordService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,28 +131,40 @@ public Response buildResult(@PathParam(RECORD_TYPE_PATH_PARAM) String recordClas

// if PK specified maps to multiple records, return Multiple Choices response with IDs from which to choose
else if (records.size() > 1) {
String idOptionText = records.stream()
.map(record -> record.getPrimaryKey().getRawValues().entrySet().stream()
.map(entry -> entry.getKey() + " = " + entry.getValue())
.collect(Collectors.joining(", ")))
.collect(Collectors.joining(NL));
return Response.status(new MultipleChoicesStatusType())
.type(MediaType.TEXT_PLAIN).entity(idOptionText).build();

// special case: if one of the records has the same PK as the requested record,
// assume user wants the requested record. Possible TODO: make this behavior configurable
boolean foundIndenticalMappedRecord = false;
for (RecordInstance record : records) {
if (record.getPrimaryKey().equals(request.getPrimaryKey())) {
// fall through to single record case
foundIndenticalMappedRecord = true;
// keep only the matching record
records = List.of(record);
}
}

if (!foundIndenticalMappedRecord) {
String idOptionText = records.stream()
.map(record -> record.getPrimaryKey().getRawValues().entrySet().stream()
.map(entry -> entry.getKey() + " = " + entry.getValue())
.collect(Collectors.joining(", ")))
.collect(Collectors.joining(NL));
return Response.status(new MultipleChoicesStatusType())
.type(MediaType.TEXT_PLAIN).entity(idOptionText).build();
}
}

// PK represents only one record; fetch, format, and return
else {

// update metrics; increment entries for requested tables
request.getTableNames().stream()
.map(tableName -> recordClass.getUrlSegment() + "." + tableName)
.forEach(key -> TABLE_REQUEST_COUNTER.labels(getWdkModel().getProjectId(), key, getRequestingUser().getRegistrationStatus()).inc());

TwoTuple<JSONObject,List<Exception>> recordJsonResult = RecordFormatter.getRecordJson(
records.get(0), request.getAttributeNames(), request.getTableNames(), AttributeFormat.DISPLAY);
triggerErrorEvents(recordJsonResult.getSecond());
return Response.ok(recordJsonResult.getFirst().toString()).build();
}
// update metrics; increment entries for requested tables
request.getTableNames().stream()
.map(tableName -> recordClass.getUrlSegment() + "." + tableName)
.forEach(key -> TABLE_REQUEST_COUNTER.labels(getWdkModel().getProjectId(), key, getRequestingUser().getRegistrationStatus()).inc());

TwoTuple<JSONObject,List<Exception>> recordJsonResult = RecordFormatter.getRecordJson(
records.get(0), request.getAttributeNames(), request.getTableNames(), AttributeFormat.DISPLAY);
triggerErrorEvents(recordJsonResult.getSecond());
return Response.ok(recordJsonResult.getFirst().toString()).build();
}
catch (JSONException e) {
throw new RequestMisformatException("Passed request body deemed unacceptable. " + e.getMessage(), e);
Expand Down
Loading