Skip to content

BI-3069: Observation unit search by studyDbId incorrectly filters results using external reference ID. #565

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
jloux-brapi merged 1 commit into from
Oct 7, 2026
+4 −12
Merged

BI-3069: Observation unit search by studyDbId incorrectly filters results using external reference ID. #565

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
16 changes: 4 additions & 12 deletions src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIObservationUnitDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,20 +292,12 @@ public List<BrAPIObservationUnit> getObservationUnits(Program program,
// TODO: Are level filters being used here at all? Should they be?
addLevelFilter(observationUnitLevelName, observationUnitLevelOrder, observationUnitLevelCode, level, levelFilter);
addLevelFilter(observationUnitLevelRelationshipName, observationUnitLevelRelationshipOrder, observationUnitLevelRelationshipCode, relationship, relationshipFilter);
// TODO: Use observationUnitSearchRequest.setStudyDbIds() instead of xrefs [BI-2919]

environmentId.ifPresent(envId -> observationUnitSearchRequest.setStudyDbIds(List.of(envId)));

return searchObservationUnitsAndProcess(observationUnitSearchRequest, program, true).stream().filter(ou -> {
//xref search does an OR, so we need to convert the searching for expId/envId to be an AND
boolean matches = environmentId.map(id -> id.equals(Utilities.getExternalReference(ou.getExternalReferences(), Utilities.generateReferenceSource(referenceSource, ExternalReferenceSource.STUDIES))
.get()
.getReferenceId()))
.orElse(true);

//adding filter for germplasmDbId because we can't easily search that in the stored data object
// TODO: Add search on germplasmDbId directly in search request [BI-3006]
return matches && germplasmId.map(id -> id.equals(ou.getAdditionalInfo().get(BrAPIAdditionalInfoFields.GERMPLASM_UUID).getAsString())).orElse(true);
}).collect(Collectors.toList());
return searchObservationUnitsAndProcess(observationUnitSearchRequest, program, true).stream()
// TODO: Add search on germplasmDbId directly in the search request [BI-3006]
.filter(ou -> germplasmId.map(id -> id.equals(ou.getAdditionalInfo().get(BrAPIAdditionalInfoFields.GERMPLASM_UUID).getAsString())).orElse(true)).collect(Collectors.toList());
}

private void addLevelFilter(Optional<String> observationUnitLevelName, Optional<Integer> observationUnitLevelOrder, Optional<String> observationUnitLevelCode, BrAPIObservationUnitLevelRelationship level, AtomicBoolean levelFilter) {
Expand Down
Loading