Add category_id and user_id as optional parameters to all edit endpoints

app.py

@@ -296,11 +296,21 @@ def save_media_click(user_id: Optional[int], category_id: str):
         existing_doc = collection.find_one({"userId": user_object_id})
         
         if existing_doc:
+            print(f"[MongoDB] Found existing document for userId: {user_object_id}, categories count: {len(existing_doc.get('categories', []))}")
             # Document exists, check if category exists in categories array
             category_exists = False
             for cat in existing_doc.get("categories", []):
-                if cat.get("categoryId") == category_object_id:
+                cat_id = cat.get("categoryId")
+                if isinstance(cat_id, ObjectId):
+                    if cat_id == category_object_id:
+                        category_exists = True
+                        current_count = cat.get("click_count", 0)
+                        print(f"[MongoDB] Category found - categoryId: {category_object_id}, current click_count: {current_count}")
+                        break
+                elif str(cat_id) == str(category_object_id):
                     category_exists = True
+                    current_count = cat.get("click_count", 0)
+                    print(f"[MongoDB] Category found (string match) - categoryId: {category_object_id}, current click_count: {current_count}")
                     break
             
             if category_exists:
@@ -318,9 +328,13 @@ def save_media_click(user_id: Optional[int], category_id: str):
                         }
                     }
                 )
-                print(f"[MongoDB] Updated category click_count - userId: {user_object_id}, categoryId: {category_object_id}")
+                if result.modified_count > 0:
+                    print(f"[MongoDB] Updated category click_count - userId: {user_object_id}, categoryId: {category_object_id}, matched: {result.matched_count}, modified: {result.modified_count}")
+                else:
+                    print(f"[MongoDB] WARNING: Update matched but did not modify - userId: {user_object_id}, categoryId: {category_object_id}, matched: {result.matched_count}, modified: {result.modified_count}")
             else:
                 # Category doesn't exist, add new category to array
+                print(f"[MongoDB] Category not found in existing document, adding new category - userId: {user_object_id}, categoryId: {category_object_id}")
                 result = collection.update_one(
                     {"userId": user_object_id},
                     {
@@ -334,7 +348,10 @@ def save_media_click(user_id: Optional[int], category_id: str):
                         "$set": {"updatedAt": now}
                     }
                 )
-                print(f"[MongoDB] Added new category - userId: {user_object_id}, categoryId: {category_object_id}")
+                if result.modified_count > 0:
+                    print(f"[MongoDB] Added new category - userId: {user_object_id}, categoryId: {category_object_id}, matched: {result.matched_count}, modified: {result.modified_count}")
+                else:
+                    print(f"[MongoDB] WARNING: Add category matched but did not modify - userId: {user_object_id}, categoryId: {category_object_id}, matched: {result.matched_count}, modified: {result.modified_count}")
         else:
             # Document doesn't exist, try to create new document
             # Use find_one_and_update with upsert which handles conflicts better
@@ -768,16 +785,18 @@ async def edit_image_nanobanana(
     request: Request,
     image: UploadFile = File(...),
     user_id: Optional[str] = Form(None),
+    category_id: Optional[str] = Form(None),
     app_check_claims: dict = Depends(verify_app_check_token),
 ):
     """
     Edit an image using the default nanobanana prompt.
     Automatically saves to nanobanana MongoDB database.
-    Automatically uses categoryId: 69368d62b95a6c2a75920505 for media_clicks logging.
+    Uses categoryId: 69368d62b95a6c2a75920505 for media_clicks logging (default, can be overridden).
     
     Parameters:
     - image: Image file to edit
     - user_id: Optional integer user ID
+    - category_id: Optional MongoDB ObjectId string for category (defaults to 69368d62b95a6c2a75920505)
     """
     task_id = str(uuid.uuid4())
     start_time = datetime.utcnow()
@@ -792,8 +811,9 @@ async def edit_image_nanobanana(
         except ValueError:
             return JSONResponse({"error": "user_id must be a valid integer"}, 400)
     
-    # Set default categoryId for nanobanana
-    category_id = "69368d62b95a6c2a75920505"
+    # Set default categoryId for nanobanana if not provided
+    if not category_id:
+        category_id = "69368d62b95a6c2a75920505"
     
     response, mongo_data = await process_image_edit(
         image=image,
@@ -813,16 +833,18 @@ async def edit_image_descratch(
     request: Request,
     image: UploadFile = File(...),
     user_id: Optional[str] = Form(None),
+    category_id: Optional[str] = Form(None),
     app_check_claims: dict = Depends(verify_app_check_token),
 ):
     """
     Edit an image using the default Descratch prompt.
     Automatically saves to Descratch_logicgo MongoDB database.
-    Automatically uses categoryId: 69368fbb2e46bd68ae18899e for media_clicks logging.
+    Uses categoryId: 69368fbb2e46bd68ae18899e for media_clicks logging (default, can be overridden).
     
     Parameters:
     - image: Image file to edit
     - user_id: Optional integer user ID
+    - category_id: Optional MongoDB ObjectId string for category (defaults to 69368fbb2e46bd68ae18899e)
     """
     task_id = str(uuid.uuid4())
     start_time = datetime.utcnow()
@@ -837,8 +859,9 @@ async def edit_image_descratch(
         except ValueError:
             return JSONResponse({"error": "user_id must be a valid integer"}, 400)
     
-    # Set default categoryId for descratch
-    category_id = "69368fbb2e46bd68ae18899e"
+    # Set default categoryId for descratch if not provided
+    if not category_id:
+        category_id = "69368fbb2e46bd68ae18899e"
     
     response, mongo_data = await process_image_edit(
         image=image,

postman_collection.json

@@ -277,7 +277,14 @@
                   "value": "{{userId}}",
                   "type": "text",
                   "disabled": false,
-                  "description": "Optional: Integer user ID. If provided, logs to media_clicks collection with categoryId: 69368d62b95a6c2a75920505"
+                  "description": "Optional: Integer user ID. Required for media_clicks logging."
+                },
+                {
+                  "key": "category_id",
+                  "value": "{{categoryId}}",
+                  "type": "text",
+                  "disabled": false,
+                  "description": "Optional: MongoDB ObjectId string for category. Defaults to 69368d62b95a6c2a75920505 if not provided."
                 }
               ]
             },
@@ -325,7 +332,14 @@
                   "value": "{{userId}}",
                   "type": "text",
                   "disabled": false,
-                  "description": "Optional: Integer user ID. If provided, logs to media_clicks collection with categoryId: 69368fbb2e46bd68ae18899e"
+                  "description": "Optional: Integer user ID. Required for media_clicks logging."
+                },
+                {
+                  "key": "category_id",
+                  "value": "{{categoryId}}",
+                  "type": "text",
+                  "disabled": false,
+                  "description": "Optional: MongoDB ObjectId string for category. Defaults to 69368fbb2e46bd68ae18899e if not provided."
                 }
               ]
             },
@@ -557,8 +571,8 @@
     },
     {
       "key": "categoryId",
-      "value": "69368fbb2e46bd68ae18899e",
-      "description": "Optional: MongoDB ObjectId string for category (24 hex characters). Used only for custom /edit endpoint."
+      "value": "69368d62b95a6c2a75920505",
+      "description": "Optional: MongoDB ObjectId string for category (24 hex characters). Defaults: nanobanana=69368d62b95a6c2a75920505, descratch=69368fbb2e46bd68ae18899e"
     }
   ]
 }