Merge pull request #11308 from Ostap-Zherebetskyi/fix/submission_notifications

[ENG-8848] Preprint pending submission notifications: Content of email is not relevant when new preprint is submitted to OSFPreprints

Author: Johnetordoff

api_tests/mailhog/provider/test_schema_responses.py

@@ -205,13 +205,11 @@ def test_accept_notification_sent_on_admin_approval(self, revised_response, admi
         delete_mailhog_messages()
         with capture_notifications(passthrough=True) as notifications:
             revised_response.approve(user=admin_user)
-        assert len(notifications['emits']) == 3
+        assert len(notifications['emits']) == 2
         assert notifications['emits'][0]['kwargs']['user'] == moderator
         assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][1]['kwargs']['user'] == moderator
-        assert notifications['emits'][1]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][2]['kwargs']['user'] == admin_user
-        assert notifications['emits'][2]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
+        assert notifications['emits'][1]['kwargs']['user'] == admin_user
+        assert notifications['emits'][1]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
         massages = get_mailhog_messages()
         assert massages['count'] == len(notifications['emails'])
         assert_emails(massages, notifications)
@@ -226,13 +224,11 @@ def test_moderators_notified_on_admin_approval(self, revised_response, admin_use
         delete_mailhog_messages()
         with capture_notifications(passthrough=True) as notifications:
             revised_response.approve(user=admin_user)
-        assert len(notifications['emits']) == 3
+        assert len(notifications['emits']) == 2
         assert notifications['emits'][0]['kwargs']['user'] == moderator
         assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][1]['kwargs']['user'] == moderator
-        assert notifications['emits'][1]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][2]['kwargs']['user'] == admin_user
-        assert notifications['emits'][2]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
+        assert notifications['emits'][1]['kwargs']['user'] == admin_user
+        assert notifications['emits'][1]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
         massages = get_mailhog_messages()
         assert massages['count'] == len(notifications['emails'])
         assert_emails(massages, notifications)

api_tests/mailhog/provider/test_submissions.py

@@ -113,10 +113,9 @@ def test_get_provider_actions(self, app, provider_actions_url, registration, mod
 
             resp = app.get(provider_actions_url, auth=moderator.auth)
 
-        assert len(notifications['emits']) == 3
+        assert len(notifications['emits']) == 2
         assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_REVIEWS_SUBMISSION_CONFIRMATION
         assert notifications['emits'][1]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][2]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
         massages = get_mailhog_messages()
         assert massages['count'] == len(notifications['emails'])
         assert_emails(massages, notifications)

notifications/listeners.py

@@ -1,7 +1,6 @@
 import logging
 
 from django.apps import apps
-from django.utils import timezone
 
 from website.project.signals import contributor_added, project_created, node_deleted, contributor_removed
 from website.reviews import signals as reviews_signals
@@ -61,55 +60,6 @@ def subscribe_contributor(resource, contributor, auth=None, *args, **kwargs):
         )
 
 
-@reviews_signals.reviews_email_submit_moderators_notifications.connect
-def reviews_submit_notification_moderators(self, timestamp, context, resource):
-    """
-    Handle email notifications to notify moderators of new submissions or resubmission.
-    """
-
-    # imports moved here to avoid AppRegistryNotReady error
-    from osf.models import NotificationType
-    from website.settings import DOMAIN
-
-    provider = resource.provider
-    context['domain'] = DOMAIN
-    context['requester_contributor_names'] = ''.join(resource.contributors.values_list('fullname', flat=True))
-    context['localized_timestamp'] = str(timezone.now()),
-
-    # Set submission url
-    if provider.type == 'osf.preprintprovider':
-        context['reviews_submission_url'] = (
-            f'{DOMAIN}reviews/preprints/{provider._id}/{resource._id}'
-        )
-    elif provider.type == 'osf.registrationprovider':
-        context['reviews_submission_url'] = f'{DOMAIN}{resource._id}?mode=moderator'
-    else:
-        raise NotImplementedError(f'unsupported provider type {provider.type}')
-
-    # Set message
-    revision_id = context.get('revision_id')
-    if revision_id:
-        context['message'] = f'submitted updates to "{resource.title}".'
-        context['reviews_submission_url'] += f'&revisionId={revision_id}'
-    else:
-        if context.get('resubmission'):
-            context['message'] = f'resubmitted "{resource.title}".'
-        else:
-            context['message'] = f'submitted "{resource.title}".'
-
-    for recipient in resource.provider.get_group('moderator').user_set.all():
-        context['user_fullname'] = recipient.fullname
-        context['recipient_fullname'] = recipient.fullname
-        context['requester_fullname'] = recipient.fullname
-        context['is_request_email'] = False
-
-        NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS.instance.emit(
-            user=recipient,
-            subscribed_object=provider,
-            event_context=context,
-            is_digest=True,
-        )
-
 # Handle email notifications to notify moderators of new submissions.
 @reviews_signals.reviews_withdraw_requests_notification_moderators.connect
 def reviews_withdraw_requests_notification_moderators(self, timestamp, context, user, resource):

osf/email/__init__.py

@@ -119,7 +119,7 @@ def _read_lookup_uri(uri: str) -> str:
 
 NOTIFY_BASE_DEFAULTS = {
     'logo': settings.OSF_LOGO,  # matches default in notify_base.mako
-    'logo_url': settings.OSF_LOGO,
+    'logo_url': None,
     'node_url': '',
     'ns_url': '',
     'osf_contact_email': settings.OSF_CONTACT_EMAIL,

osf_tests/test_registration_moderation_notifications.py

@@ -134,13 +134,12 @@ def test_submit_notifications(self, registration, moderator, admin, contrib, pro
         with capture_notifications() as notification:
             notify_submit(registration, admin)
 
-        assert len(notification['emits']) == 4
+        assert len(notification['emits']) == 3
         assert notification['emits'][0]['type'] == NotificationType.Type.PROVIDER_REVIEWS_SUBMISSION_CONFIRMATION
         assert notification['emits'][0]['kwargs']['user'] == admin
         assert notification['emits'][1]['type'] == NotificationType.Type.PROVIDER_REVIEWS_SUBMISSION_CONFIRMATION
         assert notification['emits'][1]['kwargs']['user'] == contrib
         assert notification['emits'][2]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notification['emits'][3]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
 
         assert NotificationSubscription.objects.count() == 5
         digest = NotificationSubscription.objects.last()

osf_tests/test_schema_responses.py

@@ -859,13 +859,11 @@ def test_accept_notification_sent_on_admin_approval(self, revised_response, admi
 
         with capture_notifications() as notifications:
             revised_response.approve(user=admin_user)
-        assert len(notifications['emits']) == 3
+        assert len(notifications['emits']) == 2
         assert notifications['emits'][0]['kwargs']['user'] == moderator
         assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][1]['kwargs']['user'] == moderator
-        assert notifications['emits'][1]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][2]['kwargs']['user'] == admin_user
-        assert notifications['emits'][2]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
+        assert notifications['emits'][1]['kwargs']['user'] == admin_user
+        assert notifications['emits'][1]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
 
     def test_moderators_notified_on_admin_approval(self, revised_response, admin_user, moderator):
         revised_response.approvals_state_machine.set_state(ApprovalStates.UNAPPROVED)
@@ -874,13 +872,11 @@ def test_moderators_notified_on_admin_approval(self, revised_response, admin_use
 
         with capture_notifications() as notifications:
             revised_response.approve(user=admin_user)
-        assert len(notifications['emits']) == 3
+        assert len(notifications['emits']) == 2
         assert notifications['emits'][0]['kwargs']['user'] == moderator
         assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][1]['kwargs']['user'] == moderator
-        assert notifications['emits'][1]['type'] == NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
-        assert notifications['emits'][2]['kwargs']['user'] == admin_user
-        assert notifications['emits'][2]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
+        assert notifications['emits'][1]['kwargs']['user'] == admin_user
+        assert notifications['emits'][1]['type'] == NotificationType.Type.NODE_SCHEMA_RESPONSE_APPROVED
 
     def test_no_moderator_notification_on_admin_approval_of_initial_response(
             self, initial_response, admin_user):