♻️ refactor: base schema

Author: Zerohertz

app/schemas/base.py

@@ -8,11 +8,11 @@
 from app.core.configs import configs
 
 
-class BaseSchemaRequest(BaseModel, abc.ABC):
+class BaseRequest(BaseModel, abc.ABC):
     model_config = ConfigDict(from_attributes=True)
 
 
-class BaseSchemaResponse(BaseModel, abc.ABC):
+class BaseResponse(BaseModel, abc.ABC):
     model_config = ConfigDict(from_attributes=True)
     id: int
     created_at: datetime

app/schemas/users.py

@@ -1,10 +1,10 @@
 from typing import Optional
 
 from app.models.enums import OAuthProvider, Role
-from app.schemas.base import BaseSchemaRequest, BaseSchemaResponse
+from app.schemas.base import BaseRequest, BaseResponse
 
 
-class UserRequest(BaseSchemaRequest):
+class UserRequest(BaseRequest):
     name: str
     # TODO: Email 검증
     email: str
@@ -14,18 +14,18 @@ class UserRegisterRequest(UserRequest):
     password: str
 
 
-class UserPasswordRequest(BaseSchemaRequest):
+class UserPasswordRequest(BaseRequest):
     email: str
     password: str
 
 
-class UserPatchRequest(BaseSchemaRequest):
+class UserPatchRequest(BaseRequest):
     name: Optional[str] = None
     email: Optional[str] = None
     password: Optional[str] = None
 
 
-class UserResponse(BaseSchemaResponse):
+class UserResponse(BaseResponse):
     name: str
     email: str
     oauth: OAuthProvider

app/services/base.py

@@ -3,7 +3,7 @@
 from app.core.database import database
 from app.models.base import BaseModel
 from app.repositories.base import BaseRepository
-from app.schemas.base import BaseSchemaRequest, BaseSchemaResponse
+from app.schemas.base import BaseRequest, BaseResponse
 
 T = TypeVar("T", bound=BaseModel)
 
@@ -13,51 +13,47 @@ def __init__(self, repository: BaseRepository[T]) -> None:
         self.repository = repository
 
     @overload
-    def mapper(self, data: BaseSchemaRequest) -> T: ...
+    def mapper(self, data: BaseRequest) -> T: ...
 
     @overload
-    def mapper(self, data: T) -> BaseSchemaResponse: ...
+    def mapper(self, data: T) -> BaseResponse: ...
 
-    def mapper(self, data: BaseSchemaRequest | T) -> T | BaseSchemaResponse:
-        if isinstance(data, BaseSchemaRequest):
+    def mapper(self, data: BaseRequest | T) -> T | BaseResponse:
+        if isinstance(data, BaseRequest):
             return self.repository.model(**data.model_dump())
-        return BaseSchemaResponse.model_validate(data)
+        return BaseResponse.model_validate(data)
 
     @database.transactional
-    async def create(self, schema: BaseSchemaRequest) -> BaseSchemaResponse:
+    async def create(self, schema: BaseRequest) -> BaseResponse:
         entity = self.mapper(schema)
         entity = await self.repository.create(entity=entity)
         return self.mapper(entity)
 
     @database.transactional
-    async def get_by_id(self, id: int) -> BaseSchemaResponse:
+    async def get_by_id(self, id: int) -> BaseResponse:
         entity = await self.repository.read_by_id(id=id)
         return self.mapper(entity)
 
     @database.transactional
-    async def put_by_id(self, id: int, schema: BaseSchemaRequest) -> BaseSchemaResponse:
+    async def put_by_id(self, id: int, schema: BaseRequest) -> BaseResponse:
         entity = await self.repository.update_by_id(id=id, data=schema.model_dump())
         return self.mapper(entity)
 
     @database.transactional
-    async def patch_by_id(
-        self, id: int, schema: BaseSchemaRequest
-    ) -> BaseSchemaResponse:
+    async def patch_by_id(self, id: int, schema: BaseRequest) -> BaseResponse:
         entity = await self.repository.update_by_id(
             id=id, data=schema.model_dump(exclude_none=True)
         )
         return self.mapper(entity)
 
     @database.transactional
-    async def patch_attr_by_id(
-        self, id: int, attr: str, value: Any
-    ) -> BaseSchemaResponse:
+    async def patch_attr_by_id(self, id: int, attr: str, value: Any) -> BaseResponse:
         entity = await self.repository.update_attr_by_id(
             id=id, column=attr, value=value
         )
         return self.mapper(entity)
 
     @database.transactional
-    async def delete_by_id(self, id: int) -> BaseSchemaResponse:
+    async def delete_by_id(self, id: int) -> BaseResponse:
         entity = await self.repository.delete_by_id(id=id)
         return self.mapper(entity)

app/services/users.py

@@ -14,7 +14,7 @@
 from app.models.users import User
 from app.repositories.users import UserRepository
 from app.schemas.auth import JwtAccessToken, JwtRefreshToken, JwtToken
-from app.schemas.base import BaseSchemaRequest
+from app.schemas.base import BaseRequest
 from app.schemas.users import (
     UserIn,
     UserOut,
@@ -36,13 +36,13 @@ def __init__(self, user_repository: UserRepository):
         self.github_service = GitHubService()
 
     @overload
-    def mapper(self, data: BaseSchemaRequest) -> User: ...
+    def mapper(self, data: BaseRequest) -> User: ...
 
     @overload
     def mapper(self, data: User) -> UserResponse: ...
 
-    def mapper(self, data: BaseSchemaRequest | User) -> User | UserResponse:
-        if isinstance(data, BaseSchemaRequest):
+    def mapper(self, data: BaseRequest | User) -> User | UserResponse:
+        if isinstance(data, BaseRequest):
             return self.repository.model(**data.model_dump())
         return UserResponse.model_validate(data)