user search facets patch

core/es-utils/src/main/java/org/sunbird/common/ElasticSearchHelper.java

@@ -671,7 +671,9 @@ private static SearchDTO getBasicBuiders(SearchDTO search, Map<String, Object> s
       search.setQueryFields((List<String>) searchQueryMap.get(JsonKey.QUERY_FIELDS));
     }
     if (searchQueryMap.containsKey(JsonKey.FACETS)) {
-      search.setFacets((List<Map<String, String>>) searchQueryMap.get(JsonKey.FACETS));
+      List<String> facetsList= (List<String>) searchQueryMap.get(JsonKey.FACETS);
+      search.setFacets(facetsList);
+    //  search.setFacets((List<Map<String, String>>) searchQueryMap.get(JsonKey.FACETS));
     }
     if (searchQueryMap.containsKey(JsonKey.FIELDS)) {
       search.setFields((List<String>) searchQueryMap.get(JsonKey.FIELDS));
@@ -731,9 +733,16 @@ public static Map<String, Object> getSearchResponseMap(
   }
 
   private static List getFinalFacetList(
-      SearchResponse response, SearchDTO searchDTO, List finalFacetList) {
+          SearchResponse response, SearchDTO searchDTO, List finalFacetList) {
     if (null != searchDTO.getFacets() && !searchDTO.getFacets().isEmpty()) {
-      Map<String, String> m1 = searchDTO.getFacets().get(0);
+      // Map<String, String> m1 = searchDTO.getFacets().get(0);
+      List<Map<String, String>> groupByFinalList = new ArrayList<>();
+      for (String facet : searchDTO.getFacets()) {
+        Map<String, String> groupByMap = new HashMap<String, String>();
+        groupByMap.put("groupByParent", facet);
+        groupByFinalList.add(groupByMap);
+      }
+      Map<String,String> m1 = groupByFinalList.get(0);
       for (Map.Entry<String, String> entry : m1.entrySet()) {
         String field = entry.getKey();
         String aggsType = entry.getValue();
@@ -751,16 +760,20 @@ private static List getFinalFacetList(
             aggsList.add(internalMap);
           }
         } else {
-          Terms aggs = response.getAggregations().get(field);
-          for (Bucket bucket : aggs.getBuckets()) {
-            Map internalMap = new HashMap();
-            internalMap.put(JsonKey.NAME, bucket.getKey());
-            internalMap.put(JsonKey.COUNT, bucket.getDocCount());
-            aggsList.add(internalMap);
+          List<String> facets = searchDTO.getFacets();
+          for (String facet : facets) {
+            Terms aggs = response.getAggregations().get(facet);
+            for (Bucket bucket : aggs.getBuckets()) {
+              Map internalMap = new HashMap();
+//              internalMap.put(JsonKey.NAME, bucket.getKey());
+              internalMap.put(JsonKey.NAME, facet);
+              internalMap.put(JsonKey.COUNT, bucket.getDocCount());
+              aggsList.add(internalMap);
+            }
           }
         }
         facetMap.put("values", aggsList);
-        facetMap.put(JsonKey.NAME, field);
+        //    facetMap.put(JsonKey.NAME, aggsType);
         finalFacetList.add(facetMap);
       }
     }

core/es-utils/src/main/java/org/sunbird/common/ElasticSearchRestHighImpl.java

@@ -443,8 +443,14 @@ public Future<Map<String, Object>> search(
     searchSourceBuilder.query(query);
     List finalFacetList = new ArrayList();
 
+    List<Map<String, Object>> groupByFinalList = new ArrayList<>();
     if (null != searchDTO.getFacets() && !searchDTO.getFacets().isEmpty()) {
-      searchSourceBuilder = addAggregations(searchSourceBuilder, searchDTO.getFacets());
+      for (String facet : searchDTO.getFacets()) {
+        Map<String, Object> groupByMap = new HashMap<String, Object>();
+        groupByMap.put("groupByParent", facet);
+        groupByFinalList.add(groupByMap);
+      }
+      searchSourceBuilder = addAggregations(searchSourceBuilder, groupByFinalList);
     }
     logger.info(
         context,
@@ -604,31 +610,44 @@ private static long calculateEndTime(long startTime) {
   }
 
   private static SearchSourceBuilder addAggregations(
-      SearchSourceBuilder searchSourceBuilder, List<Map<String, String>> facets) {
+      SearchSourceBuilder searchSourceBuilder, List<Map<String, Object>> facets) {
     long startTime = System.currentTimeMillis();
     logger.debug(
         null, "ElasticSearchRestHighImpl:addAggregations: method started at ==" + startTime);
-    Map<String, String> map = facets.get(0);
-    for (Map.Entry<String, String> entry : map.entrySet()) {
-
-      String key = entry.getKey();
-      String value = entry.getValue();
-      if (JsonKey.DATE_HISTOGRAM.equalsIgnoreCase(value)) {
-        searchSourceBuilder.aggregation(
-            AggregationBuilders.dateHistogram(key)
-                .field(key + ElasticSearchHelper.RAW_APPEND)
-                .dateHistogramInterval(DateHistogramInterval.days(1)));
-
-      } else if (null == value) {
-        searchSourceBuilder.aggregation(
-            AggregationBuilders.terms(key).field(key + ElasticSearchHelper.RAW_APPEND));
+ //   Map<String, String> map = facets.get(0);
+    Object firstElement = facets.get(0);
+    if (firstElement instanceof Map) {
+      Map<?, ?> map = (Map<?, ?>) firstElement;
+      for (Map.Entry<?, ?> entry : map.entrySet()) {
+
+        String key = entry.getKey().toString();
+        String value = entry.getValue().toString();
+        if (JsonKey.DATE_HISTOGRAM.equalsIgnoreCase(value)) {
+          searchSourceBuilder.aggregation(
+                  AggregationBuilders.dateHistogram(key)
+                          .field(key + ElasticSearchHelper.RAW_APPEND)
+                          .dateHistogramInterval(DateHistogramInterval.days(1)));
+
+        } else if (null == value) {
+          searchSourceBuilder.aggregation(
+                  AggregationBuilders.terms(key).field(key + ElasticSearchHelper.RAW_APPEND));
+        } else {
+          for (Map<String, Object> groupByMap : facets) {
+            String groupByParent = (String) groupByMap.get(key);
+            if (!value.contains(".")) {
+              searchSourceBuilder.aggregation(AggregationBuilders.terms(groupByParent)
+                      .field(groupByParent + ElasticSearchHelper.RAW_APPEND)
+                      .size(10000));
+            }
+          }
+        }
       }
+      logger.debug(
+              null,
+              "ElasticSearchRestHighImpl:addAggregations: method end =="
+                      + " ,Total time elapsed = "
+                      + calculateEndTime(startTime));
     }
-    logger.debug(
-        null,
-        "ElasticSearchRestHighImpl:addAggregations: method end =="
-            + " ,Total time elapsed = "
-            + calculateEndTime(startTime));
     return searchSourceBuilder;
   }
 

core/es-utils/src/main/java/org/sunbird/dto/SearchDTO.java

@@ -16,7 +16,8 @@ public class SearchDTO {
   @SuppressWarnings("rawtypes")
   private List<Map> properties;
 
-  private List<Map<String, String>> facets = new ArrayList<>();
+//  private List<Map<String, String>> facets = new ArrayList<>();
+  private List<String> facets;
   private List<String> fields;
   private List<String> excludedFields;
   private Map<String, Object> sortBy = new HashMap<>();
@@ -81,11 +82,20 @@ public void setLimit(Integer limit) {
     this.limit = limit;
   }
 
-  public List<Map<String, String>> getFacets() {
+//  public List<Map<String, String>> getFacets() {
+//    return facets;
+//  }
+//
+//  public void setFacets(List<Map<String, String>> facets) {
+//    this.facets = facets;
+//  }
+
+
+  public List<String> getFacets() {
     return facets;
   }
 
-  public void setFacets(List<Map<String, String>> facets) {
+  public void setFacets(List<String> facets) {
     this.facets = facets;
   }