Merge pull request #4165 from unicef/migration-for-pdu-subtype-boolea…

…n-into-bool

Migrate PDU subtype: BOOLEAN -> BOOL

backend/hct_mis_api/apps/core/migrations/0086_migration.py

@@ -0,0 +1,15 @@
+from django.db import migrations
+
+def migrate_subtype_boolean_to_bool(apps, schema_editor):
+    PeriodicFieldData = apps.get_model('core', 'PeriodicFieldData')
+    PeriodicFieldData.objects.filter(subtype='BOOLEAN').update(subtype='BOOL')
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0085_migration'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_subtype_boolean_to_bool, reverse_code=migrations.RunPython.noop),
+    ]

backend/selenium_tests/targeting/test_targeting.py

@@ -606,8 +606,14 @@ def test_create_targeting_with_pdu_decimal_criteria(
         pageTargetingDetails.getLockButton()
 
         assert pageTargetingDetails.getCriteriaContainer().text == bool_no_expected_criteria_text
-        assert pageTargetingDetails.getHouseholdTableCell(1, 1).text == individual1.household.unicef_id
-        assert pageTargetingDetails.getHouseholdTableCell(2, 1).text == individual2.household.unicef_id
+        assert pageTargetingDetails.getHouseholdTableCell(1, 1).text in [
+            individual1.household.unicef_id,
+            individual2.household.unicef_id,
+        ]
+        assert pageTargetingDetails.getHouseholdTableCell(2, 1).text in [
+            individual1.household.unicef_id,
+            individual2.household.unicef_id,
+        ]
         assert pageTargetingCreate.getTotalNumberOfHouseholdsCount().text == "2"
         assert len(pageTargetingDetails.getHouseholdTableRows()) == 2