Merge pull request #143 from unicef/fix-beneficiary-validation

fix beneficiary validator

Author: domdinicola

src/country_workspace/contrib/aurora/pipeline.py

@@ -21,6 +21,9 @@ class Config(BatchNameConfig, FailIfAlienConfig):
 RELATIONSHIP_HEAD: Final[str] = "HEAD"
 RELATIONSHIP_FIELDNAME: Final[str] = "relationship"
 
+ROLE_PRIMARY = "PRIMARY"
+ROLE_ALTERNATE = "ALTERNATE"
+
 
 def import_from_aurora(job: AsyncJob) -> dict[str, int]:
     """Import data from the Aurora system into the database within an atomic transaction.

src/country_workspace/models/household.py

@@ -6,6 +6,7 @@
 from django.utils import timezone
 
 from .base import BaseModel, Validable
+from ..contrib.aurora.pipeline import ROLE_PRIMARY, ROLE_ALTERNATE
 
 if TYPE_CHECKING:
     from django.db.models import QuerySet
@@ -58,7 +59,7 @@ def heads(self) -> "QuerySet[Individual]":
         return self.members.filter(flex_fields__relationship="HEAD")
 
     def collectors_primary(self) -> "QuerySet[Individual]":
-        return self.members.filter(flex_fields__primary_collector_id=self.flex_fields["household_id"])
+        return self.members.filter(flex_fields__role=ROLE_PRIMARY)
 
     def collectors_alternate(self) -> "QuerySet[Individual]":
-        return self.members.filter(flex_fields__alternate_collector_id=self.flex_fields["household_id"])
+        return self.members.filter(flex_fields__role=ROLE_ALTERNATE)

tests/contrib/hope/test_h_validators.py

@@ -4,6 +4,7 @@
 import pytest
 from faker import Faker
 
+from country_workspace.contrib.aurora.pipeline import ROLE_ALTERNATE, ROLE_PRIMARY
 from country_workspace.contrib.hope.validators import FullHouseholdValidator
 
 if TYPE_CHECKING:
@@ -52,34 +53,18 @@ def test_head(household: "Household"):
     household.members.add(IndividualFactory(household=household, flex_fields={"relationship": "HEAD"}))
     assert v.validate(household) == ["This Household does not have Primary Collector"]
 
-    household.members.add(
-        IndividualFactory(
-            household=household, flex_fields={"primary_collector_id": household.flex_fields["household_id"]}
-        )
-    )
+    household.members.add(IndividualFactory(household=household, flex_fields={"role": ROLE_PRIMARY}))
     assert v.validate(household) == []
 
     household.members.add(IndividualFactory(household=household, flex_fields={"relationship": "HEAD"}))
     assert v.validate(household) == ["This Household has multiple heads"]
-    household.members.add(
-        IndividualFactory(
-            household=household, flex_fields={"primary_collector_id": household.flex_fields["household_id"]}
-        )
-    )
+    household.members.add(IndividualFactory(household=household, flex_fields={"role": ROLE_PRIMARY}))
     assert v.validate(household) == [
         "This Household has multiple heads",
         "This Household has multiple Primary Collectors",
     ]
-    household.members.add(
-        IndividualFactory(
-            household=household, flex_fields={"alternate_collector_id": household.flex_fields["household_id"]}
-        )
-    )
-    household.members.add(
-        IndividualFactory(
-            household=household, flex_fields={"alternate_collector_id": household.flex_fields["household_id"]}
-        )
-    )
+    household.members.add(IndividualFactory(household=household, flex_fields={"role": ROLE_ALTERNATE}))
+    household.members.add(IndividualFactory(household=household, flex_fields={"role": ROLE_ALTERNATE}))
     assert v.validate(household) == [
         "This Household has multiple heads",
         "This Household has multiple Primary Collectors",

tests/functional/integration/test_hope_push_lax.py

@@ -6,6 +6,7 @@
 import pytest
 from django_celery_results.models import TaskResult
 
+from country_workspace.contrib.aurora.pipeline import ROLE_PRIMARY
 from country_workspace.models import AsyncJob
 from testutils.factories import CountryHouseholdFactory
 from testutils.factories.program import BeneficiaryGroupFactory, CountryProgramFactory
@@ -60,7 +61,7 @@ def household(program):
             "primary_collector_id": household.flex_fields["household_id"],
         }
         if first_member:
-            member.flex_fields["role"] = "PRIMARY"
+            member.flex_fields["role"] = ROLE_PRIMARY
         member.save()
         first_member = False