Remove subscription if notifications.tasks.send_moderator_email_task fails with permission error

Author: Ostap-Zherebetskyi

api/providers/serializers.py

@@ -401,7 +401,7 @@ def update(self, instance, validated_data):
             return instance
 
         try:
-            provider.remove_from_group(instance, instance.permission_group, unsubscribe=False)
+            provider.remove_from_group(instance, instance.permission_group, unsubscribe=True)
         except ValueError as e:
             raise ValidationError(str(e))
         provider.add_to_group(instance, perm_group)

api_tests/notifications/test_notifications_db_transaction.py

@@ -3,7 +3,6 @@
     AuthUserFactory,
     NotificationTypeFactory
 )
-from datetime import datetime
 from osf.models import Notification, NotificationType, NotificationSubscription
 from tests.utils import capture_notifications
 from django.db import reset_queries, connection
@@ -54,5 +53,5 @@ def test_emit_frequency_none(self, user_one, test_notification_type):
         )
         assert Notification.objects.filter(
             subscription__notification_type=test_notification_type,
-            sent=datetime(1000, 1, 1)
+            fake_sent=True
         ).exists()

notifications/tasks.py

@@ -207,10 +207,11 @@ def send_moderator_email_task(self, user_id, notification_ids, provider_content_
         if current_moderators is None or not current_moderators.user_set.filter(id=user.id).exists():
             current_admins = provider.get_group('admin')
             if current_admins is None or not current_admins.user_set.filter(id=user.id).exists():
-                log_message(f"User is not a moderator for provider {provider._id} - skipping email")
-                email_task.status = 'FAILURE'
+                log_message(f"User is not a moderator for provider {provider._id} - notifications will not be sent.")
+                email_task.status = 'AUTO_FIXED'
                 email_task.error_message = f'User is not a moderator for provider {provider._id}'
                 email_task.save()
+                notifications_qs.update(sent=timezone.now(), fake_sent=True)
                 return
 
         additional_context = {}

osf/models/email_task.py

@@ -10,6 +10,7 @@ class EmailTask(models.Model):
         ('FAILURE', 'Failure'),
         ('RETRY', 'Retry'),
         ('PARTIAL_SUCCESS', 'Partial Success'),
+        ('AUTO_FIXED', 'Auto Fixed'),
     )
 
     task_id = models.CharField(max_length=255, unique=True)

osf/models/mixins.py

@@ -1087,6 +1087,7 @@ def add_to_group(self, user, group):
                 content_type=ContentType.objects.get_for_model(self, for_concrete_model=False),
                 object_id=self.id,
                 notification_type=subscription.instance,
+                message_frequency='instantly',
                 _is_digest=True
             )