Skip to content

Commit acd8727

Browse files
author
Sergio García Prado
committed
ISSUE #198
* Rename attributes.
1 parent a6adf88 commit acd8727

File tree

4 files changed

+22
-25
lines changed

4 files changed

+22
-25
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ class SagaStepWrapper(Protocol):
5757
class SagaStepMeta:
5858
"""TODO"""
5959

60-
_func: T
61-
_step: SagaStep
60+
_inner: T
61+
_definition: SagaStep
6262

63-
def __init__(self, func: T, saga_step: SagaStep):
64-
self._func = func
65-
self._step = saga_step
63+
def __init__(self, inner: T, definition: SagaStep):
64+
self._inner = inner
65+
self._definition = definition
6666

6767
@property
6868
@abstractmethod
@@ -76,7 +76,7 @@ def definition(self) -> SagaStep:
7676
class OnStepDecorator(Generic[FN]):
7777
""" "TODO"""
7878

79-
def __init__(self, attr_name: [str] = None, step_meta: Optional[SagaStepMeta] = None, *args, **kwargs):
79+
def __init__(self, attr_name: [str] = None, step_meta: Optional[SagaStepMeta] = None):
8080
if attr_name is None or step_meta is None:
8181
raise ValueError("TODO")
8282
self.step_meta = step_meta

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,36 +63,33 @@ class ConditionalSagaStepWrapper(SagaStepWrapper):
6363
class ConditionalSagaStepMeta(SagaStepMeta):
6464
"""TODO"""
6565

66-
_step: ConditionalSagaStep
67-
68-
def __init__(self, *args, **kwargs):
69-
super().__init__(*args, **kwargs)
66+
_definition: ConditionalSagaStep
7067

7168
@cached_property
7269
def definition(self):
7370
"""TODO"""
7471
if_then_alternatives = getmembers(
75-
self._func,
72+
self._inner,
7673
predicate=lambda x: isinstance(x, IfThenAlternativeWrapper) and isinstance(x.meta, IfThenAlternativeMeta),
7774
)
7875
if_then_alternatives = map(lambda member: member[1].meta.alternative, if_then_alternatives)
7976
if_then_alternatives = sorted(if_then_alternatives, key=attrgetter("order"))
8077

8178
for alternative in if_then_alternatives:
82-
self._step.if_then_alternatives.append(alternative)
79+
self._definition.if_then_alternatives.append(alternative)
8380

8481
else_then_alternatives = getmembers(
85-
self._func,
82+
self._inner,
8683
predicate=lambda x: isinstance(x, ElseThenAlternativeWrapper)
8784
and isinstance(x.meta, ElseThenAlternativeMeta),
8885
)
8986
else_then_alternatives = list(map(lambda member: member[1].meta.alternative, else_then_alternatives))
9087
if len(else_then_alternatives) > 1:
9188
raise MultipleElseThenException()
9289
elif len(else_then_alternatives) == 1:
93-
self._step.else_then_alternative = else_then_alternatives[0]
90+
self._definition.else_then_alternative = else_then_alternatives[0]
9491

95-
return self._step
92+
return self._definition
9693

9794

9895
class ConditionalSagaStep(SagaStep):

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class LocalSagaStepWrapper(SagaStepWrapper):
5656
class LocalSagaStepMeta(SagaStepMeta):
5757
"""TODO"""
5858

59-
_step: LocalSagaStep
59+
_definition: LocalSagaStep
6060
_on_failure: Optional[LocalCallback]
6161

6262
def __init__(self, *args, **kwargs):
@@ -66,10 +66,10 @@ def __init__(self, *args, **kwargs):
6666
@cached_property
6767
def definition(self):
6868
"""TODO"""
69-
self._step.on_execute(self._func)
69+
self._definition.on_execute(self._inner)
7070
if self._on_failure is not None:
71-
self._step.on_failure(self._on_failure)
72-
return self._step
71+
self._definition.on_failure(self._on_failure)
72+
return self._definition
7373

7474
@cached_property
7575
def on_failure(self) -> OnStepDecorator:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class RemoteSagaStepWrapper(SagaStepWrapper):
6161
class RemoteSagaStepMeta(SagaStepMeta):
6262
"""TODO"""
6363

64-
_step: RemoteSagaStep
64+
_definition: RemoteSagaStep
6565
_on_success: Optional[ResponseCallBack]
6666
_on_error: Optional[ResponseCallBack]
6767
_on_failure: Optional[RequestCallBack]
@@ -75,14 +75,14 @@ def __init__(self, *args, **kwargs):
7575
@cached_property
7676
def definition(self):
7777
"""TODO"""
78-
self._step.on_execute(self._func)
78+
self._definition.on_execute(self._inner)
7979
if self._on_success is not None:
80-
self._step.on_success(self._on_success)
80+
self._definition.on_success(self._on_success)
8181
if self._on_error is not None:
82-
self._step.on_error(self._on_error)
82+
self._definition.on_error(self._on_error)
8383
if self._on_failure is not None:
84-
self._step.on_failure(self._on_failure)
85-
return self._step
84+
self._definition.on_failure(self._on_failure)
85+
return self._definition
8686

8787
@cached_property
8888
def on_success(self) -> OnStepDecorator:

0 commit comments

Comments
 (0)