[ENG-8996] Fix moderator digest (#11319)

* Fix moderator digest
* Fix unit tests

Author: Ostap-Zherebetskyi

notifications/listeners.py

@@ -67,6 +67,7 @@ def reviews_withdraw_requests_notification_moderators(self, timestamp, context,
     from osf.models import NotificationType
 
     provider = resource.provider
+    context['provider_id'] = provider.id
     # Set message
     context['message'] = f'has requested withdrawal of "{resource.title}".'
     # Set submission url

notifications/tasks.py

@@ -155,8 +155,8 @@ def send_moderator_email_task(self, user_id, provider_id, notification_ids, **kw
             'user_fullname': user.fullname,
             'can_change_preferences': False,
             'notification_settings_url': notification_settings_url,
-            'withdrawals_url': withdrawals_url,
-            'submissions_url': submissions_url,
+            'reviews_withdrawal_url': withdrawals_url,
+            'reviews_submissions_url': submissions_url,
             'provider_type': provider_type,
             'additional_context': additional_context,
             'is_admin': provider.get_group(ADMIN).user_set.filter(id=user.id).exists()

osf/models/collection_submission.py

@@ -139,6 +139,7 @@ def _notify_moderators_pending(self, event_data):
             user=user,
             subscribed_object=self.guid.referent,
             event_context={
+                'provider_id': self.collection.provider.id,
                 'submitter_fullname': self.creator.fullname,
                 'requester_fullname': event_data.kwargs.get('user').fullname,
                 'requester_contributor_names': ''.join(self.guid.referent.contributors.values_list('fullname', flat=True)),

website/reviews/listeners.py

@@ -31,6 +31,7 @@ def reviews_withdraw_requests_notification_moderators(self, timestamp, context,
     context['message'] = f'has requested withdrawal of "{resource.title}".'
     context['reviews_submission_url'] = f'{DOMAIN}reviews/registries/{provider._id}/{resource._id}'
 
+    context['provider_id'] = provider.id
     for recipient in provider.get_group('moderator').user_set.all():
         context['user_fullname'] = recipient.fullname
         context['recipient_fullname'] = recipient.fullname
@@ -54,6 +55,7 @@ def reviews_withdrawal_requests_notification(self, timestamp, context):
     context['message'] = f'has requested withdrawal of the {preprint_word} "{preprint.title}".'
     context['reviews_submission_url'] = f'{DOMAIN}reviews/preprints/{preprint.provider._id}/{preprint._id}'
 
+    context['provider_id'] = preprint.provider.id
     for recipient in preprint.provider.get_group('moderator').user_set.all():
         context['user_fullname'] = recipient.fullname
         context['recipient_fullname'] = recipient.fullname
@@ -73,6 +75,7 @@ def reviews_submit_notification_moderators(self, timestamp, resource, context):
     # imports moved here to avoid AppRegistryNotReady error
 
     provider = resource.provider
+    context['provider_id'] = provider.id
     context['reviews_submission_url'] = (
         f'{DOMAIN}reviews/preprints/{provider._id}/{resource._id}'
     )

website/templates/digest_reviews_moderators.html.mako

@@ -17,7 +17,7 @@
                 <tr>
                     <th colspan="2" style="padding: 0px 15px 0 15px">
                         <h3 style="padding: 0 15px 5px 15px; margin: 30px 0 0 0;border: none;list-style: none;font-weight: 300; border-bottom: 1px solid #eee; text-align: left;">
-                            Hello ${name},
+                            Hello ${user_fullname},
                             <p>
                             Below are the recent submissions
                             % if reviews_withdrawal_url:
@@ -39,7 +39,7 @@
             <tr>
                 <td style="border-collapse: collapse;">
                     %for item in d:
-                        ${item['message']}
+                        ${item}
                     %endfor
                 </td>
             </tr>
@@ -55,7 +55,7 @@
 </tr>
 <tr>
   <td style="border-collapse: collapse;">
-    ${build_message(message)}
+    ${build_message(notifications)}
   </td>
 </tr>
 </%def>