Update app.py

app.py

@@ -974,7 +974,7 @@ def _verify_bearer_token(credentials: Optional[HTTPAuthorizationCredentials] = D
 def sync_log_media_click(user_id_str: str, category_id_str: str):
     """
     Synchronously logs a click event to the media_clicks collection.
-    This function should be run using asyncio.to_thread().
+    ai_edit_daily_count is STRICTLY binary per day (no duplicate dates).
     """
 
     if _media_clicks_col is None:
@@ -985,16 +985,11 @@ def sync_log_media_click(user_id_str: str, category_id_str: str):
         category_oid = ObjectId(category_id_str.strip())
         now = datetime.utcnow()
 
-        # Normalize dates (UTC midnight)
+        # Normalize today to UTC midnight
         today_date = datetime(now.year, now.month, now.day)
-        yesterday_date = today_date - timedelta(days=1)
-
-        logger.info(
-            f"Attempting background write for User:{user_id_str}, Category:{category_id_str}"
-        )
 
         # --------------------------------------------------
-        # 1. AI EDIT USAGE TRACKING (GLOBAL PER USER)
+        # 1. Ensure root document exists
         # --------------------------------------------------
         _media_clicks_col.update_one(
             {"userId": user_oid},
@@ -1014,57 +1009,56 @@ def sync_log_media_click(user_id_str: str, category_id_str: str):
             upsert=True
         )
 
-        # Fetch current daily count entries
-        # Fetch current daily count entries
+        # --------------------------------------------------
+        # 2. FIXED DAILY BINARY TRACKING (NO DUPLICATES)
+        # --------------------------------------------------
         doc = _media_clicks_col.find_one(
             {"userId": user_oid},
             {"ai_edit_daily_count": 1}
         )
+
         daily_entries = doc.get("ai_edit_daily_count", []) if doc else []
-        
-        daily_updates = []
-        
-        if not daily_entries:
-            # First ever usage → only today
-            daily_updates.append({"date": today_date, "count": 1})
-        else:
-            # Build existing dates map for quick lookup
-            existing_dates = {entry["date"].date(): entry["count"] for entry in daily_entries}
-        
-            # Find last recorded date
-            last_date_in_db = max(entry["date"].date() for entry in daily_entries)
-        
-            # Fill missing days between last date and today-1 with 0
-            next_day = last_date_in_db + timedelta(days=1)
-            while next_day < today_date:
-                if next_day not in existing_dates:
-                    daily_updates.append({"date": next_day, "count": 0})
-                next_day += timedelta(days=1)
-        
-            # Add today if not already present
-            if today_date not in existing_dates:
-                daily_updates.append({"date": today_date, "count": 1})
-        
-        # Push updates if any
-        if daily_updates:
-            _media_clicks_col.update_one(
-                {"userId": user_oid},
-                {"$push": {"ai_edit_daily_count": {"$each": daily_updates}}}
-            )
-        
-        # Fetch again, sort oldest → newest, and trim to last 32 entries
-        doc = _media_clicks_col.find_one({"userId": user_oid}, {"ai_edit_daily_count": 1})
-        daily_entries = doc.get("ai_edit_daily_count", []) if doc else []
-        daily_entries.sort(key=lambda x: x["date"])
-        if len(daily_entries) > 32:
-            daily_entries = daily_entries[-32:]
-            _media_clicks_col.update_one(
-                {"userId": user_oid},
-                {"$set": {"ai_edit_daily_count": daily_entries}}
-            )
+
+        # Convert existing entries into date → count map
+        daily_map = {
+            entry["date"]: entry["count"]
+            for entry in daily_entries
+        }
+
+        # Determine last known date
+        last_date = max(daily_map.keys()) if daily_map else today_date
+
+        # Fill ALL missing days with 0
+        next_day = last_date + timedelta(days=1)
+        while next_day < today_date:
+            daily_map.setdefault(next_day, 0)
+            next_day += timedelta(days=1)
+
+        # Mark today as used (binary = 1)
+        daily_map[today_date] = 1
+
+        # Rebuild sorted list (oldest → newest)
+        final_daily_entries = [
+            {"date": d, "count": daily_map[d]}
+            for d in sorted(daily_map.keys())
+        ]
+
+        # Keep last 32 days only
+        final_daily_entries = final_daily_entries[-32:]
+
+        # ATOMIC replace (no $push)
+        _media_clicks_col.update_one(
+            {"userId": user_oid},
+            {
+                "$set": {
+                    "ai_edit_daily_count": final_daily_entries,
+                    "updatedAt": now
+                }
+            }
+        )
 
         # --------------------------------------------------
-        # 2. CATEGORY CLICK LOGIC
+        # 3. CATEGORY CLICK LOGIC (DATES CAN REPEAT)
         # --------------------------------------------------
         update_result = _media_clicks_col.update_one(
             {
@@ -1083,7 +1077,7 @@ def sync_log_media_click(user_id_str: str, category_id_str: str):
         )
 
         # --------------------------------------------------
-        # 3. IF CATEGORY DOES NOT EXIST → PUSH NEW
+        # 4. PUSH CATEGORY IF MISSING (ORDER = TIME)
         # --------------------------------------------------
         if update_result.matched_count == 0:
             _media_clicks_col.update_one(
@@ -1123,6 +1117,10 @@ def sync_log_media_click(user_id_str: str, category_id_str: str):
 #         category_oid = ObjectId(category_id_str.strip())
 #         now = datetime.utcnow()
 
+#         # Normalize dates (UTC midnight)
+#         today_date = datetime(now.year, now.month, now.day)
+#         yesterday_date = today_date - timedelta(days=1)
+
 #         logger.info(
 #             f"Attempting background write for User:{user_id_str}, Category:{category_id_str}"
 #         )
@@ -1133,20 +1131,70 @@ def sync_log_media_click(user_id_str: str, category_id_str: str):
 #         _media_clicks_col.update_one(
 #             {"userId": user_oid},
 #             {
+#                 "$setOnInsert": {
+#                     "createdAt": now,
+#                     "ai_edit_daily_count": []
+#                 },
 #                 "$set": {
 #                     "ai_edit_last_date": now,
 #                     "updatedAt": now
 #                 },
 #                 "$inc": {
 #                     "ai_edit_complete": 1
-#                 },
-#                 "$setOnInsert": {
-#                     "createdAt": now
 #                 }
 #             },
 #             upsert=True
 #         )
 
+#         # Fetch current daily count entries
+#         # Fetch current daily count entries
+#         doc = _media_clicks_col.find_one(
+#             {"userId": user_oid},
+#             {"ai_edit_daily_count": 1}
+#         )
+#         daily_entries = doc.get("ai_edit_daily_count", []) if doc else []
+        
+#         daily_updates = []
+        
+#         if not daily_entries:
+#             # First ever usage → only today
+#             daily_updates.append({"date": today_date, "count": 1})
+#         else:
+#             # Build existing dates map for quick lookup
+#             existing_dates = {entry["date"].date(): entry["count"] for entry in daily_entries}
+        
+#             # Find last recorded date
+#             last_date_in_db = max(entry["date"].date() for entry in daily_entries)
+        
+#             # Fill missing days between last date and today-1 with 0
+#             next_day = last_date_in_db + timedelta(days=1)
+#             while next_day < today_date:
+#                 if next_day not in existing_dates:
+#                     daily_updates.append({"date": next_day, "count": 0})
+#                 next_day += timedelta(days=1)
+        
+#             # Add today if not already present
+#             if today_date not in existing_dates:
+#                 daily_updates.append({"date": today_date, "count": 1})
+        
+#         # Push updates if any
+#         if daily_updates:
+#             _media_clicks_col.update_one(
+#                 {"userId": user_oid},
+#                 {"$push": {"ai_edit_daily_count": {"$each": daily_updates}}}
+#             )
+        
+#         # Fetch again, sort oldest → newest, and trim to last 32 entries
+#         doc = _media_clicks_col.find_one({"userId": user_oid}, {"ai_edit_daily_count": 1})
+#         daily_entries = doc.get("ai_edit_daily_count", []) if doc else []
+#         daily_entries.sort(key=lambda x: x["date"])
+#         if len(daily_entries) > 32:
+#             daily_entries = daily_entries[-32:]
+#             _media_clicks_col.update_one(
+#                 {"userId": user_oid},
+#                 {"$set": {"ai_edit_daily_count": daily_entries}}
+#             )
+
 #         # --------------------------------------------------
 #         # 2. CATEGORY CLICK LOGIC
 #         # --------------------------------------------------
@@ -1173,9 +1221,7 @@ def sync_log_media_click(user_id_str: str, category_id_str: str):
 #             _media_clicks_col.update_one(
 #                 {"userId": user_oid},
 #                 {
-#                     "$set": {
-#                         "updatedAt": now
-#                     },
+#                     "$set": {"updatedAt": now},
 #                     "$push": {
 #                         "categories": {
 #                             "categoryId": category_oid,
@@ -1193,7 +1239,6 @@ def sync_log_media_click(user_id_str: str, category_id_str: str):
 
 #     except Exception as media_err:
 #         logger.error(f"MEDIA_CLICK LOGGING ERROR: {media_err}")
-#         # swallow error – do not affect main flow
 #         pass