fix legacy subscriptions

Author: Johnetordoff

api/institutions/authentication.py

@@ -341,6 +341,7 @@ def authenticate(self, request):
                 event_context={
                     'domain': DOMAIN,
                     'osf_support_email': OSF_SUPPORT_EMAIL,
+                    'user_fullname': user.fullname,
                     'storage_flag_is_active': flag_is_active(request, features.STORAGE_I18N),
                 },
             )

api_tests/identifiers/views/test_identifier_detail.py

@@ -155,7 +155,7 @@ def test_identifier_preprint_detail_unpublished(
 
         # test_unpublished_preprint_identifier_readcontrib_authenticated
         read_user = AuthUserFactory()
-        preprint.add_contributor(read_user, READ, save=True)
+        preprint.add_contributor(read_user, READ, save=True, notification_type=False)
         res = app.get(url, auth=read_user.auth, expect_errors=True)
         assert res.status_code == 200
 
@@ -181,7 +181,7 @@ def test_identifier_preprint_detail_deleted(
 
         # test_deleted_preprint_identifier_readcontrib_authenticated
         read_user = AuthUserFactory()
-        preprint.add_contributor(read_user, READ, save=True)
+        preprint.add_contributor(read_user, READ, save=True, notification_type=False)
         res = app.get(url, auth=read_user.auth, expect_errors=True)
         assert res.status_code == 404
 
@@ -207,7 +207,7 @@ def test_identifier_preprint_detail_private(
 
         # test_private_preprint_identifier_readcontrib_authenticated
         read_user = AuthUserFactory()
-        preprint.add_contributor(read_user, READ, save=True)
+        preprint.add_contributor(read_user, READ, save=True, notification_type=False)
         res = app.get(url, auth=read_user.auth, expect_errors=True)
         assert res.status_code == 200
 
@@ -233,7 +233,7 @@ def test_identifier_preprint_detail_abandoned(
 
         # test_abandoned_preprint_identifier_readcontrib_authenticated
         read_user = AuthUserFactory()
-        preprint.add_contributor(read_user, READ, save=True)
+        preprint.add_contributor(read_user, READ, save=True, notification_type=False)
         res = app.get(url, auth=read_user.auth, expect_errors=True)
         assert res.status_code == 403
 

notifications/listeners.py

@@ -70,9 +70,9 @@ def queue_first_public_project_email(user, node):
         subscribed_object=user,
         user=user,
         event_context={
+            'user_fullname': user.fullname,
             'domain': settings.DOMAIN,
             'nid': node._id,
-            'fullname': user.fullname,
             'project_title': node.title,
             'osf_url': settings.DOMAIN,
         }

osf/models/collection_submission.py

@@ -1,6 +1,7 @@
 import logging
 
 from django.db import models
+from django.utils import timezone
 from django.utils.functional import cached_property
 from framework import sentry
 from framework.exceptions import PermissionsError
@@ -104,17 +105,26 @@ def _notify_contributors_pending(self, event_data):
             NotificationType.objects.get(
                 name=NotificationType.Type.COLLECTION_SUBMISSION_SUBMITTED,
             ).emit(
+                is_digest=True,
                 user=contributor,
                 subscribed_object=self,
                 event_context={
-                    'user': contributor.id,
-                    'submitter': user.id,
+                    'requester_contributor_names': ''.join(
+                        self.guid.referent.contributors.values_list('fullname', flat=True)),
+                    'localized_timestamp': str(timezone.now()),
+                    'user_fullname': contributor.fullname,
+                    'submitter_fullname': user.fullname,
+                    'requester_fullname': self.creator.fullname,
+                    'profile_image_url': user.profile_image_url(),
+                    'submitter_absolute_url': user.get_absolute_url(),
+                    'collections_link': settings.DOMAIN + 'collections/' + self.collection.provider._id,
+                    'collection_provider_name': self.collection.provider.name,
                     'is_initiator': self.creator == contributor,
                     'is_admin': self.guid.referent.has_permission(contributor, ADMIN),
                     'is_registered_contrib': contributor.is_registered,
-                    'collection': self.collection.id,
                     'claim_url': claim_url,
-                    'node': self.guid.referent.id,
+                    'node_title': self.guid.referent.title,
+                    'node_absolute_url': self.guid.referent.get_absolute_url(),
                     'domain': settings.DOMAIN,
                     'osf_contact_email': settings.OSF_CONTACT_EMAIL,
                 },
@@ -128,7 +138,7 @@ def _notify_moderators_pending(self, event_data):
             user=user,
             subscribed_object=self.guid.referent,
             event_context={
-                'submitter': self.creator.id,
+                'submitter_fullname': self.creator.fullname,
                 'requester_contributor_names': ''.join(self.guid.referent.contributors.values_list('fullname', flat=True))
             },
             is_digest=True,

osf/models/mixins.py

@@ -321,6 +321,7 @@ def add_affiliated_institution(self, inst, user, log=True, ignore_user_affiliati
                         event_context={
                             'user_fullname': user.fullname,
                             'node_title': self.title,
+                            'node_id': self.machineable.target._id,
                             'node_absolute_url': self.get_absolute_url(),
                         }
                     )
@@ -365,6 +366,7 @@ def remove_affiliated_institution(self, inst, user, save=False, log=True, notify
                         event_context={
                             'user_fullname': user.fullname,
                             'node_title': self.title,
+                            'node_id': self.machineable.target._id,
                             'node_absolute_url': self.get_absolute_url(),
                         }
                     )

osf/utils/machines.py

@@ -304,6 +304,7 @@ def notify_edit_comment(self, ev):
     def get_context(self):
         return {
             'node_title': self.machineable.target.title,
+            'node_id': self.machineable.target._id,
             'node_absolute_url': self.machineable.target.absolute_url,
             'requester_absolute_url': self.machineable.creator.absolute_url,
         }

website/notifications/views.py

@@ -153,9 +153,13 @@ def get_configured_projects(user):
 
 
 def check_project_subscriptions_are_all_none(user, node):
-    node_subscriptions = get_all_node_subscriptions(user, node)
+    node_subscriptions = NotificationSubscription.objects.filter(
+        user=user,
+        object_id=node.id,
+        content_type=ContentType.objects.get_for_model(node).id,
+    )
     for s in node_subscriptions:
-        if not s.none.filter(id=user.id).exists():
+        if not s.message_frequecy == 'none':
             return False
     return True
 
@@ -164,8 +168,8 @@ def get_all_user_subscriptions(user, extra=None):
     """ Get all Subscription objects that the user is subscribed to"""
     NotificationSubscription = apps.get_model('osf.NotificationSubscription')
     queryset = NotificationSubscription.objects.filter(
-        Q(user=user)
-    ).distinct()
+        user=user,
+    )
     return queryset.filter(extra) if extra else queryset
 
 

website/project/views/contributor.py

@@ -639,6 +639,7 @@ def notify_added_contributor(node, contributor, notification_type, auth=None, *a
             'is_initiator': getattr(getattr(auth, 'user', None), 'id', None) == contributor.id if auth else False,
             'branded_service': getattr(getattr(node, 'provider', None), 'id', None),
             'node_title': node.title,
+            'node_id': node._id,
             'node_provider__id': getattr(node.provider, '_id', None),
             'node_absolute_url': node.absolute_url,
             'can_change_preferences': False,

website/search/elastic_search.py

@@ -715,6 +715,7 @@ def update_file(file_, index=None, delete=False):
         'category': 'file',
         'node_url': node_url,
         'node_title': getattr(target, 'title', None),
+        'node__id': getattr(target, '_id', None),
         'parent_id': target.parent_node._id if getattr(target, 'parent_node', None) else None,
         'is_registration': getattr(target, 'is_registration', False),
         'is_retracted': getattr(target, 'is_retracted', False),

website/templates/emails/collection_submission_accepted.html.mako

@@ -6,9 +6,9 @@
     <p>
         % if is_admin:
             Your request to add <a href="${node.absolute_url}">${node.title}</a> to
-            <a href="${domain + 'collections/' + collection.provider._id}">${collection.provider.name}</a> was approved.
+            <a href="${domain + 'collections/' + collection.provider._id}">${collection_provider_name}</a> was approved.
         % else:
-            <a href="${node.absolute_url}">${node.title}</a> was added to <a href="${domain + 'collections/' + collection.provider._id}">${collection.provider.name}</a>.
+            <a href="${node.absolute_url}">${node.title}</a> was added to <a href="${domain + 'collections/' + collection.provider._id}">${collection_provider_name}</a>.
         % endif
     </p>
     <p>