Improve media_clicks insert: use find_one_and_update and attempt to drop old index automatically

app.py

@@ -8,7 +8,7 @@ from fastapi import FastAPI, File, Form, UploadFile, Query, Depends, Request
 from fastapi.responses import FileResponse, JSONResponse
 from huggingface_hub import InferenceClient
 from PIL import Image
-from pymongo import MongoClient
+from pymongo import MongoClient, ReturnDocument
 from pymongo.errors import DuplicateKeyError
 from bson import ObjectId
 from typing import Optional
@@ -337,9 +337,9 @@ def save_media_click(user_id: Optional[int], category_id: str):
                 print(f"[MongoDB] Added new category - userId: {user_object_id}, categoryId: {category_object_id}")
         else:
             # Document doesn't exist, try to create new document
-            # Use try-except to handle potential duplicate key errors from old index
+            # Use find_one_and_update with upsert which handles conflicts better
             try:
-                result = collection.update_one(
+                result = collection.find_one_and_update(
                     {"userId": user_object_id},
                     {
                         "$setOnInsert": {
@@ -357,36 +357,69 @@ def save_media_click(user_id: Optional[int], category_id: str):
                             "updatedAt": now
                         }
                     },
-                    upsert=True
+                    upsert=True,
+                    return_document=ReturnDocument.AFTER
                 )
-                if result.upserted_id:
-                    print(f"[MongoDB] Inserted new document - userId: {user_object_id}, categoryId: {category_object_id}, ID: {result.upserted_id}")
-                else:
-                    print(f"[MongoDB] Updated document - userId: {user_object_id}, categoryId: {category_object_id}")
-            except DuplicateKeyError:
-                # If duplicate key error, document might have been created by another request
-                # Try to find it and update it
-                print(f"[MongoDB] Duplicate key error on insert, checking if document exists...")
-                existing = collection.find_one({"userId": user_object_id})
-                if existing:
-                    # Document exists now, add category
-                    result = collection.update_one(
-                        {"userId": user_object_id},
-                        {
-                            "$push": {
-                                "categories": {
-                                    "categoryId": category_object_id,
-                                    "click_count": 1,
-                                    "lastClickedAt": now
-                                }
-                            },
-                            "$set": {"updatedAt": now}
-                        }
-                    )
-                    print(f"[MongoDB] Added category to existing document - userId: {user_object_id}, categoryId: {category_object_id}")
-                else:
-                    # Still doesn't exist, might be old index conflict - skip for now
-                    print(f"[MongoDB] WARNING: Could not create document due to old index conflict. Skipping media_clicks logging.")
+                if result:
+                    print(f"[MongoDB] Inserted/Updated document - userId: {user_object_id}, categoryId: {category_object_id}, ID: {result.get('_id')}")
+            except DuplicateKeyError as dke:
+                # If duplicate key error, try to find existing document and update it
+                print(f"[MongoDB] Duplicate key error on insert: {str(dke)[:200]}")
+                print(f"[MongoDB] Attempting to find and update existing document...")
+                try:
+                    existing = collection.find_one({"userId": user_object_id})
+                    if existing:
+                        # Document exists, add category
+                        result = collection.update_one(
+                            {"userId": user_object_id},
+                            {
+                                "$push": {
+                                    "categories": {
+                                        "categoryId": category_object_id,
+                                        "click_count": 1,
+                                        "lastClickedAt": now
+                                    }
+                                },
+                                "$set": {"updatedAt": now}
+                            }
+                        )
+                        print(f"[MongoDB] Added category to existing document - userId: {user_object_id}, categoryId: {category_object_id}")
+                    else:
+                        # Document doesn't exist but index conflict - try to drop old index programmatically
+                        print(f"[MongoDB] WARNING: Old index conflict detected. Attempting to handle...")
+                        try:
+                            # Try to drop the problematic index
+                            collection.drop_index("user_id_1_header_1_media_id_1")
+                            print(f"[MongoDB] Successfully dropped old index. Retrying insert...")
+                            # Retry the insert
+                            result = collection.find_one_and_update(
+                                {"userId": user_object_id},
+                                {
+                                    "$setOnInsert": {
+                                        "userId": user_object_id,
+                                        "createdAt": now
+                                    },
+                                    "$push": {
+                                        "categories": {
+                                            "categoryId": category_object_id,
+                                            "click_count": 1,
+                                            "lastClickedAt": now
+                                        }
+                                    },
+                                    "$set": {
+                                        "updatedAt": now
+                                    }
+                                },
+                                upsert=True,
+                                return_document=ReturnDocument.AFTER
+                            )
+                            print(f"[MongoDB] Successfully inserted after dropping old index - userId: {user_object_id}, categoryId: {category_object_id}")
+                        except Exception as drop_error:
+                            print(f"[MongoDB] Could not drop index (may not have permissions): {str(drop_error)[:200]}")
+                            print(f"[MongoDB] ERROR: Cannot create document due to old index. Please drop index 'user_id_1_header_1_media_id_1' manually in MongoDB.")
+                            return False
+                except Exception as find_error:
+                    print(f"[MongoDB] Error finding existing document: {str(find_error)[:200]}")
                     return False
         
         return True