Merge pull request #1346 from BLSQ/IA-2986-Have_sub-org-unit-types-to…

…-display-by-default

IA-2986: Have "sub org unit types to display" by default

docker-compose.yml

@@ -11,6 +11,7 @@ services:
       - ./manage.py:/opt/app/manage.py
       - ./hat:/opt/app/hat
       - ./iaso:/opt/app/iaso
+      - ./setuper:/opt/app/setuper
       - ./beanstalk_worker:/opt/app/beanstalk_worker
       - ./django_sql_dashboard_export:/opt/app/django_sql_dashboard_export
       - ./media:/opt/app/media
@@ -39,16 +40,16 @@ services:
       RDS_DB_NAME:
       THEME_PRIMARY_COLOR:
       THEME_SECONDARY_COLOR:
-      THEME_PRIMARY_BACKGROUND_COLOR:
-      #OpenHexa API token
-      OPENHEXA_TOKEN:
-      #OpenHexa API url
-      OPENHEXA_URL:
-      #OpenHexa pipeline ID
-      LQAS_PIPELINE:
-      #Optional: the version of the pipeline to run
-      LQAS_PIPELINE_VERSION:
-      # "prod", "staging" or "custom". Use "custom" for local testing
+      THEME_PRIMARY_BACKGROUND_COLOR: #OpenHexa API token
+
+      OPENHEXA_TOKEN: #OpenHexa API url
+
+      OPENHEXA_URL: #OpenHexa pipeline ID
+
+      LQAS_PIPELINE: #Optional: the version of the pipeline to run
+
+      LQAS_PIPELINE_VERSION: # "prod", "staging" or "custom". Use "custom" for local testing
+
       OH_PIPELINE_TARGET:
 
       FAVICON_PATH:
@@ -77,17 +78,15 @@ services:
       WFP_AUTH_ACCOUNT:
       WFP_EMAIL_RECIPIENTS_NEW_ACCOUNT:
       DISABLE_PASSWORD_LOGINS:
-      SERVER_URL:
-    # Limit logging in dev to not overflow terminal
+      SERVER_URL: # Limit logging in dev to not overflow terminal
     logging: &iaso_logging
       driver: "json-file"
       options:
         max-size: "5k"
     command: start_dev
 
   db:
-    image:
-      iaso/postgis
+    image: iaso/postgis
     # Workaround until there is a stable Postgis image for Apple Silicon
     build: docker/db
     logging: *iaso_logging

iaso/tests/gpkg/test_import_with_sub_org_unit_type.py

@@ -0,0 +1,31 @@
+from iaso.gpkg.import_gpkg import import_gpkg_file
+from iaso.models import Account, Project
+from iaso.test import APITestCase
+from setuper.pyramid import update_org_unit_sub_type
+
+
+class OrgUnitImportFromGPKG(APITestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.account = Account.objects.create(name="a")
+        cls.user_test = cls.create_user_with_profile(username="test", account=cls.account)
+        cls.project = Project.objects.create(name="Project 1", account=cls.account, app_id="test_app_id")
+
+    def test_minimal_import_with_sub_org_unit_type(self):
+        import_gpkg_file(
+            "./iaso/tests/fixtures/gpkg/minimal.gpkg",
+            project_id=self.project.id,
+            source_name="test",
+            version_number=1,
+            validation_status="new",
+            description="",
+        )
+        self.client.force_authenticate(self.user_test)
+        response = self.client.get("/api/v2/orgunittypes/")
+        self.assertJSONResponse(response, 200)
+        response_data = response.json()
+
+        updated_with_sub_types = update_org_unit_sub_type(self.client, self.project.id, response_data["orgUnitTypes"])
+
+        for org_unit_type_with in updated_with_sub_types:
+            self.assertJSONResponse(org_unit_type_with, 200)

setuper/pyramid.py

@@ -1,4 +1,4 @@
-def setup_orgunits(account_name, iaso_client):
+def setup_orgunits(iaso_client):
     project_id = iaso_client.get("/api/projects/")["projects"][0]["id"]
     sources = iaso_client.get("/api/datasources/")["sources"]
     data_source_id = sources[0]["id"]
@@ -15,6 +15,7 @@ def setup_orgunits(account_name, iaso_client):
     test_file = "data/small_sample.gpkg"
     geopackage_file = {"file": (test_file, open(test_file, "rb"), "application/octet-stream")}
     task = iaso_client.post("/api/tasks/create/importgpkg/", files=geopackage_file, data=data)
+
     print("-- Importing org units")
 
     iaso_client.wait_task_completion(task)
@@ -26,5 +27,31 @@ def setup_orgunits(account_name, iaso_client):
         "searches": [{"validation_status": "all", "color": "f4511e", "source": data_source_id}],
     }
     task = iaso_client.post("/api/tasks/create/orgunitsbulkupdate/", json=data)
-
+    org_unit_types = iaso_client.get("/api/v2/orgunittypes/")["orgUnitTypes"]
+    update_org_unit_sub_type(iaso_client, project_id, org_unit_types)
     iaso_client.wait_task_completion(task)
+
+
+def update_org_unit_sub_type(iaso_client, project_id, org_unit_types):
+    print("-- Updating org unit sub type")
+    updated_with_sub_types = []
+    for org_unit_type in org_unit_types:
+        org_unit_type_level = org_unit_type["depth"]
+        org_unit_type_id = org_unit_type["id"]
+        sub_unit_type_ids = [
+            org_unit_type["id"]
+            for org_unit_type in org_unit_types
+            if org_unit_type["depth"] == (org_unit_type_level + 1)
+        ]
+        if len(sub_unit_type_ids) > 0:
+            current_type = {
+                "name": org_unit_type["name"],
+                "short_name": org_unit_type["short_name"],
+                "project_ids": [project_id],
+                "sub_unit_type_ids": sub_unit_type_ids,
+            }
+            # Updating default sub type
+            updated_with_sub_types.append(
+                iaso_client.patch(f"/api/v2/orgunittypes/{org_unit_type_id}/", json=current_type)
+            )
+    return updated_with_sub_types

setuper/review_change_proposal.py

@@ -51,6 +51,7 @@ def setup_review_change_proposal(account_name, iaso_client):
             "status": status,
         }
         validation = None
+        proposal_review = None
         if len(groups) > 0:
             data["new_groups"] = groups
             approved_fields.append("new_groups")
@@ -65,11 +66,12 @@ def setup_review_change_proposal(account_name, iaso_client):
         if len(new_reference_instances) > 0:
             data["new_reference_instances"] = new_reference_instances
             approved_fields.append("new_reference_instances")
-        proposal_review = iaso_client.post("/api/orgunits/changes/", json=data)
-        if status == "approved" or status == "rejected":
-            validation = {
-                "approved_fields": approved_fields,
-                "status": status,
-                "rejection_comment": status,
-            }
-            iaso_client.patch(f"/api/orgunits/changes/{proposal_review['id']}/", json=validation)
+        if len(approved_fields) > 0:
+            proposal_review = iaso_client.post("/api/orgunits/changes/", json=data)
+            if status == "approved" or status == "rejected":
+                validation = {
+                    "approved_fields": approved_fields,
+                    "status": status,
+                    "rejection_comment": status,
+                }
+                iaso_client.patch(f"/api/orgunits/changes/{proposal_review['id']}/", json=validation)

setuper/setuper.py

@@ -54,7 +54,7 @@ def setup_account(account_name):
     account_name = "".join(random.choices(string.ascii_lowercase, k=7))
     print("Creating account:", account_name)
     iaso_client = setup_account(account_name)
-    setup_orgunits(account_name, iaso_client=iaso_client)
+    setup_orgunits(iaso_client=iaso_client)
 
     if seed_default_health_facility_form:
         setup_health_facility_level_default_form(account_name, iaso_client=iaso_client)