Skip to content

[ENG-11791][ENG-11793] Update model to pre-calculate and sort recipients; rework campaign workflow #11825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cslzchen merged 5 commits into from
Jul 23, 2026
+169 −148
Merged

[ENG-11791][ENG-11793] Update model to pre-calculate and sort recipients; rework campaign workflow #11825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89b580b
Refactor notification campaign logic: create recipients in batches, a…
Ostap-Zherebetskyi Jul 22, 2026
c81ec86
Update notification campaign logic
Ostap-Zherebetskyi Jul 23, 2026
907b585
Update sendgrid bulk
Ostap-Zherebetskyi Jul 23, 2026
001080c
Handle email sending errors in send_campaign_batch: log exceptions an…
Ostap-Zherebetskyi Jul 23, 2026
1ac66e2
Improve error logging
Ostap-Zherebetskyi Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions admin/notifications/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from mako.parsetree import ControlLine
from string import Formatter
from osf.email import _render_email_html
from osf.email.notification_campaign import FILTER_PRESETS, filter_users
from osf.email.notification_campaign import FILTER_PRESETS


def delete_selected_notifications(selected_ids):
Expand Down Expand Up @@ -568,7 +568,7 @@ def get_queryset(self):
else:
filters[f'{item["field"]}__{item["lookup"]}'] = [value.strip() for value in item['value'].split(',')]

qs = filter_users(filters)
qs = OSFUser.objects.filter(**filters)
return qs.annotate(
guid=F('guids___id')
)
Expand Down
Loading