Merge pull request #674 from praekeltfoundation/update-turn-migration-scripts

User tier to type update

Author: erikh360

scripts/migrate_to_turn/fetch_rapidpro_contacts.py

@@ -7,7 +7,6 @@
 
 from scripts.migrate_to_turn.process_fields import (
     get_user_babies,
-    get_user_tier,
     get_user_type,
     process_baby_loss_status,
     process_datetime,
@@ -71,7 +70,6 @@
 }
 
 NEW_TURN_FIELD_MAPPING = {
-    "user_tier": {"process": get_user_tier},
     "user_type": {"process": get_user_type},
     "baby_loss_status": {"process": process_baby_loss_status},
     "pregnancy_loss_status": {"process": process_pregnancy_loss_status},

scripts/migrate_to_turn/process_fields.py

@@ -68,7 +68,7 @@ def has_active_baby(contact):
     return False
 
 
-def get_user_tier(contact):
+def get_user_type(contact):
     # Ineligible: We don't save anything on rapidpro to identify ineligible users
     # Push Basic User: Clinic code is required in rapdidpro so these don't exist
 
@@ -79,26 +79,21 @@ def get_truthy_field(field_name):
     prebirth_messaging = get_truthy_field("prebirth_messaging")
     postbirth_messaging = get_truthy_field("postbirth_messaging")
 
-    user_tier = "lead"
+    user_type = "lead"
 
     if opted_out:
-        user_tier = "deregistered_user"
+        user_type = "deregistered_user"
     elif prebirth_messaging or postbirth_messaging:
-        user_tier = "push_comprehensive_user"
+        user_type = "push_comprehensive_user"
 
         if (
             not prebirth_messaging
             and postbirth_messaging
             and not has_active_baby(contact)
         ):
-            user_tier = "alumni_user"
-
-    return user_tier
+            user_type = "alumni_user"
 
-
-def get_user_type(contact):
-    # TODO: figure out user type based on rapidpro fields
-    return None
+    return user_type
 
 
 def get_user_babies(contact):

scripts/migrate_to_turn/tests/test_fetch_rapidpro_contacts.py

@@ -96,7 +96,6 @@ def test_fetch_rapidpro_contacts_writes_csv(self):
             "minor_healthcare_consent",
             "opt_out_reason",
             "active_channel",
-            "user_tier",
             "user_type",
             "baby_loss_status",
             "pregnancy_loss_status",
@@ -124,8 +123,7 @@ def test_fetch_rapidpro_contacts_writes_csv(self):
             "minor_healthcare_consent": "true",
             "opt_out_reason": "baby_loss",
             "active_channel": "whatsapp",
-            "user_tier": fetch_rapidpro_contacts.get_user_tier(contact) or "",
-            "user_type": "",
+            "user_type": fetch_rapidpro_contacts.get_user_type(contact) or "",
             "baby_loss_status": "true",
             "pregnancy_loss_status": "",
             "is_new_user": "no",

scripts/migrate_to_turn/tests/test_process_fields.py

@@ -6,7 +6,6 @@
 
 from scripts.migrate_to_turn.process_fields import (
     get_user_babies,
-    get_user_tier,
     get_user_type,
     has_active_baby,
     is_datetime,
@@ -181,27 +180,27 @@ def test_returns_none_for_other_reasons(self):
         self.assertIsNone(process_pregnancy_loss_status(contact))
 
 
-class GetUserTierTests(TestCase):
+class GetUserTypeTests(TestCase):
     def test_defaults_to_lead(self):
         """
         Defaults to lead when no flags are set
         """
         contact = type("Contact", (), {"fields": {}})()
-        self.assertEqual(get_user_tier(contact), "lead")
+        self.assertEqual(get_user_type(contact), "lead")
 
     def test_opted_out_is_deregistered(self):
         """
         Opted out users are deregistered
         """
         contact = type("Contact", (), {"fields": {"opted_out": "TRUE"}})()
-        self.assertEqual(get_user_tier(contact), "deregistered_user")
+        self.assertEqual(get_user_type(contact), "deregistered_user")
 
     def test_prebirth_messaging_is_push_comprehensive(self):
         """
         Prebirth messaging users are push comprehensive
         """
         contact = type("Contact", (), {"fields": {"prebirth_messaging": "TRUE"}})()
-        self.assertEqual(get_user_tier(contact), "push_comprehensive_user")
+        self.assertEqual(get_user_type(contact), "push_comprehensive_user")
 
     def test_postbirth_with_active_baby_is_push_comprehensive(self):
         """
@@ -211,7 +210,7 @@ def test_postbirth_with_active_baby_is_push_comprehensive(self):
         with mock.patch(
             "scripts.migrate_to_turn.process_fields.has_active_baby", return_value=True
         ):
-            self.assertEqual(get_user_tier(contact), "push_comprehensive_user")
+            self.assertEqual(get_user_type(contact), "push_comprehensive_user")
 
     def test_postbirth_without_active_baby_is_alumni(self):
         """
@@ -221,7 +220,7 @@ def test_postbirth_without_active_baby_is_alumni(self):
         with mock.patch(
             "scripts.migrate_to_turn.process_fields.has_active_baby", return_value=False
         ):
-            self.assertEqual(get_user_tier(contact), "alumni_user")
+            self.assertEqual(get_user_type(contact), "alumni_user")
 
 
 class HasActiveBabyTests(TestCase):
@@ -264,14 +263,6 @@ def test_returns_false_for_invalid_date(self, datetime_mock):
         self.assertFalse(has_active_baby(contact))
 
 
-class GetUserTypeTests(TestCase):
-    def test_default(self):
-        """
-        Default behavior returns None
-        """
-        self.assertIsNone(get_user_type(object()))
-
-
 class GetUserBabiesTests(TestCase):
     def test_default(self):
         """