fix: redact pending primary email before retirement deletion

Author: ktyagiapphelix2u

common/djangoapps/student/models/user.py

@@ -916,8 +916,11 @@ class PendingEmailChange(DeletableByUserValue, models.Model):  # noqa: DJ008
     def redact_pending_email_by_user_value(cls, value, field):
         """
         Redact pending email change fields for records matching ``field=value``.
+
         This method is intended for retirement flows where downstream systems
         may keep soft-deleted snapshots of these rows.
+
+        Returns True if redacted, and False if no matching records found.
         """
         filter_kwargs = {field: value}
         records_matching_user_value = cls.objects.filter(**filter_kwargs)

common/djangoapps/student/tests/test_models.py

@@ -612,13 +612,9 @@ def test_redact_by_user_redacts_pending_email_change_fields(self):
         assert self.email_change.activation_key == original_activation_key
 
     def test_redact_by_user_no_effect_for_user_with_no_email_change(self):
-        original_new_email = self.email_change.new_email
-        original_activation_key = self.email_change.activation_key
+        """Verify that redacting a user with no pending email change returns False."""
         record_was_redacted = PendingEmailChange.redact_pending_email_by_user_value(self.user2, field='user')
         assert not record_was_redacted
-        self.email_change.refresh_from_db()
-        assert self.email_change.new_email == original_new_email
-        assert self.email_change.activation_key == original_activation_key
 
 
 class TestCourseEnrollmentAllowed(ModuleStoreTestCase):  # lint-amnesty, pylint: disable=missing-class-docstring