add notification type emit for institutional requests

Author: Johnetordoff

notifications.yaml

@@ -19,6 +19,11 @@ notification_types:
     object_content_type_model_name: osfuser
     template: 'website/templates/emails/password_reset.html.mako'
     notification_freq_default: instantly
+  - name: user_contributor_added_default
+    __docs__: ...
+    object_content_type_model_name: osfuser
+    template: 'website/templates/emails/contributor_added_default.html.mako'
+    notification_freq_default: instantly
   - name: forgot_password
     __docs__: ...
     object_content_type_model_name: osfuser
@@ -122,6 +127,21 @@ notification_types:
     object_content_type_model_name: abstractnode
     template: 'website/templates/emails/pending_embargo_non_admin.html.mako'
     notification_freq_default: instantly
+  - name: node_affiliation_changed
+    __docs__: ...
+    object_content_type_model_name: abstractnode
+    template: 'website/templates/emails/project_affiliation_changed.html.mako'
+    notification_freq_default: instantly
+  - name: node_request_access_denied
+    __docs__: ...
+    object_content_type_model_name: abstractnode
+    template: 'website/templates/emails/access_request_rejected.html.mako'
+    notification_freq_default: instantly
+  - name: node_access_request_submitted
+    __docs__: ...
+    object_content_type_model_name: abstractnode
+    template: 'website/templates/emails/access_request_submitted.html.mako'
+    notification_freq_default: instantly
 
   #### PREPRINT
   - name: pending_retraction_admin

osf/models/mixins.py

@@ -306,15 +306,18 @@ def add_affiliated_institution(self, inst, user, log=True, ignore_user_affiliati
         if not self.is_affiliated_with_institution(inst):
             self.affiliated_institutions.add(inst)
             self.update_search()
+            from . import NotificationType
+
             if notify and getattr(self, 'type', False) == 'osf.node':
                 for user, _ in self.get_admin_contributors_recursive(unique_users=True):
-                    mails.send_mail(
-                        user.username,
-                        mails.PROJECT_AFFILIATION_CHANGED,
-                        **{
+                    NotificationType.objects.get(
+                        name=NotificationType.Type.NODE_AFFILIATION_CHANGED
+                    ).emit(
+                        user=user,
+                        event_context={
                             'user': user,
                             'node': self,
-                        },
+                        }
                     )
         if log:
             params = self.log_params
@@ -345,16 +348,18 @@ def remove_affiliated_institution(self, inst, user, save=False, log=True, notify
             if save:
                 self.save()
             self.update_search()
+            from . import NotificationType
 
             if notify and getattr(self, 'type', False) == 'osf.node':
                 for user, _ in self.get_admin_contributors_recursive(unique_users=True):
-                    mails.send_mail(
-                        user.username,
-                        mails.PROJECT_AFFILIATION_CHANGED,
-                        **{
+                    NotificationType.objects.get(
+                        name=NotificationType.Type.NODE_AFFILIATION_CHANGED
+                    ).emit(
+                        user=user,
+                        event_context={
                             'user': user,
                             'node': self,
-                        },
+                        }
                     )
 
             return True

osf/models/notification_type.py

@@ -79,6 +79,7 @@ class Type(str, Enum):
         USER_INVITE_DRAFT_REGISTRATION = 'user_invite_draft_registration'
         USER_INVITE_OSF_PREPRINT = 'user_invite_osf_preprint'
         USER_CONTRIBUTOR_ADDED_PREPRINT_NODE_FROM_OSF = 'user_contributor_added_preprint_node_from_osf'
+        USER_CONTRIBUTOR_ADDED_ACCESS_REQUEST = 'user_contributor_added_access_request'
 
         # Node notifications
         NODE_COMMENT = 'node_comments'

osf/utils/machines.py

@@ -238,14 +238,18 @@ def notify_submit(self, ev):
         context = self.get_context()
         context['contributors_url'] = f'{self.machineable.target.absolute_url}contributors/'
         context['project_settings_url'] = f'{self.machineable.target.absolute_url}settings/'
+        from osf.models import NotificationType
+
         if not self.machineable.request_type == NodeRequestTypes.INSTITUTIONAL_REQUEST.value:
             for admin in self.machineable.target.get_users_with_perm(permissions.ADMIN):
-                mails.send_mail(
-                    admin.username,
-                    mails.ACCESS_REQUEST_SUBMITTED,
-                    admin=admin,
-                    osf_contact_email=OSF_CONTACT_EMAIL,
-                    **context
+                NotificationType.objects.get(
+                    name=NotificationType.Type.NODE_REQUEST_ACCESS_SUBMITTED,
+                ).emit(
+                    user=admin,
+                    event_context={
+                        'osf_contact_email': OSF_CONTACT_EMAIL,
+                        **context
+                    }
                 )
 
     def notify_resubmit(self, ev):
@@ -257,13 +261,18 @@ def notify_resubmit(self, ev):
     def notify_accept_reject(self, ev):
         """ Notify requester that admins have approved/denied
         """
+        from osf.models import NotificationType
+
         if ev.event.name == DefaultTriggers.REJECT.value:
             context = self.get_context()
-            mails.send_mail(
-                self.machineable.creator.username,
-                mails.ACCESS_REQUEST_DENIED,
-                osf_contact_email=OSF_CONTACT_EMAIL,
-                **context
+            NotificationType.objects.get(
+                name=NotificationType.Type.NODE_REQUEST_ACCESS_DENIED
+            ).emit(
+                user=self.machineable.creator,
+                event_context={
+                    'osf_contact_email': OSF_CONTACT_EMAIL,
+                    **context
+                }
             )
         else:
             # add_contributor sends approval notification email

website/project/views/contributor.py

@@ -592,15 +592,15 @@ def notify_added_contributor(node, contributor, auth=None, email_template='defau
         elif email_template == 'draft_registration':
             email_template = NotificationType.Type.USER_CONTRIBUTOR_ADDED_DRAFT_REGISTRATION
         elif email_template == 'access_request':
-            email_template = mails.CONTRIBUTOR_ADDED_ACCESS_REQUEST
+            email_template = NotificationType.Type.USER_CONTRIBUTOR_ADDED_ACCESS_REQUEST
         elif node.has_linked_published_preprints:
             # Project holds supplemental materials for a published preprint
             email_template = NotificationType.Type.USER_CONTRIBUTOR_ADDED_PREPRINT_NODE_FROM_OSF
             logo = settings.OSF_PREPRINTS_LOGO
         else:
             email_template = NotificationType.Type.USER_CONTRIBUTOR_ADDED_DEFAULT
 
-        NotificationType.objects.create(name=email_template).emit(
+        NotificationType.objects.get(name=email_template).emit(
             user=contributor,
             event_context={
                 'node': node.id,