[Reference PR] Post-NR with Migration

addons/base/views.py

@@ -51,7 +51,7 @@
     DraftRegistration,
     Guid,
     FileVersionUserMetadata,
-    FileVersion, NotificationType
+    FileVersion, NotificationTypeEnum
 )
 from osf.metrics import PreprintView, PreprintDownload
 from osf.utils import permissions
@@ -575,14 +575,13 @@ def create_waterbutler_log(payload, **kwargs):
 
             if payload.get('email') or payload.get('errors'):
                 if payload.get('email'):
-                    notification_type = NotificationType.Type.USER_FILE_OPERATION_SUCCESS.instance
+                    notification_type = NotificationTypeEnum.USER_FILE_OPERATION_SUCCESS.instance
                 if payload.get('errors'):
-                    notification_type = NotificationType.Type.USER_FILE_OPERATION_FAILED.instance
+                    notification_type = NotificationTypeEnum.USER_FILE_OPERATION_FAILED.instance
                 notification_type.emit(
                     user=user,
                     subscribed_object=node,
                     event_context={
-                        'user_fullname': user.fullname,
                         'action': payload['action'],
                         'source_node': source_node._id,
                         'source_node_title': source_node.title,

addons/boa/tasks.py

@@ -14,7 +14,7 @@
 from addons.boa.boa_error_code import BoaErrorCode
 from framework import sentry
 from framework.celery_tasks import app as celery_app
-from osf.models import OSFUser, NotificationType
+from osf.models import OSFUser, NotificationTypeEnum
 from osf.utils.fields import ensure_str, ensure_bytes
 from website import settings as osf_settings
 
@@ -183,18 +183,15 @@ async def submit_to_boa_async(host, username, password, user_guid, project_guid,
 
     logger.info('Successfully uploaded query output to OSF.')
     logger.debug('Task ends <<<<<<<<')
-    NotificationType.Type.ADDONS_BOA_JOB_COMPLETE.instance.emit(
+    NotificationTypeEnum.ADDONS_BOA_JOB_COMPLETE.instance.emit(
         user=user,
         event_context={
             'user_fullname': user.fullname,
-            'query_file_name': query_file_name,
             'query_file_full_path': file_full_path,
             'output_file_name': output_file_name,
             'job_id': boa_job.id,
             'project_url': project_url,
             'boa_job_list_url': boa_settings.BOA_JOB_LIST_URL,
-            'boa_support_email': boa_settings.BOA_SUPPORT_EMAIL,
-            'osf_support_email': osf_settings.OSF_SUPPORT_EMAIL,
         }
     )
     return BoaErrorCode.NO_ERROR
@@ -209,12 +206,11 @@ def handle_boa_error(message, code, username, fullname, project_url, query_file_
         sentry.log_message(message, skip_session=True)
     except Exception:
         pass
-    NotificationType.Type.ADDONS_BOA_JOB_FAILURE.instance.emit(
+    NotificationTypeEnum.ADDONS_BOA_JOB_FAILURE.instance.emit(
         destination_address=username,
         event_context={
             'user_fullname': fullname,
             'code': code,
-            'query_file_name': query_file_name,
             'file_size': file_size,
             'message': message,
             'max_file_size': boa_settings.MAX_SUBMISSION_SIZE,

addons/boa/tests/test_tasks.py

@@ -9,7 +9,7 @@
 from addons.boa import settings as boa_settings
 from addons.boa.boa_error_code import BoaErrorCode
 from addons.boa.tasks import submit_to_boa, submit_to_boa_async, handle_boa_error
-from osf.models import NotificationType
+from osf.models import NotificationTypeEnum
 from osf_tests.factories import AuthUserFactory, ProjectFactory
 from tests.base import OsfTestCase
 from tests.utils import capture_notifications
@@ -66,7 +66,7 @@ def test_handle_boa_error(self):
                         job_id=self.job_id
                     )
                 assert len(notifications['emits']) == 1
-                assert notifications['emits'][0]['type'] == NotificationType.Type.ADDONS_BOA_JOB_FAILURE
+                assert notifications['emits'][0]['type'] == NotificationTypeEnum.ADDONS_BOA_JOB_FAILURE
                 mock_sentry_log_message.assert_called_with(self.error_message, skip_session=True)
                 mock_logger_error.assert_called_with(self.error_message)
                 assert return_value == BoaErrorCode.UNKNOWN

addons/osfstorage/tests/test_models.py

@@ -9,7 +9,7 @@
 
 from framework.auth import Auth
 from addons.osfstorage.models import OsfStorageFile, OsfStorageFileNode, OsfStorageFolder
-from osf.models import BaseFileNode, NotificationType
+from osf.models import BaseFileNode, NotificationTypeEnum
 from osf.exceptions import ValidationError
 from osf.utils.permissions import WRITE, ADMIN
 
@@ -750,7 +750,7 @@ def test_after_fork_copies_versions(self, node, node_settings, auth_obj):
             fork = node.fork_node(auth_obj)
 
         assert len(notifications['emits']) == 1
-        assert notifications['emits'][0]['type'] == NotificationType.Type.NODE_CONTRIBUTOR_ADDED_DEFAULT
+        assert notifications['emits'][0]['type'] == NotificationTypeEnum.NODE_CONTRIBUTOR_ADDED_DEFAULT
         fork_node_settings = fork.get_addon('osfstorage')
         fork_node_settings.reload()
 

admin/providers/views.py

@@ -1,7 +1,7 @@
 from django.shortcuts import redirect
 from django.views.generic import TemplateView
 from django.contrib import messages
-from osf.models import RegistrationProvider, OSFUser, CollectionProvider, NotificationType
+from osf.models import RegistrationProvider, OSFUser, CollectionProvider, NotificationTypeEnum
 from website.settings import DOMAIN
 
 
@@ -63,7 +63,7 @@ def post(self, request, *args, **kwargs):
 
         context['provider_url'] = f'{provider.domain or DOMAIN}{provider_type_word}/{(provider._id if not provider.domain else '').strip('/')}'
         messages.success(request, f'The following {target_type} was successfully added: {target_user.fullname} ({target_user.username})')
-        notification_type = NotificationType.Type.PROVIDER_MODERATOR_ADDED
+        notification_type = NotificationTypeEnum.PROVIDER_MODERATOR_ADDED
         notification_type.instance.emit(
             user=target_user,
             event_context=context,

admin/users/views.py

@@ -20,7 +20,7 @@
 from osf.models.base import Guid
 from osf.models.user import OSFUser
 from osf.models.spam import SpamStatus
-from osf.models.notification_type import NotificationType
+from osf.models.notification_type import NotificationTypeEnum
 from framework.auth import get_user
 from framework.auth.core import generate_verification_key
 
@@ -184,12 +184,11 @@ def post(self, request, *args, **kwargs):
                 message=f'User account {user.pk} disabled',
                 action_flag=USER_REMOVED
             )
-            NotificationType.Type.USER_REQUEST_DEACTIVATION_COMPLETE.instance.emit(
+            NotificationTypeEnum.USER_REQUEST_DEACTIVATION_COMPLETE.instance.emit(
                 user=user,
                 event_context={
                     'user_fullname': user.fullname,
                     'contact_email': OSF_SUPPORT_EMAIL,
-                    'can_change_preferences': False,
                 }
             )
         else:

admin_tests/preprints/test_views.py

@@ -8,7 +8,7 @@
 from django.contrib.messages.storage.fallback import FallbackStorage
 
 from tests.base import AdminTestCase
-from osf.models import Preprint, PreprintLog, PreprintRequest, NotificationType
+from osf.models import Preprint, PreprintLog, PreprintRequest, NotificationTypeEnum
 from framework.auth import Auth
 from osf_tests.factories import (
     AuthUserFactory,
@@ -719,7 +719,7 @@ def test_can_unwithdraw_preprint_without_moderation_workflow(self, withdrawal_re
             machine_state=DefaultStates.INITIAL.value)
         withdrawal_request.run_submit(admin)
 
-        with assert_notification(type=NotificationType.Type.PREPRINT_REQUEST_WITHDRAWAL_APPROVED):
+        with assert_notification(type=NotificationTypeEnum.PREPRINT_REQUEST_WITHDRAWAL_APPROVED):
             withdrawal_request.run_accept(admin, withdrawal_request.comment)
 
         assert preprint.machine_state == 'withdrawn'

admin_tests/users/test_views.py

@@ -27,7 +27,7 @@
 from admin.users.forms import UserSearchForm, MergeUserForm
 from osf.models.admin_log_entry import AdminLogEntry
 from tests.utils import assert_notification, capture_notifications
-from osf.models.notification_type import NotificationType
+from osf.models.notification_type import NotificationTypeEnum
 
 pytestmark = pytest.mark.django_db
 
@@ -105,7 +105,7 @@ def test_correct_view_permissions(self):
             response = views.ResetPasswordView.as_view()(request, guid=guid)
 
         assert len(notifications['emits']) == 1
-        assert notifications['emits'][0]['type'] == NotificationType.Type.USER_FORGOT_PASSWORD
+        assert notifications['emits'][0]['type'] == NotificationTypeEnum.USER_FORGOT_PASSWORD
         self.assertEqual(response.status_code, 302)
 
 
@@ -168,15 +168,15 @@ def setUp(self):
     def test_disable_user(self):
         settings.ENABLE_EMAIL_SUBSCRIPTIONS = False
         count = AdminLogEntry.objects.count()
-        with assert_notification(type=NotificationType.Type.USER_REQUEST_DEACTIVATION_COMPLETE, user=self.user):
+        with assert_notification(type=NotificationTypeEnum.USER_REQUEST_DEACTIVATION_COMPLETE, user=self.user):
             self.view().post(self.request)
         self.user.reload()
         assert self.user.is_disabled
         assert AdminLogEntry.objects.count() == count + 1
 
     def test_reactivate_user(self):
         settings.ENABLE_EMAIL_SUBSCRIPTIONS = False
-        with assert_notification(type=NotificationType.Type.USER_REQUEST_DEACTIVATION_COMPLETE, user=self.user):
+        with assert_notification(type=NotificationTypeEnum.USER_REQUEST_DEACTIVATION_COMPLETE, user=self.user):
             self.view().post(self.request)
         count = AdminLogEntry.objects.count()
         self.view().post(self.request)
@@ -206,7 +206,7 @@ def test_correct_view_permissions(self):
         change_permission = Permission.objects.get(codename='change_osfuser')
         user.user_permissions.add(change_permission)
         user.save()
-        with assert_notification(type=NotificationType.Type.USER_REQUEST_DEACTIVATION_COMPLETE, user=user):
+        with assert_notification(type=NotificationTypeEnum.USER_REQUEST_DEACTIVATION_COMPLETE, user=user):
             request = RequestFactory().post(reverse('users:disable', kwargs={'guid': guid}))
             request.user = user
 

api/crossref/views.py

@@ -6,7 +6,7 @@
 from rest_framework.views import APIView
 
 from api.crossref.permissions import RequestComesFromMailgun
-from osf.models import Preprint, NotificationType
+from osf.models import Preprint, NotificationTypeEnum
 from website import settings
 from website.preprints.tasks import mint_doi_on_crossref_fail
 
@@ -78,7 +78,7 @@ def post(self, request):
             if unexpected_errors:
                 batch_id = crossref_email_content.find('batch_id').text
                 email_error_text = request.POST['body-plain']
-                NotificationType.Type.DESK_CROSSREF_ERROR.instance.emit(
+                NotificationTypeEnum.DESK_CROSSREF_ERROR.instance.emit(
                     destination_address=settings.OSF_SUPPORT_EMAIL,
                     event_context={
                         'batch_id': batch_id,

api/institutions/authentication.py

@@ -21,7 +21,7 @@
 
 from osf import features
 from osf.exceptions import InstitutionAffiliationStateError
-from osf.models import Institution, NotificationType
+from osf.models import Institution, NotificationTypeEnum
 from osf.models.institution import SsoFilterCriteriaAction
 
 from website.settings import OSF_SUPPORT_EMAIL, DOMAIN
@@ -348,11 +348,10 @@ def authenticate(self, request):
             user.save()
 
             # Send confirmation email for all three: created, confirmed and claimed
-            NotificationType.Type.USER_WELCOME_OSF4I.instance.emit(
+            NotificationTypeEnum.USER_WELCOME_OSF4I.instance.emit(
                 user=user,
                 event_context={
                     'domain': DOMAIN,
-                    'osf_support_email': OSF_SUPPORT_EMAIL,
                     'user_fullname': user.fullname,
                     'storage_flag_is_active': flag_is_active(request, features.STORAGE_I18N),
                 },
@@ -363,14 +362,12 @@ def authenticate(self, request):
         if email_to_add:
             assert not is_created and email_to_add == sso_email
             user.emails.create(address=email_to_add)
-            NotificationType.Type.USER_ADD_SSO_EMAIL_OSF4I.instance.emit(
+            NotificationTypeEnum.USER_ADD_SSO_EMAIL_OSF4I.instance.emit(
                 user=user,
                 event_context={
                     'user_fullname': user.fullname,
                     'email_to_add': email_to_add,
-                    'domain': DOMAIN,
                     'osf_support_email': OSF_SUPPORT_EMAIL,
-                    'storage_flag_is_active': flag_is_active(request, features.STORAGE_I18N),
                 },
                 save=False,
             )
@@ -383,17 +380,15 @@ def authenticate(self, request):
             duplicate_user.remove_sso_identity_from_affiliation(institution)
             if secondary_institution:
                 duplicate_user.remove_sso_identity_from_affiliation(secondary_institution)
-            NotificationType.Type.USER_DUPLICATE_ACCOUNTS_OSF4I.instance.emit(
+            NotificationTypeEnum.USER_DUPLICATE_ACCOUNTS_OSF4I.instance.emit(
                 user=user,
                 subscribed_object=user,
                 event_context={
                     'user_fullname': user.fullname,
                     'user_username': user.username,
                     'user__id': user._id,
-                    'duplicate_user_fullname': duplicate_user.fullname,
                     'duplicate_user_username': duplicate_user.username,
                     'duplicate_user__id': duplicate_user._id,
-                    'domain': DOMAIN,
                     'osf_support_email': OSF_SUPPORT_EMAIL,
                 },
             )

api/nodes/views.py

@@ -155,7 +155,7 @@
     CedarMetadataRecord,
     Preprint,
     Collection,
-    NotificationType,
+    NotificationTypeEnum,
 )
 from addons.osfstorage.models import Region
 from osf.utils.permissions import ADMIN, WRITE_NODE
@@ -1069,26 +1069,22 @@ def perform_create(self, serializer):
         try:
             fork = serializer.save(node=node)
         except Exception as exc:
-            NotificationType.Type.NODE_FORK_FAILED.instance.emit(
+            NotificationTypeEnum.NODE_FORK_FAILED.instance.emit(
                 user=user,
                 subscribed_object=node,
                 event_context={
-                    'domain': settings.DOMAIN,
                     'node_title': node.title,
-                    'can_change_preferences': False,
                 },
             )
             raise exc
 
-        NotificationType.Type.NODE_FORK_COMPLETED.instance.emit(
+        NotificationTypeEnum.NODE_FORK_COMPLETED.instance.emit(
             user=user,
             subscribed_object=node,
             event_context={
                 'domain': settings.DOMAIN,
                 'node_title': node.title,
-                'fork_title': fork.title,
                 'fork__id': fork._id,
-                'can_change_preferences': False,
             },
         )
 

api/preprints/serializers.py

@@ -50,7 +50,7 @@
     PreprintProvider,
     Node,
     NodeLicense,
-    NotificationType,
+    NotificationTypeEnum,
 )
 from osf.utils import permissions as osf_permissions
 from osf.utils.workflows import DefaultStates
@@ -480,7 +480,7 @@ def update(self, preprint, validated_data):
                         preprint,
                         contributor=author,
                         auth=auth,
-                        notification_type=NotificationType.Type.PREPRINT_CONTRIBUTOR_ADDED_DEFAULT,
+                        notification_type=NotificationTypeEnum.PREPRINT_CONTRIBUTOR_ADDED_DEFAULT,
                     )
 
         return preprint

api/providers/serializers.py

@@ -10,7 +10,7 @@
 from api.preprints.serializers import PreprintProviderRelationshipField
 from api.providers.workflows import Workflows
 from api.base.metrics import MetricsSerializerMixin
-from osf.models import CitationStyle, NotificationType, RegistrationProvider, CollectionProvider
+from osf.models import CitationStyle, NotificationTypeEnum, RegistrationProvider, CollectionProvider
 from osf.models.user import Email, OSFUser
 from osf.models.validators import validate_email
 from osf.utils.permissions import REVIEW_GROUPS, ADMIN
@@ -385,9 +385,9 @@ def create(self, validated_data):
         provider.add_to_group(user, perm_group)
         setattr(user, 'permission_group', perm_group)  # Allows reserialization
         if 'claim_url' in context:
-            notification_type = NotificationType.Type.PROVIDER_CONFIRM_EMAIL_MODERATION
+            notification_type = NotificationTypeEnum.PROVIDER_CONFIRM_EMAIL_MODERATION
         else:
-            notification_type = NotificationType.Type.PROVIDER_MODERATOR_ADDED
+            notification_type = NotificationTypeEnum.PROVIDER_MODERATOR_ADDED
         notification_type.instance.emit(
             user=user,
             event_context=context,