Merge pull request #399 from BoostryJP/feature/#390

feat: Improve output when transfers are approved/cancelled and event data in sync

app/model/db/__init__.py

@@ -95,7 +95,10 @@
     Notification,
     NotificationType
 )
-from .transfer_appoval_history import TransferApprovalHistory
+from .transfer_appoval_history import (
+    TransferApprovalHistory,
+    TransferApprovalOperationType
+)
 from .tx_management import TransactionLock
 from .utxo import UTXO, UTXOBlockNumber
 from .scheduled_events import (

app/model/db/idx_transfer_approval.py

@@ -26,6 +26,7 @@
     BigInteger
 )
 
+import config
 from .base import Base
 
 
@@ -36,11 +37,11 @@ class IDXTransferApproval(Base):
     # Sequence Id
     id = Column(BigInteger, primary_key=True, autoincrement=True)
     # Token Address
-    token_address = Column(String(42), index=True)
+    token_address = Column(String(42), index=True, nullable=False)
     # Exchange Address (value is set if the event is from exchange)
-    exchange_address = Column(String(42), index=True)
-    # Application Id (escrow id is set if the event is from exchange)
-    application_id = Column(BigInteger, index=True)
+    exchange_address = Column(String(42), index=True, nullable=False, default=config.ZERO_ADDRESS)
+    # Application ID (escrow id is set if the event is from exchange)
+    application_id = Column(BigInteger, index=True, nullable=False)
     # Transfer From
     from_address = Column(String(42))
     # Transfer To
@@ -69,7 +70,7 @@ def json(self):
             "application_id": self.application_id,
             "from_address": self.from_address,
             "to_address": self.to_address,
-            "value": self.value,
+            "amount": self.amount,
             "application_datetime": self.application_datetime,
             "application_blocktimestamp": self.application_blocktimestamp,
             "approval_datetime": self.approval_datetime,

app/model/db/transfer_appoval_history.py

@@ -16,35 +16,41 @@
 
 SPDX-License-Identifier: Apache-2.0
 """
+from enum import Enum
+
 from sqlalchemy import (
     BigInteger,
     Column,
-    Integer,
     String
 )
 
 from .base import Base
 
 
 class TransferApprovalHistory(Base):
-    """Token Transfer Approval History"""
+    """Token Transfer Approval Operation History"""
     __tablename__ = 'transfer_approval_history'
 
     # Sequence Id
     id = Column(BigInteger, primary_key=True, autoincrement=True)
     # Token Address
-    token_address = Column(String(42), index=True)
+    token_address = Column(String(42), index=True, nullable=False)
     # Exchange Address (value is set if the event is from exchange)
-    exchange_address = Column(String(42), index=True)
-    # Application Id (escrow id is set if the event is from exchange)
-    application_id = Column(BigInteger, index=True)
-    # Result (Success:1, Fail:2)
-    result = Column(Integer)
+    exchange_address = Column(String(42), index=True, nullable=False)
+    # Application ID (escrow id is set if the event is from exchange)
+    application_id = Column(BigInteger, index=True, nullable=False)
+    # Operation Type: TransferApprovalOperationType
+    operation_type = Column(String(20), index=True, nullable=False)
 
     def json(self):
         return {
             "token_address": self.token_address,
             "exchange_address": self.exchange_address,
             "application_id": self.application_id,
-            "result": self.result,
+            "operation_type": self.operation_type,
         }
+
+
+class TransferApprovalOperationType(str, Enum):
+    APPROVE = "approve"
+    CANCEL = "cancel"

app/model/schema/transfer.py

@@ -84,7 +84,7 @@ class TransferApprovalTokenResponse(BaseModel):
     """transfer approval token data"""
     id: int
     token_address: str
-    exchange_address: Optional[str]
+    exchange_address: str
     application_id: int
     from_address: str
     to_address: str