HCMPRE:1708 - Enable search on Village Accessibility Details and security questions in Plan Service

health-services/plan-service/src/main/java/digit/config/ServiceConstants.java

@@ -366,6 +366,14 @@ public class ServiceConstants {
 
     public static final String FACILITY_TYPE_SEARCH_PARAMETER_KEY = "facilityType";
 
+    public static final String TERRAIN_CONDITION_SEARCH_PARAMETER_KEY = "accessibilityDetails.terrain.code";
+
+    public static final String ROAD_CONDITION_SEARCH_PARAMETER_KEY = "accessibilityDetails.roadCondition.code";
+
+    public static final String SECURITY_Q1_SEARCH_PARAMETER_KEY = "securityDetails.1.code";
+
+    public static final String SECURITY_Q2_SEARCH_PARAMETER_KEY = "securityDetails.2.code";
+
     public static final String COMMA_DELIMITER = ",";
 
     public static final String SERVING_POPULATION_CODE = "servingPopulation";

health-services/plan-service/src/main/java/digit/service/PlanEnricher.java

@@ -13,7 +13,7 @@
 
 import java.util.*;
 
-import static digit.config.ServiceConstants.FACILITY_ID_SEARCH_PARAMETER_KEY;
+import static digit.config.ServiceConstants.*;
 
 @Component
 public class PlanEnricher {
@@ -257,6 +257,26 @@ public void enrichSearchRequest(PlanSearchRequest planSearchRequest) {
             filtersMap.put(FACILITY_ID_SEARCH_PARAMETER_KEY, planSearchCriteria.getFacilityId());
         }
 
+        // Add terrain as a filter if present in search criteria
+        if (!ObjectUtils.isEmpty(planSearchCriteria.getTerrain())) {
+            filtersMap.put(TERRAIN_CONDITION_SEARCH_PARAMETER_KEY, planSearchCriteria.getTerrain());
+        }
+
+        // Add onRoadCondition as a filter if present in search criteria
+        if (!ObjectUtils.isEmpty(planSearchCriteria.getOnRoadCondition())) {
+            filtersMap.put(ROAD_CONDITION_SEARCH_PARAMETER_KEY, planSearchCriteria.getOnRoadCondition());
+        }
+
+        // Add securityQ1 as a filter if present in search criteria
+        if (!ObjectUtils.isEmpty(planSearchCriteria.getSecurityQ1())) {
+            filtersMap.put(SECURITY_Q1_SEARCH_PARAMETER_KEY, planSearchCriteria.getSecurityQ1());
+        }
+
+        // Add securityQ2 as a filter if present in search criteria
+        if (!ObjectUtils.isEmpty(planSearchCriteria.getSecurityQ2())) {
+            filtersMap.put(SECURITY_Q2_SEARCH_PARAMETER_KEY, planSearchCriteria.getSecurityQ2());
+        }
+
         if(!CollectionUtils.isEmpty(filtersMap))
             planSearchCriteria.setFiltersMap(filtersMap);
     }

health-services/plan-service/src/main/java/digit/util/QueryUtil.java

@@ -109,9 +109,21 @@ public String preparePartialJsonStringFromFilterMap(Map<String, String> filterMa
             if (key.contains(DOT_SEPARATOR)) {
                 String[] keyArray = key.split(DOT_REGEX);
                 Map<String, Object> nestedQueryMap = new HashMap<>();
+
+                // Recursively build the nested structure based on the key hierarchy.
                 prepareNestedQueryMap(0, keyArray, nestedQueryMap, filterMap.get(key));
-                queryMap.put(keyArray[0], nestedQueryMap.get(keyArray[0]));
+
+                // Merge the newly created nested structure into the main query map.
+                queryMap.merge(keyArray[0], nestedQueryMap.get(keyArray[0]), (existing, newValue) -> {
+                    // If both existing and new values are maps, merge them to prevent overwriting.
+                    if (existing instanceof Map && newValue instanceof Map) {
+                        mergeMaps((Map<String, Object>) existing, (Map<String, Object>) newValue);
+                        return existing;
+                    }
+                    return newValue;
+                });
             } else {
+                // If no nesting, directly put the key-value pair into the query map.
                 queryMap.put(key, filterMap.get(key));
             }
         });
@@ -170,6 +182,31 @@ public String getPaginatedQuery(String query, List<Object> preparedStmtList) {
         return paginatedQuery.toString();
     }
 
+    /**
+     * Recursively merges two maps, combining their nested structures while preserving existing values.
+     *
+     * @param existing The final map that will contain the merged result.
+     * @param newMap   The source map whose contents will be merged into the existing map.
+     *
+     * Example:
+     * existing = {"a": {"b": "value1"}}
+     * newMap = {"a": {"c": "value2"}}
+     * Result: {"a": {"b": "value1", "c": "value2"}}
+     */
+    private void mergeMaps(Map<String, Object> existing, Map<String, Object> newMap) {
+        newMap.forEach((key, value) -> {
+            existing.merge(key, value, (oldValue, newValue) -> {
+                // If both values are maps, recursively merge them
+                if (oldValue instanceof Map && newValue instanceof Map) {
+                    mergeMaps((Map<String, Object>) oldValue, (Map<String, Object>) newValue);
+                    return oldValue;
+                }
+                // If either value is not a map, use the new value
+                return newValue;
+            });
+        });
+    }
+
     /**
      * This method is used to extract and parse JSON data into a JsonNode object
      *

health-services/plan-service/src/main/java/digit/web/models/PlanSearchCriteria.java

@@ -43,6 +43,18 @@ public class PlanSearchCriteria {
     @JsonProperty("facilityId")
     private String facilityId = null;
 
+    @JsonProperty("onRoadCondition")
+    private String onRoadCondition = null;
+
+    @JsonProperty("terrain")
+    private String terrain = null;
+
+    @JsonProperty("securityQ1")
+    private String securityQ1 = null;
+
+    @JsonProperty("securityQ2")
+    private String securityQ2 = null;
+
     @JsonProperty("status")
     private String status = null;