tests

src/hct_mis_api/apps/accountability/fixtures.py

@@ -62,7 +62,6 @@ class Meta:
     title = factory.Faker("sentence", nb_words=2, variable_nb_words=True, ext_word_list=None)
     category = factory.fuzzy.FuzzyChoice(Survey.CATEGORY_CHOICES, getter=lambda c: c[0])
     created_by = factory.SubFactory(UserFactory)
-    target_population = None
     payment_plan = None
     program = None
     business_area = factory.LazyAttribute(lambda o: BusinessArea.objects.first())

src/hct_mis_api/apps/payment/models/payment.py

@@ -688,7 +688,6 @@ def household_list(self) -> "QuerySet":
         """copied from TP
         used in:
         1) create PP.create_payments() all list just filter by targeting_criteria, PaymentPlan.Status.TP_OPEN
-        2)
         """
         all_households = Household.objects.filter(business_area=self.business_area, program=self.program_cycle.program)
         households = all_households.filter(self.targeting_criteria.get_query()).order_by("unicef_id")

src/hct_mis_api/apps/targeting/migrations/0003_migration.py

@@ -1,13 +1,11 @@
-# Generated by Django 3.2.25 on 2025-01-20 14:56
+# Generated by Django 3.2.25 on 2025-01-22 08:43
 
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('payment', '0013_migration'),
-        ('accountability', '0006_migration'),
         ('targeting', '0002_migration'),
     ]
 
@@ -52,6 +50,14 @@ class Migration(migrations.Migration):
             model_name='targetpopulation',
             name='targeting_criteria',
         ),
+        migrations.RemoveField(
+            model_name='targetingcriteria',
+            name='household_ids',
+        ),
+        migrations.RemoveField(
+            model_name='targetingcriteria',
+            name='individual_ids',
+        ),
         migrations.DeleteModel(
             name='HouseholdSelection',
         ),

src/hct_mis_api/apps/targeting/models.py

@@ -48,10 +48,6 @@ class TargetingCriteria(TimeStampedUUIDModel, TargetingCriteriaQueryingBase):
         default=False,
         help_text=_("Exclude households with individuals (members or collectors) on sanction list."),
     )
-    # TODO: deprecated already moved to 'TargetingCriteriaRule'
-    household_ids = models.TextField(blank=True)
-    # TODO: deprecated already moved to 'TargetingCriteriaRule'
-    individual_ids = models.TextField(blank=True)
 
     def get_rules(self) -> "QuerySet":
         return self.rules.all()
@@ -65,18 +61,6 @@ def get_query(self) -> Q:
         query = super().get_query()
         if self.payment_plan.status != PaymentPlan.Status.TP_OPEN:
             query &= Q(size__gt=0)
-
-        q_hh_ids = Q(unicef_id__in=self.household_ids.split(", "))
-        q_ind_ids = Q(individuals__unicef_id__in=self.individual_ids.split(", "))
-
-        if self.household_ids and self.individual_ids:
-            query &= Q(q_hh_ids | q_ind_ids)
-            return query
-
-        if self.household_ids:
-            query &= q_hh_ids
-        if self.individual_ids:
-            query &= q_ind_ids
         return query