From a7f8683b31904d7d63e42ad169bef005ce4feacf Mon Sep 17 00:00:00 2001 From: andrei Date: Mon, 7 Oct 2024 17:03:29 +0500 Subject: [PATCH] ._. --- app/infrastructure/database/repository/user_repository.py | 4 +++- app/infrastructure/fastapi/user_routes.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/infrastructure/database/repository/user_repository.py b/app/infrastructure/database/repository/user_repository.py index a6bbb99..dee8d1d 100644 --- a/app/infrastructure/database/repository/user_repository.py +++ b/app/infrastructure/database/repository/user_repository.py @@ -18,7 +18,9 @@ class UsersRepository: return self.db.query(User).filter(User.id == user_id).first() def get_by_login(self, user_login: str): - return self.db.query(User).filter(User.login == user_login).first() + return self.db.query(User).filter(User.login == user_login) \ + .options(joinedload(User.role)) \ + .first() def create(self, user: User): self.db.add(user) diff --git a/app/infrastructure/fastapi/user_routes.py b/app/infrastructure/fastapi/user_routes.py index d435049..2fbf316 100644 --- a/app/infrastructure/fastapi/user_routes.py +++ b/app/infrastructure/fastapi/user_routes.py @@ -74,6 +74,8 @@ def login(form_data: OAuth2PasswordRequestForm = Depends(), db: Session = Depend "token_type": "bearer", "user": { "id": user.id, - "login": user.login + "login": user.login, + "role_id": user.role.id, + "role_name": user.role.name, } }