New Notification system proof of concept

Author: Johnetordoff

README-docker-compose.md

@@ -350,12 +350,12 @@ docker compose run --rm --service-ports web
 
 - Test a Specific Class
   ```bash
-  docker compose run --rm web python3 -m pytest tests/test_conferences.py::TestProvisionNode
+  docker compose run --rm web python3 -m pytest tests/test_node.py::TestExample:test_example
   ```
 
 - Test a Specific Method
   ```bash
-  docker compose run --rm web python3 -m pytest tests/test_conferences.py::TestProvisionNode::test_upload
+  docker compose run --rm web python3 -m pytest tests/test_node.py::TestExample:test_example
   ```
 
 ## Managing Container State

addons/base/views.py

@@ -36,7 +36,6 @@
 from framework.sentry import log_exception
 from framework.routing import proxy_url
 from framework.transactions.handlers import no_auto_transaction
-from website import mails
 from website import settings
 from addons.base import signals as file_signals
 from addons.base.utils import format_last_known_metadata, get_mfr_url
@@ -54,7 +53,8 @@
     DraftRegistration,
     Guid,
     FileVersionUserMetadata,
-    FileVersion
+    FileVersion,
+    NotificationType
 )
 from osf.metrics import PreprintView, PreprintDownload
 from osf.utils import permissions
@@ -583,17 +583,17 @@ def create_waterbutler_log(payload, **kwargs):
                 )
 
             if payload.get('email') is True or payload.get('errors'):
-                mails.send_mail(
-                    user.username,
-                    mails.FILE_OPERATION_FAILED if payload.get('errors')
-                    else mails.FILE_OPERATION_SUCCESS,
-                    action=payload['action'],
-                    source_node=source_node,
-                    destination_node=destination_node,
-                    source_path=payload['source']['materialized'],
-                    source_addon=payload['source']['addon'],
-                    destination_addon=payload['destination']['addon'],
-                    osf_support_email=settings.OSF_SUPPORT_EMAIL
+                if payload.get('errors'):
+                    notification_type = NotificationType.Type.FILE_OPERATION_FAILED
+                else:
+                    notification_type = NotificationType.Type.FILE_OPERATION_SUCCESS
+
+                NotificationType.objects.get(
+                    name=notification_type.value,
+                ).emit(
+                    user=user,
+                    subscribed_object=destination_node or node,
+                    event_context=payload,
                 )
 
             if payload.get('errors'):
@@ -613,6 +613,14 @@ def create_waterbutler_log(payload, **kwargs):
     with transaction.atomic():
         file_signals.file_updated.send(target=node, user=user, event_type=action, payload=payload)
 
+    NotificationType.objects.get(
+        name=action,
+    ).emit(
+        user=user,
+        subscribed_object=target_node or node,
+        event_context=metadata,
+    )
+
     return {'status': 'success'}
 
 

addons/wiki/tests/test_views.py

@@ -111,66 +111,6 @@ def test_update_name_invalid(self):
         with pytest.raises(NameInvalidError):
             WikiPage.objects.create_for_node(self.project, invalid_name, 'more valid content', self.auth)
 
-    def test_update_wiki_updates_comments_and_user_comments_viewed_timestamp(self):
-        project = ProjectFactory(creator=self.user, is_public=True)
-        wiki_page = WikiFactory(node=project, page_name='test')
-        wiki = WikiVersionFactory(wiki_page=wiki_page)
-        comment = CommentFactory(node=project, target=Guid.load(wiki_page._id), user=UserFactory())
-
-        # user views comments -- sets user.comments_viewed_timestamp
-        url = project.api_url_for('update_comments_timestamp')
-        res = self.app.put(url, json={
-            'page': 'wiki',
-            'rootId': wiki_page._id
-        }, auth=self.user.auth)
-        assert res.status_code == 200
-        self.user.reload()
-        assert wiki_page._id in self.user.comments_viewed_timestamp
-
-        # user updates the wiki
-        wiki_page.update(self.user, 'Updating wiki')
-        comment.reload()
-        self.user.reload()
-        assert wiki_page._id in self.user.comments_viewed_timestamp
-        assert comment.target.referent._id == wiki_page._id
-
-    # Regression test for https://openscience.atlassian.net/browse/OSF-6138
-    def test_update_wiki_updates_contributor_comments_viewed_timestamp(self):
-        contributor = AuthUserFactory()
-        project = ProjectFactory(creator=self.user, is_public=True)
-        project.add_contributor(contributor)
-        project.save()
-        wiki_page = WikiFactory(node=project, page_name='test')
-        wiki = WikiVersionFactory(wiki_page=wiki_page)
-        comment = CommentFactory(node=project, target=Guid.load(wiki_page._id), user=self.user)
-
-        # user views comments -- sets user.comments_viewed_timestamp
-        url = project.api_url_for('update_comments_timestamp')
-        res = self.app.put(url, json={
-            'page': 'wiki',
-            'rootId': wiki_page._id
-        }, auth=self.user.auth)
-        assert res.status_code == 200
-        self.user.reload()
-        assert wiki_page._id in self.user.comments_viewed_timestamp
-
-        # contributor views comments -- sets contributor.comments_viewed_timestamp
-        res = self.app.put(url, json={
-            'page': 'wiki',
-            'rootId': wiki_page._id
-        }, auth=contributor.auth)
-        contributor.reload()
-        assert wiki_page._id in contributor.comments_viewed_timestamp
-
-        # user updates the wiki
-        wiki_page.update(self.user, 'Updating wiki')
-        comment.reload()
-        contributor.reload()
-
-        new_version_id = WikiVersion.objects.get_for_node(project, 'test')._id
-        assert wiki_page._id in contributor.comments_viewed_timestamp
-        assert comment.target.referent._id == wiki_page._id
-
     # Regression test for https://openscience.atlassian.net/browse/OSF-8584
     def test_no_read_more_when_less_than_400_character(self):
         wiki_content = '1234567'

admin/notifications/views.py

@@ -1,11 +1,11 @@
-from osf.models.notifications import NotificationSubscription
+from osf.models.notification import NotificationSubscription
 from django.db.models import Count
 
 def delete_selected_notifications(selected_ids):
     NotificationSubscription.objects.filter(id__in=selected_ids).delete()
 
 def detect_duplicate_notifications(node_id=None):
-    query = NotificationSubscription.objects.values('_id').annotate(count=Count('_id')).filter(count__gt=1)
+    query = NotificationSubscription.objects.annotate(count=Count('id')).filter(count__gt=1)
     if node_id:
         query = query.filter(node_id=node_id)