web sttarting

route/users_crud.py

@@ -3,9 +3,7 @@ from pydantic import BaseModel, field_validator
 from typing import Optional
 import uuid
 
-from bd import Settings
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
+from bd import make_engine
 
 from bd.tables.users import User
 from route.auth_utils import get_current_user, require_admin_key, hash_password
@@ -18,6 +16,8 @@ class UserCreate(BaseModel):
     password: str
     first_name: str
     last_name: str
+    group_id: Optional[str] = None
+    organization_id: Optional[str] = None
 
     @field_validator("username")
     @classmethod
@@ -38,12 +38,24 @@ class UserCreate(BaseModel):
 class UserUpdate(BaseModel):
     first_name: Optional[str] = None
     last_name: Optional[str] = None
+    group_id: Optional[str] = None
+    organization_id: Optional[str] = None
 
 
 def get_session():
-    settings = Settings()
-    engine = create_engine(settings.DATABASE_URL_syncpg, future=True)
-    return sessionmaker(bind=engine, future=True)
+    from sqlalchemy.orm import sessionmaker
+    return sessionmaker(bind=make_engine(), future=True)
+
+
+def _user_dict(user: User) -> dict:
+    return {
+        "id": str(user.id),
+        "username": user.username,
+        "first_name": user.first_name,
+        "last_name": user.last_name,
+        "group_id": str(user.group_id) if user.group_id else None,
+        "organization_id": str(user.organization_id) if user.organization_id else None,
+    }
 
 
 @router.post("/", status_code=201, dependencies=[Depends(require_admin_key)])
@@ -58,11 +70,13 @@ def create_user(payload: UserCreate):
             last_name=payload.last_name.strip(),
             username=payload.username,
             hashed_password=hash_password(payload.password),
+            group_id=uuid.UUID(payload.group_id) if payload.group_id else None,
+            organization_id=uuid.UUID(payload.organization_id) if payload.organization_id else None,
         )
         session.add(user)
         session.commit()
         session.refresh(user)
-        return {"id": str(user.id), "username": user.username}
+        return _user_dict(user)
 
 
 @router.put("/{user_id}")
@@ -82,10 +96,14 @@ def update_user(user_id: str, payload: UserUpdate, current_user: User = Depends(
             user.first_name = payload.first_name
         if payload.last_name is not None:
             user.last_name = payload.last_name
+        if payload.group_id is not None:
+            user.group_id = uuid.UUID(payload.group_id)
+        if payload.organization_id is not None:
+            user.organization_id = uuid.UUID(payload.organization_id)
         session.add(user)
         session.commit()
         session.refresh(user)
-        return {"id": str(user.id), "first_name": user.first_name, "last_name": user.last_name}
+        return _user_dict(user)
 
 
 @router.delete("/{user_id}", status_code=204)
@@ -108,7 +126,15 @@ def delete_user(user_id: str, current_user: User = Depends(get_current_user)):
 
 @router.get("/me")
 def get_me(current_user: User = Depends(get_current_user)):
-    return {"id": str(current_user.id), "username": current_user.username, "first_name": current_user.first_name, "last_name": current_user.last_name}
+    return _user_dict(current_user)
+
+
+@router.get("/", dependencies=[Depends(require_admin_key)])
+def list_users():
+    Session = get_session()
+    with Session() as session:
+        rows = session.query(User).all()
+        return [_user_dict(u) for u in rows]
 
 
 @router.get("/{user_id}")
@@ -122,4 +148,4 @@ def get_user(user_id: str, current_user: User = Depends(get_current_user)):
         user = session.get(User, uid)
         if not user:
             raise HTTPException(status_code=404, detail="User not found")
-        return {"id": str(user.id), "first_name": user.first_name, "last_name": user.last_name}
+        return _user_dict(user)