sync

api/repositories/__init__.py

@@ -1,7 +1,3 @@
-from .repository import AbstractRepository
 from .user import UserRepository
 
-__all__ = (
-    "AbstractRepository",
-    "UserRepository",
-)
+__all__ = ("UserRepository",)

api/repositories/repository.py

@@ -1,23 +0,0 @@
-from abc import ABC, abstractmethod
-
-
-class AbstractRepository(ABC):
-    @abstractmethod
-    async def add_one(self, data: dict):
-        raise NotImplementedError()
-
-    @abstractmethod
-    async def find_all(self):
-        raise NotImplementedError()
-
-    @abstractmethod
-    async def find_one(self, filter: dict):
-        raise NotImplementedError()
-
-    @abstractmethod
-    async def update_one(self, filter: dict, data: dict):
-        raise NotImplementedError()
-
-    @abstractmethod
-    async def delete_one(self, filter: dict):
-        raise NotImplementedError()

api/repositories/user.py

@@ -2,22 +2,25 @@ from sqlalchemy import insert, select
 from sqlalchemy.ext.asyncio.session import AsyncSession
 
 from api.models import UserModel
-from api.repositories import AbstractRepository
+from api.schemas.user_schema import UserReadDTO, UserWriteDTO
 
 
-class UserRepository(AbstractRepository):
+class UserRepository:
     def __init__(self, session: AsyncSession):
         self.session = session
 
-    async def add_one(self, data: dict):
-        stmt = insert(UserModel).values(**data)
+    async def add_one(
+        self,
+        data: UserWriteDTO,
+    ):
+        stmt = insert(UserModel).values(**data.model_dump())
         res = await self.session.execute(stmt)
-        return res.scalar_one()
+        return UserReadDTO.model_validate(res.scalar_one())
 
     async def find_all(self):
         stmt = select(UserModel)
         res = await self.session.execute(stmt)
-        res = [row[0].to_read_model() for row in res.all()]
+        res = [UserReadDTO.model_validate(row) for row in res.scalars().all()]
         return res
 
     async def find_one(self, filter: dict):