Refactor services, tests, and mappers to align with the updated application-layer DTOs and mappers

Author: borys25ol

conduit/api/mappers/__init__.py

@@ -0,0 +1 @@
+"""API mappers for request/response conversions."""

conduit/api/mappers/article_mapper.py

@@ -0,0 +1,22 @@
+from conduit.api.schemas.requests.article import (
+    CreateArticleRequest,
+    UpdateArticleRequest,
+)
+from conduit.application.dtos.article import CreateArticleDTO, UpdateArticleDTO
+
+
+def request_to_create_article_dto(request: CreateArticleRequest) -> CreateArticleDTO:
+    return CreateArticleDTO(
+        title=request.article.title,
+        description=request.article.description,
+        body=request.article.body,
+        tags=request.article.tags,
+    )
+
+
+def request_to_update_article_dto(request: UpdateArticleRequest) -> UpdateArticleDTO:
+    return UpdateArticleDTO(
+        title=request.article.title,
+        description=request.article.description,
+        body=request.article.body,
+    )

conduit/api/mappers/comment_mapper.py

@@ -0,0 +1,6 @@
+from conduit.api.schemas.requests.comment import CreateCommentRequest
+from conduit.application.dtos.comment import CreateCommentDTO
+
+
+def request_to_create_comment_dto(request: CreateCommentRequest) -> CreateCommentDTO:
+    return CreateCommentDTO(body=request.comment.body)

conduit/api/mappers/user_mapper.py

@@ -0,0 +1,28 @@
+from conduit.api.schemas.requests.user import (
+    UserLoginRequest,
+    UserRegistrationRequest,
+    UserUpdateRequest,
+)
+from conduit.application.dtos.user import CreateUserDTO, LoginUserDTO, UpdateUserDTO
+
+
+def request_to_create_user_dto(request: UserRegistrationRequest) -> CreateUserDTO:
+    return CreateUserDTO(
+        username=request.user.username,
+        email=request.user.email,
+        password=request.user.password,
+    )
+
+
+def request_to_login_user_dto(request: UserLoginRequest) -> LoginUserDTO:
+    return LoginUserDTO(email=request.user.email, password=request.user.password)
+
+
+def request_to_update_user_dto(request: UserUpdateRequest) -> UpdateUserDTO:
+    return UpdateUserDTO(
+        email=request.user.email,
+        password=request.user.password,
+        username=request.user.username,
+        bio=request.user.bio,
+        image_url=request.user.image,
+    )

conduit/api/routes/article.py

@@ -1,6 +1,10 @@
 from fastapi import APIRouter
 from starlette import status
 
+from conduit.api.mappers.article_mapper import (
+    request_to_create_article_dto,
+    request_to_update_article_dto,
+)
 from conduit.api.schemas.requests.article import (
     CreateArticleRequest,
     UpdateArticleRequest,
@@ -87,7 +91,9 @@ async def create_article(
     Create new article.
     """
     article_dto = await article_service.create_new_article(
-        uow=uow, author_id=current_user.id, article_to_create=payload.to_dto()
+        uow=uow,
+        author_id=current_user.id,
+        article_to_create=request_to_create_article_dto(payload),
     )
     return ArticleResponse.from_dto(dto=article_dto)
 
@@ -106,7 +112,7 @@ async def update_article(
     article_dto = await article_service.update_article_by_slug(
         uow=uow,
         slug=slug,
-        article_to_update=payload.to_dto(),
+        article_to_update=request_to_update_article_dto(payload),
         current_user=current_user,
     )
     return ArticleResponse.from_dto(dto=article_dto)

conduit/api/routes/authentication.py

@@ -1,5 +1,9 @@
 from fastapi import APIRouter
 
+from conduit.api.mappers.user_mapper import (
+    request_to_create_user_dto,
+    request_to_login_user_dto,
+)
 from conduit.api.schemas.requests.user import UserLoginRequest, UserRegistrationRequest
 from conduit.api.schemas.responses.user import (
     UserLoginResponse,
@@ -20,7 +24,7 @@ async def register_user(
     Process user registration.
     """
     user_dto = await user_auth_service.sign_up_user(
-        uow=uow, user_to_create=payload.to_dto()
+        uow=uow, user_to_create=request_to_create_user_dto(payload)
     )
     return UserRegistrationResponse.from_dto(dto=user_dto)
 
@@ -33,6 +37,6 @@ async def login_user(
     Process user login.
     """
     user_dto = await user_auth_service.sign_in_user(
-        uow=uow, user_to_login=payload.to_dto()
+        uow=uow, user_to_login=request_to_login_user_dto(payload)
     )
     return UserLoginResponse.from_dto(dto=user_dto)

conduit/api/routes/comment.py

@@ -1,6 +1,7 @@
 from fastapi import APIRouter, Path
 from starlette import status
 
+from conduit.api.mappers.comment_mapper import request_to_create_comment_dto
 from conduit.api.schemas.requests.comment import CreateCommentRequest
 from conduit.api.schemas.responses.comment import CommentResponse, CommentsListResponse
 from conduit.core.dependencies import (
@@ -43,7 +44,7 @@ async def create_comment(
     comment_dto = await comment_service.create_article_comment(
         uow=uow,
         slug=slug,
-        comment_to_create=payload.to_dto(),
+        comment_to_create=request_to_create_comment_dto(payload),
         current_user=current_user,
     )
     return CommentResponse.from_dto(dto=comment_dto)

conduit/api/routes/users.py

@@ -1,5 +1,6 @@
 from fastapi import APIRouter
 
+from conduit.api.mappers.user_mapper import request_to_update_user_dto
 from conduit.api.schemas.requests.user import UserUpdateRequest
 from conduit.api.schemas.responses.user import CurrentUserResponse, UpdatedUserResponse
 from conduit.core.dependencies import CurrentUser, IUserService, JWTToken, UnitOfWork
@@ -29,6 +30,8 @@ async def update_current_user(
     Update current user.
     """
     updated_user_dto = await user_service.update_user(
-        uow=uow, current_user=current_user, user_to_update=payload.to_dto()
+        uow=uow,
+        current_user=current_user,
+        user_to_update=request_to_update_user_dto(payload),
     )
     return UpdatedUserResponse.from_dto(dto=updated_user_dto, token=token)

conduit/api/schemas/requests/article.py

@@ -1,7 +1,5 @@
 from pydantic import BaseModel, Field
 
-from conduit.domain.dtos.article import CreateArticleDTO, UpdateArticleDTO
-
 
 class ArticlesPagination(BaseModel):
     limit: int = Field(ge=1)
@@ -30,21 +28,6 @@ class UpdateArticleData(BaseModel):
 class UpdateArticleRequest(BaseModel):
     article: UpdateArticleData
 
-    def to_dto(self) -> UpdateArticleDTO:
-        return UpdateArticleDTO(
-            title=self.article.title,
-            description=self.article.description,
-            body=self.article.body,
-        )
-
 
 class CreateArticleRequest(BaseModel):
     article: CreateArticleData
-
-    def to_dto(self) -> CreateArticleDTO:
-        return CreateArticleDTO(
-            title=self.article.title,
-            description=self.article.description,
-            body=self.article.body,
-            tags=self.article.tags,
-        )

conduit/api/schemas/requests/comment.py

@@ -1,14 +1,9 @@
 from pydantic import BaseModel, Field
 
-from conduit.domain.dtos.comment import CreateCommentDTO
-
 
 class CreateCommentData(BaseModel):
     body: str = Field(..., min_length=1)
 
 
 class CreateCommentRequest(BaseModel):
     comment: CreateCommentData
-
-    def to_dto(self) -> CreateCommentDTO:
-        return CreateCommentDTO(body=self.comment.body)