Refactor: move static DTO mapping methods to consistent positions within each class

Author: borys25ol

conduit/infrastructure/repositories/article.py

@@ -29,40 +29,6 @@
 
 
 class ArticleRepository(IArticleRepository):
-    @staticmethod
-    def _to_article_record_dto(model: Article) -> ArticleRecordDTO:
-        return ArticleRecordDTO(
-            id=model.id,
-            author_id=model.author_id,
-            slug=model.slug,
-            title=model.title,
-            description=model.description,
-            body=model.body,
-            created_at=model.created_at,
-            updated_at=model.updated_at,
-        )
-
-    @staticmethod
-    def _to_article_feed_record_dto(res: Any) -> ArticleFeedRecordDTO:
-        tags = res.tags.split(", ") if res.tags else []
-        return ArticleFeedRecordDTO(
-            id=res.id,
-            author_id=res.author_id,
-            slug=res.slug,
-            title=res.title,
-            description=res.description,
-            body=res.body,
-            tags=tags,
-            author_username=res.username,
-            author_bio=res.bio,
-            author_image=res.image,
-            author_following=res.following,
-            created_at=res.created_at,
-            updated_at=res.updated_at,
-            favorited=res.favorited,
-            favorites_count=res.favorites_count,
-        )
-
     async def add(
         self, session: AsyncSession, author_id: int, create_item: CreateArticleDTO
     ) -> ArticleRecordDTO:
@@ -329,3 +295,37 @@ async def count_by_filters(
 
         result = await session.execute(query)
         return int(result.scalar_one())
+
+    @staticmethod
+    def _to_article_record_dto(model: Article) -> ArticleRecordDTO:
+        return ArticleRecordDTO(
+            id=model.id,
+            author_id=model.author_id,
+            slug=model.slug,
+            title=model.title,
+            description=model.description,
+            body=model.body,
+            created_at=model.created_at,
+            updated_at=model.updated_at,
+        )
+
+    @staticmethod
+    def _to_article_feed_record_dto(res: Any) -> ArticleFeedRecordDTO:
+        tags = res.tags.split(", ") if res.tags else []
+        return ArticleFeedRecordDTO(
+            id=res.id,
+            author_id=res.author_id,
+            slug=res.slug,
+            title=res.title,
+            description=res.description,
+            body=res.body,
+            tags=tags,
+            author_username=res.username,
+            author_bio=res.bio,
+            author_image=res.image,
+            author_following=res.following,
+            created_at=res.created_at,
+            updated_at=res.updated_at,
+            favorited=res.favorited,
+            favorites_count=res.favorites_count,
+        )

conduit/infrastructure/repositories/article_tag.py

@@ -12,10 +12,6 @@
 class ArticleTagRepository(IArticleTagRepository):
     """Repository for Article Tag model."""
 
-    @staticmethod
-    def _to_tag_record_dto(model: Tag) -> TagRecordDTO:
-        return TagRecordDTO(id=model.id, tag=model.tag, created_at=model.created_at)
-
     async def add_many(
         self, session: AsyncSession, article_id: int, tags: list[str]
     ) -> list[TagRecordDTO]:
@@ -58,3 +54,7 @@ async def list(self, session: AsyncSession, article_id: int) -> list[TagRecordDT
         )
         tags = await session.scalars(query)
         return [self._to_tag_record_dto(tag) for tag in tags]
+
+    @staticmethod
+    def _to_tag_record_dto(model: Tag) -> TagRecordDTO:
+        return TagRecordDTO(id=model.id, tag=model.tag, created_at=model.created_at)

conduit/infrastructure/repositories/comment.py

@@ -12,17 +12,6 @@
 
 
 class CommentRepository(ICommentRepository):
-    @staticmethod
-    def _to_comment_record_dto(model: Comment) -> CommentRecordDTO:
-        return CommentRecordDTO(
-            id=model.id,
-            body=model.body,
-            author_id=model.author_id,
-            article_id=model.article_id,
-            created_at=model.created_at,
-            updated_at=model.updated_at,
-        )
-
     async def add(
         self,
         session: AsyncSession,
@@ -72,3 +61,14 @@ async def count(self, session: AsyncSession, article_id: int) -> int:
         query = select(count(Comment.id)).where(Comment.article_id == article_id)
         result = await session.execute(query)
         return result.scalar_one()
+
+    @staticmethod
+    def _to_comment_record_dto(model: Comment) -> CommentRecordDTO:
+        return CommentRecordDTO(
+            id=model.id,
+            body=model.body,
+            author_id=model.author_id,
+            article_id=model.article_id,
+            created_at=model.created_at,
+            updated_at=model.updated_at,
+        )

conduit/infrastructure/repositories/tag.py

@@ -9,11 +9,11 @@
 class TagRepository(ITagRepository):
     """Repository for Tag model."""
 
-    @staticmethod
-    def _to_tag_record_dto(model: Tag) -> TagRecordDTO:
-        return TagRecordDTO(id=model.id, tag=model.tag, created_at=model.created_at)
-
     async def list(self, session: AsyncSession) -> list[TagRecordDTO]:
         query = select(Tag)
         tags = await session.scalars(query)
         return [self._to_tag_record_dto(tag) for tag in tags]
+
+    @staticmethod
+    def _to_tag_record_dto(model: Tag) -> TagRecordDTO:
+        return TagRecordDTO(id=model.id, tag=model.tag, created_at=model.created_at)