Merge pull request #11485 from Ostap-Zherebetskyi/fix/no_login_duplicates

cslzchen · web-flow · commit 35795f4db14f · 2025-12-10T14:59:29.000-05:00
[ENG-9921] ensure distinct users are returned in no_login email task
diff --git a/scripts/triggered_mails.py b/scripts/triggered_mails.py
@@ -81,7 +81,7 @@ def find_inactive_users_without_enqueued_or_sent_no_login():
             date_last_login__lt=timezone.now() - settings.NO_LOGIN_OSF4M_WAIT_TIME,
             tags__name='osf4m'
         )
-    )
+    ).distinct()
 
     # Exclude users who already have a task for this email type
     return base_q.annotate(_has_task=Exists(existing_no_login)).filter(_has_task=False)

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ def find_inactive_users_without_enqueued_or_sent_no_login():`
`81`	`81`	`date_last_login__lt=timezone.now() - settings.NO_LOGIN_OSF4M_WAIT_TIME,`
`82`	`82`	`tags__name='osf4m'`
`83`	`83`	`)`
`84`		`- )`
	`84`	`+ ).distinct()`
`85`	`85`
`86`	`86`	`# Exclude users who already have a task for this email type`
`87`	`87`	`return base_q.annotate(_has_task=Exists(existing_no_login)).filter(_has_task=False)`