PR feedback

resotocore/resotocore/action_handlers/merge_outer_edge_handler.py

@@ -1,4 +1,4 @@
-from resotocore.message_bus import MessageBus, ActionDone, Action
+from resotocore.message_bus import MessageBus, Action
 import logging
 import asyncio
 from asyncio import Task, Future
@@ -12,7 +12,7 @@
 
 log = logging.getLogger(__name__)
 
-subscriber_id = "resotocore.merge_outer_edges"
+subscriber_id = "resotocore"
 merge_outer_edges = "merge_outer_edges"
 
 
@@ -39,14 +39,7 @@ async def __handle_events(self, subscription_done: Future[None]) -> None:
                 event = await events.get()
                 if isinstance(event, Action) and event.message_type == merge_outer_edges:
                     self.merge_outer_edges(event.task_id)
-                    await self.task_handler_service.handle_action_done(
-                        ActionDone(
-                            merge_outer_edges,
-                            event.task_id,
-                            merge_outer_edges,
-                            self.subscriber.id if self.subscriber else subscriber_id,
-                        )
-                    )
+                    await self.task_handler_service.handle_action_done(event.done(subscriber_id))
 
     async def start(self) -> None:
         subscription_done = asyncio.get_event_loop().create_future()

resotocore/resotocore/message_bus.py

@@ -124,7 +124,8 @@ def __init__(self, message_type: str, task_id: str, step_name: str, data: Option
 
 
 class Action(ActionMessage):
-    pass
+    def done(self, subscriber_id: str) -> ActionDone:
+        return ActionDone(self.message_type, self.task_id, self.step_name, subscriber_id, dict(self.data))
 
 
 class ActionDone(ActionMessage):

resotocore/tests/resotocore/action_handlers/merge_outer_edge_handler_test.py

@@ -71,7 +71,10 @@ async def merge_handler(
 
 @pytest.mark.asyncio
 async def test_handler_invocation(
-    merge_handler: MergeOuterEdgesHandler, subscription_handler: SubscriptionHandler, message_bus: MessageBus
+    merge_handler: MergeOuterEdgesHandler,
+    subscription_handler: SubscriptionHandler,
+    message_bus: MessageBus,
+    task_handler: TaskHandlerService,
 ) -> None:
     merge_called: asyncio.Future[str] = asyncio.get_event_loop().create_future()
 
@@ -82,7 +85,7 @@ def mocked_merge(self: MergeOuterEdgesHandler, task_id: str) -> None:
 
     subscribers = await subscription_handler.list_subscriber_for(merge_outer_edges)
 
-    assert subscribers[0].id == "resotocore.merge_outer_edges"
+    assert subscribers[0].id == "resotocore"
 
     await message_bus.emit(Action(merge_outer_edges, "test_task_1", merge_outer_edges))