discord memes - weeks % sunday

Author: robwaz

dojo_plugin/api/v1/discord.py

@@ -139,16 +139,41 @@ class CourseMemes(Resource):
     @authed_only
     @dojo_route
     def get(self, dojo):
+
+        from datetime import timedelta, timezone
+
+        def bucket_from_start_then_sundays(ts, course_start):
+            start = course_start.astimezone(timezone.utc)
+
+            wd = start.weekday()
+            days_until_next_sunday = (6 - wd) % 7
+            if days_until_next_sunday == 0:
+                days_until_next_sunday = 7  # if start is Sunday, first boundary is a week later
+
+            first_boundary = start + timedelta(days=days_until_next_sunday)  # first Sunday 00:00 after start
+
+            if ts < first_boundary:
+                return 0
+            return 1 + (ts.date() - first_boundary.date()).days // 7
+
         discord_user = DiscordUsers.query.filter_by(user_id=get_current_user().id).first()
+
+        if not discord_user:
+            return {"success": False, "error": "Discord not linked"}
         course_start = dojo.course.get("start_date", None)
         if course_start is None:
             return {"success": False, "error": "No course start"}
         course_start = datetime.fromisoformat(course_start)
 
-        memes = (discord_user.memes(start=course_start, end=course_start + timedelta(weeks=16))
-                 .order_by(DiscordUserActivity.message_timestamp))
-        valid_meme_cnt = len(set((meme.message_timestamp.astimezone(timezone.utc) - course_start).days // 7
-                  for meme in memes))
+        memes = (
+            discord_user.memes(start=course_start, end=course_start + timedelta(weeks=17))
+            .order_by(DiscordUserActivity.message_timestamp)
+        )
+
+        valid_meme_cnt = len({
+            bucket_from_start_then_sundays(m.message_timestamp, course_start)
+            for m in memes
+        })
 
         return {"success": False, "memes": valid_meme_cnt}