Refactor user repository and service to handle password hashing and align with new DTOs

Author: borys25ol

conduit/domain/dtos/user.py

@@ -48,6 +48,13 @@ class CreateUserDTO:
     password: str
 
 
+@dataclass(frozen=True)
+class CreateUserRecordDTO:
+    username: str
+    email: str
+    password_hash: str
+
+
 @dataclass(frozen=True)
 class LoginUserDTO:
     email: str
@@ -61,3 +68,12 @@ class UpdateUserDTO:
     password: str | None = None
     bio: str | None = None
     image_url: str | None = None
+
+
+@dataclass(frozen=True)
+class UpdateUserRecordDTO:
+    username: str | None = None
+    email: str | None = None
+    password_hash: str | None = None
+    bio: str | None = None
+    image_url: str | None = None

conduit/domain/repositories/user.py

@@ -2,14 +2,14 @@
 from collections.abc import Collection, Mapping
 from typing import Any
 
-from conduit.domain.dtos.user import CreateUserDTO, UpdateUserDTO, UserDTO
+from conduit.domain.dtos.user import CreateUserRecordDTO, UpdateUserRecordDTO, UserDTO
 
 
 class IUserRepository(abc.ABC):
     """User repository interface."""
 
     @abc.abstractmethod
-    async def add(self, session: Any, create_item: CreateUserDTO) -> UserDTO: ...
+    async def add(self, session: Any, create_item: CreateUserRecordDTO) -> UserDTO: ...
 
     @abc.abstractmethod
     async def get_or_none(self, session: Any, user_id: int) -> UserDTO | None: ...
@@ -40,5 +40,5 @@ async def get_by_username(self, session: Any, username: str) -> UserDTO: ...
 
     @abc.abstractmethod
     async def update(
-        self, session: Any, user_id: int, update_item: UpdateUserDTO
+        self, session: Any, user_id: int, update_item: UpdateUserRecordDTO
     ) -> UserDTO: ...

conduit/infrastructure/repositories/user.py

@@ -5,22 +5,23 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from conduit.core.exceptions import UserNotFoundException
-from conduit.domain.dtos.user import CreateUserDTO, UpdateUserDTO, UserDTO
+from conduit.domain.dtos.user import CreateUserRecordDTO, UpdateUserRecordDTO, UserDTO
 from conduit.domain.repositories.user import IUserRepository
 from conduit.infrastructure.models import User
-from conduit.services.password import get_password_hash
 
 
 class UserRepository(IUserRepository):
     """Repository for User model."""
 
-    async def add(self, session: AsyncSession, create_item: CreateUserDTO) -> UserDTO:
+    async def add(
+        self, session: AsyncSession, create_item: CreateUserRecordDTO
+    ) -> UserDTO:
         query = (
             insert(User)
             .values(
                 username=create_item.username,
                 email=create_item.email,
-                password_hash=get_password_hash(create_item.password),
+                password_hash=create_item.password_hash,
                 image_url="https://api.realworld.io/images/smiley-cyrus.jpeg",
                 bio="",
                 created_at=datetime.now(),
@@ -78,7 +79,7 @@ async def get_by_username(self, session: AsyncSession, username: str) -> UserDTO
         return self._to_user_dto(user)
 
     async def update(
-        self, session: AsyncSession, user_id: int, update_item: UpdateUserDTO
+        self, session: AsyncSession, user_id: int, update_item: UpdateUserRecordDTO
     ) -> UserDTO:
         query = (
             update(User)
@@ -90,8 +91,8 @@ async def update(
             query = query.values(username=update_item.username)
         if update_item.email is not None:
             query = query.values(email=update_item.email)
-        if update_item.password is not None:
-            query = query.values(password_hash=get_password_hash(update_item.password))
+        if update_item.password_hash is not None:
+            query = query.values(password_hash=update_item.password_hash)
         if update_item.bio is not None:
             query = query.values(bio=update_item.bio)
         if update_item.image_url is not None:

conduit/services/user.py

@@ -10,12 +10,15 @@
 )
 from conduit.domain.dtos.user import (
     CreateUserDTO,
+    CreateUserRecordDTO,
     UpdatedUserDTO,
     UpdateUserDTO,
+    UpdateUserRecordDTO,
     UserDTO,
 )
 from conduit.domain.repositories.user import IUserRepository
 from conduit.domain.services.user import IUserService
+from conduit.services.password import get_password_hash
 
 
 class UserService(IUserService):
@@ -37,9 +40,14 @@ async def create_user(
         ):
             raise UserNameAlreadyTakenException()
 
+        create_user_record = CreateUserRecordDTO(
+            username=user_to_create.username,
+            email=user_to_create.email,
+            password_hash=get_password_hash(user_to_create.password),
+        )
         try:
             return await self._user_repo.add(
-                session=session, create_item=user_to_create
+                session=session, create_item=create_user_record
             )
         except (NoResultFound, MultipleResultsFound) as exc:
             raise UserCreateException() from exc
@@ -78,8 +86,19 @@ async def update_user(
             ):
                 raise EmailAlreadyTakenException()
 
+        update_record = UpdateUserRecordDTO(
+            username=user_to_update.username,
+            email=user_to_update.email,
+            password_hash=(
+                get_password_hash(user_to_update.password)
+                if user_to_update.password is not None
+                else None
+            ),
+            bio=user_to_update.bio,
+            image_url=user_to_update.image_url,
+        )
         updated_user = await self._user_repo.update(
-            session=session, user_id=current_user.id, update_item=user_to_update
+            session=session, user_id=current_user.id, update_item=update_record
         )
         return UpdatedUserDTO(
             id=updated_user.id,

tests/api/routes/test_article.py

@@ -4,8 +4,8 @@
 
 from conduit.api.schemas.responses.article import ArticleResponse
 from conduit.domain.dtos.article import ArticleDTO
+from conduit.domain.services.user import IUserService
 from conduit.infrastructure.repositories.article import ArticleRepository
-from conduit.infrastructure.repositories.user import UserRepository
 from tests.utils import create_another_test_article, create_another_test_user
 
 
@@ -117,11 +117,11 @@ async def test_user_can_retrieve_article_if_exists(
 async def test_user_can_not_delete_foreign_article(
     authorized_test_client: AsyncClient,
     session: AsyncSession,
-    user_repository: UserRepository,
+    user_service: IUserService,
     article_repository: ArticleRepository,
 ) -> None:
     new_user = await create_another_test_user(
-        session=session, user_repository=user_repository
+        session=session, user_service=user_service
     )
     new_article = await create_another_test_article(
         session=session, article_repository=article_repository, author_id=new_user.id
@@ -134,11 +134,11 @@ async def test_user_can_not_delete_foreign_article(
 async def test_user_can_not_update_foreign_article(
     authorized_test_client: AsyncClient,
     session: AsyncSession,
-    user_repository: UserRepository,
+    user_service: IUserService,
     article_repository: ArticleRepository,
 ) -> None:
     new_user = await create_another_test_user(
-        session=session, user_repository=user_repository
+        session=session, user_service=user_service
     )
     new_article = await create_another_test_article(
         session=session, article_repository=article_repository, author_id=new_user.id

tests/api/routes/test_profile.py

@@ -4,7 +4,7 @@
 
 from conduit.api.schemas.responses.profile import ProfileResponse
 from conduit.domain.dtos.user import UserDTO
-from conduit.infrastructure.repositories.user import UserRepository
+from conduit.domain.services.user import IUserService
 from tests.utils import create_another_test_user
 
 
@@ -50,11 +50,11 @@ async def test_authenticated_user_cant_follow_own_profile(
 async def test_authenticated_user_cant_follow_another_profile(
     authorized_test_client: AsyncClient,
     test_user: UserDTO,
-    user_repository: UserRepository,
+    user_service: IUserService,
     session: AsyncSession,
 ) -> None:
     new_user = await create_another_test_user(
-        session=session, user_repository=user_repository
+        session=session, user_service=user_service
     )
     response = await authorized_test_client.post(
         url=f"/profiles/{new_user.username}/follow"
@@ -67,11 +67,11 @@ async def test_authenticated_user_cant_follow_another_profile(
 async def test_authenticated_user_cant_follow_already_followed_profile(
     authorized_test_client: AsyncClient,
     test_user: UserDTO,
-    user_repository: UserRepository,
+    user_service: IUserService,
     session: AsyncSession,
 ) -> None:
     new_user = await create_another_test_user(
-        session=session, user_repository=user_repository
+        session=session, user_service=user_service
     )
     response = await authorized_test_client.post(
         url=f"/profiles/{new_user.username}/follow"
@@ -88,11 +88,11 @@ async def test_authenticated_user_cant_follow_already_followed_profile(
 @pytest.mark.anyio
 async def test_authenticated_user_cant_unfollow_not_followed_profile(
     authorized_test_client: AsyncClient,
-    user_repository: UserRepository,
+    user_service: IUserService,
     session: AsyncSession,
 ) -> None:
     new_user = await create_another_test_user(
-        session=session, user_repository=user_repository
+        session=session, user_service=user_service
     )
     response = await authorized_test_client.delete(
         url=f"/profiles/{new_user.username}/follow"
@@ -103,11 +103,11 @@ async def test_authenticated_user_cant_unfollow_not_followed_profile(
 @pytest.mark.anyio
 async def test_authenticated_user_can_unfollow_followed_profile(
     authorized_test_client: AsyncClient,
-    user_repository: UserRepository,
+    user_service: IUserService,
     session: AsyncSession,
 ) -> None:
     new_user = await create_another_test_user(
-        session=session, user_repository=user_repository
+        session=session, user_service=user_service
     )
     response = await authorized_test_client.post(
         url=f"/profiles/{new_user.username}/follow"
@@ -125,11 +125,11 @@ async def test_authenticated_user_can_unfollow_followed_profile(
 @pytest.mark.anyio
 async def test_authenticated_user_can_unfollow_already_unfollowed_profile(
     authorized_test_client: AsyncClient,
-    user_repository: UserRepository,
+    user_service: IUserService,
     session: AsyncSession,
 ) -> None:
     new_user = await create_another_test_user(
-        session=session, user_repository=user_repository
+        session=session, user_service=user_service
     )
     response = await authorized_test_client.post(
         url=f"/profiles/{new_user.username}/follow"

tests/conftest.py

@@ -19,6 +19,7 @@
 from conduit.domain.dtos.user import CreateUserDTO, UserDTO
 from conduit.domain.repositories.article import IArticleRepository
 from conduit.domain.repositories.user import IUserRepository
+from conduit.domain.services.user import IUserService
 from conduit.infrastructure.models import Base
 
 SetupFixture: TypeAlias = None
@@ -100,6 +101,11 @@ def auth_token_service(di_container: Container) -> IAuthTokenService:
     return di_container.auth_token_service()
 
 
+@pytest.fixture
+def user_service(di_container: Container) -> IUserService:
+    return di_container.user_service()
+
+
 @pytest.fixture
 def user_to_create() -> CreateUserDTO:
     return CreateUserDTO(username="test", email="test@gmail.com", password="password")
@@ -131,11 +137,11 @@ def not_exists_user() -> UserDTO:
 
 @pytest.fixture
 async def test_user(
-    session: AsyncSession,
-    user_repository: IUserRepository,
-    user_to_create: CreateUserDTO,
+    session: AsyncSession, user_service: IUserService, user_to_create: CreateUserDTO
 ) -> UserDTO:
-    return await user_repository.add(session=session, create_item=user_to_create)
+    return await user_service.create_user(
+        session=session, user_to_create=user_to_create
+    )
 
 
 @pytest.fixture

tests/utils.py

@@ -2,17 +2,19 @@
 
 from conduit.domain.dtos.article import ArticleRecordDTO, CreateArticleDTO
 from conduit.domain.dtos.user import CreateUserDTO, UserDTO
+from conduit.domain.services.user import IUserService
 from conduit.infrastructure.repositories.article import ArticleRepository
-from conduit.infrastructure.repositories.user import UserRepository
 
 
 async def create_another_test_user(
-    session: AsyncSession, user_repository: UserRepository
+    session: AsyncSession, user_service: IUserService
 ) -> UserDTO:
     create_user_dto = CreateUserDTO(
         username="temp-user", email="temp-user@gmail.com", password="password"
     )
-    return await user_repository.add(session=session, create_item=create_user_dto)
+    return await user_service.create_user(
+        session=session, user_to_create=create_user_dto
+    )
 
 
 async def create_another_test_article(