Skip to content

[BI-2343] - GID filtering not informative #435

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
HMS17 merged 4 commits into from
Nov 27, 2024
Merged

[BI-2343] - GID filtering not informative #435

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
257e848
[BI-2343] - GID filtering not informative
HMS17 Nov 19, 2024
bfbddf6
Merge branch 'develop' into bug/BI-2343
HMS17 Nov 20, 2024
d389288
[BI-2343] - added entry number matching
HMS17 Nov 26, 2024
0130ce6
Merge branch 'develop' into bug/BI-2343
HMS17 Nov 27, 2024
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
22 changes: 22 additions & 0 deletions src/main/java/org/breedinginsight/utilities/response/ResponseUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,18 @@ private static List<?> search(List<?> data, SearchRequest searchRequest, Abstrac
.collect(Collectors.toList());
}

//To enable checking for the case of Germplasm Search when the filter is accessionNumber or list entry number and thereby needs to do exact match
String accessionNumFilter;
if (mapper.exists("accessionNumber")) accessionNumFilter = mapper.getField("accessionNumber").toString();
else {
accessionNumFilter = "";
}
String entryNumFilter;
if (mapper.exists("importEntryNumber")) entryNumFilter = mapper.getField("importEntryNumber").toString();
else {
entryNumFilter = "";
}

if (filterFields.size() > 0){
// Apply filters
List<FilterField> finalFilterFields = filterFields;
Expand All @@ -211,6 +223,16 @@ private static List<?> search(List<?> data, SearchRequest searchRequest, Abstrac
return recordList.stream()
.anyMatch(listValue ->
listValue.toString().toLowerCase().contains(filterField.getValue().toLowerCase()));
}
else if (!accessionNumFilter.isEmpty() && filterField.getField().toString().equals(accessionNumFilter)) {
//enable exact match in case of GID
return filterField.getField().apply(record).toString()
.toLowerCase().equalsIgnoreCase(filterField.getValue().toLowerCase());
}
else if (!entryNumFilter.isEmpty() && filterField.getField().toString().equals(entryNumFilter)) {
//enable exact match in case of entry number
return filterField.getField().apply(record).toString()
.toLowerCase().equalsIgnoreCase(filterField.getValue().toLowerCase());
} else {
return filterField.getField().apply(record).toString()
.toLowerCase().contains(filterField.getValue().toLowerCase());
Expand Down