refactored to send main via Notification model

Author: bodintsov

api/requests/serializers.py

@@ -15,11 +15,13 @@
     PreprintRequest,
     Institution,
     OSFUser,
+    NotificationType,
 )
+from osf.models.notification import FrequencyChoices
 from osf.utils.workflows import DefaultStates, RequestTypes, NodeRequestTypes
 from osf.utils import permissions as osf_permissions
 from website import language, settings
-from website.mails import send_mail, NODE_REQUEST_INSTITUTIONAL_ACCESS_REQUEST
+from website.mails import NODE_REQUEST_INSTITUTIONAL_ACCESS_REQUEST
 
 from rest_framework.exceptions import PermissionDenied, ValidationError
 
@@ -188,20 +190,38 @@ def make_node_institutional_access_request(self, node, validated_data) -> NodeRe
 
             comment = validated_data.get('comment', '').strip() or language.EMPTY_REQUEST_INSTITUTIONAL_ACCESS_REQUEST_TEXT
 
-            send_mail(
-                to_addr=recipient.username,
-                mail=NODE_REQUEST_INSTITUTIONAL_ACCESS_REQUEST,
+            notification_type_name = NotificationType.Type.NODE_REQUEST_INSTITUTIONAL_ACCESS_REQUEST.value
+            notification_type, created = NotificationType.objects.get_or_create(
+                name=notification_type_name,
+                defaults={
+                    'notification_freq': FrequencyChoices.INSTANTLY.value,
+                    'template': NODE_REQUEST_INSTITUTIONAL_ACCESS_REQUEST
+                }
+            )
+            event_context = {
+                'recipient': {
+                    'fullname': recipient.full_name,
+                },
+                'sender': {
+                    'absolute_url': sender.get_absolute_url(),
+                    'full_name': sender.full_name,
+                },
+                'node':{
+                    'absolute_url': node.absolute_url,
+                    'title': node.title,
+                },
+                'comment': comment,
+                'settings': {
+                    'DOMAIN': settings.DOMAIN,
+                    'OSF_CONTACT_EMAIL': settings.OSF_CONTACT_EMAIL,
+                },
+            }
+
+            notification_type.emit(
                 user=recipient,
-                sender=sender,
-                bcc_addr=[sender.username] if validated_data['bcc_sender'] else None,
-                reply_to=sender.username if validated_data['reply_to'] else None,
-                recipient=recipient,
-                comment=comment,
-                institution=institution,
-                osf_url=settings.DOMAIN,
-                node=node_request.target,
+                subscribed_object=node_request.target,
+                event_context=event_context
             )
-
         return node_request
 
     def _create_node_request(self, node, validated_data) -> NodeRequest:

osf/utils/machines.py

@@ -6,6 +6,7 @@
 from framework.auth import Auth
 
 from osf.exceptions import InvalidTransitionError
+from osf.models.notification import FrequencyChoices, NotificationType
 from osf.models.preprintlog import PreprintLog
 from osf.models.action import ReviewAction, NodeRequestAction, PreprintRequestAction
 from osf.utils import permissions
@@ -240,12 +241,18 @@ def notify_submit(self, ev):
         context['project_settings_url'] = f'{self.machineable.target.absolute_url}settings/'
         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
+                notification_type_name = NotificationType.Type.NODE_REQUEST_ACCESS_SUBMITTED.value
+                notification_type, created = NotificationType.objects.get_or_create(
+                    name=notification_type_name,
+                    defaults={
+                        'notification_freq': FrequencyChoices.INSTANTLY.value,
+                        'template': mails.ACCESS_REQUEST_SUBMITTED
+                    }
+                )
+                event_context = dict(**context)
+                notification_type.emit(
+                    user=admin.username,
+                    event_context=event_context
                 )
 
     def notify_resubmit(self, ev):