Merge pull request #435 from Breeding-Insight/bug/BI-2343

[BI-2343] - GID filtering not informative
Breeding-Insight · Nov 27, 2024 · 8e7ec0c · 8e7ec0c
2 parents e778c65 + 0130ce6
commit 8e7ec0c
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/src/main/java/org/breedinginsight/utilities/response/ResponseUtils.java b/src/main/java/org/breedinginsight/utilities/response/ResponseUtils.java
@@ -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;
@@ -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());