Refactor services and repositories to consolidate session management under UnitOfWork

Author: borys25ol

conduit/api/routes/article.py

@@ -9,10 +9,10 @@
 from conduit.core.dependencies import (
     CurrentOptionalUser,
     CurrentUser,
-    DBSession,
     IArticleService,
     Pagination,
     QueryFilters,
+    UnitOfWork,
 )
 
 router = APIRouter()
@@ -21,15 +21,15 @@
 @router.get("/feed", response_model=ArticlesFeedResponse)
 async def get_article_feed(
     pagination: Pagination,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentUser,
     article_service: IArticleService,
 ) -> ArticlesFeedResponse:
     """
     Get article feed from following users.
     """
     articles_feed_dto = await article_service.get_articles_feed(
-        session=session,
+        uow=uow,
         current_user=current_user,
         limit=pagination.limit,
         offset=pagination.offset,
@@ -41,15 +41,15 @@ async def get_article_feed(
 async def get_global_article_feed(
     pagination: Pagination,
     articles_filters: QueryFilters,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentOptionalUser,
     article_service: IArticleService,
 ) -> ArticlesFeedResponse:
     """
     Get global article feed.
     """
     articles_feed_dto = await article_service.get_articles_by_filters(
-        session=session,
+        uow=uow,
         current_user=current_user,
         tag=articles_filters.tag,
         author=articles_filters.author,
@@ -63,31 +63,31 @@ async def get_global_article_feed(
 @router.get("/{slug}", response_model=ArticleResponse)
 async def get_article(
     slug: str,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentOptionalUser,
     article_service: IArticleService,
 ) -> ArticleResponse:
     """
     Get new article by slug.
     """
     article_dto = await article_service.get_article_by_slug(
-        session=session, slug=slug, current_user=current_user
+        uow=uow, slug=slug, current_user=current_user
     )
     return ArticleResponse.from_dto(dto=article_dto)
 
 
 @router.post("", response_model=ArticleResponse)
 async def create_article(
     payload: CreateArticleRequest,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentUser,
     article_service: IArticleService,
 ) -> ArticleResponse:
     """
     Create new article.
     """
     article_dto = await article_service.create_new_article(
-        session=session, author_id=current_user.id, article_to_create=payload.to_dto()
+        uow=uow, author_id=current_user.id, article_to_create=payload.to_dto()
     )
     return ArticleResponse.from_dto(dto=article_dto)
 
@@ -96,15 +96,15 @@ async def create_article(
 async def update_article(
     slug: str,
     payload: UpdateArticleRequest,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentUser,
     article_service: IArticleService,
 ) -> ArticleResponse:
     """
     Update an article.
     """
     article_dto = await article_service.update_article_by_slug(
-        session=session,
+        uow=uow,
         slug=slug,
         article_to_update=payload.to_dto(),
         current_user=current_user,
@@ -115,45 +115,45 @@ async def update_article(
 @router.delete("/{slug}", status_code=status.HTTP_204_NO_CONTENT)
 async def delete_article(
     slug: str,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentUser,
     article_service: IArticleService,
 ) -> None:
     """
     Delete an article by slug.
     """
     await article_service.delete_article_by_slug(
-        session=session, slug=slug, current_user=current_user
+        uow=uow, slug=slug, current_user=current_user
     )
 
 
 @router.post("/{slug}/favorite", response_model=ArticleResponse)
 async def favorite_article(
     slug: str,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentUser,
     article_service: IArticleService,
 ) -> ArticleResponse:
     """
     Favorite an article.
     """
     article_dto = await article_service.add_article_into_favorites(
-        session=session, slug=slug, current_user=current_user
+        uow=uow, slug=slug, current_user=current_user
     )
     return ArticleResponse.from_dto(dto=article_dto)
 
 
 @router.delete("/{slug}/favorite", response_model=ArticleResponse)
 async def unfavorite_article(
     slug: str,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentUser,
     article_service: IArticleService,
 ) -> ArticleResponse:
     """
     Unfavorite an article.
     """
     article_dto = await article_service.remove_article_from_favorites(
-        session=session, slug=slug, current_user=current_user
+        uow=uow, slug=slug, current_user=current_user
     )
     return ArticleResponse.from_dto(dto=article_dto)

conduit/api/routes/authentication.py

@@ -5,34 +5,34 @@
     UserLoginResponse,
     UserRegistrationResponse,
 )
-from conduit.core.dependencies import DBSession, IUserAuthService
+from conduit.core.dependencies import IUserAuthService, UnitOfWork
 
 router = APIRouter()
 
 
 @router.post("", response_model=UserRegistrationResponse)
 async def register_user(
     payload: UserRegistrationRequest,
-    session: DBSession,
+    uow: UnitOfWork,
     user_auth_service: IUserAuthService,
 ) -> UserRegistrationResponse:
     """
     Process user registration.
     """
     user_dto = await user_auth_service.sign_up_user(
-        session=session, user_to_create=payload.to_dto()
+        uow=uow, user_to_create=payload.to_dto()
     )
     return UserRegistrationResponse.from_dto(dto=user_dto)
 
 
 @router.post("/login", response_model=UserLoginResponse)
 async def login_user(
-    payload: UserLoginRequest, session: DBSession, user_auth_service: IUserAuthService
+    payload: UserLoginRequest, uow: UnitOfWork, user_auth_service: IUserAuthService
 ) -> UserLoginResponse:
     """
     Process user login.
     """
     user_dto = await user_auth_service.sign_in_user(
-        session=session, user_to_login=payload.to_dto()
+        uow=uow, user_to_login=payload.to_dto()
     )
     return UserLoginResponse.from_dto(dto=user_dto)

conduit/api/routes/comment.py

@@ -6,8 +6,8 @@
 from conduit.core.dependencies import (
     CurrentOptionalUser,
     CurrentUser,
-    DBSession,
     ICommentService,
+    UnitOfWork,
 )
 
 router = APIRouter()
@@ -16,15 +16,15 @@
 @router.get("/{slug}/comments", response_model=CommentsListResponse)
 async def get_comments(
     slug: str,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentOptionalUser,
     comment_service: ICommentService,
 ) -> CommentsListResponse:
     """
     Get comments for an article.
     """
     comment_list_dto = await comment_service.get_article_comments(
-        session=session, slug=slug, current_user=current_user
+        uow=uow, slug=slug, current_user=current_user
     )
     return CommentsListResponse.from_dto(dto=comment_list_dto)
 
@@ -33,15 +33,15 @@ async def get_comments(
 async def create_comment(
     slug: str,
     payload: CreateCommentRequest,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentUser,
     comment_service: ICommentService,
 ) -> CommentResponse:
     """
     Create a comment for an article.
     """
     comment_dto = await comment_service.create_article_comment(
-        session=session,
+        uow=uow,
         slug=slug,
         comment_to_create=payload.to_dto(),
         current_user=current_user,
@@ -52,7 +52,7 @@ async def create_comment(
 @router.delete("/{slug}/comments/{id}", status_code=status.HTTP_204_NO_CONTENT)
 async def delete_comment(
     slug: str,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentUser,
     comment_service: ICommentService,
     comment_id: int = Path(..., alias="id"),
@@ -61,5 +61,5 @@ async def delete_comment(
     Delete a comment for an article.
     """
     await comment_service.delete_article_comment(
-        session=session, slug=slug, comment_id=comment_id, current_user=current_user
+        uow=uow, slug=slug, comment_id=comment_id, current_user=current_user
     )

conduit/api/routes/profile.py

@@ -4,8 +4,8 @@
 from conduit.core.dependencies import (
     CurrentOptionalUser,
     CurrentUser,
-    DBSession,
     IProfileService,
+    UnitOfWork,
 )
 
 router = APIRouter()
@@ -14,52 +14,52 @@
 @router.get("/{username}", response_model=ProfileResponse)
 async def get_user_profile(
     username: str,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentOptionalUser,
     profile_service: IProfileService,
 ) -> ProfileResponse:
     """
     Return user profile information.
     """
     profile_dto = await profile_service.get_profile_by_username(
-        session=session, username=username, current_user=current_user
+        uow=uow, username=username, current_user=current_user
     )
     return ProfileResponse.from_dto(dto=profile_dto)
 
 
 @router.post("/{username}/follow", response_model=ProfileResponse)
 async def follow_username(
     username: str,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentUser,
     profile_service: IProfileService,
 ) -> ProfileResponse:
     """
     Follow profile with specific username.
     """
     await profile_service.follow_user(
-        session=session, username=username, current_user=current_user
+        uow=uow, username=username, current_user=current_user
     )
     profile_dto = await profile_service.get_profile_by_username(
-        session=session, username=username, current_user=current_user
+        uow=uow, username=username, current_user=current_user
     )
     return ProfileResponse.from_dto(dto=profile_dto)
 
 
 @router.delete("/{username}/follow", response_model=ProfileResponse)
 async def unfollow_username(
     username: str,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentUser,
     profile_service: IProfileService,
 ) -> ProfileResponse:
     """
     Unfollow profile with specific username
     """
     await profile_service.unfollow_user(
-        session=session, username=username, current_user=current_user
+        uow=uow, username=username, current_user=current_user
     )
     profile_dto = await profile_service.get_profile_by_username(
-        session=session, username=username, current_user=current_user
+        uow=uow, username=username, current_user=current_user
     )
     return ProfileResponse.from_dto(dto=profile_dto)

conduit/api/routes/tag.py

@@ -1,15 +1,15 @@
 from fastapi import APIRouter
 
 from conduit.api.schemas.responses.tag import TagsResponse
-from conduit.core.dependencies import DBSession, ITagService
+from conduit.core.dependencies import ITagService, UnitOfWork
 
 router = APIRouter()
 
 
 @router.get("", response_model=TagsResponse)
-async def get_all_tags(session: DBSession, tag_service: ITagService) -> TagsResponse:
+async def get_all_tags(uow: UnitOfWork, tag_service: ITagService) -> TagsResponse:
     """
     Return available all tags.
     """
-    tags = await tag_service.get_all_tags(session=session)
+    tags = await tag_service.get_all_tags(uow=uow)
     return TagsResponse.from_dtos(dtos=tags)

conduit/api/routes/users.py

@@ -2,7 +2,7 @@
 
 from conduit.api.schemas.requests.user import UserUpdateRequest
 from conduit.api.schemas.responses.user import CurrentUserResponse, UpdatedUserResponse
-from conduit.core.dependencies import CurrentUser, DBSession, IUserService, JWTToken
+from conduit.core.dependencies import CurrentUser, IUserService, JWTToken, UnitOfWork
 
 router = APIRouter()
 
@@ -21,14 +21,14 @@ async def get_current_user(
 async def update_current_user(
     payload: UserUpdateRequest,
     token: JWTToken,
-    session: DBSession,
+    uow: UnitOfWork,
     current_user: CurrentUser,
     user_service: IUserService,
 ) -> UpdatedUserResponse:
     """
     Update current user.
     """
     updated_user_dto = await user_service.update_user(
-        session=session, current_user=current_user, user_to_update=payload.to_dto()
+        uow=uow, current_user=current_user, user_to_update=payload.to_dto()
     )
     return UpdatedUserResponse.from_dto(dto=updated_user_dto, token=token)