Skip to content

BI-2922: Study Cache 5 - Update bi-api to utilize prodserver for filtering/sorting/pagination #27

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

Open
humsika wants to merge 1 commit into
base: epic/BI-2862
Choose a base branch
from
+8 −2
Open

BI-2922: Study Cache 5 - Update bi-api to utilize prodserver for filtering/sorting/pagination #27

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion src/main/java/io/swagger/model/core/StudySearchRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,21 @@ public class StudySearchRequest extends SearchRequest {
// Value = entity field name and type that represents the submitted field. Used later on in query building.
private static final Map<String, EntityColumnNameAndType> ALLOWED_SORT_AND_FILTER_FIELDS =
Map.ofEntries(
Map.entry("commonCropName", new EntityColumnNameAndType("crop.cropName", EntityType.TEXT)),
Map.entry("externalReferenceId", new EntityColumnNameAndType("*externalReferences.externalReferenceId", EntityType.TEXT)),
Map.entry("externalReferenceSource", new EntityColumnNameAndType("*externalReferences.externalReferenceSource", EntityType.TEXT)),
Map.entry("germplasmDbId", new EntityColumnNameAndType("*obsunit.germplasm.id", EntityType.UUID)),
Map.entry("locationDbId", new EntityColumnNameAndType("location.id", EntityType.UUID)),
Map.entry("observationVariableDbId", new EntityColumnNameAndType("*observation.observationVariable.id", EntityType.UUID)),
Map.entry("programDbId", new EntityColumnNameAndType("trial.program.id", EntityType.UUID)),
Map.entry("programName", new EntityColumnNameAndType("trial.program.name", EntityType.TEXT)),
Map.entry("seasonDbId", new EntityColumnNameAndType("*season.id", EntityType.UUID)),
Map.entry("studyCode", new EntityColumnNameAndType("studyCode", EntityType.TEXT)),
Map.entry("studyDbId", new EntityColumnNameAndType("id", EntityType.UUID)),
Map.entry("studyLocation", new EntityColumnNameAndType("location.id", EntityType.UUID)),
Map.entry("studyPUI", new EntityColumnNameAndType("studyPUI", EntityType.TEXT)),
Map.entry("trialDbId", new EntityColumnNameAndType("trial.id", EntityType.UUID)),
Map.entry("studyType", new EntityColumnNameAndType("studyName", EntityType.TEXT)),
Map.entry("studyType", new EntityColumnNameAndType("studyType", EntityType.TEXT)),
Map.entry("studyName", new EntityColumnNameAndType("studyName", EntityType.TEXT))
);

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/brapi/test/BrAPITestServer/service/core/StudyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ public List<Study> findStudies(StudySearchRequest request, Metadata metaData)
.appendList(request.getStudyDbIds(), "id").appendList(request.getStudyNames(), "studyName")
.appendList(request.getStudyPUIs(), "studyPUI").appendList(request.getStudyTypes(), "studyType")
.appendList(request.getTrialDbIds(), "trial.id").appendList(request.getTrialNames(), "trial.trialName")
.sortBy(request.getSortByElements(), request.getEntityColAndTypeBySubmittedNameMap());
.sortBy(request.getSortByElements(), request.getEntityColAndTypeBySubmittedNameMap())
.filterBy(request.getFilterBy(), request.getEntityColAndTypeBySubmittedNameMap());

Page<StudyEntity> studiesPage = studyRepository.findAllBySearchAndPaginate(searchQuery, pageReq);
PagingUtility.calculateMetaData(metaData, studiesPage);
Expand Down
Loading