rzmk/learnhouse
1
0
Fork 0
mirror of https://github.com/rzmk/learnhouse.git synced 2025-12-19 04:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: adapt to SQLModel 16 & SQLAlchemy 2.x

Browse source
This commit is contained in:
swve 2024-04-01 12:20:29 +02:00
parent 938c3a2349
commit c8f6aff996
24 changed files with 120 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/api/src/services/users/password_reset.py
View file

@ -93,9 +93,9 @@ async def send_reset_password_code(
ex=ttl,
)
user = UserRead.from_orm(user)
user = UserRead.model_validate(user)
org = OrganizationRead.from_orm(org)
org = OrganizationRead.model_validate(org)
# Send reset code via email
isEmailSent = send_password_reset_email(

14
apps/api/src/services/users/usergroups.py
View file

@ -22,7 +22,7 @@ async def create_usergroup(
usergroup_create: UserGroupCreate,
) -> UserGroupRead:
usergroup = UserGroup.from_orm(usergroup_create)
usergroup = UserGroup.model_validate(usergroup_create)
# RBAC check
await rbac_check(
@ -53,7 +53,7 @@ async def create_usergroup(
db_session.commit()
db_session.refresh(usergroup)
usergroup = UserGroupRead.from_orm(usergroup)
usergroup = UserGroupRead.model_validate(usergroup)
return usergroup
@ -83,7 +83,7 @@ async def read_usergroup_by_id(
db_session=db_session,
)
usergroup = UserGroupRead.from_orm(usergroup)
usergroup = UserGroupRead.model_validate(usergroup)
return usergroup
@ -125,7 +125,7 @@ async def get_users_linked_to_usergroup(
user = db_session.exec(statement).first()
users.append(user)
users = [UserRead.from_orm(user) for user in users]
users = [UserRead.model_validate(user) for user in users]
return users
@ -149,7 +149,7 @@ async def read_usergroups_by_org_id(
db_session=db_session,
)
usergroups = [UserGroupRead.from_orm(usergroup) for usergroup in usergroups]
usergroups = [UserGroupRead.model_validate(usergroup) for usergroup in usergroups]
return usergroups
@ -184,7 +184,7 @@ async def get_usergroups_by_resource(
usergroup = db_session.exec(statement).first()
usergroups.append(usergroup)
usergroups = [UserGroupRead.from_orm(usergroup) for usergroup in usergroups]
usergroups = [UserGroupRead.model_validate(usergroup) for usergroup in usergroups]
return usergroups
@ -223,7 +223,7 @@ async def update_usergroup_by_id(
db_session.commit()
db_session.refresh(usergroup)
usergroup = UserGroupRead.from_orm(usergroup)
usergroup = UserGroupRead.model_validate(usergroup)
return usergroup

26
apps/api/src/services/users/users.py
View file

@ -37,7 +37,7 @@ async def create_user(
user_object: UserCreate,
org_id: int,
):
user = User.from_orm(user_object)
user = User.model_validate(user_object)
# RBAC check
await rbac_check(request, current_user, "create", "user_x", db_session)
@ -104,7 +104,7 @@ async def create_user(
db_session.commit()
db_session.refresh(user_organization)
user = UserRead.from_orm(user)
user = UserRead.model_validate(user)
# Send Account creation email
send_account_creation_email(
@ -157,7 +157,7 @@ async def create_user_without_org(
current_user: PublicUser | AnonymousUser,
user_object: UserCreate,
):
user = User.from_orm(user_object)
user = User.model_validate(user_object)
# RBAC check
await rbac_check(request, current_user, "create", "user_x", db_session)
@ -201,7 +201,7 @@ async def create_user_without_org(
db_session.commit()
db_session.refresh(user)
user = UserRead.from_orm(user)
user = UserRead.model_validate(user)
# Send Account creation email
send_account_creation_email(
@ -270,7 +270,7 @@ async def update_user(
db_session.commit()
db_session.refresh(user)
user = UserRead.from_orm(user)
user = UserRead.model_validate(user)
return user
@ -315,7 +315,7 @@ async def update_user_avatar(
db_session.commit()
db_session.refresh(user)
user = UserRead.from_orm(user)
user = UserRead.model_validate(user)
return user
@ -354,7 +354,7 @@ async def update_user_password(
db_session.commit()
db_session.refresh(user)
user = UserRead.from_orm(user)
user = UserRead.model_validate(user)
return user
@ -378,7 +378,7 @@ async def read_user_by_id(
# RBAC check
await rbac_check(request, current_user, "read", user.user_uuid, db_session)
user = UserRead.from_orm(user)
user = UserRead.model_validate(user)
return user
@ -402,7 +402,7 @@ async def read_user_by_uuid(
# RBAC check
await rbac_check(request, current_user, "read", user.user_uuid, db_session)
user = UserRead.from_orm(user)
user = UserRead.model_validate(user)
return user
@ -422,7 +422,7 @@ async def get_user_session(
detail="User does not exist",
)
user = UserRead.from_orm(user)
user = UserRead.model_validate(user)
# Get roles and orgs
statement = (
@ -445,8 +445,8 @@ async def get_user_session(
roles.append(
UserRoleWithOrg(
role=RoleRead.from_orm(role),
org=OrganizationRead.from_orm(org),
role=RoleRead.model_validate(role),
org=OrganizationRead.model_validate(org),
)
)
@ -531,7 +531,7 @@ async def security_get_user(request: Request, db_session: Session, email: str) -
detail="User with Email does not exist",
)
user = User(**user.dict())
user = User(**user.model_dump())
return user