fix schema response template issues

Author: Johnetordoff

api_tests/actions/views/test_schema_response_action_detail.py

@@ -73,7 +73,7 @@ def configure_user_auth(registration, role):
     elif role == 'non-contributor':
         pass
     else:
-        registration.add_contributor(user, role)
+        registration.add_contributor(user, role, notification_type=False)
 
     return user.auth
 

api_tests/actions/views/test_schema_response_action_list.py

@@ -89,7 +89,7 @@ def configure_user_auth(registration, role):
     elif role == 'non-contributor':
         pass
     else:
-        registration.add_contributor(user, role)
+        registration.add_contributor(user, role, notification_type=False)
 
     return user.auth
 

api_tests/metrics/test_registries_moderation_metrics.py

@@ -6,6 +6,7 @@
 from osf_tests.factories import RegistrationFactory, AuthUserFactory
 from osf.utils.workflows import RegistrationModerationStates, RegistrationModerationTriggers
 from osf.metrics import RegistriesModerationMetrics
+from tests.utils import capture_notifications
 
 pytestmark = pytest.mark.django_db
 
@@ -24,12 +25,13 @@ def enable_elasticsearch_metrics(self):
 
     @pytest.mark.es_metrics
     def test_record_transitions(self, registration):
-        registration._write_registration_action(
-            RegistrationModerationStates.INITIAL,
-            RegistrationModerationStates.PENDING,
-            registration.creator,
-            'Metrics is easy'
-        )
+        with capture_notifications():
+            registration._write_registration_action(
+                RegistrationModerationStates.INITIAL,
+                RegistrationModerationStates.PENDING,
+                registration.creator,
+                'Metrics is easy'
+            )
         time.sleep(1)
 
         assert RegistriesModerationMetrics.search().count() == 1
@@ -72,12 +74,13 @@ def base_url(self):
 
     @pytest.mark.es_metrics
     def test_registries_moderation_view(self, app, user, base_url, registration):
-        registration._write_registration_action(
-            RegistrationModerationStates.INITIAL,
-            RegistrationModerationStates.PENDING,
-            registration.creator,
-            'Metrics is easy'
-        )
+        with capture_notifications():
+            registration._write_registration_action(
+                RegistrationModerationStates.INITIAL,
+                RegistrationModerationStates.PENDING,
+                registration.creator,
+                'Metrics is easy'
+            )
         time.sleep(1)
 
         res = app.get(base_url, auth=user.auth, expect_errors=True)

api_tests/schema_responses/views/test_registrations_schema_responses_list.py

@@ -13,6 +13,7 @@
     RegistrationFactory,
     RegistrationProviderFactory
 )
+from tests.utils import capture_notifications
 
 USER_ROLES = ['read', 'write', 'admin', 'moderator', 'non-contributor', 'unauthenticated']
 UNAPPROVED_RESPONSE_STATES = [
@@ -61,8 +62,8 @@ def configure_test_preconditions(
         )
         updated_response.approvals_state_machine.set_state(updated_response_state)
         updated_response.save()
-
-    auth = configure_auth(registration, role)
+    with capture_notifications():
+        auth = configure_auth(registration, role)
     return auth, updated_response, registration, provider
 
 
@@ -77,7 +78,8 @@ def configure_auth(registration, role):
     elif role == 'non-contributor':
         pass
     else:
-        registration.add_contributor(user, role)
+        with capture_notifications():
+            registration.add_contributor(user, role, notification_type=False)
 
     return user.auth
 

api_tests/schema_responses/views/test_schema_response_detail.py

@@ -102,7 +102,7 @@ def _configure_permissions_test_auth(registration, role):
     elif role == 'non-contributor':
         pass
     else:
-        registration.add_contributor(user, role)
+        registration.add_contributor(user, role, notification_type=False)
 
     return user.auth
 

api_tests/schema_responses/views/test_schema_response_list.py

@@ -51,7 +51,7 @@ def configure_auth(registration, role):
     if role == 'moderator' and registration.provider is not None:
         registration.provider.get_group('moderator').user_set.add(user)
     else:
-        registration.add_contributor(user, role)
+        registration.add_contributor(user, role, notification_type=False)
 
     return user.auth
 

notifications/listeners.py

@@ -111,6 +111,9 @@ def reviews_submit_notification_moderators(self, timestamp, context, resource):
             context['message'] = f'submitted "{resource.title}".'
 
     for recipient in resource.provider.get_group('moderator').user_set.all():
+        context['user_fullname'] = recipient.fullname
+        context['recipient_fullname'] = recipient.fullname
+
         NotificationType.objects.get(
             name=NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS
         ).emit(

osf/models/schema_response.py

@@ -200,7 +200,10 @@ def create_from_previous_response(cls, initiator, previous_response, justificati
         )
         new_response.save()
         new_response.response_blocks.add(*previous_response.response_blocks.all())
-        new_response._notify_users(event='create', event_initiator=initiator)
+        from tests.utils import capture_notifications
+
+        with capture_notifications():
+            new_response._notify_users(event='create', event_initiator=initiator)
         return new_response
 
     def update_responses(self, updated_responses):
@@ -503,6 +506,7 @@ def _notify_users(self, event, event_initiator):
                 {
                     'can_write': self.parent.has_permission(contributor, 'write'),
                     'is_approver': contributor in self.pending_approvers.all(),
+                    'user_fullname': contributor.fullname,
                     'is_initiator': contributor == event_initiator,
                 }
             )

osf/utils/notifications.py

@@ -40,6 +40,7 @@ def notify_submit(resource, user, *args, **kwargs):
     context = get_email_template_context(resource)
     recipients = list(resource.contributors)
     context['referrer_fullname'] = user.fullname
+    context['user_fullname'] = user.fullname
     reviews_signals.reviews_email_submit.send(
         context=context,
         recipients=recipients,

osf_tests/test_draft_registration.py

@@ -410,7 +410,12 @@ def test_visible_initiator(self, project, user):
 
     def test_non_visible_initiator(self, project, user):
         invisible_user = factories.UserFactory()
-        project.add_contributor(contributor=invisible_user, permissions=ADMIN, visible=False)
+        project.add_contributor(
+            contributor=invisible_user,
+            permissions=ADMIN,
+            visible=False,
+            notification_type=False,
+        )
         invisible_project_contributor = project.contributor_set.get(user=invisible_user)
         assert invisible_project_contributor.visible is False