fix template tests

Author: Johnetordoff

api/institutions/authentication.py

@@ -355,6 +355,7 @@ def authenticate(self, request):
             ).emit(
                 user=user,
                 event_context={
+                    'user_fullname': user.fullname,
                     'email_to_add': email_to_add,
                     'domain': DOMAIN,
                     'osf_support_email': OSF_SUPPORT_EMAIL,

api/nodes/views.py

@@ -1051,6 +1051,7 @@ def perform_create(self, serializer):
                 user=user,
                 subscribed_object=node,
                 event_context={
+                    'domain': settings.DOMAIN,
                     'guid': fork._id,
                     'node_title': node.title,
                     'node__id': node._id,
@@ -1065,6 +1066,7 @@ def perform_create(self, serializer):
                 user=user,
                 subscribed_object=node,
                 event_context={
+                    'domain': settings.DOMAIN,
                     'guid': fork._id,
                     'node_title': node.title,
                     'node__id': node._id,

api/requests/serializers.py

@@ -193,15 +193,18 @@ def make_node_institutional_access_request(self, node, validated_data) -> NodeRe
                 user=recipient,
                 message_frequency='instantly',
                 event_context={
-                    'sender': sender.username,
-                    'bcc_addr': [sender.username] if validated_data['bcc_sender'] else None,
-                    'reply_to': sender.username if validated_data['reply_to'] else None,
-                    'recipient': recipient.username if recipient else None,
+                    'sender_fullname': sender.fullname,
+                    'sender_absolute_url': sender.absolute_url,
+                    'recipient_fullname': recipient.username if recipient else None,
                     'comment': comment,
-                    'institution': institution.id if institution else None,
+                    'institution_name': institution.name if institution else None,
                     'osf_url': settings.DOMAIN,
                     'node': node_request.target._id,
                 },
+                email_context={
+                    'bcc_addr': [sender.username] if validated_data['bcc_sender'] else None,
+                    'reply_to': sender.username if validated_data['reply_to'] else None,
+                },
             )
 
         return node_request

osf_tests/metadata/test_osf_gathering.py

@@ -101,9 +101,9 @@ def setUpTestData(cls):
             creator=cls.user__admin,
             is_public=True,
         )
-        cls.preprint.add_contributor(cls.user__readwrite, permissions=permissions.WRITE)
-        cls.preprint.add_contributor(cls.user__readonly, permissions=permissions.READ)
-        cls.preprint.add_contributor(cls.user__invisible, permissions=permissions.WRITE, visible=False)
+        cls.preprint.add_contributor(cls.user__readwrite, permissions=permissions.WRITE, notification_type=False)
+        cls.preprint.add_contributor(cls.user__readonly, permissions=permissions.READ, notification_type=False)
+        cls.preprint.add_contributor(cls.user__invisible, permissions=permissions.WRITE, visible=False, notification_type=False)
         cls.registration_cedar_record = factories.CedarMetadataRecordFactory(
             template=cls.cedar_template,
             is_published=True,

website/project/views/contributor.py

@@ -638,14 +638,16 @@ def notify_added_contributor(node, contributor, notification_type, auth=None, *a
             'domain': settings.DOMAIN,
             'is_initiator': getattr(getattr(auth, 'user', None), 'id', None) == contributor.id if auth else False,
             'branded_service': getattr(getattr(node, 'provider', None), 'id', None),
+            'branded_service_name': getattr(getattr(node, 'provider', None), 'name', None),
+            'branded_service_preprint_word': getattr(getattr(node, 'provider', None), 'preprint_word', 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,
             'logo': logo,
             'osf_contact_email': settings.OSF_CONTACT_EMAIL,
-            'published_preprints': [] if isinstance(node, (Preprint, DraftRegistration)) else serialize_preprints(node, user=None),
+            'preprint_list': ''.join(f"- {p['absolute_url']}\n" for p in serialize_preprints(node, user=None))
         }
     )
 

website/templates/emails/collection_submission_cancel.html.mako

@@ -15,7 +15,7 @@
 
             was canceled. If you wish to be associated with the collection, you will need to request to be added again.
         % else:
-            <a href="${remover_absolute_url}">${remover.fullname}</a> canceled the request to add
+            <a href="${remover_absolute_url}">${remover_fullname}</a> canceled the request to add
             <a href="${node_absolute_url}">${node_title}</a>to
             % if collection.provider:
                 <a href="${collections_link}">${collection_provider_name}</a>

website/templates/emails/confirm_merge.html.mako

@@ -3,7 +3,7 @@
 <%def name="content()">
 <tr>
   <td style="border-collapse: collapse;">
-    Hello ${merge_target.fullname},<br>
+    Hello ${merge_target_fullname},<br>
     <br>
     This email is to notify you that ${user_username} has initiated an account merge with your account on the Open Science Framework (OSF). This merge will move all of the projects and components associated with ${email} and with ${user_username} into one account. All projects and components will be displayed under ${user.username}.<br>
     <br>

website/templates/emails/confirm_moderation.html.mako

@@ -5,15 +5,15 @@
   <td style="border-collapse: collapse;">
     Hello ${user_fullname},<br>
     <br>
-    You have been added by ${referrer_fullname}, as ${'an administrator' if is_admin else 'a moderator'} to ${provider.name}, powered by OSF. To set a password for your account, visit:<br>
+    You have been added by ${referrer_fullname}, as ${'an administrator' if is_admin else 'a moderator'} to ${provider_name}, powered by OSF. To set a password for your account, visit:<br>
     <br>
     ${claim_url}<br>
     <br>
-    Once you have set a password you will be able to moderate, create and approve your own submissions. You will automatically be subscribed to notification emails for new submissions to ${provider.name}.<br>
+    Once you have set a password you will be able to moderate, create and approve your own submissions. You will automatically be subscribed to notification emails for new submissions to ${provider_name}.<br>
     <br>
-    If you are not ${user_fullname} or you have been erroneously associated with ${provider.name}, email contact+${provider._id}@osf.io with the subject line "Claiming error" to report the problem.<br>
+    If you are not ${user_fullname} or you have been erroneously associated with ${provider_name}, email contact+${provider__id}@osf.io with the subject line "Claiming error" to report the problem.<br>
     <br>
     Sincerely,<br>
-    Your ${provider.name} and OSF teams<br>
+    Your ${provider_name} and OSF teams<br>
 </tr>
 </%def>

website/templates/emails/contributor_added_preprint_node_from_osf.html.mako

@@ -5,17 +5,15 @@
   <td style="border-collapse: collapse;">
     Hello ${user_fullname},<br>
     <br>
-    ${referrer_text} as a contributor to the project "${node.title}" on the Open Science Framework: ${node.absolute_url}<br>
+    ${referrer_text} as a contributor to the project "${node_title}" on the Open Science Framework: ${node_absolute_url}<br>
     <br>
     This project also contains the supplemental files for the following preprint(s):
     <br>
     <ul>
-    % for preprint in published_preprints:
-        <li>${preprint['absolute_url']}</li>
-    % endfor
+        ${preprint_list}
     </ul>
     <br>
-    If you are erroneously being associated with "${node.title}," then you may visit the project's "Contributors" page and remove yourself as a contributor.<br>
+    If you are erroneously being associated with "${node_title}," then you may visit the project's "Contributors" page and remove yourself as a contributor.<br>
     <br>
     Sincerely,<br>
     <br>

website/templates/emails/contributor_added_preprints.html.mako

@@ -5,7 +5,7 @@
   <td style="border-collapse: collapse;">
     Hello ${user_fullname},<br>
     <br>
-    ${referrer_text} as a contributor to the ${branded_service.preprint_word} "${node_title}" on ${branded_service_name}, which is hosted on the Open Science Framework: ${node.absolute_url}<br>
+    ${referrer_text} as a contributor to the ${branded_service_preprint_word} "${node_title}" on ${branded_service_name}, which is hosted on the Open Science Framework: ${node_absolute_url}<br>
     <br>
     If you have been erroneously associated with "${node_title}", then you may visit the ${branded_service_preprint_word} and remove yourself as a contributor.<br>
     <br>