Skip to content
This repository was archived by the owner on Aug 1, 2025. It is now read-only.

Commit 55aa9e7

Browse files
BrapiCoordinatorSelbyBrapiCoordinatorSelby
committed
fix query issues
1 parent 6511ab9 commit 55aa9e7

File tree

7 files changed

+25
-24
lines changed

7 files changed

+25
-24
lines changed

‎src/main/java/org/brapi/test/BrAPITestServer/service/core/StudyService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public List<Study> findStudies(StudySearchRequest request, Metadata metaData) {
141141
.appendList(request.getSeasonDbIds(), "*season.id").appendList(request.getStudyCodes(), "studyCode")
142142
.appendList(request.getStudyDbIds(), "id").appendList(request.getStudyNames(), "studyName")
143143
.appendList(request.getStudyPUIs(), "studyPUI").appendList(request.getStudyTypes(), "studyType")
144-
.appendList(request.getTrialDbIds(), "trial.id").appendList(request.getTrialNames(), "trial.name")
144+
.appendList(request.getTrialDbIds(), "trial.id").appendList(request.getTrialNames(), "trial.trialName")
145145
.withSort(getSortByField(request.getSortBy()), request.getSortOrder());
146146

147147
Page<StudyEntity> studiesPage = studyRepository.findAllBySearch(searchQuery, pageReq);

‎src/main/java/org/brapi/test/BrAPITestServer/service/geno/CallSetService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public List<CallSetEntity> findCallSetEntities(CallSetsSearchRequest request, Me
6262
.appendList(request.getGermplasmDbIds(), "sample.germplasm.id")
6363
.appendList(request.getGermplasmNames(), "sample.germplasm.germplasmName")
6464
.appendList(request.getSampleDbIds(), "sample.id")
65-
.appendList(request.getSampleNames(), "sample.name");
65+
.appendList(request.getSampleNames(), "sample.sampleName");
6666

6767
Page<CallSetEntity> page = callSetRepository.findAllBySearch(searchQuery, pageReq);
6868
PagingUtility.calculateMetaData(metadata, page);

‎src/main/java/org/brapi/test/BrAPITestServer/service/geno/SampleService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ public List<Sample> findSamples(@Valid SampleSearchRequest request, Metadata met
6767
SearchQueryBuilder<SampleEntity> searchQuery = new SearchQueryBuilder<SampleEntity>(SampleEntity.class)
6868
.withExRefs(request.getExternalReferenceIDs(), request.getExternalReferenceSources())
6969
.appendList(request.getGermplasmDbIds(), "germplasm.id")
70-
.appendList(request.getGermplasmNames(), "germplasm.name")
70+
.appendList(request.getGermplasmNames(), "germplasm.germplasmName")
7171
.appendList(request.getObservationUnitDbIds(), "observationUnit.id")
7272
.appendList(request.getPlateDbIds(), "plate.id").appendList(request.getSampleDbIds(), "id")
7373
.appendList(request.getStudyDbIds(), "observationUnit.study.id")
74-
.appendList(request.getStudyNames(), "observationUnit.study.name");
74+
.appendList(request.getStudyNames(), "observationUnit.study.studyName");
7575

7676
Page<SampleEntity> page = sampleRepository.findAllBySearch(searchQuery, pageReq);
7777
List<Sample> samples = page.map(this::convertFromEntity).getContent();

‎src/main/java/org/brapi/test/BrAPITestServer/service/germ/GermplasmAttributeValueService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public List<GermplasmAttributeValue> findGermplasmAttributeValues(
7373
.appendList(request.getTraitClasses(), "attribute.trait.traitClass")
7474
.appendList(request.getTraitDbIds(), "attribute.trait.id")
7575
.appendList(request.getGermplasmDbIds(), "germplasm.id")
76-
.appendList(request.getGermplasmNames(), "germplasm.name");
76+
.appendList(request.getGermplasmNames(), "germplasm.germplasmName");
7777

7878
Page<GermplasmAttributeValueEntity> page = attributeValueRepository.findAllBySearch(searchQuery, pageReq);
7979
List<GermplasmAttributeValue> attributeValues = page.map(this::convertFromEntity).getContent();

‎src/main/java/org/brapi/test/BrAPITestServer/service/germ/GermplasmService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public List<Germplasm> findGermplasm(@Valid GermplasmSearchRequest request, Meta
129129
if (request.getStudyDbIds() != null || request.getStudyNames() != null) {
130130
searchQuery = searchQuery.join("observationUnits", "obsunit")
131131
.appendList(request.getStudyDbIds(), "*obsunit.study.id")
132-
.appendList(request.getStudyNames(), "*obsunit.study.name");
132+
.appendList(request.getStudyNames(), "*obsunit.study.studyName");
133133
}
134134
if (request.getSynonyms() != null) {
135135
searchQuery = searchQuery.join("synonyms", "synonym")

‎src/main/java/org/brapi/test/BrAPITestServer/service/pheno/ObservationService.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,49 +129,49 @@ public List<Observation> findObservations(@Valid ObservationSearchRequest reques
129129
.appendEnumList(
130130
request.getObservationLevels().stream().filter(r -> r.getLevelName() != null)
131131
.map(r -> r.getLevelName()).collect(Collectors.toList()),
132-
"observationUnit.position.level.name")
132+
"observationUnit.position.level.levelName")
133133
.appendList(
134134
request.getObservationLevels().stream().filter(r -> r.getLevelCode() != null)
135135
.map(r -> r.getLevelCode()).collect(Collectors.toList()),
136-
"observationUnit.position.level.code")
136+
"observationUnit.position.level.levelCode")
137137
.appendIntList(
138138
request.getObservationLevels().stream().filter(r -> r.getLevelOrder() != null)
139139
.map(r -> r.getLevelOrder()).collect(Collectors.toList()),
140-
"observationUnit.position.level.order");
140+
"observationUnit.position.level.levelOrder");
141141
}
142142
if (request.getObservationLevelRelationships() != null) {
143143
searchQuery = searchQuery.join("observationUnit.position.levelRelationships", "levelRelationship")
144144
.appendEnumList(
145145
request.getObservationLevelRelationships().stream().filter(r -> r.getLevelName() != null)
146146
.map(r -> r.getLevelName()).collect(Collectors.toList()),
147-
"levelRelationship.name")
147+
"levelRelationship.levelName")
148148
.appendList(
149149
request.getObservationLevelRelationships().stream().filter(r -> r.getLevelCode() != null)
150150
.map(r -> r.getLevelCode()).collect(Collectors.toList()),
151-
"levelRelationship.code")
151+
"levelRelationship.levelCode")
152152
.appendIntList(
153153
request.getObservationLevelRelationships().stream().filter(r -> r.getLevelOrder() != null)
154154
.map(r -> r.getLevelOrder()).collect(Collectors.toList()),
155-
"levelRelationship.order");
155+
"levelRelationship.levelOrder");
156156
}
157157
searchQuery = searchQuery.withExRefs(request.getExternalReferenceIDs(), request.getExternalReferenceSources())
158158
.appendList(request.getGermplasmDbIds(), "observationUnit.germplasm.id")
159-
.appendList(request.getGermplasmNames(), "observationUnit.germplasm.name")
159+
.appendList(request.getGermplasmNames(), "observationUnit.germplasm.germplasmName")
160160
.appendList(request.getLocationDbIds(), "observationUnit.study.location.id")
161-
.appendList(request.getLocationNames(), "observationUnit.study.location.name")
161+
.appendList(request.getLocationNames(), "observationUnit.study.location.locationName")
162162
.appendList(request.getObservationDbIds(), "id")
163163
.appendList(request.getObservationUnitDbIds(), "observationUnit.id")
164164
.appendDateRange(request.getObservationTimeStampRangeStart(), request.getObservationTimeStampRangeEnd(),
165165
"observationTimeStamp")
166166
.appendList(request.getObservationVariableDbIds(), "observationVariable.id")
167167
.appendList(request.getObservationVariableNames(), "observationVariable.name")
168168
.appendList(request.getProgramDbIds(), "observationUnit.study.trial.program.id")
169-
.appendList(request.getProgramNames(), "observationUnit.study.trial.program.name")
169+
.appendList(request.getProgramNames(), "observationUnit.study.trial.program.programName")
170170
.appendList(request.getSeasonDbIds(), "season.id")
171171
.appendList(request.getStudyDbIds(), "observationUnit.study.id")
172-
.appendList(request.getStudyNames(), "observationUnit.study.name")
172+
.appendList(request.getStudyNames(), "observationUnit.study.studyName")
173173
.appendList(request.getTrialDbIds(), "observationUnit.study.trial.id")
174-
.appendList(request.getTrialNames(), "observationUnit.study.trial.name");
174+
.appendList(request.getTrialNames(), "observationUnit.study.trial.trialName");
175175

176176
Page<ObservationEntity> page = observationRepository.findAllBySearch(searchQuery, pageReq);
177177
List<Observation> observations = page.map(this::convertFromEntity).getContent();

‎src/main/java/org/brapi/test/BrAPITestServer/service/pheno/ObservationUnitService.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,27 +155,28 @@ public List<ObservationUnit> findObservationUnits(@Valid ObservationUnitSearchRe
155155
.appendEnumList(
156156
request.getObservationLevelRelationships().stream().filter(r -> r.getLevelName() != null)
157157
.map(r -> r.getLevelName()).collect(Collectors.toList()),
158-
"*levelRelationship.name")
158+
"*levelRelationship.levelName")
159159
.appendList(
160160
request.getObservationLevelRelationships().stream().filter(r -> r.getLevelCode() != null)
161161
.map(r -> r.getLevelCode()).collect(Collectors.toList()),
162-
"*levelRelationship.code")
162+
"*levelRelationship.levelCode")
163163
.appendIntList(
164164
request.getObservationLevelRelationships().stream().filter(r -> r.getLevelOrder() != null)
165165
.map(r -> r.getLevelOrder()).collect(Collectors.toList()),
166-
"*levelRelationship.order");
166+
"*levelRelationship.levelOrder");
167167
}
168168
searchQuery = searchQuery.withExRefs(request.getExternalReferenceIDs(), request.getExternalReferenceSources())
169169
.appendList(request.getGermplasmDbIds(), "germplasm.id")
170-
.appendList(request.getGermplasmNames(), "germplasm.name")
170+
.appendList(request.getGermplasmNames(), "germplasm.germplasmName")
171171
.appendList(request.getLocationDbIds(), "study.location.id")
172-
.appendList(request.getLocationNames(), "study.location.name")
172+
.appendList(request.getLocationNames(), "study.location.locationName")
173173
.appendList(request.getObservationUnitDbIds(), "id")
174174
.appendList(request.getProgramDbIds(), "study.trial.program.id")
175175
.appendList(request.getProgramNames(), "study.trial.program.name")
176-
.appendList(request.getStudyDbIds(), "study.id").appendList(request.getStudyNames(), "study.name")
176+
.appendList(request.getStudyDbIds(), "study.id")
177+
.appendList(request.getStudyNames(), "study.studyName")
177178
.appendList(request.getTrialDbIds(), "study.trial.id")
178-
.appendList(request.getTrialNames(), "study.trial.name");
179+
.appendList(request.getTrialNames(), "study.trial.trailName");
179180

180181
Page<ObservationUnitEntity> page = observationUnitRepository.findAllBySearch(searchQuery, pageReq);
181182
List<ObservationUnit> observationUnits = page.map(this::convertFromEntity).getContent();

0 commit comments

Comments
 (0)