refactor reponse

diff --git a/federation/api/handler.go b/federation/api/handler.go
index 4cf5e00..afd4bfb 100644 (file)
--- a/federation/api/handler.go
+++ b/federation/api/handler.go
@@ -21,9 +21,9 @@ func (s *Server) ListCrosschainTxs(c *gin.Context, listTxsReq *listCrosschainTxs
        // filter tx status
        if status, err := listTxsReq.GetFilterString("status"); err == nil && status != "" {
                switch strings.ToLower(status) {
-               case "pending":
+               case common.CrossTxPendingStatusLabel:
                        txFilter.Status = common.CrossTxPendingStatus
-               case "completed":
+               case common.CrossTxCompletedStatusLabel:
                        txFilter.Status = common.CrossTxCompletedStatus
                }
        }

diff --git a/federation/common/const.go b/federation/common/const.go
index 9402031..56f7d0b 100644 (file)
--- a/federation/common/const.go
+++ b/federation/common/const.go
@@ -5,3 +5,8 @@ const (
        CrossTxPendingStatus
        CrossTxCompletedStatus
 )
+
+const (
+       CrossTxPendingStatusLabel   = "pending"
+       CrossTxCompletedStatusLabel = "completed"
+)

diff --git a/federation/database/orm/cross_transaction.go b/federation/database/orm/cross_transaction.go
index 9a70d9e..4a327b8 100644 (file)
--- a/federation/database/orm/cross_transaction.go
+++ b/federation/database/orm/cross_transaction.go
@@ -2,27 +2,68 @@ package orm
 
 import (
        "database/sql"
+       "encoding/json"
 
+       "github.com/vapor/errors"
+       "github.com/vapor/federation/common"
        "github.com/vapor/federation/types"
 )
 
 type CrossTransaction struct {
-       ID                   uint64          `gorm:"primary_key" json:"-"`
-       ChainID              uint64          `json:"-"`
-       SourceBlockHeight    uint64          `json:"source_block_height"`
-       SourceBlockHash      string          `json:"source_block_hash"`
-       SourceTxIndex        uint64          `json:"source_tx_index"`
-       SourceMuxID          string          `json:"-"`
-       SourceTxHash         string          `json:"source_tx_hash"`
-       SourceRawTransaction string          `json:"-"`
-       DestBlockHeight      sql.NullInt64   `sql:"default:null" json:"dest_block_height"`
-       DestBlockHash        sql.NullString  `sql:"default:null" json:"dest_block_hash"`
-       DestTxIndex          sql.NullInt64   `sql:"default:null" json:"dest_tx_index"`
-       DestTxHash           sql.NullString  `sql:"default:null" json:"dest_tx_hash"`
-       Status               uint8           `json:"status"`
-       CreatedAt            types.Timestamp `json:"-"`
-       UpdatedAt            types.Timestamp `json:"-"`
+       ID                   uint64 `gorm:"primary_key"`
+       ChainID              uint64
+       SourceBlockHeight    uint64
+       SourceBlockHash      string
+       SourceTxIndex        uint64
+       SourceMuxID          string
+       SourceTxHash         string
+       SourceRawTransaction string
+       DestBlockHeight      sql.NullInt64  `sql:"default:null"`
+       DestBlockHash        sql.NullString `sql:"default:null"`
+       DestTxIndex          sql.NullInt64  `sql:"default:null"`
+       DestTxHash           sql.NullString `sql:"default:null"`
+       Status               uint8
+       CreatedAt            types.Timestamp
+       UpdatedAt            types.Timestamp
 
-       Chain *Chain                 `gorm:"foreignkey:ChainID" json:"-"`
-       Reqs  []*CrossTransactionReq `json:"crosschain_requests"`
+       Chain *Chain `gorm:"foreignkey:ChainID"`
+       Reqs  []*CrossTransactionReq
+}
+
+func (c *CrossTransaction) MarshalJSON() ([]byte, error) {
+       var status string
+       switch c.Status {
+       case common.CrossTxPendingStatus:
+               status = common.CrossTxPendingStatusLabel
+       case common.CrossTxCompletedStatus:
+               status = common.CrossTxCompletedStatusLabel
+       default:
+               return nil, errors.New("unknown cross-chain tx status")
+       }
+
+       return json.Marshal(&struct {
+               FromChain         string                 `json:"from_chain"`
+               SourceBlockHeight uint64                 `json:"source_block_height"`
+               SourceBlockHash   string                 `json:"source_block_hash"`
+               SourceTxIndex     uint64                 `json:"source_tx_index"`
+               SourceTxHash      string                 `json:"source_tx_hash"`
+               DestBlockHeight   uint64                 `json:"dest_block_height"`
+               DestBlockHash     string                 `json:"dest_block_hash"`
+               DestTxIndex       uint64                 `json:"dest_tx_index"`
+               DestTxHash        string                 `json:"dest_tx_hash"`
+               Status            string                 `json:"status"`
+               Reqs              []*CrossTransactionReq `json:"crosschain_requests"`
+       }{
+               FromChain:         c.Chain.Name,
+               SourceBlockHeight: c.SourceBlockHeight,
+               SourceBlockHash:   c.SourceBlockHash,
+               SourceTxIndex:     c.SourceTxIndex,
+               SourceTxHash:      c.SourceTxHash,
+               DestBlockHeight:   uint64(c.DestBlockHeight.Int64),
+               DestBlockHash:     c.DestBlockHash.String,
+               DestTxIndex:       uint64(c.DestTxIndex.Int64),
+               DestTxHash:        c.DestTxHash.String,
+               Status:            status,
+               Reqs:              c.Reqs,
+       })
 }