Refactor notification type references to use NotificationTypeEnum

Author: Ostap-Zherebetskyi

osf/management/commands/remove_duplicate_notification_subscriptions_v2.py

@@ -2,7 +2,7 @@
 from django.db import transaction
 from django.db.models import OuterRef, Exists, Q
 
-from osf.models import NotificationSubscription, NotificationType
+from osf.models import NotificationSubscription, NotificationType, NotificationTypeEnum
 
 
 class Command(BaseCommand):
@@ -23,22 +23,22 @@ def handle(self, *args, **options):
         self.stdout.write('Finding duplicate NotificationSubscription records…')
         digest_type_names = {
             # User types
-            NotificationType.Type.USER_NO_ADDON.value,
+            NotificationTypeEnum.USER_NO_ADDON.value,
             # File types
-            NotificationType.Type.ADDON_FILE_COPIED.value,
-            NotificationType.Type.ADDON_FILE_MOVED.value,
-            NotificationType.Type.ADDON_FILE_RENAMED.value,
-            NotificationType.Type.FILE_ADDED.value,
-            NotificationType.Type.FILE_REMOVED.value,
-            NotificationType.Type.FILE_UPDATED.value,
-            NotificationType.Type.FOLDER_CREATED.value,
-            NotificationType.Type.NODE_FILE_UPDATED.value,
-            NotificationType.Type.USER_FILE_UPDATED.value,
+            NotificationTypeEnum.ADDON_FILE_COPIED.value,
+            NotificationTypeEnum.ADDON_FILE_MOVED.value,
+            NotificationTypeEnum.ADDON_FILE_RENAMED.value,
+            NotificationTypeEnum.FILE_ADDED.value,
+            NotificationTypeEnum.FILE_REMOVED.value,
+            NotificationTypeEnum.FILE_UPDATED.value,
+            NotificationTypeEnum.FOLDER_CREATED.value,
+            NotificationTypeEnum.NODE_FILE_UPDATED.value,
+            NotificationTypeEnum.USER_FILE_UPDATED.value,
             # Review types
-            NotificationType.Type.COLLECTION_SUBMISSION_SUBMITTED.value,
-            NotificationType.Type.PROVIDER_NEW_PENDING_SUBMISSIONS.value,
-            NotificationType.Type.PROVIDER_NEW_PENDING_WITHDRAW_REQUESTS.value,
-            NotificationType.Type.REVIEWS_SUBMISSION_STATUS.value,
+            NotificationTypeEnum.COLLECTION_SUBMISSION_SUBMITTED.value,
+            NotificationTypeEnum.PROVIDER_NEW_PENDING_SUBMISSIONS.value,
+            NotificationTypeEnum.PROVIDER_NEW_PENDING_WITHDRAW_REQUESTS.value,
+            NotificationTypeEnum.REVIEWS_SUBMISSION_STATUS.value,
         }
 
         digest_type_ids = NotificationType.objects.filter(

scripts/remove_after_use/populate_notification_subscriptions_node_file_updated.py

@@ -9,15 +9,15 @@
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Count, F, OuterRef, Subquery, IntegerField, CharField
 from django.db.models.functions import Cast, Coalesce
-from osf.models import  Node, NotificationSubscription, NotificationType
+from osf.models import  Node, NotificationSubscription, NotificationTypeEnum
 
 
 @celery_app.task(name='scripts.remove_after_use.populate_notification_subscriptions_node_file_updated')
 def populate_notification_subscriptions_node_file_updated(batch_size: int = 1000):
     print('---Starting NODE_FILE_UPDATED subscriptions population script----')
     global_start = datetime.now()
 
-    node_file_nt = NotificationType.Type.NODE_FILE_UPDATED
+    node_file_nt = NotificationTypeEnum.NODE_FILE_UPDATED
 
     node_ct = ContentType.objects.get_for_model(Node)
 
@@ -113,7 +113,7 @@ def populate_notification_subscriptions_node_file_updated(batch_size: int = 1000
 def update_notification_subscriptions_node_file_updated():
     print('---Starting NODE_FILE_UPDATED subscriptions update script----')
 
-    node_file_nt = NotificationType.Type.NODE_FILE_UPDATED
+    node_file_nt = NotificationTypeEnum.NODE_FILE_UPDATED
 
     updated_start = datetime.now()
     updated = (

scripts/remove_after_use/populate_notification_subscriptions_user_global_file_updated.py

@@ -9,14 +9,14 @@
 from datetime import datetime
 from framework.celery_tasks import app as celery_app
 from django.contrib.contenttypes.models import ContentType
-from osf.models import OSFUser, NotificationSubscription, NotificationType
+from osf.models import OSFUser, NotificationSubscription, NotificationTypeEnum
 
 @celery_app.task(name='scripts.remove_after_use.populate_notification_subscriptions_user_global_file_updated')
 def populate_notification_subscriptions_user_global_file_updated(per_last_years: int | None= None, batch_size: int = 1000):
     print('---Starting USER_FILE_UPDATED subscriptions population script----')
     global_start = datetime.now()
 
-    user_file_updated_nt = NotificationType.Type.USER_FILE_UPDATED
+    user_file_updated_nt = NotificationTypeEnum.USER_FILE_UPDATED
     user_ct = ContentType.objects.get_for_model(OSFUser)
     if per_last_years:
         from_date = timezone.now() - relativedelta(years=per_last_years)
@@ -94,7 +94,7 @@ def populate_notification_subscriptions_user_global_file_updated(per_last_years:
 def update_notification_subscriptions_user_global_file_updated():
     print('---Starting USER_FILE_UPDATED subscriptions updating script----')
 
-    user_file_updated_nt = NotificationType.Type.USER_FILE_UPDATED
+    user_file_updated_nt = NotificationTypeEnum.USER_FILE_UPDATED
 
     update_start = datetime.now()
     updated = (

scripts/remove_after_use/populate_notification_subscriptions_user_global_reviews.py

@@ -9,15 +9,15 @@
 from datetime import datetime
 from framework.celery_tasks import app as celery_app
 from django.contrib.contenttypes.models import ContentType
-from osf.models import OSFUser, NotificationSubscription, NotificationType
+from osf.models import OSFUser, NotificationSubscription, NotificationTypeEnum
 
 
 @celery_app.task(name='scripts.remove_after_use.populate_notification_subscriptions_user_global_reviews')
 def populate_notification_subscriptions_user_global_reviews(per_last_years: int | None = None, batch_size: int = 1000):
     print('---Starting REVIEWS_SUBMISSION_STATUS subscriptions population script----')
     global_start = datetime.now()
 
-    review_nt = NotificationType.Type.REVIEWS_SUBMISSION_STATUS
+    review_nt = NotificationTypeEnum.REVIEWS_SUBMISSION_STATUS
     user_ct = ContentType.objects.get_for_model(OSFUser)
     if per_last_years:
         from_date = timezone.now() - relativedelta(years=per_last_years)
@@ -88,7 +88,7 @@ def populate_notification_subscriptions_user_global_reviews(per_last_years: int
 def update_notification_subscriptions_user_global_reviews():
     print('---Starting REVIEWS_SUBMISSION_STATUS subscriptions updating script----')
 
-    review_nt = NotificationType.Type.REVIEWS_SUBMISSION_STATUS
+    review_nt = NotificationTypeEnum.REVIEWS_SUBMISSION_STATUS
 
     updated_start = datetime.now()
     updated = (