fix contibutor added unit tests p1

Author: Ostap-Zherebetskyi

api/nodes/serializers.py

@@ -1271,7 +1271,7 @@ def create(self, validated_data):
 
         try:
             contributor_dict = {
-                'auth': auth, 'user_id': user_id, 'email': email, 'full_name': full_name,
+                'auth': auth, 'user_id': user_id, 'email': email, 'full_name': full_name, 'notification_type': False if email_pref == 'false' else None,
                 'bibliographic': bibliographic, 'index': index, 'permissions': permissions,
             }
             contributor_obj = resource.add_contributor_registered_or_not(**contributor_dict)

api_tests/nodes/views/test_node_contributors_list.py

@@ -186,7 +186,8 @@ def test_return_public_contributor_list_logged_out(
     ):
         project_public.add_contributor(
             user_two,
-            save=True
+            save=True,
+            notification_type=False
         )
 
         res = app.get(url_public)
@@ -203,7 +204,7 @@ def test_return_public_contributor_list_logged_out(
     def test_return_private_contributor_list_logged_in_contributor(
         self, app, user, user_two, project_private, url_private, make_contrib_id
     ):
-        project_private.add_contributor(user_two)
+        project_private.add_contributor(user_two, notification_type=False)
         project_private.save()
 
         res = app.get(url_private, auth=user.auth)
@@ -278,6 +279,7 @@ def test_total_bibliographic_contributor_count_returned_in_metadata(
             non_bibliographic_user,
             visible=False,
             auth=Auth(project_public.creator),
+            notification_type=False
         )
         project_public.save()
         res = app.get(url_public, auth=user_two.auth)
@@ -297,7 +299,7 @@ def test_unregistered_contributor_field_is_null_if_account_claimed(self, app, us
     def test_unregistered_contributors_show_up_as_name_associated_with_project(self, app, user):
         project = ProjectFactory(creator=user, is_public=True)
         project.add_unregistered_contributor(
-            'Robert Jackson', '[email protected]', auth=Auth(user)
+            'Robert Jackson', '[email protected]', auth=Auth(user), notification_type=False
         )
         url = f'/{API_BASE}nodes/{project._id}/contributors/'
         res = app.get(url, auth=user.auth, expect_errors=True)
@@ -314,7 +316,7 @@ def test_unregistered_contributors_show_up_as_name_associated_with_project(self,
 
         project_two = ProjectFactory(creator=user, is_public=True)
         project_two.add_unregistered_contributor(
-            'Bob Jackson', '[email protected]', auth=Auth(user)
+            'Bob Jackson', '[email protected]', auth=Auth(user), notification_type=False
         )
         url = f'/{API_BASE}nodes/{project_two._id}/contributors/'
         res = app.get(url, auth=user.auth, expect_errors=True)
@@ -331,7 +333,7 @@ def test_contributors_order_is_the_same_over_multiple_requests(
         self, app, user, project_public, url_public
     ):
         project_public.add_unregistered_contributor(
-            'Robert Jackson', '[email protected]', auth=Auth(user)
+            'Robert Jackson', '[email protected]', auth=Auth(user), notification_type=False
         )
 
         for i in range(0, 10):
@@ -341,7 +343,7 @@ def test_contributors_order_is_the_same_over_multiple_requests(
             else:
                 visible = False
             project_public.add_contributor(
-                new_user, visible=visible, auth=Auth(project_public.creator), save=True
+                new_user, visible=visible, auth=Auth(project_public.creator), save=True, notification_type=False
             )
         req_one = app.get(f'{url_public}?page=2', auth=Auth(project_public.creator))
         req_two = app.get(f'{url_public}?page=2', auth=Auth(project_public.creator))
@@ -634,7 +636,7 @@ def test_adds_contributor_public_project_non_admin(
         url_public,
     ):
         project_public.add_contributor(
-            user_two, permissions=permissions.WRITE, auth=Auth(user), save=True
+            user_two, permissions=permissions.WRITE, auth=Auth(user), save=True, notification_type=False
         )
         res = app.post_json_api(
             url_public, data_user_three, auth=user_two.auth, expect_errors=True
@@ -805,7 +807,7 @@ def test_adds_none_permission_contributor_private_project_admin_uses_default_per
     def test_adds_already_existing_contributor_private_project_admin(
         self, app, user, user_two, project_private, data_user_two, url_private
     ):
-        project_private.add_contributor(user_two, auth=Auth(user), save=True)
+        project_private.add_contributor(user_two, auth=Auth(user), save=True, notification_type=False)
         project_private.reload()
 
         res = app.post_json_api(
@@ -840,7 +842,7 @@ def test_adds_contributor_private_project_non_admin(
         url_private,
     ):
         project_private.add_contributor(
-            user_two, permissions=permissions.WRITE, auth=Auth(user)
+            user_two, permissions=permissions.WRITE, auth=Auth(user), notification_type=False
         )
         res = app.post_json_api(
             url_private, data_user_three, auth=user_two.auth, expect_errors=True
@@ -966,7 +968,7 @@ def test_add_unregistered_contributor_already_contributor(
     ):
         name, email = fake.name(), fake_email()
         project_public.add_unregistered_contributor(
-            auth=Auth(user), fullname=name, email=email
+            auth=Auth(user), fullname=name, email=email, notification_type=False
         )
         payload = {
             'data': {
@@ -1038,9 +1040,9 @@ def test_add_contributor_set_index_out_of_range(
         self, app, user, user_two, project_public, url_public
     ):
         user_contrib_one = UserFactory()
-        project_public.add_contributor(user_contrib_one, save=True)
+        project_public.add_contributor(user_contrib_one, save=True, notification_type=False)
         user_contrib_two = UserFactory()
-        project_public.add_contributor(user_contrib_two, save=True)
+        project_public.add_contributor(user_contrib_two, save=True, notification_type=False)
         payload = {
             'data': {
                 'type': 'contributors',
@@ -1061,9 +1063,9 @@ def test_add_contributor_set_index_first(
         self, app, user, user_two, project_public, url_public
     ):
         user_contrib_one = UserFactory()
-        project_public.add_contributor(user_contrib_one, save=True)
+        project_public.add_contributor(user_contrib_one, save=True, notification_type=False)
         user_contrib_two = UserFactory()
-        project_public.add_contributor(user_contrib_two, save=True)
+        project_public.add_contributor(user_contrib_two, save=True, notification_type=False)
         payload = {
             'data': {
                 'type': 'contributors',
@@ -1084,9 +1086,9 @@ def test_add_contributor_set_index_last(
         self, app, user, user_two, project_public, url_public
     ):
         user_contrib_one = UserFactory()
-        project_public.add_contributor(user_contrib_one, save=True)
+        project_public.add_contributor(user_contrib_one, save=True, notification_type=False)
         user_contrib_two = UserFactory()
-        project_public.add_contributor(user_contrib_two, save=True)
+        project_public.add_contributor(user_contrib_two, save=True, notification_type=False)
         payload = {
             'data': {
                 'type': 'contributors',
@@ -1311,7 +1313,7 @@ def test_add_unregistered_contributor_sends_email(
             )
             assert res.status_code == 201
         assert len(notifications['emits']) == 1
-        assert notifications['emits'][0]['type'] == NotificationType.Type.NODE_CONTRIBUTOR_ADDED_DEFAULT
+        assert notifications['emits'][0]['type'] == NotificationType.Type.USER_INVITE_DEFAULT
 
     @mock.patch('website.project.signals.unreg_contributor_added.send')
     def test_add_unregistered_contributor_signal_if_default(
@@ -1333,7 +1335,7 @@ def test_add_unregistered_contributor_signal_if_default(
             )
             assert res.status_code == 201
         assert len(notifications['emits']) == 1
-        assert notifications['emits'][0]['type'] == NotificationType.Type.NODE_CONTRIBUTOR_ADDED_DEFAULT
+        assert notifications['emits'][0]['type'] == NotificationType.Type.USER_INVITE_DEFAULT
 
     def test_add_unregistered_contributor_signal_preprint_email_disallowed(
         self, app, user, url_project_contribs
@@ -1380,7 +1382,8 @@ def test_add_unregistered_contributor_without_email_no_email(self, app, user, ur
         }
 
         with capture_signals() as mock_signal:
-            res = app.post_json_api(url, payload, auth=user.auth)
+            with capture_notifications():
+                res = app.post_json_api(url, payload, auth=user.auth)
         assert contributor_added in mock_signal.signals_sent()
         assert res.status_code == 201
 
@@ -1426,7 +1429,7 @@ def test_node_contributor_bulk_create_contributor_exists(
         self, app, user, user_two, project_public, payload_one, payload_two, url_public
     ):
         project_public.add_contributor(
-            user_two, permissions=permissions.READ, visible=True, save=True
+            user_two, permissions=permissions.READ, visible=True, save=True, notification_type=False
         )
         res = app.post_json_api(
             url_public,
@@ -1498,7 +1501,7 @@ def test_node_contributor_bulk_create_errors(
 
         #   test_node_contributor_bulk_create_logged_in_read_only_contrib_private_project
         project_private.add_contributor(
-            user_two, permissions=permissions.READ, save=True
+            user_two, permissions=permissions.READ, save=True, notification_type=False
         )
         res = app.post_json_api(
             url_private,
@@ -1638,10 +1641,10 @@ def project_public(self, user, user_two, user_three, title, description, categor
             creator=user,
         )
         project_public.add_contributor(
-            user_two, permissions=permissions.READ, visible=True, save=True
+            user_two, permissions=permissions.READ, visible=True, save=True, notification_type=False
         )
         project_public.add_contributor(
-            user_three, permissions=permissions.READ, visible=True, save=True
+            user_three, permissions=permissions.READ, visible=True, save=True, notification_type=False
         )
         return project_public
 
@@ -1655,10 +1658,10 @@ def project_private(self, user, user_two, user_three, title, description, catego
             creator=user,
         )
         project_private.add_contributor(
-            user_two, permissions=permissions.READ, visible=True, save=True
+            user_two, permissions=permissions.READ, visible=True, save=True, notification_type=False
         )
         project_private.add_contributor(
-            user_three, permissions=permissions.READ, visible=True, save=True
+            user_three, permissions=permissions.READ, visible=True, save=True, notification_type=False
         )
         return project_private
 
@@ -2091,10 +2094,10 @@ def project_public(self, user, user_two, user_three, title, description, categor
             creator=user,
         )
         project_public.add_contributor(
-            user_two, permissions=permissions.READ, visible=True, save=True
+            user_two, permissions=permissions.READ, visible=True, save=True, notification_type=False
         )
         project_public.add_contributor(
-            user_three, permissions=permissions.READ, visible=True, save=True
+            user_three, permissions=permissions.READ, visible=True, save=True, notification_type=False
         )
         return project_public
 
@@ -2108,10 +2111,10 @@ def project_private(self, user, user_two, user_three, title, description, catego
             creator=user,
         )
         project_private.add_contributor(
-            user_two, permissions=permissions.READ, visible=True, save=True
+            user_two, permissions=permissions.READ, visible=True, save=True, notification_type=False
         )
         project_private.add_contributor(
-            user_three, permissions=permissions.READ, visible=True, save=True
+            user_three, permissions=permissions.READ, visible=True, save=True, notification_type=False
         )
         return project_private
 
@@ -2466,10 +2469,10 @@ def project_public(self, user, user_two, user_three, title, description, categor
             creator=user,
         )
         project_public.add_contributor(
-            user_two, permissions=permissions.READ, visible=True, save=True
+            user_two, permissions=permissions.READ, visible=True, save=True, notification_type=False
         )
         project_public.add_contributor(
-            user_three, permissions=permissions.READ, visible=True, save=True
+            user_three, permissions=permissions.READ, visible=True, save=True, notification_type=False
         )
         return project_public
 
@@ -2483,10 +2486,10 @@ def project_private(self, user, user_two, user_three, title, description, catego
             creator=user,
         )
         project_private.add_contributor(
-            user_two, permissions=permissions.READ, visible=True, save=True
+            user_two, permissions=permissions.READ, visible=True, save=True, notification_type=False
         )
         project_private.add_contributor(
-            user_three, permissions=permissions.READ, visible=True, save=True
+            user_three, permissions=permissions.READ, visible=True, save=True, notification_type=False
         )
         return project_private
 
@@ -2842,8 +2845,8 @@ def test_filtering(self, app, user, url, project):
 
         user_two = AuthUserFactory()
         user_three = AuthUserFactory()
-        project.add_contributor(user_two, permissions.WRITE)
-        project.add_contributor(user_three, permissions.READ, visible=False)
+        project.add_contributor(user_two, permissions.WRITE, notification_type=False)
+        project.add_contributor(user_three, permissions.READ, visible=False, notification_type=False)
 
         #   test_filtering_node_with_only_bibliographic_contributors
         # no filter
@@ -2877,7 +2880,7 @@ def test_filtering_node_with_non_bibliographic_contributor(
         self, app, user, project, url
     ):
         non_bibliographic_contrib = UserFactory()
-        project.add_contributor(non_bibliographic_contrib, visible=False)
+        project.add_contributor(non_bibliographic_contrib, visible=False, notification_type=False)
         project.save()
 
         # no filter
@@ -2901,8 +2904,8 @@ def test_filtering_permission_field_admin(self, app, user, project, url):
 
         user_two = AuthUserFactory()
         user_three = AuthUserFactory()
-        project.add_contributor(user_two, permissions.WRITE)
-        project.add_contributor(user_three, permissions.READ, visible=False)
+        project.add_contributor(user_two, permissions.WRITE, notification_type=False)
+        project.add_contributor(user_three, permissions.READ, visible=False, notification_type=False)
 
         # test_filtering_permission_field_admin
         filter_url = f'{url}?filter[permission]=admin'
@@ -2922,8 +2925,8 @@ def test_filtering_permission_field_write(self, app, user, project, url):
 
         user_two = AuthUserFactory()
         user_three = AuthUserFactory()
-        project.add_contributor(user_two, permissions.WRITE)
-        project.add_contributor(user_three, permissions.READ, visible=False)
+        project.add_contributor(user_two, permissions.WRITE, notification_type=False)
+        project.add_contributor(user_three, permissions.READ, visible=False, notification_type=False)
 
         # test_filtering_permission_field_write
         filter_url = f'{url}?filter[permission]=write'
@@ -2942,8 +2945,8 @@ def test_filtering_permission_field_read(self, app, user, project, url):
 
         user_two = AuthUserFactory()
         user_three = AuthUserFactory()
-        project.add_contributor(user_two, permissions.WRITE)
-        project.add_contributor(user_three, permissions.READ, visible=False)
+        project.add_contributor(user_two, permissions.WRITE, notification_type=False)
+        project.add_contributor(user_three, permissions.READ, visible=False, notification_type=False)
 
         # test_filtering_permission_field_read
         filter_url = f'{url}?filter[permission]=read'