Update app.py

app.py

@@ -161,31 +161,23 @@ async def log_faceswap_hit(user_email: str, status: str, start_time: datetime, e
         "response_time_ms": response_time_ms
     })
 
+# --------------------- Media Click Logging Helper ---------------------
 # --------------------- Media Click Logging Helper ---------------------
 async def log_media_click(user_id: str, category_oid_str: str):
     """
     Logs a click event to the media_clicks collection against the Category.
-    Safely updates ai_edit_last_date, ai_edit_complete, and ai_edit_daily_count.
+    ai_edit_daily_count is binary per day (no duplicate dates).
     """
     try:
         user_oid = ObjectId(user_id.strip())
         category_oid = ObjectId(category_oid_str.strip())
         now = datetime.utcnow()
 
-        # Normalize dates (UTC midnight)
+        # Normalize today (UTC midnight)
         today_date = datetime(now.year, now.month, now.day)
-        yesterday_date = today_date - timedelta(days=1)
-
-        # Optional safety check
-        if not await categories_col.find_one({"_id": category_oid}):
-            logger.warning(
-                "Category ID %s not found. Skipping media click logging.",
-                category_oid_str
-            )
-            return
 
         # -------------------------------------------------
-        # STEP 1: Ensure user document + root fields exist
+        # STEP 1: Ensure root document exists
         # -------------------------------------------------
         await media_clicks_col.update_one(
             {"userId": user_oid},
@@ -201,55 +193,56 @@ async def log_media_click(user_id: str, category_oid_str: str):
         )
 
         # -------------------------------------------------
-        # STEP 1.5: Handle ai_edit_daily_count
+        # STEP 2: FIXED DAILY BINARY TRACKING
         # -------------------------------------------------
         doc = await 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 date map for lookup
-            existing_dates = {entry["date"].date(): entry["count"] for entry in daily_entries}
-            last_date_in_db = max(entry["date"].date() for entry in daily_entries)
-        
-            # Fill missing days between last recorded day and today-1
-            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:
-            await media_clicks_col.update_one(
-                {"userId": user_oid},
-                {"$push": {"ai_edit_daily_count": {"$each": daily_updates}}}
-            )
-        
-        # Sort oldest → newest and trim to last 32 entries
-        doc = await 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:]
-            await media_clicks_col.update_one(
-                {"userId": user_oid},
-                {"$set": {"ai_edit_daily_count": daily_entries}}
-            )
 
+        # Convert to date -> count map (unique by design)
+        daily_map = {
+            entry["date"]: entry["count"]
+            for entry in daily_entries
+        }
+
+        # Determine last recorded 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)
+        daily_map[today_date] = 1
+
+        # Rebuild sorted list (old → new)
+        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)
+        await media_clicks_col.update_one(
+            {"userId": user_oid},
+            {
+                "$set": {
+                    "ai_edit_daily_count": final_daily_entries,
+                    "ai_edit_last_date": now,
+                    "updatedAt": now
+                }
+            }
+        )
 
         # -------------------------------------------------
-        # STEP 2: Try updating existing category
+        # STEP 3: CATEGORY CLICK LOGIC (DATES CAN REPEAT)
         # -------------------------------------------------
         update_result = await media_clicks_col.update_one(
             {
@@ -263,26 +256,20 @@ async def log_media_click(user_id: str, category_oid_str: str):
                 },
                 "$set": {
                     "categories.$.lastClickedAt": now,
-                    "ai_edit_last_date": now,
                     "updatedAt": now
                 }
             }
         )
 
         # -------------------------------------------------
-        # STEP 3: Category not present → push new
+        # STEP 4: Push category if missing (order = time)
         # -------------------------------------------------
         if update_result.matched_count == 0:
             await media_clicks_col.update_one(
                 {"userId": user_oid},
                 {
-                    "$inc": {
-                        "ai_edit_complete": 1
-                    },
-                    "$set": {
-                        "ai_edit_last_date": now,
-                        "updatedAt": now
-                    },
+                    "$inc": {"ai_edit_complete": 1},
+                    "$set": {"updatedAt": now},
                     "$push": {
                         "categories": {
                             "categoryId": category_oid,
@@ -294,23 +281,28 @@ async def log_media_click(user_id: str, category_oid_str: str):
             )
 
         logger.info(
-            "[MEDIA_CLICK] user=%s category=%s ai_edit_complete incremented & daily_tracked",
+            "[MEDIA_CLICK] user=%s category=%s daily_binary_tracked",
             user_id,
             category_oid_str
         )
 
     except Exception as media_err:
         logger.error("MEDIA_CLICK LOGGING ERROR: %s", media_err)
+
 # async def log_media_click(user_id: str, category_oid_str: str):
 #     """
 #     Logs a click event to the media_clicks collection against the Category.
-#     Safely updates ai_edit_last_date and ai_edit_complete at ROOT level.
+#     Safely updates ai_edit_last_date, ai_edit_complete, and ai_edit_daily_count.
 #     """
 #     try:
 #         user_oid = ObjectId(user_id.strip())
 #         category_oid = ObjectId(category_oid_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)
+
 #         # Optional safety check
 #         if not await categories_col.find_one({"_id": category_oid}):
 #             logger.warning(
@@ -328,12 +320,61 @@ async def log_media_click(user_id: str, category_oid_str: str):
 #                 "$setOnInsert": {
 #                     "userId": user_oid,
 #                     "createdAt": now,
-#                     "ai_edit_complete": 0
+#                     "ai_edit_complete": 0,
+#                     "ai_edit_daily_count": []
 #                 }
 #             },
 #             upsert=True
 #         )
 
+#         # -------------------------------------------------
+#         # STEP 1.5: Handle ai_edit_daily_count
+#         # -------------------------------------------------
+#         doc = await 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 date map for lookup
+#             existing_dates = {entry["date"].date(): entry["count"] for entry in daily_entries}
+#             last_date_in_db = max(entry["date"].date() for entry in daily_entries)
+        
+#             # Fill missing days between last recorded day and today-1
+#             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:
+#             await media_clicks_col.update_one(
+#                 {"userId": user_oid},
+#                 {"$push": {"ai_edit_daily_count": {"$each": daily_updates}}}
+#             )
+        
+#         # Sort oldest → newest and trim to last 32 entries
+#         doc = await 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:]
+#             await media_clicks_col.update_one(
+#                 {"userId": user_oid},
+#                 {"$set": {"ai_edit_daily_count": daily_entries}}
+#             )
+
+
 #         # -------------------------------------------------
 #         # STEP 2: Try updating existing category
 #         # -------------------------------------------------
@@ -380,7 +421,7 @@ async def log_media_click(user_id: str, category_oid_str: str):
 #             )
 
 #         logger.info(
-#             "[MEDIA_CLICK] user=%s category=%s ai_edit_complete incremented",
+#             "[MEDIA_CLICK] user=%s category=%s ai_edit_complete incremented & daily_tracked",
 #             user_id,
 #             category_oid_str
 #         )