[ENG-10538] Post-NR Project PR by Ostap-Zherebetskyi · Pull Request #11623 · CenterForOpenScience/osf.io

Ostap-Zherebetskyi · 2026-03-05T14:13:25Z

Ticket

ENG-10538

Purpose

Changes

Side Effects

QE Notes

CE Notes

Documentation

* Use USER_FILE_UPDATED for group global_file_updated * Use REVIEWS_SUBMISSION_STATUS for group global_reviews

…it method

…ling

…ation logic

… handling logic

…fails with permission error

remove datetime

[ENG-10083] Add type and is_digest "relation" and update subscription

… logic

…for functionality

…_sync_task [ENG-10076] Add Celery task to delete removed beat tasks from PeriodicTask entries

…pe-defenitions [ENG-9923] Sync naming of notifications

…actor notification model

…migration [ENG-10496] Fix migration due to postgres limitation

…last login date

[ENG-9923] Removed comment

[ENG-10535] Update the no_login mail send conditions

…tifications-refactor-with-develop

…EmailTasks and recent no-login emails

[ENG-10535] Update the no_login mail send conditions

…refactor-with-develop [ENG-10530] Merge notifications refactor with develop after ROR release

Ostap-Zherebetskyi

LGTM ⭐

…ifications [ENG-10547] Collections: Project link pointing to api request instead of FE overview for all add/remove to collection notifications

… and readability

…ifications [ENG-10547] Collections: fix logo url

…e_notification_types_to_admin [ENG-10570] Add management command to sync notification templates in admin

…files to CeleryConfig

[ENG-10611] Add delete_withdrawn_or_failed_registration_files import

…pport

…st_logo [ENG-10547] Fix collections digest logo

cslzchen

⭐ LGTM, my comments are for code clean-up only. Let's take care of the code clean-up after release as a separate squash merge commit.

scripts/remove_after_use/merge_notification_subscription_provider_ct.py

cslzchen · 2026-03-13T02:49:05Z

scripts/remove_after_use/populate_notification_subscriptions_node_file_updated.py

+
+
+@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):


No longer needed since we have the create-on-missing fix.

cslzchen · 2026-03-13T02:49:57Z

scripts/remove_after_use/populate_notification_subscriptions_node_file_updated.py

+    print('----Creation finished----')
+
+@celery_app.task(name='scripts.remove_after_use.update_notification_subscriptions_node_file_updated')
+def update_notification_subscriptions_node_file_updated():


No longer needed since our de-duplication v2 command already fix the _id_digest issue.

cslzchen · 2026-03-13T02:50:17Z

scripts/remove_after_use/populate_notification_subscriptions_user_global_file_updated.py

+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):


Same, no longer needed since we have the create-on-missing fix.

cslzchen · 2026-03-13T02:50:31Z

scripts/remove_after_use/populate_notification_subscriptions_user_global_file_updated.py

+    print('----Creation finished----')
+
+@celery_app.task(name='scripts.remove_after_use.update_notification_subscriptions_user_global_file_updated')
+def update_notification_subscriptions_user_global_file_updated():


Same, no longer needed since our de-duplication v2 command already fix the _id_digest issue.

cslzchen · 2026-03-13T02:50:57Z

scripts/remove_after_use/populate_notification_subscriptions_user_global_reviews.py

+    print('----Creation finished----')
+
+@celery_app.task(name='scripts.remove_after_use.update_notification_subscriptions_user_global_reviews')
+def update_notification_subscriptions_user_global_reviews():


Same, no longer needed since our de-duplication v2 command already fix the _id_digest issue.

cslzchen · 2026-03-13T02:53:50Z

website/routes.py

-        Rule(
-            '/subscriptions/',
-            'get',
-            notification_views.get_subscriptions,
-            json_renderer,
-        ),
+        # Legacy v1 API for notifications, which is no longer used by Angular/Post-NR
+        # Rule(
+        #     '/subscriptions/',
+        #     'get',
+        #     notification_views.get_subscriptions,
+        #     json_renderer,
+        # ),


Should be safe to remove now

cslzchen · 2026-03-13T02:54:10Z

website/routes.py

-        Rule(
-            [
-                '/project/<pid>/subscriptions/',
-                '/project/<pid>/node/<nid>/subscriptions/'
-            ],
-            'get',
-            notification_views.get_node_subscriptions,
-            json_renderer,
-        ),
+        # Legacy v1 API for notifications, which is no longer used by Angular/Post-NR
+        # Rule(
+        #     [
+        #         '/project/<pid>/subscriptions/',
+        #         '/project/<pid>/node/<nid>/subscriptions/'
+        #     ],
+        #     'get',
+        #     notification_views.get_node_subscriptions,
+        #     json_renderer,
+        # ),


Same, safe to remove

cslzchen · 2026-03-13T02:54:14Z

website/routes.py

-        Rule(
-            '/subscriptions/',
-            'post',
-            notification_views.configure_subscription,
-            json_renderer,
-        ),
+        # Legacy v1 API for notifications, which is no longer used by Angular/Post-NR
+        # Rule(
+        #     '/subscriptions/',
+        #     'post',
+        #     notification_views.configure_subscription,
+        #     json_renderer,
+        # ),


Same, safe to remove

cslzchen · 2026-03-13T02:55:38Z

osf/management/commands/remove_duplicate_notification_subscriptions_v2.py

+from osf.models import NotificationSubscription, NotificationType, NotificationTypeEnum


 class Command(BaseCommand):


Not this v2 one. We can remove the old de-duplication command.

@Ostap-Zherebetskyi

* [ENG-10083] Add type<-->is_digest "relation" and update subscription (#11575) * Add is_digest_type property to NotificationType and log message in emit method * Fix is_digest handling in NotificationType.emit method * Log message update in NotificationType.emit method for is_digest handling * fix unit tests --------- Co-authored-by: Ostap Zherebetskyi <ozherebetskyi@exoft.net> * Add notification subscriptions de-duplication v2 command (#11576) Co-authored-by: Ostap Zherebetskyi <ozherebetskyi@exoft.net> * [ENG-10190][ENG-10214] Permanently update a couple of templates to match admin/admin changes Update archive_size_exceeded_user and provider_reviews_resubmission_confirmation templates * Update changelog and bump version * Exclude spam and deleted Registration from queryset (#11572) * [ENG-10135] - Fix/eng 10135 (#11587) * Exclude spam and deleted Registration from queryset * Update RegistrationActionList to check deleted flag * Fix tests * Fix test * Feature/fair signposting (#11599) * linkset initial implementation * linkset initial implementation (updating data extraction and adding serialization) * and \n in EOF instead of % * update code * get file mediatype from metadata * add unittests for linkset approach (TODO: ?) * update code * update code and unit tests and * update file related code and unit tests * refactor code after CR | implement 'describes' | check file type differs from parent project / registry / preprint * update files to compare on unittests run * implement datacite - scheme type mapping for linkset draft version (need tests updates and maybe some type yield logic ) * Update osf/metadata/osf_gathering.py Co-authored-by: abram axel booth <aaxelb@users.noreply.github.com> * Update osf/metadata/serializers/linkset.py Co-authored-by: abram axel booth <aaxelb@users.noreply.github.com> * implement datacite - schema mapping * update tests expected results * resolve CR * refactor code | resolve CR * remove redundant describes from file response (#11590) * [ENG-10256] 2.1.9 BE: Fix permission issue where users without permission to an object can access the metadata (#11588) * Fix permission issue where users without permission to an object can access the metadata (add decorator is_contributor_or_public_resource) * refactor code * resolve CR | refactor code * resolve CR | add unittests * add *args, **kwargs for decorated view * [ENG-10167] 2.1.6 BE: add link header to guid metadata endpoints (#11594) * add link header to guid metadata endpoints for registry and project * update code * avoid Component Registration/Project JSON Contains type: null (#11597) * [ENG-10168] 2.1.7 BE: add link header to cedar metadata records endpoints (#11596) * add link header to guid metadata endpoints for registry and project * update code * add link header to cedar metadata records endpoints * change ResearchProject for CreativeWork for projects (#11603) * [ENG-10169] 2.1.8 BE: add link header to file download URL (#11600) * avoid Component Registration/Project JSON Contains type: null * add link header to file download URL * update unittests * resolve CR --------- Co-authored-by: mkovalua <mkoval@exoft.net> Co-authored-by: abram axel booth <aaxelb@users.noreply.github.com> * Bump versio no. Add CHANGELOG * [ENG-10054] feature/ror-migration (#11610) * feat(osf): script to migrate Crossref Funder IDs to ROR IDs * feat(osf): Fix fot the script to migrate Crossref Funder IDs to ROR IDs * feat(osf): Update OSF metadata model code and tests for ROR funder identifier support * feat(osf): Add DataCite client tests for ROR funder identifier support * feat(osf): update migration script to remove unmapped crossref funders * add another stat to the migration script --------- Co-authored-by: Andriy Sheredko <sheredko.andriy@gmail.com> * bump version & update changelog * add command to migrate ror funder names * bump version & update changelog * [ENG-10538] Post-NR Project PR (#11623) * Create global_file_updated and global_reviews subscriptions if missing * Use USER_FILE_UPDATED for group global_file_updated * Use REVIEWS_SUBMISSION_STATUS for group global_reviews * Add missing `is_digest=True` for new OSF user subscriptions * Extend otf subscription creation to apply to _node_file_updated group * Fix typo for `_is_digest` * add is_digest_type property * Add is_digest_type property to NotificationType and log message in emit method * Fix is_digest handling in NotificationType.emit method * Log message update in NotificationType.emit method for is_digest handling * fix unit tests * Move set-deafult-subscriptions out of non-effective try-except * Add fake_sent field to Notification model and update notification creation logic * add unique_together constraint * Add 'PARTIAL_SUCCESS' status to EmailTask model and update email task handling logic * NR migration [ENG-10040, ENG-10025, ENG-9854] * Remove subscription if notifications.tasks.send_moderator_email_task fails with permission error * Apply suggestion from @Ostap-Zherebetskyi * remove datetime * Add 'no_login_email_last_sent' field to OSFUser and update email task logic * Enforce and improve permission check for subscriptions * Fix typo in annotated_obj_qs for NODE_FILE_UPDATED * Add unit tests for testing node_file_updated subscription detail * Implement notifications cleanup task and related settings; add tests for functionality * Fix legacy subscription ID for NODE_FILE_UPDATED: "guid_files_updated" * Fix duplicate and mismatched type NODE_FILE(S)_UPDATED * removed email.py * Fix annotated qs for global reviews and update unit tests * Update tests for node_file(s)_updated subscription detail * Rename fixtures for notification subscription detail tests * Annotate with legacy_id for serializer to handle created subscriptions * Add unit tests for creating missing subscriptions on the fly * clear useless code * Rename migration name for NR post-release * Improve unit test: test_emit_frequency_none * Remove `seen` from `Notification` and re-make migrations * `mark_sent()` now handles `fake_sent=True`, and only `save()` once * Update default settings * remove useless import * Enhance SubscriptionList queryset with additional content types and refactor notification type handling * fix unit test * Refactor SubscriptionList queryset to use a single provider content type and update related notification handling; add script to update notification subscriptions' content types. * fix CR comments * Update comments * split into 3 files * remove populate_notification_subscriptions * Renamed files, refactor of populate notification subscriptions user global file updated * added try/except, added timers * converted populate_notification_subscriptions_user_global_reviews.py * fix batch time execution * converted populate_notification_subscriptions_node_file_updated * convert to separate update and create scripts * updated, added parameters * move to remove_after_use * add time track to last batch, fix proper time track for batch in node_file_updated * convert to use review_nt * Fix unit tests due to new constraints * Move missing subscription creation to a helper function in utils * Subscription list view now creates missing attributes on-the-fly * Note: only works for when filter on "legacy id"; logs message to sentry for tracking purpose when filter on "event names". * Fix broken `.exists()` due to complex annotated QS with `.distinct()` * fix names of tasks * Add notification subscriptions de-duplication v2 command * fix naming * Add deduplication command to notification migration * Fix notification handling by updating legacy ID suffix from '_files_updated' to '_file_updated' across utils and views; adjust related test cases accordingly. * fix unit tests * Update the name of the NotificationType NODE_FILE_UPDATED to be consistent * Rename notification type from node_files_updated to node_file_updated for consistency * clean keys * fix naming in templates, event_context * remove leftover comments * Refactor notification type references to use NotificationTypeEnum - Updated all instances of NotificationType.Type to NotificationTypeEnum in test files and application code. - Ensured consistency in notification type usage across various tests including auth, claims, events, and more. - This change improves clarity and maintainability by standardizing the notification type references. * Fix notification type reference for FILE_UPDATED * Refactor notification type references to use NotificationTypeEnum across views and scripts * fix unit tests * remove imports * fix USER_CROSSREF_DOI_PENDING event_context * sync naming * added explanation * Add Celery task to disable removed beat tasks from PeriodicTask entries * Apply suggestion from @Ostap-Zherebetskyi * Apply suggestion from @cslzchen * Add migrations to remove duplicate notification subscriptions and refactor notification model * removed comment * Refactor no-login email filtering to ensure last sent date is before last login date * Add test to exclude users logged in before no_login_email_last_sent * Refactor no-login email user filtering to exclude those with pending EmailTasks and recent no-login emails * Fix CollectionSubmission URLs to use absolute_url method for consistency * Refactor logo handling in notification methods to improve consistency and readability * Add management command to sync notification templates * Apply suggestion from @cslzchen * Add management command for deleting withdrawn or failed registration files to CeleryConfig * fix: update logo handling in send_moderator_email_task for favicon support --------- Co-authored-by: Longze Chen <cslzchen@gmail.com> Co-authored-by: Ostap Zherebetskyi <ozherebetskyi@exoft.net> Co-authored-by: Bohdan Odintsov <bodintsov@exoft.net> * Updated cut-off time and added comments for NR settings * Update changelog and bump version * resolve merge conflicts * respond to CR comments * fix tests * fix tests again --------- Co-authored-by: Longze Chen <cslzchen@gmail.com> Co-authored-by: Ostap Zherebetskyi <ozherebetskyi@exoft.net> Co-authored-by: Vlad0n20 <137097005+Vlad0n20@users.noreply.github.com> Co-authored-by: futa-ikeda <51409893+futa-ikeda@users.noreply.github.com> Co-authored-by: mkovalua <mkoval@exoft.net> Co-authored-by: abram axel booth <aaxelb@users.noreply.github.com> Co-authored-by: Fitz Elliott <fitz@cos.io> Co-authored-by: Andriy Sheredko <sheredko.andriy@gmail.com> Co-authored-by: Bohdan Odintsov <bodintsov@exoft.net>

cslzchen and others added 30 commits January 19, 2026 11:29

Create global_file_updated and global_reviews subscriptions if missing

62af777

* Use USER_FILE_UPDATED for group global_file_updated * Use REVIEWS_SUBMISSION_STATUS for group global_reviews

Add missing is_digest=True for new OSF user subscriptions

3093f88

Extend otf subscription creation to apply to _node_file_updated group

f23108b

Fix typo for _is_digest

abdfc1b

add is_digest_type property

ae98b96

Add is_digest_type property to NotificationType and log message in em…

73d87ca

…it method

Fix is_digest handling in NotificationType.emit method

d302576

Log message update in NotificationType.emit method for is_digest hand…

a6c9576

…ling

fix unit tests

bc3f05f

fix unit tests

daaa834

fix unit tests

807f652

Move set-deafult-subscriptions out of non-effective try-except

e7f7216

Add fake_sent field to Notification model and update notification cre…

f0b7056

…ation logic

add unique_together constraint

ce14838

Add 'PARTIAL_SUCCESS' status to EmailTask model and update email task…

0e3f9bc

… handling logic

NR migration [ENG-10040, ENG-10025, ENG-9854]

e90bb1c

Remove subscription if notifications.tasks.send_moderator_email_task …

08e1ea2

…fails with permission error

Apply suggestion from @Ostap-Zherebetskyi remove datetime

ab06f57

remove datetime

Merge pull request #11558 from Ostap-Zherebetskyi/feature/digest_types

ced4078

[ENG-10083] Add type and is_digest "relation" and update subscription

Add 'no_login_email_last_sent' field to OSFUser and update email task…

c0f944f

… logic

Enforce and improve permission check for subscriptions

b86793e

Fix typo in annotated_obj_qs for NODE_FILE_UPDATED

5d78491

Add unit tests for testing node_file_updated subscription detail

20d8cb6

Implement notifications cleanup task and related settings; add tests …

8f51b4a

…for functionality

Fix legacy subscription ID for NODE_FILE_UPDATED: "guid_files_updated"

1ede6f2

Fix duplicate and mismatched type NODE_FILE(S)_UPDATED

fa8ebfb

removed email.py

7f475ab

Fix annotated qs for global reviews and update unit tests

3996aad

Update tests for node_file(s)_updated subscription detail

46128e7

Rename fixtures for notification subscription detail tests

75e6038

cslzchen and others added 14 commits February 27, 2026 10:45

Merge pull request #11606 from Ostap-Zherebetskyi/feature/celery_beat…

109a1aa

…_sync_task [ENG-10076] Add Celery task to delete removed beat tasks from PeriodicTask entries

Merge pull request #11611 from bodintsov/feature/clean-up-and-sync-ty…

0003dc8

…pe-defenitions [ENG-9923] Sync naming of notifications

Add migrations to remove duplicate notification subscriptions and ref…

d440ed7

…actor notification model

Merge pull request #11618 from Ostap-Zherebetskyi/fix/split_osf_0036_…

8206a95

…migration [ENG-10496] Fix migration due to postgres limitation

removed comment

18554ce

Refactor no-login email filtering to ensure last sent date is before …

f531765

…last login date

Merge pull request #11619 from bodintsov/fix/remove-comments

0909e98

[ENG-9923] Removed comment

Add test to exclude users logged in before no_login_email_last_sent

160063e

Merge pull request #11620 from Ostap-Zherebetskyi/fix/no_login_mail

6724230

[ENG-10535] Update the no_login mail send conditions

Merge remote-tracking branch 'upstream/develop' into feature/merge-no…

a4acd04

…tifications-refactor-with-develop

Refactor no-login email user filtering to exclude those with pending …

7aff4ac

…EmailTasks and recent no-login emails

Merge pull request #11622 from Ostap-Zherebetskyi/fix/no_login_mail

d085121

[ENG-10535] Update the no_login mail send conditions

Merge pull request #11621 from bodintsov/feature/merge-notifications-…

ee4cab3

…refactor-with-develop [ENG-10530] Merge notifications refactor with develop after ROR release

Fix CollectionSubmission URLs to use absolute_url method for consistency

0a270b9

Ostap-Zherebetskyi commented Mar 9, 2026

View reviewed changes

Ostap-Zherebetskyi marked this pull request as ready for review March 9, 2026 10:58

cslzchen and others added 10 commits March 10, 2026 09:35

Merge pull request #11626 from Ostap-Zherebetskyi/fix/collections_not…

a95e4e0

…ifications [ENG-10547] Collections: Project link pointing to api request instead of FE overview for all add/remove to collection notifications

Refactor logo handling in notification methods to improve consistency…

f5a71a0

… and readability

Merge pull request #11630 from Ostap-Zherebetskyi/fix/collections_not…

740c820

…ifications [ENG-10547] Collections: fix logo url

Add management command to sync notification templates

0a23867

Apply suggestion from @cslzchen

6bc5432

Merge pull request #11632 from Ostap-Zherebetskyi/feature/add_populat…

861eb32

…e_notification_types_to_admin [ENG-10570] Add management command to sync notification templates in admin

Add management command for deleting withdrawn or failed registration …

98ed895

…files to CeleryConfig

Merge pull request #11635 from Ostap-Zherebetskyi/fix/colery_imports

e91158f

[ENG-10611] Add delete_withdrawn_or_failed_registration_files import

fix: update logo handling in send_moderator_email_task for favicon su…

798d202

…pport

Merge pull request #11636 from Ostap-Zherebetskyi/fix/collection_dige…

34e8285

…st_logo [ENG-10547] Fix collections digest logo

cslzchen changed the title ~~[ENG-10538] Post-NR with Migration~~ [ENG-10538] Post-NR Project PR Mar 13, 2026

cslzchen approved these changes Mar 13, 2026

View reviewed changes

cslzchen merged commit 31048c7 into develop Mar 13, 2026
16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ENG-10538] Post-NR Project PR#11623

[ENG-10538] Post-NR Project PR#11623
cslzchen merged 126 commits intodevelopfrom
feature/notifications-refactor-post-release

Ostap-Zherebetskyi commented Mar 5, 2026 •

edited by atlassian bot

Loading

Uh oh!

Ostap-Zherebetskyi left a comment

Uh oh!

cslzchen left a comment

Uh oh!

Uh oh!

cslzchen Mar 13, 2026

Uh oh!

cslzchen Mar 13, 2026

Uh oh!

cslzchen Mar 13, 2026

Uh oh!

cslzchen Mar 13, 2026

Uh oh!

cslzchen Mar 13, 2026

Uh oh!

cslzchen Mar 13, 2026

Uh oh!

cslzchen Mar 13, 2026

Uh oh!

cslzchen Mar 13, 2026

Uh oh!

cslzchen Mar 13, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants



		@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):

		from osf.models import NotificationSubscription, NotificationType, NotificationTypeEnum


		class Command(BaseCommand):

Conversation

Ostap-Zherebetskyi commented Mar 5, 2026 • edited by atlassian bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Ticket

Purpose

Changes

Side Effects

QE Notes

CE Notes

Documentation

Uh oh!

Ostap-Zherebetskyi left a comment

Choose a reason for hiding this comment

Uh oh!

cslzchen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Ostap-Zherebetskyi commented Mar 5, 2026 •

edited by atlassian bot

Loading