fix: import orgUnitGroupMember using csv (#18741)

dhis2 · Oct 4, 2024 · 5aab73b · 5aab73b
1 parent 0bfd091
commit 5aab73b
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 0 deletions.
diff --git a/...vices/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/csv/DefaultCsvImportService.java b/...vices/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/csv/DefaultCsvImportService.java
@@ -532,6 +532,7 @@ private List<OrganisationUnitGroup> orgUnitGroupMembersFromCsv(CsvReader reader)
 
                     nonPersistedGroup.setUid(persistedGroup.getUid());
                     nonPersistedGroup.setName(persistedGroup.getName());
+                    nonPersistedGroup.setShortName(persistedGroup.getShortName());
 
                     return nonPersistedGroup;
                   });

diff --git a/...his-test-integration/src/test/java/org/hisp/dhis/dxf2/metadata/CsvMetadataImportTest.java b/...his-test-integration/src/test/java/org/hisp/dhis/dxf2/metadata/CsvMetadataImportTest.java
@@ -47,6 +47,7 @@
 import org.hisp.dhis.option.OptionGroupSet;
 import org.hisp.dhis.option.OptionService;
 import org.hisp.dhis.option.OptionSet;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.preheat.PreheatIdentifier;
 import org.hisp.dhis.schema.SchemaService;
@@ -228,6 +229,35 @@ void testImportOptionGroupSet() throws IOException {
     assertEquals(2, ogsA.getMembers().get(0).getMembers().size());
   }
 
+  @Test
+  void testImportOrganisationUnitGroupMembers() throws IOException {
+    ImportReport importReport =
+        runImport(
+            "metadata/organisationUnitMembers.csv",
+            CsvImportClass.ORGANISATION_UNIT,
+            metadata -> assertEquals(4, metadata.getOrganisationUnits().size()));
+    assertEquals(4, importReport.getStats().getCreated());
+    assertEquals(4, organisationUnitService.getAllOrganisationUnits().size());
+
+    importReport =
+        runImport(
+            "metadata/organisationUnitGroup.csv",
+            CsvImportClass.ORGANISATION_UNIT_GROUP,
+            metadata -> assertEquals(2, metadata.getOrganisationUnitGroups().size()));
+    assertEquals(2, importReport.getStats().getCreated());
+
+    importReport =
+        runImport(
+            "metadata/organisationUnitGroup_members.csv",
+            CsvImportClass.ORGANISATION_UNIT_GROUP_MEMBERSHIP,
+            metadata -> assertEquals(2, metadata.getOrganisationUnitGroups().size()));
+    assertEquals(2, importReport.getStats().getUpdated());
+    OrganisationUnitGroup orgUnitA = manager.get(OrganisationUnitGroup.class, "a1234567890");
+    assertEquals(2, orgUnitA.getMembers().size());
+    OrganisationUnitGroup orgUnitB = manager.get(OrganisationUnitGroup.class, "b1234567890");
+    assertEquals(2, orgUnitB.getMembers().size());
+  }
+
   private ImportReport runImport(String csvFile, CsvImportClass importClass) throws IOException {
     return runImport(csvFile, importClass, null);
   }

diff --git a/dhis-2/dhis-test-integration/src/test/resources/metadata/organisationUnitGroup.csv b/dhis-2/dhis-test-integration/src/test/resources/metadata/organisationUnitGroup.csv
@@ -0,0 +1,3 @@
+name,uid,code,shortName
+"group1","a1234567890","G1","Group1"
+"group2","b1234567890","G2","Group2"
diff --git a/dhis-2/dhis-test-integration/src/test/resources/metadata/organisationUnitGroup_members.csv b/dhis-2/dhis-test-integration/src/test/resources/metadata/organisationUnitGroup_members.csv
@@ -0,0 +1,5 @@
+groupid,memberid
+a1234567890,c1234567890
+a1234567890,d1234567890
+b1234567890,e1234567890
+b1234567890,f1234567890
diff --git a/dhis-2/dhis-test-integration/src/test/resources/metadata/organisationUnitMembers.csv b/dhis-2/dhis-test-integration/src/test/resources/metadata/organisationUnitMembers.csv
@@ -0,0 +1,5 @@
+name,uid,code,parent,shortName
+"Level 2a","c1234567890","L2a","","L2a"
+"Level 2b","d1234567890","L2b","c1234567890","L2b"
+"Level 3","e1234567890","L3","","L3"
+"Level 4","f1234567890","L4","e1234567890","L4"