web sttarting

route/auth.py

@@ -1,10 +1,10 @@
 from fastapi import APIRouter, Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordRequestForm
 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 hash_password, verify_password, create_access_token
@@ -12,10 +12,9 @@ from route.auth_utils import hash_password, verify_password, create_access_token
 router = APIRouter(tags=["auth"], prefix="/auth")
 
 
-def _get_session():
-    settings = Settings()
-    engine = create_engine(settings.DATABASE_URL_syncpg, future=True)
-    return sessionmaker(bind=engine, future=True)
+def get_session():
+    from sqlalchemy.orm import sessionmaker
+    return sessionmaker(bind=make_engine(), future=True)
 
 
 class RegisterIn(BaseModel):
@@ -23,6 +22,8 @@ class RegisterIn(BaseModel):
     password: str
     first_name: str
     last_name: str
+    group_id: Optional[str] = None
+    organization_id: Optional[str] = None
 
     @field_validator("password")
     @classmethod
@@ -42,7 +43,7 @@ class RegisterIn(BaseModel):
 
 @router.post("/register", status_code=201)
 def register(payload: RegisterIn):
-    Session = _get_session()
+    Session = get_session()
     with Session() as session:
         existing = session.query(User).filter(User.username == payload.username).first()
         if existing:
@@ -52,6 +53,8 @@ def register(payload: RegisterIn):
             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()
@@ -61,7 +64,7 @@ def register(payload: RegisterIn):
 
 @router.post("/login")
 def login(form: OAuth2PasswordRequestForm = Depends()):
-    Session = _get_session()
+    Session = get_session()
     with Session() as session:
         user = session.query(User).filter(User.username == form.username).first()
         if not user or not verify_password(form.password, user.hashed_password):