adding acctions into receives

ereuse_devicehub/migrations/versions/e93aec8fc41f_added_assigned_action.py

@@ -49,9 +49,11 @@ def upgrade():
         sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
         sa.Column('agent_from_id', postgresql.UUID(as_uuid=True), nullable=False),
         sa.Column('agent_to_id', postgresql.UUID(as_uuid=True), nullable=False),
+        sa.Column('action_id', postgresql.UUID(as_uuid=True), nullable=True),
 
         sa.ForeignKeyConstraint(['agent_from_id'], [f'{get_inv()}.agent.id'], ),
         sa.ForeignKeyConstraint(['agent_to_id'], [f'{get_inv()}.agent.id'], ),
+        sa.ForeignKeyConstraint(['action_id'], [f'{get_inv()}.action.id'], ),
         sa.ForeignKeyConstraint(['id'], [f'{get_inv()}.action.id'], ),
         sa.PrimaryKeyConstraint('id'),
         schema=f'{get_inv()}'

ereuse_devicehub/resources/action/models.py

@@ -1450,8 +1450,15 @@ class Receive(JoinedTableMixin, ActionWithMultipleDevices):
                       default=lambda: g.user.individual.id)
     agent_to = relationship(Agent,
                         backref=backref('actions_agent', lazy=True, **_sorted_actions),
-                        primaryjoin=agent_to_id == Agent.id)
+                        primaryjoin=agent_to_id == Action.id)
     agent_to_id.comment = """ This device go to this agent """
+    action_id = Column(UUID(as_uuid=True),
+                      ForeignKey(Action.id),
+                      nullable=True)
+    action = relationship(Action,
+                        backref=backref('actions_id', lazy=True, **_sorted_actions),
+                        primaryjoin=action_id == Action.id)
+    action_id.comment = """ This Receive confirm this action """
 
 
 class Migrate(JoinedTableMixin, ActionWithMultipleDevices):

ereuse_devicehub/resources/action/models.pyi

@@ -530,11 +530,9 @@ class TransferOwnershipBlockchain(Trade):
 
 
 class Receive(ActionWithMultipleDevices):
-    role = ...  # type:Column
-
-    def __init__(self, **kwargs) -> None:
-        super().__init__(**kwargs)
-        self.role = ...  # type: ReceiverRole
+    agent_from = ...  # type: relationship
+    agent_to = ...  # type: relationship
+    action = ...  # type: relationship
 
 
 class Migrate(ActionWithMultipleDevices):