double import celery

Author: Johnetordoff

addons/base/views.py

@@ -610,34 +610,37 @@ def create_waterbutler_log(payload, **kwargs):
     with transaction.atomic():
         file_signals.file_updated.send(target=node, user=user, payload=payload)
 
-    with transaction.atomic():
-        match action:
-            case NotificationType.Type.FILE_ADDED:
-                notification = NotificationType.objects.get(name=NotificationType.Type.FILE_ADDED)
-            case NotificationType.Type.FILE_REMOVED:
-                notification = NotificationType.objects.get(name=NotificationType.Type.FILE_REMOVED)
-            case NotificationType.Type.FILE_UPDATED:
-                notification = NotificationType.objects.get(name=NotificationType.Type.FILE_UPDATED)
-            case NotificationType.Type.ADDON_FILE_RENAMED:
-                notification = NotificationType.objects.get(name=NotificationType.Type.ADDON_FILE_RENAMED)
-            case NotificationType.Type.ADDON_FILE_COPIED:
-                notification = NotificationType.objects.get(name=NotificationType.Type.ADDON_FILE_COPIED)
-            case NotificationType.Type.ADDON_FILE_REMOVED:
-                notification = NotificationType.objects.get(name=NotificationType.Type.ADDON_FILE_REMOVED)
-            case NotificationType.Type.ADDON_FILE_MOVED:
-                notification = NotificationType.objects.get(name=NotificationType.Type.ADDON_FILE_MOVED)
-            case _:
-                raise NotImplementedError(f'action {action} not implemented')
-
-        notification.emit(
-            user=user,
-            event_context={
-                'profile_image_url': user.profile_image_url(),
-                'localized_timestamp': str(timezone.now()),
-                'user_fullname': user.fullname,
-                'url': node.absolute_url,
-            }
-        )
+
+@file_signals.file_viewed.connect
+def emit_notification(self, target, user, payload):
+    action = payload['action']
+    match action:
+        case NotificationType.Type.FILE_ADDED:
+            notification = NotificationType.objects.get(name=NotificationType.Type.FILE_ADDED)
+        case NotificationType.Type.FILE_REMOVED:
+            notification = NotificationType.objects.get(name=NotificationType.Type.FILE_REMOVED)
+        case NotificationType.Type.FILE_UPDATED:
+            notification = NotificationType.objects.get(name=NotificationType.Type.FILE_UPDATED)
+        case NotificationType.Type.ADDON_FILE_RENAMED:
+            notification = NotificationType.objects.get(name=NotificationType.Type.ADDON_FILE_RENAMED)
+        case NotificationType.Type.ADDON_FILE_COPIED:
+            notification = NotificationType.objects.get(name=NotificationType.Type.ADDON_FILE_COPIED)
+        case NotificationType.Type.ADDON_FILE_REMOVED:
+            notification = NotificationType.objects.get(name=NotificationType.Type.ADDON_FILE_REMOVED)
+        case NotificationType.Type.ADDON_FILE_MOVED:
+            notification = NotificationType.objects.get(name=NotificationType.Type.ADDON_FILE_MOVED)
+        case _:
+            raise NotImplementedError(f'action {action} not implemented')
+
+    notification.emit(
+        user=user,
+        event_context={
+            'profile_image_url': user.profile_image_url(),
+            'localized_timestamp': str(timezone.now()),
+            'user_fullname': user.fullname,
+            'url': target.absolute_url,
+        }
+    )
 
     return {'status': 'success'}
 

api/institutions/authentication.py

@@ -372,6 +372,7 @@ def authenticate(self, request):
                 name=NotificationType.Type.USER_DUPLICATE_ACCOUNTS_OSF4I,
             ).emit(
                 user=user,
+                subscribed_object=user,
                 event_context={
                     'user_fullname': user.fullname,
                     'user_username': user.username,

framework/auth/views.py

@@ -861,6 +861,7 @@ def send_confirm_email(user, email, renew=False, external_id_provider=None, exte
 
     NotificationType.objects.get(name=notification_type).emit(
         user=user,
+        subscribed_object=user,
         event_context={
             'user_fullname': user.fullname,
             'confirmation_url': confirmation_url,

notifications.yaml

@@ -27,10 +27,6 @@ notification_types:
     __docs__: ...
     object_content_type_model_name: osfuser
     template: 'website/templates/emails/password_reset.html.mako'
-  - name: user_contributor_added_draft_registration
-    __docs__: ...
-    object_content_type_model_name: osfuser
-    template: 'website/templates/emails/contributor_added_draft_registration.html.mako'
   - name: user_contributor_added_preprint_node_from_osf
     __docs__: ...
     object_content_type_model_name: osfuser
@@ -39,10 +35,6 @@ notification_types:
     __docs__: ...
     object_content_type_model_name: osfuser
     template: 'website/templates/emails/contributor_added_access_request.html.mako'
-  - name: user_contributor_added_draft_registration
-    __docs__: ...
-    object_content_type_model_name: osfuser
-    template: 'website/templates/emails/contributor_added_draft_registration.html.mako'
   - name: user_contributor_added_osf_preprint
     subject: 'You have been added as a contributor to an OSF preprint.'
     __docs__: ...

osf/models/user.py

@@ -1061,6 +1061,7 @@ def set_password(self, raw_password, notify=True):
             NotificationType.objects.get(
                 name=NotificationType.Type.USER_PASSWORD_RESET
             ).emit(
+                subscribed_object=self,
                 user=self,
                 message_frequency='instantly',
                 event_context={

website/notifications/listeners.py

@@ -5,7 +5,6 @@
 from framework.celery_tasks import app
 from framework.postcommit_tasks.handlers import run_postcommit
 from website.project.signals import contributor_added, project_created, node_deleted, contributor_removed
-from framework.auth.signals import user_confirmed
 from website.project.signals import privacy_set_public
 from website import settings
 from website.reviews import signals as reviews_signals
@@ -58,15 +57,6 @@ def subscribe_contributor(resource, contributor, auth=None, *args, **kwargs):
             _is_digest=True,
         )
 
-@user_confirmed.connect
-def subscribe_confirmed_user(user):
-    NotificationSubscription = apps.get_model('osf.NotificationSubscription')
-    NotificationType = apps.get_model('osf.NotificationType')
-    NotificationSubscription.objects.get_or_create(
-        user=user,
-        notification_type=NotificationType.objects.get(name=NotificationType.Type.USER_FILE_UPDATED)
-    )
-
 @privacy_set_public.connect
 def queue_first_public_project_email(user, node):
     """Queue and email after user has made their first
@@ -77,6 +67,7 @@ def queue_first_public_project_email(user, node):
     NotificationType.objects.get(
         name=NotificationType.Type.USER_NEW_PUBLIC_PROJECT,
     ).emit(
+        subscribed_object=user,
         user=user,
         event_context={
             'nid': node._id,
@@ -143,6 +134,7 @@ def reviews_withdraw_requests_notification_moderators(self, timestamp, context,
     NotificationType.objects.get(
         name=NotificationType.Type.PROVIDER_NEW_PENDING_WITHDRAW_REQUESTS
     ).emit(
+        subscribed_object=provider,
         user=user,
         event_context=context
     )

website/notifications/tasks.py

@@ -6,7 +6,6 @@
 from django.utils import timezone
 
 from framework.celery_tasks import app as celery_app
-from celery import shared_task
 from celery.utils.log import get_task_logger
 from osf.models import OSFUser, Notification, NotificationType, EmailTask, AbstractProvider, RegistrationProvider, \
     CollectionProvider
@@ -17,7 +16,7 @@
 
 logger = get_task_logger(__name__)
 
-@shared_task(bind=True, max_retries=3, default_retry_delay=60)
+@celery_app.task
 def send_user_email_task(self, user_id, notification_ids, message_freq):
     try:
         user = OSFUser.objects.get(
@@ -79,7 +78,7 @@ def send_user_email_task(self, user_id, notification_ids, message_freq):
         logger.exception('Retrying send_user_email_task due to exception')
         raise self.retry(exc=e)
 
-@shared_task(bind=True, max_retries=3, default_retry_delay=60)
+@celery_app.task
 def send_moderator_email_task(self, user_id, provider_id, notification_ids, message_freq):
     try:
         user = OSFUser.objects.get(

website/profile/views.py

@@ -190,6 +190,7 @@ def update_user(auth):
             NotificationType.objects.get(
                 name=NotificationType.Type.USER_PRIMARY_EMAIL_CHANGED
             ).emit(
+                subscribed_object=user,
                 user=user,
                 event_context={
                     'new_address': username,

website/project/views/contributor.py

@@ -453,6 +453,7 @@ def send_claim_registered_email(claimer, unclaimed_user, node, throttle=24 * 360
     NotificationType.objects.get(
         name=NotificationType.Type.USER_PENDING_VERIFICATION_REGISTERED
     ).emit(
+        subscribed_object=claimer,
         user=claimer,
         event_context={
             'claim_url': claim_url,
@@ -534,6 +535,7 @@ def send_claim_email(
             NotificationType.objects.get(
                 name=NotificationType.Type.USER_PENDING_VERIFICATION
             ).emit(
+                subscribed_object=unclaimed_user,
                 user=unclaimed_user,
                 event_context={
                     'user': unclaimed_user.id,

website/settings/defaults.py

@@ -553,6 +553,8 @@ class CeleryConfig:
         'osf.management.commands.registration_schema_metrics',
         'website.mailchimp_utils',
         'website.notifications.tasks',
+        'website.notifications.tasks.send_users_digest_email',
+        'website.notifications.tasks.send_moderators_digest_email',
         'website.archiver.tasks',
         'website.identifiers.tasks',
         'website.search.search',
@@ -625,12 +627,12 @@ class CeleryConfig:
             'kwargs': {'dry_run': False},
         },
         'send_moderators_digest_email': {
-            'task': 'website.notifications.tasks.send_moderators_digest_email',
+            'task': 'website.notifications.tasks',
             'schedule': crontab(minute=0, hour=5),  # Daily 12 a.m
             'kwargs': {'dry_run': False},
         },
         'send_users_digest_email': {
-            'task': 'website.notifications.tasks.send_users_digest_email',
+            'task': 'website.notifications.tasks',
             'schedule': crontab(minute=0, hour=5),  # Daily 12 a.m
             'kwargs': {'dry_run': False},
         },