Make v2 article methods as general

Author: borys25ol

conduit/api/routes/article.py

@@ -28,7 +28,7 @@ async def get_article_feed(
     """
     Get article feed from following users.
     """
-    articles_feed_dto = await article_service.get_articles_feed_v2(
+    articles_feed_dto = await article_service.get_articles_feed(
         session=session,
         current_user=current_user,
         limit=pagination.limit,
@@ -48,7 +48,7 @@ async def get_global_article_feed(
     """
     Get global article feed.
     """
-    articles_feed_dto = await article_service.get_articles_by_filters_v2(
+    articles_feed_dto = await article_service.get_articles_by_filters(
         session=session,
         current_user=current_user,
         tag=articles_filters.tag,

conduit/domain/repositories/article.py

@@ -36,26 +36,10 @@ async def update_by_slug(
     @abc.abstractmethod
     async def list_by_followings(
         self, session: Any, user_id: int, limit: int, offset: int
-    ) -> list[ArticleRecordDTO]: ...
-
-    @abc.abstractmethod
-    async def list_by_followings_v2(
-        self, session: Any, user_id: int, limit: int, offset: int
     ) -> list[ArticleDTO]: ...
 
     @abc.abstractmethod
     async def list_by_filters(
-        self,
-        session: Any,
-        limit: int,
-        offset: int,
-        tag: str | None = None,
-        author: str | None = None,
-        favorited: str | None = None,
-    ) -> list[ArticleRecordDTO]: ...
-
-    @abc.abstractmethod
-    async def list_by_filters_v2(
         self,
         session: Any,
         user_id: int | None,

conduit/domain/services/article.py

@@ -32,11 +32,6 @@ async def get_articles_feed(
         self, session: Any, current_user: UserDTO, limit: int, offset: int
     ) -> ArticlesFeedDTO: ...
 
-    @abc.abstractmethod
-    async def get_articles_feed_v2(
-        self, session: Any, current_user: UserDTO, limit: int, offset: int
-    ) -> ArticlesFeedDTO: ...
-
     @abc.abstractmethod
     async def get_articles_by_filters(
         self,
@@ -49,18 +44,6 @@ async def get_articles_by_filters(
         favorited: str | None = None,
     ) -> ArticlesFeedDTO: ...
 
-    @abc.abstractmethod
-    async def get_articles_by_filters_v2(
-        self,
-        session: Any,
-        current_user: UserDTO | None,
-        limit: int,
-        offset: int,
-        tag: str | None = None,
-        author: str | None = None,
-        favorited: str | None = None,
-    ) -> ArticlesFeedDTO: ...
-
     @abc.abstractmethod
     async def update_article_by_slug(
         self,

conduit/infrastructure/repositories/article.py

@@ -105,39 +105,6 @@ async def update_by_slug(
 
     async def list_by_followings(
         self, session: AsyncSession, user_id: int, limit: int, offset: int
-    ) -> list[ArticleRecordDTO]:
-        query = (
-            (
-                select(
-                    Article.id,
-                    Article.author_id,
-                    Article.slug,
-                    Article.title,
-                    Article.description,
-                    Article.body,
-                    Article.created_at,
-                    Article.updated_at,
-                    User.username,
-                    User.bio,
-                    User.image_url,
-                )
-            )
-            .join(
-                Follower,
-                (
-                    (Follower.following_id == Article.author_id)
-                    & (Follower.follower_id == user_id)
-                ),
-            )
-            .join(User, (User.id == Article.author_id))
-            .order_by(Article.created_at)
-        )
-        query = query.limit(limit).offset(offset)
-        articles = await session.execute(query)
-        return [self._article_mapper.to_dto(article) for article in articles]
-
-    async def list_by_followings_v2(
-        self, session: AsyncSession, user_id: int, limit: int, offset: int
     ) -> list[ArticleDTO]:
         query = (
             select(
@@ -201,66 +168,6 @@ async def list_by_followings_v2(
         return [self._to_article_dto(article) for article in articles]
 
     async def list_by_filters(
-        self,
-        session: AsyncSession,
-        limit: int,
-        offset: int,
-        tag: str | None = None,
-        author: str | None = None,
-        favorited: str | None = None,
-    ) -> list[ArticleRecordDTO]:
-        query = (
-            select(
-                Article.id,
-                Article.author_id,
-                Article.slug,
-                Article.title,
-                Article.description,
-                Article.body,
-                Article.created_at,
-                Article.updated_at,
-            )
-        ).order_by(Article.created_at)
-
-        if tag:
-            # fmt: off
-            query = query.join(
-                ArticleTag,
-                (Article.id == ArticleTag.article_id),
-            ).where(
-                ArticleTag.tag_id == select(Tag.id).where(
-                    Tag.tag == tag
-                ).scalar_subquery()
-            )
-            # fmt: on
-
-        if author:
-            # fmt: off
-            query = query.join(
-                User,
-                (User.id == Article.author_id)
-            ).where(
-                User.username == author
-            )
-            # fmt: on
-
-        if favorited:
-            # fmt: off
-            query = query.join(
-                Favorite,
-                (Favorite.article_id == Article.id)
-            ).where(
-                Favorite.user_id == select(User.id).where(
-                    User.username == favorited
-                ).scalar_subquery()
-            )
-            # fmt: on
-
-        query = query.limit(limit).offset(offset)
-        articles = await session.execute(query)
-        return [self._article_mapper.to_dto(article) for article in articles]
-
-    async def list_by_filters_v2(
         self,
         session: AsyncSession,
         user_id: int | None,

conduit/services/article.py

@@ -122,43 +122,6 @@ async def get_articles_by_filters(
         favorited: str | None = None,
     ) -> ArticlesFeedDTO:
         articles = await self._article_repo.list_by_filters(
-            session=session,
-            limit=limit,
-            offset=offset,
-            tag=tag,
-            author=author,
-            favorited=favorited,
-        )
-        profiles_map = await self._get_profiles_mapping(
-            session=session, articles=articles, current_user=current_user
-        )
-        articles_with_extra = [
-            await self._get_article_info(
-                session=session,
-                article=article,
-                profile=profiles_map[article.author_id],
-                user_id=current_user.id if current_user else None,
-            )
-            for article in articles
-        ]
-        articles_count = await self._article_repo.count_by_filters(
-            session=session, tag=tag, author=author, favorited=favorited
-        )
-        return ArticlesFeedDTO(
-            articles=articles_with_extra, articles_count=articles_count
-        )
-
-    async def get_articles_by_filters_v2(
-        self,
-        session: AsyncSession,
-        current_user: UserDTO | None,
-        limit: int,
-        offset: int,
-        tag: str | None = None,
-        author: str | None = None,
-        favorited: str | None = None,
-    ) -> ArticlesFeedDTO:
-        articles = await self._article_repo.list_by_filters_v2(
             session=session,
             user_id=current_user.id if current_user else None,
             limit=limit,
@@ -178,31 +141,6 @@ async def get_articles_feed(
         articles = await self._article_repo.list_by_followings(
             session=session, user_id=current_user.id, limit=limit, offset=offset
         )
-        profiles_map = await self._get_profiles_mapping(
-            session=session, articles=articles, current_user=current_user
-        )
-        articles_with_extra = [
-            await self._get_article_info(
-                session=session,
-                article=article,
-                profile=profiles_map[article.author_id],
-                user_id=current_user.id,
-            )
-            for article in articles
-        ]
-        articles_count = await self._article_repo.count_by_followings(
-            session=session, user_id=current_user.id
-        )
-        return ArticlesFeedDTO(
-            articles=articles_with_extra, articles_count=articles_count
-        )
-
-    async def get_articles_feed_v2(
-        self, session: AsyncSession, current_user: UserDTO, limit: int, offset: int
-    ) -> ArticlesFeedDTO:
-        articles = await self._article_repo.list_by_followings_v2(
-            session=session, user_id=current_user.id, limit=limit, offset=offset
-        )
         articles_count = await self._article_repo.count_by_followings(
             session=session, user_id=current_user.id
         )