refactor folder structure

n1nj4t4nuk1 · Dec 6, 2021 · fa70c49 · fa70c49
1 parent 3c5e24f
commit fa70c49
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 18 deletions.
diff --git a/src/apps/backoffice/controllers/UsersGetController.py b/src/apps/backoffice/controllers/UsersGetController.py
@@ -3,7 +3,7 @@
 from http import HTTPStatus
 
 from src.apps.backoffice.controllers.BackofficeController import BackofficeController
-from src.contexts.backoffice.users.application.queries.FindUsersByCriteriaQuery import FindUsersByCriteriaQuery
+from src.contexts.backoffice.users.application.findall.FindUsersByCriteriaQuery import FindUsersByCriteriaQuery
 from src.contexts.shared.Infrastructure.parsers.parse_dict_format_to_criteria import parse_dict_to_criteria
 from src.contexts.shared.application.Response import Response
 from src.contexts.shared.domain.Query import Query

diff --git a/src/apps/backoffice/controllers/UsersPostController.py b/src/apps/backoffice/controllers/UsersPostController.py
@@ -5,7 +5,7 @@
 from http import HTTPStatus
 
 from src.apps.backoffice.controllers.BackofficeController import BackofficeController
-from src.contexts.backoffice.users.application.commands.CreateUserCommand import CreateUserCommand
+from src.contexts.backoffice.users.application.createone.CreateUserCommand import CreateUserCommand
 from src.contexts.backoffice.users.infrastructure.JsonResponseErrorHandler import JsonResponseErrorHandler
 from src.contexts.shared.domain.CommandBus import CommandBus
 from src.contexts.shared.domain.errors.DomainError import DomainError

diff --git a/src/apps/backoffice/dependencies/BackofficeContainer.py b/src/apps/backoffice/dependencies/BackofficeContainer.py
@@ -3,11 +3,11 @@
 from src.apps.backoffice.controllers.StatusGetController import StatusGetController
 from src.apps.backoffice.controllers.UsersGetController import UsersGetController
 from src.apps.backoffice.controllers.UsersPostController import UsersPostController
-from src.contexts.backoffice.users.application.commandhandlers.CreateUserCommandHandler import CreateUserCommandHandler
-from src.contexts.backoffice.users.application.queryhandlers.FindUsersByCriteriaQueryHandler import \
+from src.contexts.backoffice.users.application.createone.CreateUserCommandHandler import CreateUserCommandHandler
+from src.contexts.backoffice.users.application.findall.FindUsersByCriteriaQueryHandler import \
     FindUsersByCriteriaQueryHandler
-from src.contexts.backoffice.users.application.usecases.UserCreator import UserCreator
-from src.contexts.backoffice.users.application.usecases.UsersByCriteriaFinder import UsersByCriteriaFinder
+from src.contexts.backoffice.users.application.createone.UserCreator import UserCreator
+from src.contexts.backoffice.users.application.findall.UsersByCriteriaFinder import UsersByCriteriaFinder
 from src.contexts.backoffice.users.infrastructure.persistence.PyMongoBackofficeUserRepository import \
     PyMongoUserRepository
 from src.contexts.backoffice.users.infrastructure.persistence.config.PyMongoUserConfigFactory import PyMongoUserConfigFactory

diff --git a/...application/commands/CreateUserCommand.py → ...pplication/createone/CreateUserCommand.py b/...application/commands/CreateUserCommand.py → ...pplication/createone/CreateUserCommand.py
@@ -4,7 +4,7 @@
 
 class CreateUserCommand(BaseObject, Command):
 
-    COMMAND_TYPE: str = 'create-user'
+    COMMAND_TYPE: str = 'createone-user'
 
     def __init__(self, user_id: str, name: str):
         self.id = user_id

diff --git a/...mmandhandlers/CreateUserCommandHandler.py → ...ion/createone/CreateUserCommandHandler.py b/...mmandhandlers/CreateUserCommandHandler.py → ...ion/createone/CreateUserCommandHandler.py
@@ -1,12 +1,10 @@
-from typing import Any, NoReturn
+from typing import NoReturn
 
-from src.contexts.backoffice.users.application.commands.CreateUserCommand import CreateUserCommand
-from src.contexts.backoffice.users.application.usecases.UserCreator import UserCreator
-from src.contexts.backoffice.users.domain.entities.User import User
+from src.contexts.backoffice.users.application.createone.CreateUserCommand import CreateUserCommand
+from src.contexts.backoffice.users.application.createone.UserCreator import UserCreator
 from src.contexts.backoffice.users.domain.entities.UserId import UserId
 from src.contexts.backoffice.users.domain.entities.UserName import UserName
 from src.contexts.shared.domain.BaseObject import BaseObject
-from src.contexts.shared.domain.Command import Command
 from src.contexts.shared.domain.CommandHandler import CommandHandler
 
 

diff --git a/...users/application/usecases/UserCreator.py → ...sers/application/createone/UserCreator.py b/...users/application/usecases/UserCreator.py → ...sers/application/createone/UserCreator.py
diff --git a/...ation/queries/FindUsersByCriteriaQuery.py → ...ation/findall/FindUsersByCriteriaQuery.py b/...ation/queries/FindUsersByCriteriaQuery.py → ...ation/findall/FindUsersByCriteriaQuery.py
diff --git a/...ndlers/FindUsersByCriteriaQueryHandler.py → ...indall/FindUsersByCriteriaQueryHandler.py b/...ndlers/FindUsersByCriteriaQueryHandler.py → ...indall/FindUsersByCriteriaQueryHandler.py
@@ -1,9 +1,6 @@
-from typing import List
-
 from src.contexts.backoffice.users.application.BackofficeUsersResponse import BackofficeUsersResponse
-from src.contexts.backoffice.users.application.queries.FindUsersByCriteriaQuery import FindUsersByCriteriaQuery
-from src.contexts.backoffice.users.application.usecases.UsersByCriteriaFinder import UsersByCriteriaFinder
-from src.contexts.shared.domain.QueryBus import QueryBus
+from src.contexts.backoffice.users.application.findall.FindUsersByCriteriaQuery import FindUsersByCriteriaQuery
+from src.contexts.backoffice.users.application.findall.UsersByCriteriaFinder import UsersByCriteriaFinder
 from src.contexts.shared.domain.QueryHandler import QueryHandler
 from src.contexts.shared.domain.criteria.Criteria import Criteria
 

diff --git a/...ication/usecases/UsersByCriteriaFinder.py → ...lication/findall/UsersByCriteriaFinder.py b/...ication/usecases/UsersByCriteriaFinder.py → ...lication/findall/UsersByCriteriaFinder.py
diff --git a/tests/contexts/backoffice/users/application/unit/UserCreatorTest.py b/tests/contexts/backoffice/users/application/unit/UserCreatorTest.py
@@ -1,6 +1,6 @@
 import unittest
 
-from src.contexts.backoffice.users.application.usecases.UserCreator import UserCreator
+from src.contexts.backoffice.users.application.createone.UserCreator import UserCreator
 from src.contexts.backoffice.users.domain.entities.User import User
 from tests.contexts.backoffice.users.__mocks__.EventBusMock import EventBusMock
 from tests.contexts.backoffice.users.__mocks__.UserRepositoryMock import UserRepositoryMock