changed user_id as UUID

app/nosql.py

@@ -41,7 +41,12 @@ class DatabaseConnection:
             
             logger.info(f"Connecting to MongoDB: {mongodb_uri}")
             
-            cls._client = AsyncIOMotorClient(mongodb_uri)
+
+            cls._client = AsyncIOMotorClient(
+                mongodb_uri,
+                uuidRepresentation="standard"
+            )
+            
             cls._db = cls._client[settings.MONGODB_DB_NAME]
             
             # Test the connection

app/system_users/controllers/router.py

@@ -1,3 +1,4 @@
+from uuid import UUID
 from pydantic import BaseModel, Field
 from fastapi import APIRouter, Depends, HTTPException, status, Request
 from fastapi.security import HTTPAuthorizationCredentials
@@ -436,7 +437,7 @@ async def list_users_with_projection(
 
 @router.get("/users/{user_id}", response_model=UserInfoResponse)
 async def get_user_by_id(
-    user_id: str,
+    user_id: UUID,
     current_user: SystemUserModel = Depends(require_admin_role),
     user_service: SystemUserService = Depends(get_system_user_service)
 ):
@@ -480,7 +481,7 @@ async def get_user_by_id(
 
 @router.put("/users/{user_id}", response_model=UserInfoResponse)
 async def update_user(
-    user_id: str,
+    user_id: UUID,
     update_data: UpdateUserRequest,
     current_user: SystemUserModel = Depends(require_admin_role),
     user_service: SystemUserService = Depends(get_system_user_service)
@@ -764,7 +765,7 @@ async def reset_password(
 
 @router.delete("/users/{user_id}", response_model=StandardResponse)
 async def deactivate_user(
-    user_id: str,
+    user_id: UUID,
     current_user: SystemUserModel = Depends(require_admin_role),
     user_service: SystemUserService = Depends(get_system_user_service)
 ):

app/system_users/models/model.py

@@ -4,6 +4,7 @@ Represents a system user with login credentials and permissions.
 """
 from datetime import datetime
 from typing import Optional, Dict, Any, List
+from uuid import UUID
 from pydantic import BaseModel, Field, EmailStr
 from enum import Enum
 
@@ -53,7 +54,7 @@ class SystemUserModel(BaseModel):
     System User data model for authentication and authorization.
     Represents the complete user document in MongoDB.
     """
-    user_id: str = Field(..., description="Unique user identifier (UUID/ULID)")
+    user_id: UUID = Field(..., description="Unique user identifier (UUID/ULID)")
     username: str = Field(..., description="Unique username (lowercase alphanumeric)")
     email: EmailStr = Field(..., description="User email address")
     merchant_id: str = Field(..., description="User Merchant Information")

app/system_users/schemas/schema.py

@@ -3,6 +3,7 @@ System User schemas for request/response models.
 """
 from datetime import datetime
 from typing import Optional, List, Dict, Any
+from uuid import UUID
 from pydantic import BaseModel, Field, EmailStr, validator
 from app.system_users.models.model import UserStatus, UserRole
 
@@ -24,7 +25,7 @@ class LoginResponse(BaseModel):
 
 class UserInfoResponse(BaseModel):
     """User information response schema."""
-    user_id: str = Field(..., description="Unique user identifier")
+    user_id: UUID = Field(..., description="Unique user identifier")
     username: str = Field(..., description="Username")
     email: str = Field(..., description="Email address")
     merchant_id: str = Field(..., description="Merchant ID")

app/system_users/services/service.py

@@ -4,6 +4,8 @@ System User service for authentication and user management.
 import secrets
 from datetime import datetime, timedelta
 from typing import Optional, List, Dict, Any, Tuple
+from uuid import UUID
+import uuid
 from motor.motor_asyncio import AsyncIOMotorDatabase
 from passlib.context import CryptContext
 from jose import JWTError, jwt
@@ -116,7 +118,7 @@ class SystemUserService:
             logger.warning(f"Token verification failed: {e}")
             return None
 
-    async def get_user_by_id(self, user_id: str) -> Optional[SystemUserModel]:
+    async def get_user_by_id(self, user_id: UUID) -> Optional[SystemUserModel]:
         """Get user by user_id."""
         try:
             user_doc = await self.collection.find_one({"user_id": user_id})
@@ -179,8 +181,8 @@ class SystemUserService:
                 )
             
             # Generate user ID
-            user_id = f"usr_{secrets.token_urlsafe(16)}"
-            
+            # user_id = f"usr_{secrets.token_urlsafe(16)}"
+            user_id=str(uuid.uuid4())
             # Hash password
             password_hash = self.get_password_hash(user_data.password)
             
@@ -194,7 +196,7 @@ class SystemUserService:
             
             # Create user model
             user_model = SystemUserModel(
-                user_id=user_id,
+                user_id=str(user_id),
                 username=user_data.username.lower(),
                 email=user_data.email.lower(),
                 merchant_id=user_data.merchant_id,
@@ -206,12 +208,17 @@ class SystemUserService:
                 role=user_data.role,
                 permissions=user_data.permissions,
                 status=UserStatus.ACTIVE,  # Set as active by default
-                created_by=created_by,
+                created_by=str(created_by),
                 created_at=datetime.utcnow()
             )
-            
-            # Insert to database
-            await self.collection.insert_one(user_model.model_dump())
+            doc = user_model.model_dump(by_alias=True, exclude_none=True)
+
+            # safety: convert UUID -> str if any slips through
+            for k, v in doc.items():
+                if isinstance(v, uuid.UUID):
+                    doc[k] = str(v)
+
+            await self.collection.insert_one(doc)
             
             logger.info(f"User created successfully: {user_id}")
             return user_model
@@ -470,7 +477,7 @@ class SystemUserService:
             "warning_threshold_days": warning_threshold
         }
 
-    async def mark_password_change_required(self, user_id: str, reason: str = "password_rotation") -> bool:
+    async def mark_password_change_required(self, user_id: UUID, reason: str = "password_rotation") -> bool:
         """
         Mark that a user must change their password.
         
@@ -519,7 +526,7 @@ class SystemUserService:
             logger.error(f"Error marking password change required for {user_id}: {e}")
             return False
 
-    async def record_password_change(self, user_id: str, changed_by: str = "user") -> bool:
+    async def record_password_change(self, user_id: UUID, changed_by: str = "user") -> bool:
         """
         Record password change for rotation policy compliance.
         
@@ -593,7 +600,7 @@ class SystemUserService:
             logger.error(f"Error updating user {user_id}: {e}")
             return None
 
-    async def change_password(self, user_id: str, current_password: str, new_password: str) -> bool:
+    async def change_password(self, user_id: UUID, current_password: str, new_password: str) -> bool:
         """Change user password."""
         try:
             user = await self.get_user_by_id(user_id)