Changed how new users are added to a default organization

Author: kevinjnev

backend/app/api/routes/private.py

@@ -3,10 +3,10 @@
 from fastapi import APIRouter
 from pydantic import BaseModel
 
+from app import crud
 from app.api.deps import SessionDep
-from app.core.security import get_password_hash
 from app.models import (
-    User,
+    UserCreate,
     UserPublic,
 )
 
@@ -26,13 +26,11 @@ def create_user(user_in: PrivateUserCreate, session: SessionDep) -> Any:
     Create a new user.
     """
 
-    user = User(
+    user_create = UserCreate(
         email=user_in.email,
         full_name=user_in.full_name,
-        hashed_password=get_password_hash(user_in.password),
+        password=user_in.password,
     )
 
-    session.add(user)
-    session.commit()
-
+    user = crud.create_user(session=session, user_create=user_create)
     return user

backend/app/api/routes/users.py

@@ -152,15 +152,6 @@ def register_user(session: SessionDep, user_in: UserRegister) -> Any:
         )
     user_create = UserCreate.model_validate(user_in)
     user = crud.create_user(session=session, user_create=user_create)
-    
-    # Assign user to default organization
-    default_org = crud.get_default_organization(session=session)
-    if default_org:
-        user.organization_id = default_org.id
-        session.add(user)
-        session.commit()
-        session.refresh(user)
-    
     return user
 
 

backend/app/crud.py

@@ -31,6 +31,16 @@ def create_user(*, session: Session, user_create: UserCreate) -> User:
     session.add(db_obj)
     session.commit()
     session.refresh(db_obj)
+
+    # Automatically assign user to default organization if not already assigned
+    if not db_obj.organization_id:
+        default_org = get_default_organization(session=session)
+        if default_org:
+            db_obj.organization_id = default_org.id
+            session.add(db_obj)
+            session.commit()
+            session.refresh(db_obj)
+
     return db_obj