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

Author: Johnetordoff

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

@@ -3,8 +3,6 @@
 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 +15,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)

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
             )

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:

website/notifications/listeners.py

@@ -24,11 +24,11 @@ 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),
         )
         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)
         )
@@ -45,11 +45,11 @@ 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),
         )
         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)
         )
@@ -58,15 +58,10 @@ def subscribe_contributor(resource, contributor, auth=None, *args, **kwargs):
 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):
@@ -121,7 +116,7 @@ def reviews_submit_notification_moderators(self, timestamp, context, resource):
         else:
             context['message'] = f'submitted "{resource.title}".'
     provider_subscription, created = NotificationSubscription.objects.get_or_create(
-        notification_type__name=NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS,
+        notification_type=NotificationType.objects.get(name=NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS),
         object_id=provider.id,
         content_type=ContentType.objects.get_for_model(provider.__class__),
     )

website/reviews/listeners.py

@@ -10,7 +10,7 @@ def reviews_withdraw_requests_notification_moderators(self, timestamp, context,
     from osf.models import NotificationSubscription, NotificationType
 
     provider_subscription, _ = NotificationSubscription.objects.get_or_create(
-        notification_type__name=NotificationType.Type.PROVIDER_REVIEWS_WITHDRAWAL_REQUESTED,
+        notification_type=NotificationType.objects.get(name=NotificationType.Type.PROVIDER_REVIEWS_WITHDRAWAL_REQUESTED),
         object_id=provider.id,
         content_type=ContentType.objects.get_for_model(provider.__class__),
     )
@@ -35,7 +35,7 @@ def reviews_withdrawal_requests_notification(self, timestamp, context):
     from osf.models import NotificationSubscription, NotificationType
 
     provider_subscription, _ = NotificationSubscription.objects.get_or_create(
-        notification_type__name=NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS,
+        notification_type=NotificationType.objects.get(name=NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS),
         object_id=preprint.provider.id,
         content_type=ContentType.objects.get_for_model(preprint.provider.__class__),
     )
@@ -87,7 +87,7 @@ def reviews_submit_notification_moderators(self, timestamp, resource, context):
 
     # Get NotificationSubscription instance, which contains reference to all subscribers
     provider_subscription, created = NotificationSubscription.objects.get_or_create(
-        notification_type__name=NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS,
+        notification_type=NotificationType.objects.get(name=NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS),
         object_id=provider.id,
         content_type=ContentType.objects.get_for_model(provider.__class__),
     )