Fix empty string handling and support both subCategories and categories schemas

- Handle empty strings for user_id and category_id properly
- Support both old (subCategories) and new (categories) schemas simultaneously
- Add debug logging for media click tracking
- Preserve existing subCategories data when adding new categories
- Update all endpoints to properly handle empty form fields

app/database.py

@@ -97,6 +97,10 @@ def _normalize_object_id(raw_value: Optional[Union[str, int, ObjectId]]) -> Obje
     if raw_value is None: 
         return ObjectId() 
 
+    # Handle empty strings as None
+    if isinstance(raw_value, str) and not raw_value.strip():
+        return ObjectId()
+
     try: 
         if isinstance(raw_value, int) or (isinstance(raw_value, str) and raw_value.strip().lstrip("-").isdigit()): 
             int_value = int(str(raw_value).strip()) 
@@ -133,6 +137,10 @@ def _resolve_category_id(
     default_category_id: Optional[str], 
 ) -> ObjectId: 
     """Pick category id from explicit value, endpoint default, or fallback.""" 
+    # Handle empty strings as None
+    if isinstance(category_id, str) and not category_id.strip():
+        category_id = None
+        
     endpoint_map = { 
         "colorization": os.getenv("DEFAULT_CATEGORY_COLORIZATION"), 
         "upload": os.getenv("DEFAULT_CATEGORY_COLORIZATION"), 
@@ -325,8 +333,12 @@ def log_media_click(
 
         user_object_id = _normalize_object_id(user_id) 
         category_object_id = _resolve_category_id(category_id, endpoint_path, default_category_id) 
-        now = datetime.utcnow() 
+        now = datetime.utcnow()
+        
+        logger.info("Media click - user_id input: %s, normalized: %s, category_id input: %s, normalized: %s", 
+                   user_id, str(user_object_id), category_id, str(category_object_id)) 
 
+        # Try to update existing category in new schema (categories.categoryId)
         update_existing = collection.update_one( 
             {"userId": user_object_id, "categories.categoryId": category_object_id}, 
             { 
@@ -336,21 +348,41 @@ def log_media_click(
         ) 
 
         if update_existing.matched_count == 0: 
-            collection.update_one( 
-                {"userId": user_object_id}, 
-                { 
-                    "$setOnInsert": {"createdAt": now}, 
-                    "$set": {"updatedAt": now}, 
-                    "$push": { 
-                        "categories": { 
-                            "categoryId": category_object_id, 
-                            "click_count": 1, 
-                            "lastClickedAt": now, 
-                        } 
+            # Category not found in new schema, check if user exists
+            user_exists = collection.find_one({"userId": user_object_id})
+            
+            if user_exists:
+                # User exists but category doesn't in new schema - add to categories array
+                collection.update_one( 
+                    {"userId": user_object_id}, 
+                    { 
+                        "$set": {"updatedAt": now}, 
+                        "$push": { 
+                            "categories": { 
+                                "categoryId": category_object_id, 
+                                "click_count": 1, 
+                                "lastClickedAt": now, 
+                            } 
+                        }, 
                     }, 
-                }, 
-                upsert=True, 
-            ) 
+                )
+            else:
+                # User doesn't exist - create new document with categories array
+                collection.update_one( 
+                    {"userId": user_object_id}, 
+                    { 
+                        "$setOnInsert": {"createdAt": now}, 
+                        "$set": {"updatedAt": now}, 
+                        "$push": { 
+                            "categories": { 
+                                "categoryId": category_object_id, 
+                                "click_count": 1, 
+                                "lastClickedAt": now, 
+                            } 
+                        }, 
+                    }, 
+                    upsert=True, 
+                ) 
 
         logger.info("Media click logged for user %s", str(user_object_id)) 
         return True 

app/main.py

@@ -129,8 +129,10 @@ def verify_app_check_token(token: str):
     return True
 
 def _resolve_user_id(request: Request, supplied_user_id: Optional[str]) -> Optional[str]:
-    """Return supplied user_id if provided, otherwise None (will auto-generate in log_media_click)."""
-    return supplied_user_id
+    """Return supplied user_id if provided and not empty, otherwise None (will auto-generate in log_media_click)."""
+    if supplied_user_id and supplied_user_id.strip():
+        return supplied_user_id.strip()
+    return None
 
 # -------------------------------------------------
 # 📤 Upload Image
@@ -148,7 +150,11 @@ async def upload_image(
     
     ip_address = request.client.host if request.client else None
     effective_user_id = _resolve_user_id(request, user_id)
-    effective_category_id = category_id or categoryId
+    effective_category_id = (category_id or categoryId) if (category_id or categoryId) else None
+    if effective_category_id:
+        effective_category_id = effective_category_id.strip() if isinstance(effective_category_id, str) else effective_category_id
+    if not effective_category_id:
+        effective_category_id = None
 
     if not file.content_type.startswith("image/"):
         log_api_call(
@@ -225,7 +231,11 @@ async def colorize(
     
     ip_address = request.client.host if request.client else None
     effective_user_id = _resolve_user_id(request, user_id)
-    effective_category_id = category_id or categoryId
+    effective_category_id = (category_id or categoryId) if (category_id or categoryId) else None
+    if effective_category_id:
+        effective_category_id = effective_category_id.strip() if isinstance(effective_category_id, str) else effective_category_id
+    if not effective_category_id:
+        effective_category_id = None
 
     if not file.content_type.startswith("image/"):
         log_api_call(

app/main_fastai.py

@@ -209,8 +209,10 @@ async def verify_request(request: Request):
 
 
 def _resolve_user_id(request: Request, supplied_user_id: Optional[str]) -> Optional[str]:
-    """Return supplied user_id if provided, otherwise None (will auto-generate in log_media_click)."""
-    return supplied_user_id
+    """Return supplied user_id if provided and not empty, otherwise None (will auto-generate in log_media_click)."""
+    if supplied_user_id and supplied_user_id.strip():
+        return supplied_user_id.strip()
+    return None
 
 @app.get("/api")
 async def api_info(request: Request):
@@ -382,7 +384,11 @@ async def colorize_api(
     start_time = time.time()
     
     effective_user_id = _resolve_user_id(request, user_id)
-    effective_category_id = category_id or categoryId
+    effective_category_id = (category_id or categoryId) if (category_id or categoryId) else None
+    if effective_category_id:
+        effective_category_id = effective_category_id.strip() if isinstance(effective_category_id, str) else effective_category_id
+    if not effective_category_id:
+        effective_category_id = None
  
     ip_address = request.client.host if request.client else None
     

app/main_sdxl.py

@@ -308,8 +308,10 @@ async def verify_request(request: Request):
 
 
 def _resolve_user_id(request: Request, supplied_user_id: Optional[str]) -> Optional[str]: 
-    """Return supplied user_id if provided, otherwise None (will auto-generate in log_media_click).""" 
-    return supplied_user_id 
+    """Return supplied user_id if provided and not empty, otherwise None (will auto-generate in log_media_click).""" 
+    if supplied_user_id and supplied_user_id.strip():
+        return supplied_user_id.strip()
+    return None 
 
 
 # ========== Auth Endpoints ==========
@@ -648,7 +650,11 @@ async def upload_image(
     Requires Firebase App Check authentication.
     """
     effective_user_id = _resolve_user_id(request, user_id)
-    effective_category_id = category_id or categoryId 
+    effective_category_id = (category_id or categoryId) if (category_id or categoryId) else None
+    if effective_category_id:
+        effective_category_id = effective_category_id.strip() if isinstance(effective_category_id, str) else effective_category_id
+    if not effective_category_id:
+        effective_category_id = None 
  
     ip_address = request.client.host if request.client else None
     
@@ -754,7 +760,11 @@ async def colorize_api(
     start_time = time.time()
     
     effective_user_id = _resolve_user_id(request, user_id)
-    effective_category_id = category_id or categoryId 
+    effective_category_id = (category_id or categoryId) if (category_id or categoryId) else None
+    if effective_category_id:
+        effective_category_id = effective_category_id.strip() if isinstance(effective_category_id, str) else effective_category_id
+    if not effective_category_id:
+        effective_category_id = None 
  
     ip_address = request.client.host if request.client else None
     

postman_collection.json

@@ -78,6 +78,12 @@
 							"value": "{{category_id}}",
 							"type": "text",
 							"description": "Optional category id; endpoint default used when omitted"
+						},
+						{
+							"key": "categoryId",
+							"value": "{{categoryId}}",
+							"type": "text",
+							"description": "Optional category id (alternative to category_id)"
 						}
 					]
 				},
@@ -136,6 +142,12 @@
 							"value": "{{category_id}}",
 							"type": "text",
 							"description": "Optional category id; endpoint default used when omitted"
+						},
+						{
+							"key": "categoryId",
+							"value": "{{categoryId}}",
+							"type": "text",
+							"description": "Optional category id (alternative to category_id)"
 						}
 					]
 				},
@@ -212,6 +224,12 @@
 							"value": "{{category_id}}",
 							"type": "text",
 							"description": "Optional category id; endpoint default used when omitted"
+						},
+						{
+							"key": "categoryId",
+							"value": "{{categoryId}}",
+							"type": "text",
+							"description": "Optional category id (alternative to category_id)"
 						}
 					]
 				},
@@ -272,6 +290,64 @@
 			},
 			"response": []
 		},
+		{
+			"name": "Upload Image",
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Authorization",
+						"value": "Bearer {{firebase_token}}",
+						"type": "text"
+					},
+					{
+						"key": "X-Firebase-AppCheck",
+						"value": "{{firebase_app_check}}",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "formdata",
+					"formdata": [
+						{
+							"key": "file",
+							"type": "file",
+							"src": [],
+							"description": "Image file to upload"
+						},
+						{
+							"key": "user_id",
+							"value": "{{user_id}}",
+							"type": "text",
+							"description": "Optional user id (ObjectId or numeric) for media click logging"
+						},
+						{
+							"key": "category_id",
+							"value": "{{category_id}}",
+							"type": "text",
+							"description": "Optional category id; endpoint default used when omitted"
+						},
+						{
+							"key": "categoryId",
+							"value": "{{categoryId}}",
+							"type": "text",
+							"description": "Optional category id (alternative to category_id)"
+						}
+					]
+				},
+				"url": {
+					"raw": "{{base_url}}/upload",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"upload"
+					]
+				},
+				"description": "Upload an image and get the uploaded image URL"
+			},
+			"response": []
+		},
 		{
 			"name": "Colorize Image - Without Auth",
 			"request": {
@@ -331,6 +407,30 @@
 			"value": "",
 			"type": "string",
 			"description": "Filename from colorize response (e.g., uuid.png)"
+		},
+		{
+			"key": "user_id",
+			"value": "",
+			"type": "string",
+			"description": "User ID for media click logging (ObjectId string, integer, or leave empty to auto-generate)"
+		},
+		{
+			"key": "category_id",
+			"value": "",
+			"type": "string",
+			"description": "Category ID for media click logging (ObjectId string, or leave empty for endpoint default)"
+		},
+		{
+			"key": "categoryId",
+			"value": "",
+			"type": "string",
+			"description": "Category ID (alternative to category_id)"
+		},
+		{
+			"key": "firebase_app_check",
+			"value": "YOUR_FIREBASE_APP_CHECK_TOKEN",
+			"type": "string",
+			"description": "Firebase App Check token"
 		}
 	]
 }