update notification subscription get or create to create the notification types.

Author: Johnetordoff

admin/common_auth/views.py

@@ -1,3 +1,4 @@
+from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse, reverse_lazy
 from django.http import Http404
 from django.shortcuts import redirect
@@ -8,6 +9,7 @@
 from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.contrib.auth import login, REDIRECT_FIELD_NAME, authenticate, logout
+from osf.models.notification_subscription import NotificationSubscription
 
 from osf.models.user import OSFUser
 from osf.models import AdminProfile, AbstractProvider
@@ -77,7 +79,20 @@ def form_valid(self, form):
             if group_type == 'reviews':
                 provider_id = split[2]
                 provider = AbstractProvider.objects.get(id=provider_id)
-                provider.notification_subscriptions.get(event_name='new_pending_submissions').add_user_to_subscription(osf_user, 'email_transactional')
+
+                data = {}
+                if subscribed_object := provider:
+                    data = {
+                        'object_id': subscribed_object.id,
+                        'content_type_id': ContentType.objects.get_for_model(subscribed_object).id,
+                    }
+
+                notification, created = NotificationSubscription.objects.get_or_create(
+                    user=osf_user,
+                    notification_type=self,
+                    **data,
+                )
+                return notification
 
         osf_user.save()
 

osf/apps.py

@@ -15,6 +15,7 @@
     update_waffle_flags,
     update_default_providers
 )
+from osf.management.commands.populate_notification_types import populate_notification_types
 
 logger = logging.getLogger(__file__)
 
@@ -68,3 +69,7 @@ def ready(self):
             update_storage_regions,
             dispatch_uid='osf.apps.update_storage_regions'
         )
+        post_migrate.connect(
+            populate_notification_types,
+            dispatch_uid='osf.apps.populate_notification_types'
+        )

osf/management/commands/populate_notification_types.py

@@ -1,10 +1,9 @@
 import yaml
 from django.apps import apps
+
 from website import settings
 
 import logging
-from django.contrib.contenttypes.models import ContentType
-from osf.models.notification_type import NotificationType
 from django.core.management.base import BaseCommand
 from django.db import transaction
 
@@ -17,6 +16,8 @@
 }
 
 def populate_notification_types(*args, **kwargs):
+    from django.contrib.contenttypes.models import ContentType
+    from osf.models.notification_type import NotificationType
 
     with open(settings.NOTIFICATION_TYPES_YAML) as stream:
         notification_types = yaml.safe_load(stream)
@@ -41,6 +42,9 @@ def populate_notification_types(*args, **kwargs):
         elif object_content_type_model_name == 'osfuser':
             OSFUser = apps.get_model('osf', 'OSFUser')
             content_type = ContentType.objects.get_for_model(OSFUser)
+        elif object_content_type_model_name == 'draftregistration':
+            DraftRegistration = apps.get_model('osf', 'DraftRegistration')
+            content_type = ContentType.objects.get_for_model(DraftRegistration)
         else:
             try:
                 content_type = ContentType.objects.get(

osf/models/mixins.py

@@ -5,6 +5,7 @@
 
 from django.apps import apps
 from django.contrib.auth.models import Group, AnonymousUser
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import models, transaction
 from django.utils import timezone
@@ -1079,6 +1080,8 @@ def add_to_group(self, user, group):
 
         NotificationSubscription.objects.get_or_create(
             user=user,
+            content_type=ContentType.objects.get_for_model(self),
+            object_id=self.id,
             notification_type=NotificationType.objects.get(
                 name=NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
             )
@@ -1096,11 +1099,6 @@ def remove_from_group(self, user, group, unsubscribe=True):
 
         return _group.user_set.remove(user)
 
-    def add_user_to_subscription(self, user, subscription):
-        subscription.objects.get_or_create(
-            user=user,
-        )
-
     def remove_user_from_subscription(self, user, subscription):
         notification_type = NotificationType.objects.get(
             name=subscription,

osf/models/notification_subscription.py

@@ -6,6 +6,7 @@
 from django.core.exceptions import ValidationError
 from osf.models.notification_type import get_default_frequency_choices
 from osf.models.notification import Notification
+from api.base import settings
 
 from .base import BaseModel
 
@@ -70,15 +71,16 @@ def emit(
             to a test address or OSF desk support'
             email_context (dict, optional): Context for sending the email bcc, reply_to header etc
         """
-        logging.info(
-            f"Attempting to create Notification:"
-            f"\nto={getattr(self.user, 'username', destination_address)}"
-            f"\ntype={self.notification_type.name}"
-            f"\nmessage_frequency={self.message_frequency}"
-            f"\ncontext={event_context}"
-            f"\nemail={email_context}"
+        if not settings.CI_ENV:
+            logging.info(
+                f"Attempting to create Notification:"
+                f"\nto={getattr(self.user, 'username', destination_address)}"
+                f"\ntype={self.notification_type.name}"
+                f"\nmessage_frequency={self.message_frequency}"
+                f"\nevent_context={event_context}"
+                f"\nemail_context={email_context}"
 
-        )
+            )
         if self.message_frequency == 'instantly':
             notification = Notification.objects.create(
                 subscription=self,

osf/models/notification_type.py

@@ -115,7 +115,6 @@ class Type(str, Enum):
         PROVIDER_NEW_PENDING_WITHDRAW_REQUESTS = 'provider_new_pending_withdraw_requests'
         PROVIDER_REVIEWS_SUBMISSION_CONFIRMATION = 'provider_reviews_submission_confirmation'
         PROVIDER_REVIEWS_MODERATOR_SUBMISSION_CONFIRMATION = 'provider_reviews_moderator_submission_confirmation'
-        PROVIDER_REVIEWS_WITHDRAWAL_REQUESTED = 'preprint_request_withdrawal_requested'
         PROVIDER_REVIEWS_REJECT_CONFIRMATION = 'provider_reviews_reject_confirmation'
         PROVIDER_REVIEWS_ACCEPT_CONFIRMATION = 'provider_reviews_accept_confirmation'
         PROVIDER_REVIEWS_RESUBMISSION_CONFIRMATION = 'provider_reviews_resubmission_confirmation'
@@ -235,27 +234,6 @@ def emit(
             email_context=email_context,
         )
 
-    def add_user_to_subscription(self, user, *args, **kwargs):
-        """
-        """
-        from osf.models.notification_subscription import NotificationSubscription
-
-        provider = kwargs.pop('provider', None)
-        node = kwargs.pop('node', None)
-        data = {}
-        if subscribed_object := provider or node:
-            data = {
-                'object_id': subscribed_object.id,
-                'content_type_id': ContentType.objects.get_for_model(subscribed_object).id,
-            }
-
-        notification, created = NotificationSubscription.objects.get_or_create(
-            user=user,
-            notification_type=self,
-            **data,
-        )
-        return notification
-
     def remove_user_from_subscription(self, user):
         """
         """

osf/models/provider.py

@@ -2,7 +2,6 @@
 import requests
 
 from django.apps import apps
-from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres import fields
 from django.core.exceptions import ValidationError
 from django.db import connection
@@ -16,7 +15,6 @@
 
 from framework import sentry
 from osf.models.notification_type import NotificationType
-from osf.models.notification_subscription import NotificationSubscription
 from .base import BaseModel, TypedObjectIDMixin
 from .mixins import ReviewProviderMixin
 from .brand import Brand
@@ -473,19 +471,6 @@ def create_provider_auth_groups(sender, instance, created, **kwargs):
         instance.update_group_permissions()
 
 
-@receiver(post_save, sender=CollectionProvider)
-@receiver(post_save, sender=PreprintProvider)
-@receiver(post_save, sender=RegistrationProvider)
-def create_provider_notification_subscriptions(sender, instance, created, **kwargs):
-    if created:
-        for subscription in instance.DEFAULT_SUBSCRIPTIONS:
-            NotificationSubscription.objects.get_or_create(
-                notification_type__name=subscription,
-                object_id=instance.id,
-                content_type=ContentType.objects.get_for_model(instance)
-            )
-
-
 @receiver(post_save, sender=CollectionProvider)
 def create_primary_collection_for_provider(sender, instance, created, **kwargs):
     if created:

osf/utils/notifications.py

@@ -50,6 +50,7 @@ def notify_submit(resource, user, *args, **kwargs):
         timestamp=timezone.now(),
         context=context,
         resource=resource,
+
     )
 
 

website/notifications/listeners.py

@@ -24,13 +24,15 @@ def subscribe_creator(resource):
     if user.is_registered:
         NotificationSubscription.objects.get_or_create(
             user=user,
-            notification_type__name=NotificationType.Type.USER_FILE_UPDATED,
+            notification_type=NotificationType.objects.get(name=NotificationType.Type.USER_FILE_UPDATED),
+            _is_digest=True,
         )
         NotificationSubscription.objects.get_or_create(
             user=user,
-            notification_type__name=NotificationType.Type.FILE_UPDATED,
+            notification_type=NotificationType.objects.get(name=NotificationType.Type.FILE_UPDATED),
             object_id=resource.id,
-            content_type=ContentType.objects.get_for_model(resource)
+            content_type=ContentType.objects.get_for_model(resource),
+            _is_digest=True,
         )
 
 @contributor_added.connect
@@ -45,28 +47,25 @@ def subscribe_contributor(resource, contributor, auth=None, *args, **kwargs):
     if contributor.is_registered:
         NotificationSubscription.objects.get_or_create(
             user=contributor,
-            notification_type__name=NotificationType.Type.USER_FILE_UPDATED,
+            notification_type=NotificationType.objects.get(name=NotificationType.Type.USER_FILE_UPDATED),
+            _is_digest=True,
         )
         NotificationSubscription.objects.get_or_create(
             user=contributor,
-            notification_type__name=NotificationType.Type.FILE_UPDATED,
+            notification_type=NotificationType.objects.get(name=NotificationType.Type.FILE_UPDATED),
             object_id=resource.id,
-            content_type=ContentType.objects.get_for_model(resource)
+            content_type=ContentType.objects.get_for_model(resource),
+            _is_digest=True,
         )
 
 @user_confirmed.connect
 def subscribe_confirmed_user(user):
     NotificationSubscription = apps.get_model('osf.NotificationSubscription')
     NotificationType = apps.get_model('osf.NotificationType')
-    user_events = [
-        NotificationType.Type.USER_FILE_UPDATED,
-        NotificationType.Type.USER_REVIEWS,
-    ]
-    for user_event in user_events:
-        NotificationSubscription.objects.get_or_create(
-            user=user,
-            notification_type__name=user_event
-        )
+    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):
@@ -94,8 +93,7 @@ def reviews_submit_notification_moderators(self, timestamp, context, resource):
     """
 
     # imports moved here to avoid AppRegistryNotReady error
-    from osf.models import NotificationSubscription, NotificationType
-    from django.contrib.contenttypes.models import ContentType
+    from osf.models import NotificationType
     from website.settings import DOMAIN
 
     provider = resource.provider
@@ -120,17 +118,15 @@ def reviews_submit_notification_moderators(self, timestamp, context, resource):
             context['message'] = f'resubmitted "{resource.title}".'
         else:
             context['message'] = f'submitted "{resource.title}".'
-    provider_subscription, created = NotificationSubscription.objects.get_or_create(
-        notification_type__name=NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS,
-        object_id=provider.id,
-        content_type=ContentType.objects.get_for_model(provider.__class__),
-    )
-    for recipient in provider_subscription.subscribed_object.get_group('moderator').user_set.all():
+
+    for recipient in resource.provider.get_group('moderator').user_set.all():
         NotificationType.objects.get(
             name=NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
         ).emit(
             user=recipient,
-            event_context=context
+            subscribed_object=provider,
+            event_context=context,
+            is_digest=True,
         )
 
 # Handle email notifications to notify moderators of new submissions.