Merge pull request upyog#995 from deepikaarora88/Dev-2.0

Dev 2.0
deepa-s-13 · Mar 13, 2024 · 94eaca7 · 94eaca7
2 parents adac6cd + c851c8c
commit 94eaca7
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/...c/main/java/org/egov/nationaldashboardingest/service/CustomIndexRequestDecoratorImpl.java b/...c/main/java/org/egov/nationaldashboardingest/service/CustomIndexRequestDecoratorImpl.java
@@ -76,11 +76,14 @@ public List<JsonNode> createFlattenedIndexRequest(Data ingestData) {
                         }
                         String flattenedFieldName = name + "For" + ingestUtil.capitalizeFieldName(groupByMetric);
                         //log.info(flattenedFieldName);
+                        String usagecat=null;
                         for(JsonNode bucketNode : currentNode.get("buckets")) {
-                            if (!flattenedValuesToBeInserted.get(groupByMetricInCamelCase).containsKey(bucketNode.get("name").asText())){
-                                flattenedValuesToBeInserted.get(groupByMetricInCamelCase).put(bucketNode.get("name").asText(), new HashMap<>());
+                        	if(currentNode.get("groupBy").asText().equalsIgnoreCase("usageCategory") || currentNode.get("groupBy").asText().equalsIgnoreCase("usageType"))
+                        			usagecat=toCamelCase(bucketNode.get("name").asText());
+                            if (!flattenedValuesToBeInserted.get(groupByMetricInCamelCase).containsKey(usagecat)){
+                                flattenedValuesToBeInserted.get(groupByMetricInCamelCase).put(usagecat, new HashMap<>());
                             }
-                            flattenedValuesToBeInserted.get(groupByMetricInCamelCase).get(bucketNode.get("name").asText()).put(flattenedFieldName, jsonProcessorUtil.convertJsonNodeToNativeType(bucketNode.get("value")));
+                            flattenedValuesToBeInserted.get(groupByMetricInCamelCase).get(usagecat).put(flattenedFieldName, jsonProcessorUtil.convertJsonNodeToNativeType(bucketNode.get("value")));
                         }
                     }
                 }
@@ -215,5 +218,32 @@ public List<String> createFlattenedMasterDataRequest(MasterData masterData) {
         log.info("Flattening incoming request took: " + (endTime - startTime) + " ms");
         return finalDocumentsToBeIndexed;
     }
+
+    public static String toCamelCase(String str)
+	{
+	    if (str == null || str.isEmpty()) {
+        return str;
+	    }
+		str = new String (str.trim());
+		StringBuilder converted = new StringBuilder();
+
+        boolean convertNext = true;
+
+        for (char ch : str.toCharArray()) {
+        	if (Character.isSpaceChar(ch)){
+            convertNext = true;
+        	} 
+        	else if (convertNext) {
+            ch = Character.toTitleCase(ch);
+            convertNext = false;
+        	} 
+        	else {
+            ch = Character.toLowerCase(ch);
+        	}
+        converted.append(ch);
+        }
+        return converted.toString();
+	}
+
 
 }
diff --git a/...ard-ingest/src/main/java/org/egov/nationaldashboardingest/validators/IngestValidator.java b/...ard-ingest/src/main/java/org/egov/nationaldashboardingest/validators/IngestValidator.java
@@ -439,7 +439,7 @@ else if (ingestData.getModule() != null && ingestData.getModule().equals("FSM"))
                     if (a.get("groupBy").equals("usageCategory") || a.get("groupBy").equals("usageType")) {
                         List < HashMap < String, String >> valuess = (List < HashMap < String, String >> ) a.get("buckets");
                         for (HashMap < String, String > b: valuess)
-                            usageCategory.add(b.get("name"));
+                            usageCategory.add(toCamelCase(b.get("name")));
                     }
                 }
                 }