Sync suppressed emails daily (#21998)

* Raname suppression sync task

* Add cron job to sync suppressed emails daily

Author: KevinMind

scripts/crontab/crontab.tpl

@@ -27,6 +27,7 @@ HOME=/tmp
 30 9 * * * %(z_cron)s update_user_ratings
 0 22 * * * %(z_cron)s gc
 0 23 * * * %(z_cron)s write_sitemaps
+0 23 * * * %(z_cron)s sync_suppressed_emails_cron
 
 # Once per day after metrics import is done
 30 12 * * * %(z_cron)s update_addon_weekly_downloads

src/olympia/lib/settings_base.py

@@ -922,7 +922,7 @@ def get_db_config(environ_var, atomic_requests=True):
         'queue': 'cron'
     },
     'olympia.reviewers.tasks.recalculate_post_review_weight': {'queue': 'cron'},
-    'olympia.users.tasks.sync_blocked_emails': {'queue': 'cron'},
+    'olympia.users.tasks.sync_suppressed_emails_task': {'queue': 'cron'},
     'olympia.users.tasks.send_suppressed_email_confirmation': {'queue': 'devhub'},
     'olympia.users.tasks.check_suppressed_email_confirmation': {'queue': 'devhub'},
     # Reviewers.
@@ -1461,6 +1461,7 @@ def read_only_mode(env):
     'upload_mlbf_to_remote_settings': 'olympia.blocklist.cron',
     'update_blog_posts': 'olympia.devhub.cron',
     'update_user_ratings': 'olympia.users.cron',
+    'sync_suppressed_emails_cron': 'olympia.users.cron',
 }
 
 RECOMMENDATION_ENGINE_URL = env(

src/olympia/users/cron.py

@@ -7,7 +7,7 @@
 from olympia.amo import VALID_ADDON_STATUSES
 from olympia.amo.utils import chunked
 
-from .tasks import update_user_ratings_task
+from .tasks import sync_suppressed_emails_task, update_user_ratings_task
 
 
 task_log = olympia.core.logger.getLogger('z.task')
@@ -45,3 +45,11 @@ def update_user_ratings():
     ts = [update_user_ratings_task.subtask(args=[chunk]) for chunk in chunked(d, 1000)]
 
     group(ts).apply_async()
+
+
+def sync_suppressed_emails_cron():
+    """
+    Sync suppressed emails daily
+    """
+
+    sync_suppressed_emails_task.delay()

src/olympia/users/management/commands/sync_suppressed_emails.py

@@ -1,10 +1,10 @@
 from django.core.management.base import BaseCommand
 
-from olympia.users.tasks import sync_blocked_emails
+from olympia.users.tasks import sync_suppressed_emails_task
 
 
 class Command(BaseCommand):
     """Sync Socket labs suppression list to database."""
 
     def handle(self, *args, **options):
-        sync_blocked_emails.apply()
+        sync_suppressed_emails_task.apply()

src/olympia/users/tasks.py

@@ -103,7 +103,7 @@ def assert_socket_labs_settings_defined():
 
 
 @task(autoretry_for=(HTTPError, Timeout), max_retries=5, retry_backoff=True)
-def sync_blocked_emails(batch_size=BATCH_SIZE, **kw):
+def sync_suppressed_emails_task(batch_size=BATCH_SIZE, **kw):
     assert_socket_labs_settings_defined()
 
     task_log.info('fetching suppression list from socket labs...')

src/olympia/users/tests/test_tasks.py

@@ -32,7 +32,7 @@
     delete_photo,
     resize_photo,
     send_suppressed_email_confirmation,
-    sync_blocked_emails,
+    sync_suppressed_emails_task,
 )
 
 
@@ -219,7 +219,7 @@ def test_fails_missing_settings(self):
         ):
             with pytest.raises(Exception) as exc:
                 setattr(settings, setting, None)
-                sync_blocked_emails.s().apply(throw=True)
+                sync_suppressed_emails_task.s().apply(throw=True)
                 assert exc.match('SOCKET_LABS_TOKEN is not defined')
 
     def test_retry_if_api_returns_bad_response(self):
@@ -229,7 +229,7 @@ def test_retry_if_api_returns_bad_response(self):
             status=500,
         )
 
-        task = sync_blocked_emails.s()
+        task = sync_suppressed_emails_task.s()
 
         with pytest.raises(Retry):
             task.apply(throw=True)
@@ -244,7 +244,7 @@ def timeout_callback(request):
             callback=timeout_callback,
         )
 
-        task = sync_blocked_emails.s()
+        task = sync_suppressed_emails_task.s()
 
         with pytest.raises(Retry):
             task.apply(throw=True)
@@ -259,7 +259,7 @@ def test_empty_csv(self):
             status=200,
         )
 
-        sync_blocked_emails()
+        sync_suppressed_emails_task()
 
         assert SuppressedEmail.objects.count() == 0
 
@@ -277,7 +277,7 @@ def test_existing_email(self):
 
         SuppressedEmail.objects.create(email=user.email)
 
-        sync_blocked_emails()
+        sync_suppressed_emails_task()
 
         email_block = SuppressedEmail.objects.get(email=user.email)
 
@@ -296,7 +296,7 @@ def test_unique_email(self):
             status=200,
         )
 
-        sync_blocked_emails()
+        sync_suppressed_emails_task()
 
         email_block = SuppressedEmail.objects.get(email=user.email)