Remove collect_individual_data from Household fieldset

src/country_workspace/versioning/scripts/0013_remove_extra_fields.py

@@ -0,0 +1,29 @@
+# Generated by HCW 0.1.0 on 2025 07 14 18:14:41
+from django import forms
+from hope_flex_fields.models import Fieldset, FieldDefinition
+from packaging.version import Version
+
+from country_workspace.contrib.hope.constants import HOUSEHOLD_FIELDSET_NAME
+
+_script_for_version = Version("0.1.0")
+
+
+field_to_remove = "collect_individual_data"
+household_fieldset = Fieldset.objects.get(name=HOUSEHOLD_FIELDSET_NAME)
+
+
+def forward() -> None:
+    household_fieldset.fields.filter(name=field_to_remove).delete()
+
+
+def backward() -> None:
+    household_fieldset.fields.get_or_create(
+        name=field_to_remove,
+        definition=FieldDefinition.objects.get(field_type=forms.BooleanField),
+        defaults={"attrs": {}},
+    )
+
+
+class Scripts:
+    requires = []
+    operations = [(forward, backward)]

tests/extras/testutils/factories/household.py

@@ -22,7 +22,6 @@ def get_hh_fields(household: "CountryHousehold"):
         "admin3": "",
         "admin4": "",
         "residence_status": "",
-        "collect_individual_data": True,
         "consent": bool(getrandbits(1)),
         "consent_sharing": "",
         "country": fake.country(),

tests/functional/integration/test_hope_push_lax.py

@@ -44,7 +44,6 @@ def household(program):
         batch__country_office=program.country_office,
         flex_fields={
             "country": program.country_office.code,
-            "collect_individual_data": True,
             "consent": True,
             "household_id": randint(1, sys.maxsize),
             "size": randint(3, 6),

tests/workspace/test_ws_program.py

@@ -33,7 +33,7 @@ def program(office):
 
     return CountryProgramFactory(
         country_office=office,
-        household_checker=DataCheckerFactory(fields=["collect_individual_data"]),
+        household_checker=DataCheckerFactory(fields=["consent"]),
         individual_checker=DataCheckerFactory(fields=["gender"]),
         household_columns="__str__\nid\nxx",
         individual_columns="__str__\nid\nxx",
@@ -80,14 +80,14 @@ def test_configure_hh_columns(app, household: "CountryHousehold", master_detail:
         if should_be_visible:
             res = res.click(button_text)
             form = res.forms["configure-columns"]
-            form["columns"] = ["name", "flex_fields__collect_individual_data"]
+            form["columns"] = ["name", "flex_fields__consent"]
             form.submit().follow()
             program.refresh_from_db()
-            assert program.household_columns == "name\nflex_fields__collect_individual_data"
+            assert program.household_columns == "name\nflex_fields__consent"
             hh_list = reverse("workspace:workspaces_countryhousehold_changelist")
             res = app.get(hh_list)
-            assert not res.pyquery("div.text a:contains('flex_fields__collect_individual_data')")
-            assert res.pyquery("div.text a:contains('Collect_individual_data')")
+            assert not res.pyquery("div.text a:contains('flex_fields__consent')")
+            assert res.pyquery("div.text a:contains('Consent')")
         else:
             assert button_text not in res.text