refactor: Change merchant_id and service_id types from UUID to str for consistency across endpoints and schemas

app/appointments/controllers/router.py

@@ -2,7 +2,6 @@
 Appointments API router.
 """
 import logging
-import hashlib
 from uuid import UUID
 from typing import Optional
 from datetime import datetime
@@ -48,12 +47,8 @@ async def create_appointment_endpoint(
         if merchant_id is None:
             if not current_user.merchant_id:
                 raise HTTPException(status_code=400, detail="merchant_id must be provided in request or token")
-            # merchant_id from JWT token is a string, convert to UUID for database operations
-            try:
-                merchant_id = UUID(current_user.merchant_id)
-            except ValueError:
-                # If merchant_id is not a valid UUID, create a deterministic UUID from the string
-                merchant_id = UUID(bytes=hashlib.md5(current_user.merchant_id.encode()).digest()[:16])
+            # Use merchant_id directly as string from JWT token
+            merchant_id = current_user.merchant_id
         
         aid = await create_appointment(
             merchant_id=merchant_id,
@@ -75,7 +70,7 @@ async def create_appointment_endpoint(
 
 @router.post("/list", response_model=ListAppointmentsResponse)
 async def list_appointments_endpoint(
-    merchant_id: Optional[UUID] = None,
+    merchant_id: Optional[str] = None,
     start_from: Optional[datetime] = Query(None),
     start_to: Optional[datetime] = Query(None),
     staff_id: Optional[UUID] = Query(None),
@@ -89,12 +84,8 @@ async def list_appointments_endpoint(
     if merchant_id is None:
         if not current_user.merchant_id:
             raise HTTPException(status_code=400, detail="merchant_id must be provided in request or token")
-        # merchant_id from JWT token is a string, convert to UUID for database operations
-        try:
-            merchant_id = UUID(current_user.merchant_id)
-        except ValueError:
-            # If merchant_id is not a valid UUID, create a deterministic UUID from the string
-            merchant_id = UUID(bytes=hashlib.md5(current_user.merchant_id.encode()).digest()[:16])
+        # Use merchant_id directly as string from JWT token
+        merchant_id = current_user.merchant_id
     
     items, total = await list_appointments(
         merchant_id=merchant_id,

app/appointments/schemas/schema.py

@@ -15,7 +15,7 @@ class AppointmentServiceInput(BaseModel):
     service_price: Optional[float] = Field(default=None, ge=0)
 
 class CreateAppointmentRequest(BaseModel):
-    merchant_id: Optional[UUID] = None
+    merchant_id: Optional[str] = None
     source: str = Field(..., pattern="^(online|offline)$")
     booking_channel: Optional[str] = Field(None, pattern="^(app|web|walkin|phone|pos)$")
     customer_id: Optional[UUID] = None
@@ -45,7 +45,7 @@ class AppointmentServiceResponse(BaseModel):
 
 class AppointmentResponse(BaseModel):
     appointment_id: UUID
-    merchant_id: UUID
+    merchant_id: str
     source: str
     booking_channel: Optional[str]
     customer_id: Optional[UUID]

app/catalogue_services/controllers/router.py

@@ -2,9 +2,7 @@
 Catalogue Services API router - FastAPI endpoints for service catalogue CRUD.
 """
 import logging
-import hashlib
 from typing import Optional
-from uuid import UUID
 from fastapi import APIRouter, HTTPException, Query, status, Depends
 
 from app.dependencies.auth import TokenUser
@@ -44,12 +42,8 @@ async def create_service_endpoint(
         if merchant_id is None:
             if not current_user.merchant_id:
                 raise HTTPException(status_code=400, detail="merchant_id must be provided in request or token")
-            # merchant_id from JWT token is a string, convert to UUID for database operations
-            try:
-                merchant_id = UUID(current_user.merchant_id)
-            except ValueError:
-                # If merchant_id is not a valid UUID, create a deterministic UUID from the string
-                merchant_id = UUID(bytes=hashlib.md5(current_user.merchant_id.encode()).digest()[:16])
+            # Use merchant_id directly as string from JWT token
+            merchant_id = current_user.merchant_id
         
         doc = await create_service(
             merchant_id=merchant_id,
@@ -78,12 +72,8 @@ async def list_services_endpoint(
         if merchant_id is None:
             if not current_user.merchant_id:
                 raise HTTPException(status_code=400, detail="merchant_id must be provided in request or token")
-            # merchant_id from JWT token is a string, convert to UUID for database operations
-            try:
-                merchant_id = UUID(current_user.merchant_id)
-            except ValueError:
-                # If merchant_id is not a valid UUID, create a deterministic UUID from the string
-                merchant_id = UUID(bytes=hashlib.md5(current_user.merchant_id.encode()).digest()[:16])
+            # Use merchant_id directly as string from JWT token
+            merchant_id = current_user.merchant_id
         
         items, total = await list_services(
             merchant_id=merchant_id,
@@ -111,7 +101,7 @@ async def list_services_endpoint(
 
 @router.get("/{service_id}", response_model=ServiceResponse)
 async def get_service_endpoint(
-    service_id: UUID,
+    service_id: str,  # Changed from UUID to str
     current_user: TokenUser = Depends(require_pos_permission("retail_catalogue", "view"))
 ):
     doc = await get_service(service_id)
@@ -121,7 +111,7 @@ async def get_service_endpoint(
 
 @router.put("/{service_id}", response_model=ServiceResponse)
 async def update_service_endpoint(
-    service_id: UUID, 
+    service_id: str,  # Changed from UUID to str
     req: UpdateServiceRequest,
     current_user: TokenUser = Depends(require_pos_permission("retail_catalogue", "update"))
 ):
@@ -143,7 +133,7 @@ async def update_service_endpoint(
 
 @router.patch("/{service_id}/status", response_model=ServiceResponse)
 async def update_status_endpoint(
-    service_id: UUID, 
+    service_id: str,  # Changed from UUID to str
     req: UpdateStatusRequest,
     current_user: TokenUser = Depends(require_pos_permission("retail_catalogue", "update"))
 ):
@@ -155,7 +145,7 @@ async def update_status_endpoint(
 
 @router.delete("/{service_id}", response_model=ServiceResponse)
 async def delete_service_endpoint(
-    service_id: UUID,
+    service_id: str,  # Changed from UUID to str
     current_user: TokenUser = Depends(require_pos_permission("retail_catalogue", "delete"))
 ):
     try:
@@ -166,8 +156,8 @@ async def delete_service_endpoint(
 
 def _to_response(doc: dict) -> ServiceResponse:
     return ServiceResponse(
-        service_id=UUID(doc["_id"]) if isinstance(doc["_id"], str) else doc["_id"],
-        merchant_id=UUID(doc["merchant_id"]) if isinstance(doc["merchant_id"], str) else doc["merchant_id"],
+        service_id=doc["_id"],  # Keep as string, don't convert to UUID
+        merchant_id=doc["merchant_id"],  # Keep as string, don't convert to UUID
         name=doc["name"],
         code=doc["code"],
         category=doc.get("category"),

app/catalogue_services/schemas/schema.py

@@ -3,7 +3,6 @@ Pydantic schemas for Catalogue Services API.
 """
 from typing import Optional, List
 from pydantic import BaseModel, Field
-from uuid import UUID
 from datetime import datetime
 
 class CategoryInput(BaseModel):
@@ -11,7 +10,7 @@ class CategoryInput(BaseModel):
     name: str
 
 class CreateServiceRequest(BaseModel):
-    merchant_id: Optional[UUID] = None
+    merchant_id: Optional[str] = None
     name: str = Field(..., min_length=1, max_length=200)
     code: str = Field(..., min_length=1, max_length=50)
     category_id: Optional[str] = None
@@ -35,8 +34,8 @@ class UpdateStatusRequest(BaseModel):
     status: str = Field(..., pattern="^(active|inactive|archived)$")
 
 class ServiceResponse(BaseModel):
-    service_id: UUID
-    merchant_id: UUID
+    service_id: str  # Changed from UUID to str to handle string IDs
+    merchant_id: str
     name: str
     code: str
     category: Optional[dict] = None
@@ -49,7 +48,7 @@ class ServiceResponse(BaseModel):
     updated_at: datetime
 
 class ListServicesRequest(BaseModel):
-    merchant_id: Optional[UUID] = None
+    merchant_id: Optional[str] = None
     status: Optional[str] = Field(None, pattern="^(active|inactive|archived)$")
     category: Optional[str] = None
     skip: int = Field(0, ge=0)

app/catalogue_services/services/service.py

@@ -2,7 +2,7 @@
 Catalogue Services business logic: Mongo master + Postgres sync.
 """
 import logging
-from uuid import uuid4, UUID
+from uuid import uuid4
 from typing import Optional, List, Tuple
 from datetime import datetime
 from sqlalchemy import text
@@ -58,7 +58,7 @@ async def _sync_to_postgres(service_doc: dict):
             await session.rollback()
 
 async def create_service(
-    merchant_id: UUID,
+    merchant_id,  # Can be UUID or str
     name: str,
     code: str,
     category_id: Optional[str],
@@ -111,15 +111,15 @@ async def create_service(
     
     return doc
 
-async def get_service(service_id: UUID) -> Optional[dict]:
+async def get_service(service_id: str) -> Optional[dict]:  # Changed from UUID to str
     """Get service by ID from Mongo."""
     db = get_database()
     if db is None:
         raise RuntimeError("MongoDB not available")
-    return await db[CATALOGUE_SERVICES_COLLECTION].find_one({"_id": str(service_id)})
+    return await db[CATALOGUE_SERVICES_COLLECTION].find_one({"_id": service_id})
 
 async def list_services(
-    merchant_id: UUID,
+    merchant_id,  # Can be UUID or str
     status: Optional[str] = None,
     category: Optional[str] = None,
     skip: int = 0,
@@ -131,7 +131,9 @@ async def list_services(
     if db is None:
         raise RuntimeError("MongoDB not available")
     
-    query = {"merchant_id": str(merchant_id)}
+    # Convert merchant_id to string for consistent querying
+    merchant_id_str = str(merchant_id)
+    query = {"merchant_id": merchant_id_str}
     if status:
         query["status"] = status
     if category:
@@ -150,7 +152,7 @@ async def list_services(
     return items, total
 
 async def update_service(
-    service_id: UUID,
+    service_id: str,  # Changed from UUID to str
     name: Optional[str],
     code: Optional[str],
     category_id: Optional[str],
@@ -166,7 +168,7 @@ async def update_service(
         raise RuntimeError("MongoDB not available")
     
     # Check service exists and not archived
-    existing = await db[CATALOGUE_SERVICES_COLLECTION].find_one({"_id": str(service_id)})
+    existing = await db[CATALOGUE_SERVICES_COLLECTION].find_one({"_id": service_id})
     if not existing:
         raise ValueError("Service not found")
     if existing.get("status") == "archived":
@@ -177,7 +179,7 @@ async def update_service(
         dup = await db[CATALOGUE_SERVICES_COLLECTION].find_one({
             "merchant_id": existing["merchant_id"],
             "code": code,
-            "_id": {"$ne": str(service_id)}
+            "_id": {"$ne": service_id}
         })
         if dup:
             raise ValueError(f"Service code '{code}' already exists")
@@ -208,12 +210,12 @@ async def update_service(
         update_data["pricing"] = pricing
     
     await db[CATALOGUE_SERVICES_COLLECTION].update_one(
-        {"_id": str(service_id)},
+        {"_id": service_id},
         {"$set": update_data}
     )
     
     # Get updated doc
-    updated = await db[CATALOGUE_SERVICES_COLLECTION].find_one({"_id": str(service_id)})
+    updated = await db[CATALOGUE_SERVICES_COLLECTION].find_one({"_id": service_id})
     logger.info(f"Updated service {service_id} in MongoDB")
     
     # Sync to Postgres
@@ -221,22 +223,22 @@ async def update_service(
     
     return updated
 
-async def update_status(service_id: UUID, status: str) -> dict:
+async def update_status(service_id: str, status: str) -> dict:  # Changed from UUID to str
     """Update service status and sync."""
     db = get_database()
     if db is None:
         raise RuntimeError("MongoDB not available")
     
-    existing = await db[CATALOGUE_SERVICES_COLLECTION].find_one({"_id": str(service_id)})
+    existing = await db[CATALOGUE_SERVICES_COLLECTION].find_one({"_id": service_id})
     if not existing:
         raise ValueError("Service not found")
     
     await db[CATALOGUE_SERVICES_COLLECTION].update_one(
-        {"_id": str(service_id)},
+        {"_id": service_id},
         {"$set": {"status": status, "updated_at": datetime.utcnow()}}
     )
     
-    updated = await db[CATALOGUE_SERVICES_COLLECTION].find_one({"_id": str(service_id)})
+    updated = await db[CATALOGUE_SERVICES_COLLECTION].find_one({"_id": service_id})
     logger.info(f"Updated service {service_id} status to {status}")
     
     # Sync to Postgres
@@ -244,6 +246,6 @@ async def update_status(service_id: UUID, status: str) -> dict:
     
     return updated
 
-async def delete_service(service_id: UUID) -> dict:
+async def delete_service(service_id: str) -> dict:  # Changed from UUID to str
     """Soft delete service (archive) and sync."""
     return await update_status(service_id, "archived")