Merge pull request #196 from mapswipe/fix/aggregate-update-cron

Author: thenav56

apps/community_dashboard/tasks.py

@@ -0,0 +1,22 @@
+import logging
+
+from celery import shared_task
+
+from apps.community_dashboard.management.commands.update_aggregated_data import Command as UpdateAggregateCommand
+from main.cache import CeleryLock
+from main.cronjobs import TimeConstants
+
+logger = logging.getLogger(__name__)
+
+
+@shared_task
+def update_aggregated_data():
+    with CeleryLock.redis_lock(
+        CeleryLock.Key.COMMUNITY_DASHBOARD_UPDATE_AGGREGATE,
+        lock_expire=TimeConstants.SECONDS_IN_A_HOUR,
+    ) as acquired:
+        if not acquired:
+            logger.warning("Community Dashboard update aggregate already running")
+            return
+
+    UpdateAggregateCommand().handle()

main/cache.py

@@ -21,6 +21,7 @@ class Key:
         TUTORIAL_PUSH_TO_FIREBASE = "TUTORIAL_PUSH_TO_FIREBASE_{0}"
 
         MAPPING_SESSION_PULL_FROM_FIREBASE = "MAPPING_SESSION_PULL_FROM_FIREBASE"
+        COMMUNITY_DASHBOARD_UPDATE_AGGREGATE = "COMMUNITY_DASHBOARD_UPDATE_AGGREGATE"
 
         USERS_PULL_FROM_FIREBASE = "USERS_PULL_FROM_FIREBASE"
         USER_GROUP_MEMBERSHIPS_PULL_FROM_FIREBASE = "USER_GROUP_MEMBERSHIPS_PULL_FROM_FIREBASE"

main/cronjobs.py

@@ -11,11 +11,13 @@
 
 
 class TimeConstants:
+    SECONDS_IN_A_DAY = 24 * 60 * 60
     SECONDS_IN_A_HOUR = 60 * 60
     SECONDS_IN_A_WEEK = 7 * 24 * 60 * 60
     SECONDS_IN_A_MINUTE = 60
 
     EVERY_WEEK = crontab(minute="1", hour="1", day_of_week="1")
+    EVERY_DAY = crontab(minute="1", hour="1")
     EVERY_HOUR = crontab(minute="0", hour="*")
     EVERY_2_MINUTES = crontab(minute="*/2")
     EVERY_1_MINUTES = crontab(minute="*/1")
@@ -128,6 +130,16 @@ class CronJob(typing.NamedTuple):
             max_runtime=2,
         ),
     ),
+    "update_community_dashboard_aggregated_data": CronJob(
+        task="apps.community_dashboard.tasks.update_aggregated_data",
+        schedule=TimeConstants.EVERY_DAY,
+        options=CronJobOption(expires=TimeConstants.SECONDS_IN_A_DAY),
+        sentry_config=CronJobSentryConfig(
+            failure_issue_threshold=1,
+            checkin_margin=10,
+            max_runtime=10,
+        ),
+    ),
     # Queue uptime
     **{
         f"celery_queue_uptime_{celery_queue.name}": CronJob(