[ENG-11524][ENG-11709] Project ENTER by cslzchen · Pull Request #11803 · CenterForOpenScience/osf.io

cslzchen · 2026-07-08T17:32:03Z

Ticket

https://openscience.atlassian.net/browse/ENG-11709
https://openscience.atlassian.net/browse/ENG-11524

Purpose

Project Enter: see project requirements & documents

Changes

See child PRs

QA Notes

See QA testing plan

CE Notes

See release playbook

Documentation

N/A

* Add blank notification type and template * Respond to CR --------- Co-authored-by: Longze Chen <cslzchen@gmail.com>

…TER - Part 1 (#11805) * Implement notification campaign models and email handling - Add NotificationCampaign and NotificationCampaignRecipient models. - Introduce notification campaign status management. - Update OSFUser model to track received notification campaigns. - Enhance email templates for notification campaigns. - Create migration for new models and relationships. * Remove notification settings table from blank email template * Code clean-up and fixes --------- Co-authored-by: Longze Chen <cslzchen@gmail.com>

…ch (#11806)

…min Page (#11808) * Add Notification Campaign management features including forms, views, and templates * Add support for restarting failed notification campaigns and update progress metrics * Prevent updating recipient count on campaign restart

…logging (#11814) * Add developer reminder status and update notification campaign recipient status choices * Handle campaign failure status and log execution time window in send_campaign_batch * Add Sentry logging for campaign retries and execution time window * Improve campaign logging --------- Co-authored-by: Longze Chen <cslzchen@gmail.com>

…nd spam status (#11815) * sort recipients by activity priority * simplify filter; send campaign email tasks in 3 phases * add global values to defaults and admin campaign metadata fields

* Add recipients list and preview views for notification campaigns

…nts; rework campaign workflow (#11825) * Refactor notification campaign logic: create recipients in batches, add run_id to models, and improve filtering by activity score * Update notification campaign logic * Update sendgrid bulk * Handle email sending errors in send_campaign_batch: log exceptions and update recipient statuses * Improve error logging --------- Co-authored-by: antkryt <ant.krytskyi@gmail.com>

* unit tests on ordering and filtering * fix recipients ordering

* Add sendgrid_bulk field to NotificationCampaignCreateForm and handle errors in context and filters; update notification campaign views and templates for improved messaging and recipient handling * Add sendgrid_bulk field to NotificationCampaignCreateForm and update notification campaign processing logic * Fix campaign recipient query to filter only by FAILED status when restarting failed campaigns * Refactor notification campaign recipient status handling and improve message display in templates

* Add functionality to restart stuck notification campaigns * Add support for restarting stuck notification campaigns

…enter Fixed conflicts for imports in osf/models/user.py

* Add unit tests for notification campaign flow and admin (part 1)

…#11836) * Add time window field to NotificationCampaignCreateForm and update templates for campaign details and recipients * Add cancel functionality to NotificationCampaign and update UI for campaign management * Refactor process_campaign_retry to handle cancelled campaigns and improve retry logic * Add run_id check to process_campaign_retry to prevent incorrect retries * Fix unit tests

* Update notification campaign permissions in views and tests * fix test_start_rejects_when_another_campaign_is_running

* Update notification campaign flow and admin unit tests

) * Create confirmed test user with fake activity points * Respond to CR with improvements

…rt 2 (#11840) * Update command to create more users with different status and options

…ers to use a dynamic query builder + Bug fixes (#11842) * Refactor notification campaign filters to use a dynamic query builder and streamline filter handling in the UI * Refactor campaign recipient filters to use Q objects and dynamic query building * Enhance notification campaign creation UI with improved group structure and styling * Remove copy * Refactor initial state handling in filter mode to improve readability * Add manual filter validation and improve filter display in notification campaigns

* Change notification campaign time window to be in seconds

…11848) * Additional user lookups for notification campaign

…mpaign and batches (#11850) * Add and normalize logs and sentry messages for campaign and batches * Fix type in logs * Add time check and logging for each notification emit in batch

* Sort campaigns list by created time

* Keep developer reminder even if campaign is finished

* Enforce manual filters values cannot be none or empty

…velop-and-redo-migration

…o-migration [ENG-11904][ENG-11910] Merge `develop` + redo migration + DevQA Fixes

…y tasks (#11857) * Add separate queue for notification campaign tasks

antkryt

LGTM

cslzchen

2nd pass done

cslzchen · 2026-08-05T19:16:10Z

+ESTIMATED_BATCH_RUN_TIME_THRESHOLD = DEFAULT_CAMPAIGN_WINDOW_TIME / (ESTIMATED_EIGHT_HOUR_WINDOW_USERS / DEFAULT_CAMPAIGN_BATCH_SIZE)  # By default, 48 seconds per batch of 1000 requests
+ESTIMATED_PER_REQUEST_THRESHOLD = ESTIMATED_BATCH_RUN_TIME_THRESHOLD / DEFAULT_CAMPAIGN_BATCH_SIZE  # By default, 0.048 seconds (21 requests / second)


This threshold are estimates if we only had one worker working on one batch at the same time and we set them very high so that we can sentry log batch and request timing.

On production, after we verified the SendGrid request speed on production, we can override/loose both so we don't flood production sentry with 2M errors.

ESTIMATED_BATCH_RUN_TIME_THRESHOLD = 180 # 3 min, could lower to 2 min if production SendGrid is faster ESTIMATED_PER_REQUEST_THRESHOLD = 0.2 # 200ms, could lower to 0.15 if production SendGrid is faster

Co-authored-by: Longze Chen <cslzchen@gmail.com>

cslzchen

Additional DevQA passed on the latest feature branch deployment, merging now.

Ostap-Zherebetskyi and others added 30 commits July 8, 2026 13:31

[ENG-11583] Create Blank Notification Template (#11802)

3ea9764

* Add blank notification type and template * Respond to CR --------- Co-authored-by: Longze Chen <cslzchen@gmail.com>

[ENG-11698] Add bulk email sending with SendGrid to send_campaign_bat…

d1048ec

…ch (#11806)

[ENG-11762] Refactor filter handling in notification campaign (#11813)

22b2d02

[ENG-11764] Filter, order, skip user by activity, registration date a…

8c770b2

…nd spam status (#11815) * sort recipients by activity priority * simplify filter; send campaign email tasks in 3 phases * add global values to defaults and admin campaign metadata fields

[ENG-11769] Redo recipients page (#11821)

4fd95a0

* Add recipients list and preview views for notification campaigns

[ENG-11796] Unit tests on ordering/filtering user (#11829)

faddad1

* unit tests on ordering and filtering * fix recipients ordering

[ENG-11792] Implement campaign restart in case of catastrophe (#11831)

dcfabd2

* Add functionality to restart stuck notification campaigns * Add support for restarting stuck notification campaigns

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

e5c7526

…enter Fixed conflicts for imports in osf/models/user.py

[ENG-11797] Unit tests on updated campaign workflow - Part 1 (#11832)

0ee21d2

* Add unit tests for notification campaign flow and admin (part 1)

[ENG-11847] Look into the permission issue (#11838)

c93805b

* Update notification campaign permissions in views and tests * fix test_start_rejects_when_another_campaign_is_running

[ENG-11797] Unit tests on updated campaign workflow - Part 2 (#11839)

8bec7dd

* Update notification campaign flow and admin unit tests

[ENG-11844] Create confirmed test user with fake activity points (#11837

59be6e8

) * Create confirmed test user with fake activity points * Respond to CR with improvements

[ENG-11844] Create confirmed test user with fake activity points - Pa…

de20f5b

…rt 2 (#11840) * Update command to create more users with different status and options

[ENG-11881] Time window needs to be set in seconds (#11847)

64efdc4

* Change notification campaign time window to be in seconds

[ENG-11882] Add a filter on username to include non-email usernames (#…

765b17d

…11848) * Additional user lookups for notification campaign

[ENG-11891] Part 1: Add and normalize logs and sentry messages for ca…

0871cbe

…mpaign and batches (#11850) * Add and normalize logs and sentry messages for campaign and batches * Fix type in logs * Add time check and logging for each notification emit in batch

[ENG-11889] Sort Campaign list (#11853)

54b1719

* Sort campaigns list by created time

[ENG-11888] Passing set time window error doesn't persist (#11851)

cc987e6

* Keep developer reminder even if campaign is finished

[ENG-11871] Enforce manual option requires filters (#11854)

eaebfbc

* Enforce manual filters values cannot be none or empty

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

d11590a

…velop-and-redo-migration

Redo migrations for project enter

086d675

Fix page title for list notification campaigns

9df4282

Merge pull request #11856 from cslzchen/feature/merge-develop-and-red…

8f7f312

…o-migration [ENG-11904][ENG-11910] Merge `develop` + redo migration + DevQA Fixes

cslzchen changed the title ~~[TBD] Reference PR for Project ENTER~~ [ENG-11524][ENG-11709] Project ENTER Aug 5, 2026

cslzchen marked this pull request as ready for review August 5, 2026 13:06

[ENG-11903] Add a project enter queue (priority 8) for batch and retr…

e2fb77a

…y tasks (#11857) * Add separate queue for notification campaign tasks

antkryt approved these changes Aug 5, 2026

View reviewed changes

cslzchen commented Aug 5, 2026

View reviewed changes

Comment thread admin/templates/notifications/notification_type_preview.html

brianjgeiger approved these changes Aug 5, 2026

View reviewed changes

cslzchen commented Aug 5, 2026

View reviewed changes

Comment thread admin/templates/notifications/notification_type_preview.html Outdated

Apply suggestions from code review

d52032c

Co-authored-by: Longze Chen <cslzchen@gmail.com>

cslzchen force-pushed the feature/project-enter branch from ac3d839 to d52032c Compare August 5, 2026 19:28

cslzchen commented Aug 5, 2026

View reviewed changes

cslzchen merged commit 209361a into develop Aug 5, 2026
16 checks passed

Navigation Menu

Uh oh!

[ENG-11524][ENG-11709] Project ENTER - #11803

[ENG-11524][ENG-11709] Project ENTER#11803
cslzchen merged 32 commits into
developfrom
feature/project-enter

cslzchen commented Jul 8, 2026 •

edited

Loading

Uh oh!

antkryt left a comment

Uh oh!

cslzchen left a comment

Uh oh!

Uh oh!

Uh oh!

cslzchen Aug 5, 2026

Uh oh!

Uh oh!

Uh oh!

cslzchen left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		ESTIMATED_BATCH_RUN_TIME_THRESHOLD = DEFAULT_CAMPAIGN_WINDOW_TIME / (ESTIMATED_EIGHT_HOUR_WINDOW_USERS / DEFAULT_CAMPAIGN_BATCH_SIZE) # By default, 48 seconds per batch of 1000 requests
		ESTIMATED_PER_REQUEST_THRESHOLD = ESTIMATED_BATCH_RUN_TIME_THRESHOLD / DEFAULT_CAMPAIGN_BATCH_SIZE # By default, 0.048 seconds (21 requests / second)

Uh oh!

Conversation

cslzchen commented Jul 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Ticket

Purpose

Changes

QA Notes

CE Notes

Documentation

Uh oh!

antkryt 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!

Uh oh!

cslzchen Aug 5, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

cslzchen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

cslzchen commented Jul 8, 2026 •

edited

Loading