add logout logic and wip recap

backend/src/users/service.py

@@ -16,7 +16,7 @@ def get_all(
 def get_one(session: Session, user_id: int) -> models.UserPublic:
     return session.get(models.User, user_id)
 
-def get_or_create_roles(session: Session, role_names) -> list[models.ContractType]:
+def get_or_create_roles(session: Session, role_names: list[str]) -> list[models.ContractType]:
     statement = select(models.ContractType).where(models.ContractType.name.in_(role_names))
     existing = session.exec(statement).all()
     existing_roles = {role.name for role in existing}
@@ -37,6 +37,9 @@ def get_or_create_user(session: Session, user_create: models.UserCreate):
     statement = select(models.User).where(models.User.email == user_create.email)
     user = session.exec(statement).first()
     if user:
+        user_role_names = [r.name for r in user.roles]
+        if user_role_names != user_create.role_names or user.name != user_create.name:
+            user = update_one(session, user.id, user_create)
         return user
     user = create_one(session, user_create)
     return user
@@ -46,7 +49,6 @@ def get_roles(session: Session):
     return session.exec(statement.order_by(models.ContractType.name)).all()
 
 def create_one(session: Session, user: models.UserCreate) -> models.UserPublic:
-    print("USER CREATE", user)
     new_user = models.User(
         name=user.name,
         email=user.email
@@ -60,15 +62,20 @@ def create_one(session: Session, user: models.UserCreate) -> models.UserPublic:
     session.refresh(new_user)
     return new_user
 
-def update_one(session: Session, id: int, user: models.UserUpdate) -> models.UserPublic:
+def update_one(session: Session, id: int, user: models.UserCreate) -> models.UserPublic:
     statement = select(models.User).where(models.User.id == id)
     result = session.exec(statement)
     new_user = result.first()
     if not new_user:
         return None
-    user_updates = user.model_dump(exclude_unset=True)
+
+    user_updates = user.model_dump(exclude="role_names")
     for key, value in user_updates.items():
         setattr(new_user, key, value)
+
+    roles = get_or_create_roles(session, user.role_names)
+    new_user.roles = roles
+
     session.add(new_user)
     session.commit()
     session.refresh(new_user)
@@ -83,4 +90,4 @@ def delete_one(session: Session, id: int) -> models.UserPublic:
     result = models.UserPublic.model_validate(user)
     session.delete(user)
     session.commit()
-    return result
+    return result