Set document and account types by prefixes before push

Author: datamik

src/country_workspace/contrib/hope/constants.py

@@ -13,3 +13,13 @@
 ADMINAREAS_FIELDSET_NAME: Final[str] = "HOPE Admin Areas"
 ACCOUNT_FIELDSET_NAME: Final[str] = "HOPE Account"
 DOCUMENT_FIELDSET_NAME: Final[str] = "HOPE Document"
+
+DOCUMENT_PREFIXES_TO_TYPE_MAPPING = {
+    "national_id__": "national_id",
+    "national_passport__": "national_passport",
+}
+
+ACCOUNT_PREFIXES_TO_TYPE_MAPPING = {
+    "phone__": "mobile",
+    "bank__": "bank",
+}

src/country_workspace/contrib/hope/push.py

@@ -12,8 +12,10 @@
 from requests.exceptions import RequestException
 
 from country_workspace.contrib.hope.client import HopeClient
+from country_workspace.contrib.hope.constants import DOCUMENT_PREFIXES_TO_TYPE_MAPPING, ACCOUNT_PREFIXES_TO_TYPE_MAPPING
 from country_workspace.exceptions import RemoteError
 from country_workspace.models import AsyncJob, Rdp, Program
+from country_workspace.models.base import Validable
 from country_workspace.workspaces.models import CountryHousehold, CountryIndividual
 
 
@@ -193,6 +195,18 @@ def safe_post(self, path: str, data: Any, error_msg: str) -> dict[str, Any] | No
     def program(self) -> Program:
         return Program.objects.get(hope_id=self.program_hope_id)
 
+    @staticmethod
+    def _set_types(item: Validable) -> None:
+        for prefix in DOCUMENT_PREFIXES_TO_TYPE_MAPPING:
+            type_field = f"{prefix}type"
+            if type_field in item.flex_fields:
+                item.flex_fields[type_field] = DOCUMENT_PREFIXES_TO_TYPE_MAPPING[prefix]
+
+        for prefix in ACCOUNT_PREFIXES_TO_TYPE_MAPPING:
+            type_field = f"{prefix}account_type"
+            if type_field in item.flex_fields:
+                item.flex_fields[type_field] = ACCOUNT_PREFIXES_TO_TYPE_MAPPING[prefix]
+
     def prepare_batch(self) -> tuple[list[int], list[dict]]:
         """Prepare a batch of household/individual|people data for API submission."""
         ids, data = [], []
@@ -202,6 +216,7 @@ def prepare_batch(self) -> tuple[list[int], list[dict]]:
             if self.master_detail:
                 flex_fields["members"] = []
                 for member in item.members.all():
+                    self._set_types(member)
                     flex_fields["members"].append(member.apply_grouping())
                 data.append(flex_fields)
             else:
@@ -286,10 +301,10 @@ def push_to_hope_core(job: AsyncJob) -> dict[str, Any]:
 
     def steps() -> Iterator[Callable[[], None]]:
         """Yield steps for pushing beneficiaries data in batches."""
-        yield processor.rdi_create
+        # yield processor.rdi_create
         for batch_pks in batched(config["pks"], config["batch_size"]):
             processor.set_queryset(batch_pks)
-            yield from (processor.check_beneficiaries_validity, processor.rdi_push)
+            yield from (processor.rdi_push,)
         yield processor.rdi_complete
 
     if job.program.beneficiary_group is None:

src/country_workspace/versioning/scripts/0009_add_document_and_account_fieldsets.py

@@ -12,6 +12,8 @@
     INDIVIDUAL_CHECKER_NAME,
     DOCUMENT_FIELDSET_NAME,
     ACCOUNT_FIELDSET_NAME,
+    DOCUMENT_PREFIXES_TO_TYPE_MAPPING,
+    ACCOUNT_PREFIXES_TO_TYPE_MAPPING,
 )
 from country_workspace.contrib.hope.lookups import FinancialInstitutionChoice
 from country_workspace.utils.flex_fields import Base64ImageField
@@ -88,8 +90,8 @@ def add_account_and_document_fieldsets() -> None:
     document_fieldset, _ = Fieldset.objects.get_or_create(name=DOCUMENT_FIELDSET_NAME)
     account_fieldset, _ = Fieldset.objects.get_or_create(name=ACCOUNT_FIELDSET_NAME)
     for fieldset, prefixes in (
-        (document_fieldset, ("national_id__", "national_passport__")),
-        (account_fieldset, ("phone__", "bank__")),
+        (document_fieldset, tuple(DOCUMENT_PREFIXES_TO_TYPE_MAPPING.keys())),
+        (account_fieldset, tuple(ACCOUNT_PREFIXES_TO_TYPE_MAPPING.keys())),
     ):
         for prefix in prefixes:
             DataCheckerFieldset.objects.get_or_create(checker=ind_datachecker, fieldset=fieldset, prefix=prefix)