sync staff and system user IDs

app/system_users/schemas.py

@@ -12,14 +12,14 @@ class SystemUserCreateSchema(BaseModel):
     name: str
     email: EmailStr
     phone: str
-    status: str = Field(..., regex="^(active|inactive|on_leave|suspended|terminated)$")
+    status: str = Field(..., pattern="^(active|inactive|on_leave|suspended|terminated)$")
     role: str
 
 class SystemUserUpdateSchema(BaseModel):
     name: Optional[str] = None
     email: Optional[EmailStr] = None
     phone: Optional[str] = None
-    status: Optional[str] = Field(None, regex="^(active|inactive|on_leave|suspended|terminated)$")
+    status: Optional[str] = Field(None, pattern="^(active|inactive|on_leave|suspended|terminated)$")
     role: Optional[str] = None
 
 class SystemUserResponseSchema(BaseModel):

app/system_users/service.py

@@ -17,8 +17,7 @@ class SystemUserService:
         # Try to find existing user by staff_id and merchant_id
         user = await db[POS_SYSTEM_USERS_COLLECTION].find_one({
             "staff_id": str(payload.staff_id),
-            "merchant_id": str(payload.merchant_id),
-            "user_id": str(payload.user_id)
+            "merchant_id": str(payload.merchant_id)
         })
         if user:
             # Update existing user
@@ -35,8 +34,8 @@ class SystemUserService:
             )
             user_id = user["user_id"]
         else:
-            # Create new user
-            user_id = str(uuid4())
+            # Create new user with user_id from payload
+            user_id = str(payload.user_id)  # <-- system user ID
             await db[POS_SYSTEM_USERS_COLLECTION].insert_one({
                 "user_id": user_id,
                 "staff_id": str(payload.staff_id),