Encapsulate logic in value objects

Author: ivan-borovets

src/app/application/commands/activate_user.py

@@ -19,7 +19,7 @@
 from app.domain.enums.user_role import UserRole
 from app.domain.exceptions.user import UserNotFoundByUsernameError
 from app.domain.services.user import UserService
-from app.domain.value_objects.username.username import Username
+from app.domain.value_objects.username import Username
 
 log = logging.getLogger(__name__)
 

src/app/application/commands/change_password.py

@@ -18,8 +18,8 @@
 from app.domain.entities.user import User
 from app.domain.exceptions.user import UserNotFoundByUsernameError
 from app.domain.services.user import UserService
-from app.domain.value_objects.raw_password.raw_password import RawPassword
-from app.domain.value_objects.username.username import Username
+from app.domain.value_objects.raw_password import RawPassword
+from app.domain.value_objects.username import Username
 
 log = logging.getLogger(__name__)
 

src/app/application/commands/create_user.py

@@ -19,8 +19,8 @@
 from app.domain.enums.user_role import UserRole
 from app.domain.exceptions.user import UsernameAlreadyExistsError
 from app.domain.services.user import UserService
-from app.domain.value_objects.raw_password.raw_password import RawPassword
-from app.domain.value_objects.username.username import Username
+from app.domain.value_objects.raw_password import RawPassword
+from app.domain.value_objects.username import Username
 
 log = logging.getLogger(__name__)
 

src/app/application/commands/deactivate_user.py

@@ -20,7 +20,7 @@
 from app.domain.enums.user_role import UserRole
 from app.domain.exceptions.user import UserNotFoundByUsernameError
 from app.domain.services.user import UserService
-from app.domain.value_objects.username.username import Username
+from app.domain.value_objects.username import Username
 
 log = logging.getLogger(__name__)
 

src/app/application/commands/grant_admin.py

@@ -17,7 +17,7 @@
 from app.domain.enums.user_role import UserRole
 from app.domain.exceptions.user import UserNotFoundByUsernameError
 from app.domain.services.user import UserService
-from app.domain.value_objects.username.username import Username
+from app.domain.value_objects.username import Username
 
 log = logging.getLogger(__name__)
 

src/app/application/commands/revoke_admin.py

@@ -15,7 +15,7 @@
 from app.domain.enums.user_role import UserRole
 from app.domain.exceptions.user import UserNotFoundByUsernameError
 from app.domain.services.user import UserService
-from app.domain.value_objects.username.username import Username
+from app.domain.value_objects.username import Username
 
 log = logging.getLogger(__name__)
 

src/app/application/common/ports/user_command_gateway.py

@@ -3,7 +3,7 @@
 
 from app.domain.entities.user import User
 from app.domain.value_objects.user_id import UserId
-from app.domain.value_objects.username.username import Username
+from app.domain.value_objects.username import Username
 
 
 class UserCommandGateway(Protocol):

src/app/domain/entities/user.py

@@ -4,7 +4,7 @@
 from app.domain.enums.user_role import UserRole
 from app.domain.value_objects.user_id import UserId
 from app.domain.value_objects.user_password_hash import UserPasswordHash
-from app.domain.value_objects.username.username import Username
+from app.domain.value_objects.username import Username
 
 
 @dataclass(eq=False, kw_only=True)

src/app/domain/exceptions/user.py

@@ -2,7 +2,7 @@
 
 from app.domain.enums.user_role import UserRole
 from app.domain.exceptions.base import DomainError
-from app.domain.value_objects.username.username import Username
+from app.domain.value_objects.username import Username
 
 
 class UsernameAlreadyExistsError(DomainError):

src/app/domain/ports/password_hasher.py

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 from typing import Protocol
 
-from app.domain.value_objects.raw_password.raw_password import RawPassword
+from app.domain.value_objects.raw_password import RawPassword
 
 
 class PasswordHasher(Protocol):