avniproject/avni-webapp#1337 | Filter table names by org_schema_name

avniproject · Dec 11, 2024 · f2e749f · f2e749f
1 parent 13058da
commit f2e749f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/domain/metabase/DatasetColumn.java b/avni-server-api/src/main/java/org/avni/server/domain/metabase/DatasetColumn.java
@@ -2,7 +2,8 @@
 
 public enum DatasetColumn {
     NAME(1),
-    TYPE(2);
+    TYPE(2),
+    SCHEMA_NAME(3);
 
     private final int index;
 

diff --git a/avni-server-api/src/main/java/org/avni/server/service/metabase/DatabaseService.java b/avni-server-api/src/main/java/org/avni/server/service/metabase/DatabaseService.java
@@ -4,8 +4,9 @@
 import org.avni.server.domain.metabase.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.Arrays;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -81,10 +82,12 @@ public List<String> getSubjectTypeNames() {
 
         for (List<String> row : rows) {
             String type = row.get(DatasetColumn.TYPE.getIndex());
-            if (type.equalsIgnoreCase(TableType.INDIVIDUAL.getTypeName()) ||
-                    type.equalsIgnoreCase(TableType.HOUSEHOLD.getTypeName()) ||
-                    type.equalsIgnoreCase(TableType.GROUP.getTypeName()) ||
-                    type.equalsIgnoreCase(TableType.PERSON.getTypeName())) {
+            String schemaName = row.get(DatasetColumn.SCHEMA_NAME.getIndex());
+            if (schemaName.equalsIgnoreCase(getGlobalDatabase().getName()) &&
+                    (type.equalsIgnoreCase(TableType.INDIVIDUAL.getTypeName()) ||
+                            type.equalsIgnoreCase(TableType.HOUSEHOLD.getTypeName()) ||
+                            type.equalsIgnoreCase(TableType.GROUP.getTypeName()) ||
+                            type.equalsIgnoreCase(TableType.PERSON.getTypeName()))) {
                 subjectTypeNames.add(row.get(DatasetColumn.NAME.getIndex()));
             }
         }
@@ -98,18 +101,20 @@ public List<String> getProgramAndEncounterNames() {
         DatasetResponse datasetResponse = databaseRepository.findAll(fetchedMetadataTable, getGlobalDatabase());
         List<List<String>> rows = datasetResponse.getData().getRows();
 
-        List<String> programNames = new ArrayList<>();
+        List<String> programAndEncounterNames = new ArrayList<>();
 
         for (List<String> row : rows) {
             String type = row.get(DatasetColumn.TYPE.getIndex());
-            if (type.equalsIgnoreCase(TableType.PROGRAM_ENCOUNTER.getTypeName()) ||
-                    type.equalsIgnoreCase(TableType.ENCOUNTER.getTypeName()) ||
-                    type.equalsIgnoreCase(TableType.PROGRAM_ENROLMENT.getTypeName())) {
-                programNames.add(row.get(DatasetColumn.NAME.getIndex()));
+            String schemaName = row.get(DatasetColumn.SCHEMA_NAME.getIndex());
+            if (schemaName.equalsIgnoreCase(getGlobalDatabase().getName()) &&
+                    (type.equalsIgnoreCase(TableType.PROGRAM_ENCOUNTER.getTypeName()) ||
+                            type.equalsIgnoreCase(TableType.ENCOUNTER.getTypeName()) ||
+                            type.equalsIgnoreCase(TableType.PROGRAM_ENROLMENT.getTypeName()))) {
+                programAndEncounterNames.add(row.get(DatasetColumn.NAME.getIndex()));
             }
         }
 
-        return programNames;
+        return programAndEncounterNames;
     }
 
     private void createQuestionsForEntities(List<String> entityNames, FieldDetails addressFieldDetails, FieldDetails entityFieldDetails) {