Simplified fetch_slack_activity and made idempotent (#2058)

Author: daveoconnor

config/celery.py

@@ -83,11 +83,12 @@ def setup_periodic_tasks(sender, **kwargs):
         app.signature("core.tasks.clear_static_content_cache"),
     )
 
-    # Fetch Slack activity. Executes daily at 3:07 AM.
-    sender.add_periodic_task(
-        crontab(hour=3, minute=7),
-        app.signature("slack.tasks.fetch_slack_activity"),
-    )
+    # TODO: reenable
+    # # Fetch Slack activity. Executes daily at 3:07 AM.
+    # sender.add_periodic_task(
+    #     crontab(hour=3, minute=7),
+    #     app.signature("slack.tasks.fetch_slack_activity"),
+    # )
 
     # delete users scheduled for deletion, arbitrarily every 61 minutes
     sender.add_periodic_task(

docs/commands.md

@@ -360,7 +360,7 @@ Preview which users would be updated:
 
 ## `clear_slack_activity`
 
-**Purpose**: Delete all slack activity tracking data from the database. This command removes all records from the `SlackActivityBucket` and `ChannelUpdateGap` tables, and resets the `last_update_ts` field to "0" for all channels. This is useful for resetting the slack activity tracking system to its initial state.
+**Purpose**: Delete all slack activity tracking data from the database. This command removes all records from the `SlackActivityBucket` and resets the `last_update_ts` field to July 31st 2025 (for now) for all channels. This is useful for resetting the slack activity tracking system. It should in future be reset to zero for all data.
 
 **Example**
 

slack/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 
 from slack.filters import FilterByReleaseDates
-from slack.models import Channel, SlackActivityBucket, Thread
+from slack.models import Channel, SlackActivityBucket
 
 
 @admin.register(Channel)
@@ -64,47 +64,3 @@ def has_change_permission(self, request, obj=None):
 
     def has_delete_permission(self, request, obj=None):
         return False
-
-
-@admin.register(Thread)
-class ThreadAdmin(admin.ModelAdmin):
-    list_display = [
-        "id",
-        "channel__id",
-        "channel__name",
-        "thread_ts_readable",
-        "last_update_ts_readable",
-    ]
-    search_fields = ["channel__id", "channel__name", "thread_ts"]
-    list_filter = ["channel__name"]
-    readonly_fields = ["channel", "thread_ts", "last_update_ts", "db_created_at"]
-    raw_id_fields = ["channel"]
-    date_hierarchy = "db_created_at"
-    ordering = ["-db_created_at"]
-
-    @admin.display(description="Thread Created")
-    def thread_ts_readable(self, obj):
-        """Display thread_ts in a human-readable format."""
-        if obj.thread_ts:
-            from slack.models import parse_ts
-
-            return parse_ts(obj.thread_ts).strftime("%Y-%m-%d %H:%M:%S UTC")
-        return "-"
-
-    @admin.display(description="Last Update")
-    def last_update_ts_readable(self, obj):
-        """Display last_update_ts in a human-readable format."""
-        if obj.last_update_ts:
-            from slack.models import parse_ts
-
-            return parse_ts(obj.last_update_ts).strftime("%Y-%m-%d %H:%M:%S UTC")
-        return "-"
-
-    def has_add_permission(self, request):
-        return False
-
-    def has_change_permission(self, request, obj=None):
-        return False
-
-    def has_delete_permission(self, request, obj=None):
-        return False

slack/management/commands/clear_slack_activity.py

@@ -3,11 +3,7 @@
 import djclick as click
 from django.db import transaction
 
-from slack.models import (
-    SlackActivityBucket,
-    Channel,
-    ChannelUpdateGap,
-)
+from slack.models import SlackActivityBucket, Channel
 
 
 logger = logging.getLogger(__name__)
@@ -36,16 +32,12 @@ def command(confirm):
 
     with transaction.atomic():
         activity_count = SlackActivityBucket.objects.count()
-        gap_count = ChannelUpdateGap.objects.count()
         channel_count = Channel.objects.count()
 
         logger.info(f"Deleting {activity_count:,} SlackActivityBucket records...")
         SlackActivityBucket.objects.all().delete()
 
-        logger.info(f"Deleting {gap_count:,} ChannelUpdateGap records...")
-        ChannelUpdateGap.objects.all().delete()
-
         logger.info(f"Resetting last_update_ts for {channel_count:,} Channels...")
-        Channel.objects.all().update(last_update_ts="0")
+        Channel.objects.all().update(last_update_ts="1753920000")  # 31st July, 2025
 
         logger.info("Successfully cleared all slack activity data.")