chore(dependencies): update dependencies to new way of typing it (pre…

…paring it for v2 breaking changes)
alice-biometrics · May 24, 2023 · f105dd5 · f105dd5
1 parent 3123ae7
commit f105dd5
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 25 deletions.
diff --git a/app/petisco/dependencies.py b/app/petisco/dependencies.py
@@ -1,9 +1,10 @@
 from typing import List
 
-from petisco import Builder, Dependency, InmemoryCrudRepository
+from petisco import Builder, CrudRepository, Dependency, InmemoryCrudRepository
 from petisco.extra.rabbitmq import get_rabbitmq_message_dependencies
 
 from app import APPLICATION_NAME, ORGANIZATION
+from app.src.task.label.domain.task_labeler import TaskLabeler
 from app.src.task.label.infrastructure.fake_task_labeler import FakeTaskLabeler
 from app.src.task.label.infrastructure.size_task_labeler import SizeTaskLabeler
 from app.src.task.shared.domain.task import Task
@@ -15,22 +16,26 @@
 def dependencies_provider() -> List[Dependency]:
     repositories = [
         Dependency(
-            name="task_repository",
-            default_builder=Builder(InmemoryCrudRepository[Task]),
+            CrudRepository,
+            alias="task_repository",
             envar_modifier="TASK_REPOSITORY_TYPE",
+            strict=False,  # This should be strict due to this Bug when inherit from Generic (InmemoryCrudRepository[Task]) https://github.com/alice-biometrics/petisco/issues/356
             builders={
+                "default": Builder(InmemoryCrudRepository[Task]),
                 "folder": Builder(
                     FolderTaskCrudRepository, folder="folder_task_database"
-                )
+                ),
             },
         )
     ]
     app_services = [
         Dependency(
-            name="task_labeler",
-            default_builder=Builder(SizeTaskLabeler),
-            envar_modifier="TASK_REPOSITORY_TYPE",
-            builders={"fake": Builder(FakeTaskLabeler)},
+            TaskLabeler,
+            envar_modifier="TASK_LABELER_TYPE",
+            builders={
+                "default": Builder(SizeTaskLabeler),
+                "fake": Builder(FakeTaskLabeler),
+            },
         ),
     ]
     message_dependencies = get_rabbitmq_message_dependencies(

diff --git a/app/src/task/create/application/create_task_controller.py b/app/src/task/create/application/create_task_controller.py
@@ -1,16 +1,17 @@
 from meiga import BoolResult
-from petisco import Container
+from petisco import Container, CrudRepository, DomainEventBus
 from petisco.extra.fastapi import FastAPIController
 
 from app.src.task.create.application.task_creator import TaskCreator
+from app.src.task.label.domain.task_labeler import TaskLabeler
 from app.src.task.shared.domain.task import Task
 
 
 class CreateTaskController(FastAPIController):
     def execute(self, task: Task) -> BoolResult:
         task_creator = TaskCreator(
-            labeler=Container.get("task_labeler"),
-            repository=Container.get("task_repository"),
-            domain_event_bus=Container.get("domain_event_bus"),
+            labeler=Container.get(TaskLabeler),
+            repository=Container.get(CrudRepository, alias="task_repository"),
+            domain_event_bus=Container.get(DomainEventBus),
         )
         return task_creator.execute(task=task)
diff --git a/app/src/task/delete/application/delete_task_controller.py b/app/src/task/delete/application/delete_task_controller.py
@@ -1,5 +1,5 @@
 from meiga import BoolResult
-from petisco import Container, Uuid
+from petisco import Container, CrudRepository, DomainEventBus, Uuid
 from petisco.extra.fastapi import FastAPIController
 
 from app.src.task.delete.application.task_deleter import TaskDeleter
@@ -8,7 +8,7 @@
 class DeleteTaskController(FastAPIController):
     def execute(self, aggregate_id: Uuid) -> BoolResult:
         deleter = TaskDeleter(
-            repository=Container.get("task_repository"),
-            domain_event_bus=Container.get("domain_event_bus"),
+            repository=Container.get(CrudRepository, alias="task_repository"),
+            domain_event_bus=Container.get(DomainEventBus),
         )
         return deleter.execute(aggregate_id)
diff --git a/app/src/task/retrieve/application/retrieve_task_controller.py b/app/src/task/retrieve/application/retrieve_task_controller.py
@@ -1,5 +1,5 @@
 from meiga import Error, Result
-from petisco import Container, Uuid
+from petisco import Container, CrudRepository, DomainEventBus, Uuid
 from petisco.extra.fastapi import FastAPIController
 
 from app.api.models import TaskOut
@@ -13,7 +13,7 @@ class Config:
 
     def execute(self, aggregate_id: Uuid) -> Result[Task, Error]:
         retriever = TaskRetriever(
-            repository=Container.get("task_repository"),
-            domain_event_bus=Container.get("domain_event_bus"),
+            repository=Container.get(CrudRepository, alias="task_repository"),
+            domain_event_bus=Container.get(DomainEventBus),
         )
         return retriever.execute(aggregate_id)
diff --git a/app/src/task/update/application/update_task_controller.py b/app/src/task/update/application/update_task_controller.py
@@ -1,16 +1,17 @@
 from meiga import BoolResult
-from petisco import Container
+from petisco import Container, CrudRepository, DomainEventBus
 from petisco.extra.fastapi import FastAPIController
 
+from app.src.task.label.domain.task_labeler import TaskLabeler
 from app.src.task.shared.domain.task import Task
 from app.src.task.update.application.task_updater import TaskUpdater
 
 
 class UpdateTaskController(FastAPIController):
     def execute(self, task: Task) -> BoolResult:
         updater = TaskUpdater(
-            labeler=Container.get("task_labeler"),
-            repository=Container.get("task_repository"),
-            domain_event_bus=Container.get("domain_event_bus"),
+            labeler=Container.get(TaskLabeler),
+            repository=Container.get(CrudRepository, alias="task_repository"),
+            domain_event_bus=Container.get(DomainEventBus),
         )
         return updater.execute(task=task)
diff --git a/tests/modules/task/create/acceptance/test_post_task.py b/tests/modules/task/create/acceptance/test_post_task.py
@@ -11,7 +11,7 @@ class TestPostTask:
     task: Task
     id: str
 
-    def setup(self):
+    def setup_method(self):
         TaskRepositoryMother.empty()
 
     def should_success_with_any_valid_json(self, client_app):

diff --git a/tests/mothers/task_repository_mother.py b/tests/mothers/task_repository_mother.py
@@ -1,4 +1,4 @@
-from petisco import Container
+from petisco import Container, CrudRepository
 
 from app.src.task.shared.domain.task import Task
 from tests.mothers.task_mother import TaskMother
@@ -7,7 +7,7 @@
 class TaskRepositoryMother:
     @staticmethod
     def empty():
-        repository = Container.get("task_repository")
+        repository = Container.get(CrudRepository, alias="task_repository")
         repository.clear()
         return repository