Merge pull request Sunbird-RC#343 from aimansharief/ViewTemplateFix

Issue #1051: SB-RC: Added Fix for view template in search
holashchand · Aug 13, 2024 · c377055 · c377055
2 parents 3100322 + d82f931
commit c377055
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -31,6 +31,11 @@ jobs:
         sudo rm -rf /usr/local/.ghcup/ghc/9.6.4
     - name: Check space before tests
       run: df -h
+    - name: Install Docker Compose
+      run: |
+        curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+        chmod +x /usr/local/bin/docker-compose
+        docker-compose --version
       # debug step
 #    - name: Setup upterm session
 #      uses: lhotari/action-upterm@v1

diff --git a/java/registry/src/main/java/dev/sunbirdrc/registry/helper/RegistryHelper.java b/java/registry/src/main/java/dev/sunbirdrc/registry/helper/RegistryHelper.java
@@ -370,7 +370,9 @@ private JsonNode searchEntity(JsonNode inputJson, ISearchService service, String
         ViewTemplate viewTemplate = viewTemplateManager.getViewTemplate(inputJson);
         if (viewTemplate != null) {
             ViewTransformer vTransformer = new ViewTransformer();
-            resultNode.set(ENTITY_LIST, vTransformer.transform(viewTemplate, resultNode.get(ENTITY_LIST)));
+            String entityName = resultNode.fields().next().getKey();
+            ObjectNode transformerInput = JsonNodeFactory.instance.objectNode().set(entityName, resultNode.get(entityName).get(ENTITY_LIST));
+            ((ObjectNode) resultNode.get(entityName)).set(ENTITY_LIST, vTransformer.transform(viewTemplate, transformerInput).get(entityName));
         }
         // Search is tricky to support LD. Needs a revisit here.
         logger.debug("searchEntity ends");
@@ -754,7 +756,9 @@ public JsonNode getAuditLog(JsonNode inputJson, String userId) throws Exception
         ViewTemplate viewTemplate = viewTemplateManager.getViewTemplate(inputJson);
         if (viewTemplate != null) {
             ViewTransformer vTransformer = new ViewTransformer();
-            resultNode.set(ENTITY_LIST, vTransformer.transform(viewTemplate, resultNode.get(ENTITY_LIST)));
+            String entityName = resultNode.fields().next().getKey();
+            ObjectNode transformerInput = JsonNodeFactory.instance.objectNode().set(entityName, resultNode.get(entityName).get(ENTITY_LIST));
+            ((ObjectNode) resultNode.get(entityName)).set(ENTITY_LIST, vTransformer.transform(viewTemplate, transformerInput).get(entityName));
         }
         logger.debug("get audit log ends");