ISSUE #53

* Simplify `SagaStepStatus`.

Author: Sergio García Prado

packages/core/minos-microservice-saga/minos/saga/executions/status.py

@@ -29,7 +29,7 @@ def from_raw(cls, raw: Union[str, SagaStatus]) -> SagaStatus:
         if isinstance(raw, cls):
             return raw
 
-        # noinspection PyTypeChecker
+        # noinspection PyTypeChecker,PyUnresolvedReferences
         return next(obj for obj in cls if obj.value == raw)
 
     @property
@@ -41,7 +41,7 @@ def raw(self) -> str:
         return self.value
 
 
-class SagaStepStatus(Enum):
+class SagaStepStatus(str, Enum):
     """Saga Step Status class."""
 
     Created = "created"
@@ -50,12 +50,11 @@ class SagaStepStatus(Enum):
     ErroredOnExecute = "errored-on-execute"
     PausedByOnExecute = "paused-by-on-execute"
     ErroredByOnExecute = "errored-by-on-execute"
-    RunningOnFailure = "running-on-failure"
-    PausedOnFailure = "paused-on-failure"
-    ErroredOnFailure = "errored-on-failure"
     RunningOnSuccess = "running-on-success"
+    FinishedOnSuccess = "finished-on-success"
     ErroredOnSuccess = "errored-on-success"
     RunningOnError = "running-on-error"
+    FinishedOnError = "finished-on-error"
     ErroredOnError = "errored-on-error"
     Finished = "finished"
 
@@ -69,6 +68,7 @@ def from_raw(cls, raw: Union[str, SagaStepStatus]) -> SagaStepStatus:
         if isinstance(raw, cls):
             return raw
 
+        # noinspection PyTypeChecker,PyUnresolvedReferences
         return next(obj for obj in cls if obj.value == raw)
 
     @property

packages/core/minos-microservice-saga/minos/saga/executions/steps/conditional.py

@@ -81,12 +81,11 @@ async def execute(self, context: SagaContext, *args, **kwargs) -> SagaContext:
         if self.status == SagaStepStatus.Created:
             self.inner = await self._create_inner(context, *args, **kwargs)
 
-        self.status = SagaStepStatus.RunningOnExecute
-
         if self.inner is not None:
             context = await self._execute_inner(context, *args, **kwargs)
 
         self.status = SagaStepStatus.Finished
+
         return context
 
     async def _create_inner(
@@ -96,6 +95,8 @@ async def _create_inner(
             SagaExecution,
         )
 
+        self.status = SagaStepStatus.RunningOnExecute
+
         executor = Executor(execution_uuid=execution_uuid)
         self.related_services.add(get_service_name())
 
@@ -108,12 +109,15 @@ async def _create_inner(
         if definition is None and self.definition.else_then_alternative is not None:
             definition = self.definition.else_then_alternative.saga
 
-        if definition is None:
-            return None
+        execution = None
+        if definition is not None:
+            execution = SagaExecution.from_definition(
+                definition, context=context, user=user, uuid=execution_uuid, *args, **kwargs
+            )
 
-        return SagaExecution.from_definition(
-            definition, context=context, user=user, uuid=execution_uuid, *args, **kwargs
-        )
+        self.status = SagaStepStatus.FinishedOnExecute
+
+        return execution
 
     async def _execute_inner(
         self, context: SagaContext, user: Optional[UUID] = None, execution_uuid: Optional[UUID] = None, *args, **kwargs
@@ -125,6 +129,8 @@ async def _execute_inner(
             execution.user = user
         execution.context = context
 
+        self.status = SagaStepStatus.RunningOnSuccess
+
         try:
             with suppress(SagaExecutionAlreadyExecutedException):
                 await self.inner.execute(*args, **(kwargs | {"autocommit": False}))
@@ -135,6 +141,8 @@ async def _execute_inner(
             self.status = SagaStepStatus.ErroredByOnExecute
             raise exc
 
+        self.status = SagaStepStatus.FinishedOnSuccess
+
         return execution.context
 
     async def rollback(self, context: SagaContext, *args, **kwargs) -> SagaContext:

packages/core/minos-microservice-saga/minos/saga/executions/steps/local.py

@@ -39,6 +39,13 @@ async def execute(self, context: SagaContext, *args, **kwargs) -> SagaContext:
         if self.status != SagaStepStatus.Created:
             return context
 
+        context = await self._execute_on_execute(context, *args, **kwargs)
+
+        self.status = SagaStepStatus.Finished
+        return context
+
+    async def _execute_on_execute(self, context: SagaContext, *args, **kwargs) -> SagaContext:
+
         self.status = SagaStepStatus.RunningOnExecute
 
         executor = LocalExecutor(*args, **kwargs)
@@ -51,7 +58,8 @@ async def execute(self, context: SagaContext, *args, **kwargs) -> SagaContext:
             self.status = SagaStepStatus.ErroredOnExecute
             raise exc
 
-        self.status = SagaStepStatus.Finished
+        self.status = SagaStepStatus.FinishedOnExecute
+
         return context
 
     async def rollback(self, context: SagaContext, *args, **kwargs) -> SagaContext:

packages/core/minos-microservice-saga/minos/saga/executions/steps/remote.py

@@ -101,6 +101,8 @@ async def _execute_on_success(self, context: SagaContext, response: SagaResponse
             await self.rollback(context, *args, **kwargs)
             raise exc
 
+        self.status = SagaStepStatus.FinishedOnSuccess
+
         return context
 
     async def _execute_on_error(self, context: SagaContext, response: SagaResponse, *args, **kwargs) -> SagaContext:
@@ -115,6 +117,8 @@ async def _execute_on_error(self, context: SagaContext, response: SagaResponse,
             await self.rollback(context, *args, **kwargs)
             raise exc
 
+        self.status = SagaStepStatus.FinishedOnError
+
         return context
 
     async def rollback(self, context: SagaContext, *args, **kwargs) -> SagaContext: