fix MPP-4106: refactor(phone): update last_engagement on phone operations

Author: groovecoder

phones/models.py

@@ -22,6 +22,7 @@
 from twilio.rest import Client
 
 from emails.utils import incr_if_enabled
+from privaterelay.models import Profile
 
 from .apps import phones_config, twilio_client
 from .iq_utils import send_iq_sms
@@ -295,7 +296,21 @@ def save(self, *args, **kwargs):
         # if this number exists for this user, this is an update call
         existing_numbers = RelayNumber.objects.filter(user=self.user)
         this_number = existing_numbers.filter(number=self.number).first()
+        update_user_profile_last_engagement = False
         if this_number and this_number.id == self.id:
+            update_user_profile_last_engagement = any(
+                [
+                    self.enabled != this_number.enabled,
+                    self.calls_forwarded != this_number.calls_forwarded,
+                    self.calls_blocked != this_number.calls_blocked,
+                    self.texts_forwarded != this_number.texts_forwarded,
+                    self.texts_blocked != this_number.texts_blocked,
+                ]
+            )
+            if update_user_profile_last_engagement:
+                profile: Profile = Profile.objects.get(user=self.user)
+                profile.last_engagement = datetime.now(UTC)
+                profile.save()
             return super().save(*args, **kwargs)
         elif existing_numbers.exists():
             raise ValidationError("User can have only one relay number.")

phones/tests/models_tests.py

@@ -99,6 +99,16 @@ def upgrade_test_user_to_phone(user):
     return user
 
 
+def add_verified_realphone_to_user(phone_user: User):
+    number = "+12223334444"
+    return RealPhone.objects.create(
+        user=phone_user,
+        number=number,
+        verification_sent_date=datetime.now(UTC),
+        verified=True,
+    )
+
+
 @pytest.fixture(autouse=True)
 def phone_user(db):
     return make_phone_test_user()
@@ -772,6 +782,89 @@ def test_save_store_phone_log_true_doesnt_delete_data() -> None:
     assert inbound_contact
 
 
+def _setup_phone_user_for_last_engagment(phone_user):
+    add_verified_realphone_to_user(phone_user)
+    relay_number = RelayNumber.objects.create(user=phone_user, number="+12223334444")
+
+    # Get initial last_engagement
+    initial_last_engagement = phone_user.profile.last_engagement
+    return relay_number, initial_last_engagement
+
+
+def test_relaynumber_save_updates_last_engagement(phone_user):
+    """
+    Test that updating specific RelayNumber fields triggers last_engagement update.
+    """
+    relay_number, initial_last_engagement = _setup_phone_user_for_last_engagment(
+        phone_user
+    )
+
+    # Update one of the tracked fields
+    relay_number.calls_forwarded += 1
+    relay_number.save()
+
+    # Check if last_engagement was updated
+    phone_user.profile.refresh_from_db()
+    assert phone_user.profile.last_engagement is not None
+
+    if initial_last_engagement:
+        assert phone_user.profile.last_engagement > initial_last_engagement
+
+
+def test_relaynumber_save_no_update_when_other_fields_change(phone_user):
+    """
+    Test that updating fields NOT in the tracked list does NOT update last_engagement.
+    """
+    relay_number, initial_last_engagement = _setup_phone_user_for_last_engagment(
+        phone_user
+    )
+
+    # Update a field that is NOT in the tracked list
+    relay_number.remaining_seconds -= 10
+    relay_number.save()
+
+    # Ensure last_engagement was NOT updated
+    phone_user.profile.refresh_from_db()
+    assert phone_user.profile.last_engagement == initial_last_engagement
+
+
+def test_relaynumber_create_does_not_trigger_last_engagement(phone_user):
+    """
+    Test that creating a new RelayNumber does NOT trigger last_engagement update.
+    """
+    add_verified_realphone_to_user(phone_user)
+    initial_last_engagement = phone_user.profile.last_engagement
+
+    RelayNumber.objects.create(user=phone_user, number="+12223334444")
+
+    # Ensure last_engagement was NOT updated
+    phone_user.profile.refresh_from_db()
+    assert phone_user.profile.last_engagement == initial_last_engagement
+
+
+def test_multiple_relaynumber_updates_trigger_last_engagement_once(phone_user):
+    """
+    Test that multiple updates to a tracked field still updates last_engagement.
+    """
+    relay_number, initial_last_engagement = _setup_phone_user_for_last_engagment(
+        phone_user
+    )
+
+    # Update multiple tracked fields
+    relay_number.calls_forwarded += 1
+    relay_number.calls_blocked += 1
+    relay_number.texts_forwarded += 1
+    relay_number.save()
+
+    # Check if last_engagement was updated
+    phone_user.profile.refresh_from_db()
+
+    assert phone_user.profile.last_engagement is not None
+
+    if initial_last_engagement:
+        assert phone_user.profile.last_engagement > initial_last_engagement
+
+
 def test_save_store_phone_log_false_deletes_data() -> None:
     user = make_phone_test_user()
     baker.make(RealPhone, user=user, verified=True)