ISSUE #198

* Rename attributes.

Author: Sergio García Prado

packages/core/minos-microservice-saga/minos/saga/definitions/steps/abc.py

@@ -57,12 +57,12 @@ class SagaStepWrapper(Protocol):
 class SagaStepMeta:
     """TODO"""
 
-    _func: T
-    _step: SagaStep
+    _inner: T
+    _definition: SagaStep
 
-    def __init__(self, func: T, saga_step: SagaStep):
-        self._func = func
-        self._step = saga_step
+    def __init__(self, inner: T, definition: SagaStep):
+        self._inner = inner
+        self._definition = definition
 
     @property
     @abstractmethod
@@ -76,7 +76,7 @@ def definition(self) -> SagaStep:
 class OnStepDecorator(Generic[FN]):
     """ "TODO"""
 
-    def __init__(self, attr_name: [str] = None, step_meta: Optional[SagaStepMeta] = None, *args, **kwargs):
+    def __init__(self, attr_name: [str] = None, step_meta: Optional[SagaStepMeta] = None):
         if attr_name is None or step_meta is None:
             raise ValueError("TODO")
         self.step_meta = step_meta

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

@@ -63,36 +63,33 @@ class ConditionalSagaStepWrapper(SagaStepWrapper):
 class ConditionalSagaStepMeta(SagaStepMeta):
     """TODO"""
 
-    _step: ConditionalSagaStep
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    _definition: ConditionalSagaStep
 
     @cached_property
     def definition(self):
         """TODO"""
         if_then_alternatives = getmembers(
-            self._func,
+            self._inner,
             predicate=lambda x: isinstance(x, IfThenAlternativeWrapper) and isinstance(x.meta, IfThenAlternativeMeta),
         )
         if_then_alternatives = map(lambda member: member[1].meta.alternative, if_then_alternatives)
         if_then_alternatives = sorted(if_then_alternatives, key=attrgetter("order"))
 
         for alternative in if_then_alternatives:
-            self._step.if_then_alternatives.append(alternative)
+            self._definition.if_then_alternatives.append(alternative)
 
         else_then_alternatives = getmembers(
-            self._func,
+            self._inner,
             predicate=lambda x: isinstance(x, ElseThenAlternativeWrapper)
             and isinstance(x.meta, ElseThenAlternativeMeta),
         )
         else_then_alternatives = list(map(lambda member: member[1].meta.alternative, else_then_alternatives))
         if len(else_then_alternatives) > 1:
             raise MultipleElseThenException()
         elif len(else_then_alternatives) == 1:
-            self._step.else_then_alternative = else_then_alternatives[0]
+            self._definition.else_then_alternative = else_then_alternatives[0]
 
-        return self._step
+        return self._definition
 
 
 class ConditionalSagaStep(SagaStep):

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

@@ -56,7 +56,7 @@ class LocalSagaStepWrapper(SagaStepWrapper):
 class LocalSagaStepMeta(SagaStepMeta):
     """TODO"""
 
-    _step: LocalSagaStep
+    _definition: LocalSagaStep
     _on_failure: Optional[LocalCallback]
 
     def __init__(self, *args, **kwargs):
@@ -66,10 +66,10 @@ def __init__(self, *args, **kwargs):
     @cached_property
     def definition(self):
         """TODO"""
-        self._step.on_execute(self._func)
+        self._definition.on_execute(self._inner)
         if self._on_failure is not None:
-            self._step.on_failure(self._on_failure)
-        return self._step
+            self._definition.on_failure(self._on_failure)
+        return self._definition
 
     @cached_property
     def on_failure(self) -> OnStepDecorator:

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

@@ -61,7 +61,7 @@ class RemoteSagaStepWrapper(SagaStepWrapper):
 class RemoteSagaStepMeta(SagaStepMeta):
     """TODO"""
 
-    _step: RemoteSagaStep
+    _definition: RemoteSagaStep
     _on_success: Optional[ResponseCallBack]
     _on_error: Optional[ResponseCallBack]
     _on_failure: Optional[RequestCallBack]
@@ -75,14 +75,14 @@ def __init__(self, *args, **kwargs):
     @cached_property
     def definition(self):
         """TODO"""
-        self._step.on_execute(self._func)
+        self._definition.on_execute(self._inner)
         if self._on_success is not None:
-            self._step.on_success(self._on_success)
+            self._definition.on_success(self._on_success)
         if self._on_error is not None:
-            self._step.on_error(self._on_error)
+            self._definition.on_error(self._on_error)
         if self._on_failure is not None:
-            self._step.on_failure(self._on_failure)
-        return self._step
+            self._definition.on_failure(self._on_failure)
+        return self._definition
 
     @cached_property
     def on_success(self) -> OnStepDecorator: