diff --git a/src/repository/base.py b/src/repository/base.py index 24ce697..3f8d378 100644 --- a/src/repository/base.py +++ b/src/repository/base.py @@ -21,6 +21,12 @@ class BaseRepo: result = await self.session.execute(query) model = result.scalars().one_or_none() return model + + async def get_all(self) -> list[model]: + query = select(self.model) + result = await self.session.execute(query) + models = result.scalars().all() + return models async def delete_one(self, **filter_by) -> None: await self.session.execute(delete(self.model).filter_by(**filter_by)) diff --git a/src/repository/users.py b/src/repository/users.py index 155951b..0cd236e 100644 --- a/src/repository/users.py +++ b/src/repository/users.py @@ -1,4 +1,4 @@ -from sqlalchemy import select, update +from sqlalchemy import update from src.models import UsersORM from src.repository.base import BaseRepo @@ -7,12 +7,6 @@ from src.repository.base import BaseRepo class UsersRepo(BaseRepo): model = UsersORM - async def get_all_users(self) -> list[UsersORM]: - query = select(self.model) - result = await self.session.execute(query) - models = result.scalars().all() - return models - async def update_one(self, id: int, data: dict) -> UsersORM: stmt = ( update(self.model) diff --git a/src/services/users.py b/src/services/users.py index 5f921fb..38140f5 100644 --- a/src/services/users.py +++ b/src/services/users.py @@ -24,7 +24,7 @@ class UserService(BaseService): return user async def get_all_users(self) -> list[User]: - users = await self.session.user.get_all_users() + users = await self.session.user.get_all() return [User.model_validate(user) for user in users] async def delete_user(self, id: int) -> None: