#104 | groupBy both "form_mapping_uuid" and "repeatable_question_grou…

…p_concept_uuid"

src/main/java/org/avniproject/etl/repository/SchemaMetadataRepository.java

@@ -143,7 +143,11 @@ private List<TableMetadata> getChecklistTables() {
 
     private List<TableMetadata> getTableMetadataForForm(String sql) {
         List<Map<String, Object>> maps = runInOrgContext(() -> jdbcTemplate.queryForList(sql), jdbcTemplate);
-        Map<Object, List<Map<String, Object>>> tableMaps = maps.stream().collect(Collectors.groupingBy(stringObjectMap -> stringObjectMap.get("form_mapping_uuid")));
+        Map<Object, List<Map<String, Object>>> tableMaps = maps.stream().collect(Collectors.groupingBy(stringObjectMap -> {
+            String formMappingUuid = stringObjectMap.get("form_mapping_uuid").toString();
+            Object rwgConceptUUID = stringObjectMap.get("repeatable_question_group_concept_uuid");
+            return rwgConceptUUID == null ? formMappingUuid : formMappingUuid + rwgConceptUUID;
+        }));
         return tableMaps.values().stream().map(mapList -> new TableMetadataMapper().create(mapList)).collect(Collectors.toList());
     }