Merge pull request #4413 from unicef/generic-import-admin-area-fix

generic-import-admin-area-fix

src/frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "2.12.1",
+  "version": "2.12.3",
   "private": true,
   "type": "module",
   "scripts": {

src/hct_mis_api/contrib/aurora/services/generic_registration_service.py

@@ -115,24 +115,9 @@ def _create_household_dict(cls, data_dict: Dict, mapping_dict: Dict) -> Dict:
                     my_dict.update(cls._create_household_dict(data_dict[key], mapping_dict[key]))
 
         # update admin areas values
-        admin2 = cls.get(data_dict, "admin2_h_c")
-        admin3 = cls.get(data_dict, "admin3_h_c")
-        admin4 = cls.get(data_dict, "admin4_h_c")
-
-        my_dict["admin2"] = str(Area.objects.get(p_code=admin2).id) if admin2 else None
-        my_dict["admin3"] = str(Area.objects.get(p_code=admin3).id) if admin3 else None
-        my_dict["admin4"] = str(Area.objects.get(p_code=admin4).id) if admin4 else None
-
-        if admin2 and Area.objects.filter(p_code=admin2).exists():
-            my_dict["admin1"] = str(Area.objects.get(p_code=admin2).parent.id)
-
-        if admin4 and Area.objects.filter(p_code=admin4).exists():
-            my_dict["admin_area"] = str(Area.objects.get(p_code=admin4).id)
-        elif admin3 and Area.objects.filter(p_code=admin3).exists():
-            my_dict["admin_area"] = str(Area.objects.get(p_code=admin3).id)
-        elif admin2 and Area.objects.filter(p_code=admin2).exists():
-            my_dict["admin_area"] = str(Area.objects.get(p_code=admin2).id)
-
+        for key in ["admin1", "admin2", "admin3", "admin4"]:
+            if key in my_dict and Area.objects.filter(p_code=my_dict[key]).exists():
+                my_dict[key] = str(Area.objects.get(p_code=my_dict[key]).id)
         return my_dict
 
     @staticmethod
@@ -231,6 +216,7 @@ def create_individuals(
             program=household.program,
             first_registration_date=record.timestamp,
             last_registration_date=record.timestamp,
+            detail_id=record.source_id,
         )
 
         record_data_dict = record.get_data()

tests/unit/apps/registration_datahub/test_generic_registration_service.py

@@ -257,8 +257,6 @@ def test_import_data_to_datahub(
         self.assertEqual(PendingIndividualRoleInHousehold.objects.filter(role=ROLE_PRIMARY).count(), 1)
         self.assertEqual(PendingIndividualRoleInHousehold.objects.filter(role=ROLE_ALTERNATE).count(), 1)
 
-        self.assertEqual(pending_household.admin_area.p_code, self.household[0][admin_area_field])
-
     def test_import_data_to_datahub_household_individual(self) -> None:
         records = [
             Record(