Add transaction index to flip kick

db/migrations/1532468319_create_flip_kick_table.up.sql

@@ -8,5 +8,6 @@ CREATE TABLE maker.flip_kick (
 	"end"            TIMESTAMP WITH TIME ZONE,
   urn              VARCHAR,
   tab              NUMERIC,
+  tx_idx           INTEGER NOT NUll,
   raw_log          JSONB
 );

db/schema.sql

@@ -233,6 +233,7 @@ CREATE TABLE maker.flip_kick (
     "end" timestamp with time zone,
     urn character varying,
     tab numeric,
+    tx_idx integer NOT NULL,
     raw_log jsonb
 );
 

pkg/transformers/flip_kick/converter.go

@@ -49,6 +49,7 @@ func (FlipKickConverter) ToEntity(contractAddress string, contractAbi string, et
 		return entity, err
 	}
 	entity.Raw = ethLog
+	entity.TransactionIndex = ethLog.TxIndex
 	return entity, nil
 }
 
@@ -72,13 +73,14 @@ func (FlipKickConverter) ToModel(flipKick FlipKickEntity) (FlipKickModel, error)
 	rawLogString := string(rawLogJson)
 
 	return FlipKickModel{
-		Id:  id,
+		Id:               id,
-		Lot: lot,
+		Lot:              lot,
-		Bid: bid,
+		Bid:              bid,
-		Gal: gal,
+		Gal:              gal,
-		End: end,
+		End:              end,
-		Urn: urn,
+		Urn:              urn,
-		Tab: tab,
+		Tab:              tab,
-		Raw: rawLogString,
+		TransactionIndex: flipKick.TransactionIndex,
+		Raw:              rawLogString,
 	}, nil
 }

pkg/transformers/flip_kick/entity.go

@@ -22,12 +22,13 @@ import (
 )
 
 type FlipKickEntity struct {
-	Id  *big.Int
+	Id               *big.Int
-	Lot *big.Int
+	Lot              *big.Int
-	Bid *big.Int
+	Bid              *big.Int
-	Gal common.Address
+	Gal              common.Address
-	End *big.Int
+	End              *big.Int
-	Urn [32]byte
+	Urn              [32]byte
-	Tab *big.Int
+	Tab              *big.Int
-	Raw types.Log
+	TransactionIndex uint
+	Raw              types.Log
 }

pkg/transformers/flip_kick/model.go

@@ -17,12 +17,13 @@ package flip_kick
 import "time"
 
 type FlipKickModel struct {
-	Id  string
+	Id               string
-	Lot string
+	Lot              string
-	Bid string
+	Bid              string
-	Gal string
+	Gal              string
-	End time.Time
+	End              time.Time
-	Urn string
+	Urn              string
-	Tab string
+	Tab              string
-	Raw string `db:"raw_log"`
+	TransactionIndex uint   `db:"tx_idx"`
+	Raw              string `db:"raw_log"`
 }

pkg/transformers/flip_kick/repository.go

@@ -35,16 +35,11 @@ func NewFlipKickRepository(db *postgres.DB) FlipKickRepository {
 }
 func (fkr FlipKickRepository) Create(headerId int64, flipKick FlipKickModel) error {
 	_, err := fkr.DB.Exec(
-		`INSERT into maker.flip_kick (header_id, id, lot, bid, gal, "end", urn, tab, raw_log)
+		`INSERT into maker.flip_kick (header_id, id, lot, bid, gal, "end", urn, tab, tx_idx, raw_log)
-        VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9)`,
+        VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)`,
-		headerId, flipKick.Id, flipKick.Lot, flipKick.Bid, flipKick.Gal, flipKick.End, flipKick.Urn, flipKick.Tab, flipKick.Raw,
+		headerId, flipKick.Id, flipKick.Lot, flipKick.Bid, flipKick.Gal, flipKick.End, flipKick.Urn, flipKick.Tab, flipKick.TransactionIndex, flipKick.Raw,
 	)
-
+	return err
-	if err != nil {
-		return err
-	}
-
-	return nil
 }
 
 func (fkr FlipKickRepository) MissingHeaders(startingBlockNumber, endingBlockNumber int64) ([]core.Header, error) {

pkg/transformers/flip_kick/repository_test.go

@@ -71,6 +71,7 @@ var _ = Describe("FlipKick Repository", func() {
 			Expect(dbResult.End.Equal(flipKick.End)).To(BeTrue())
 			Expect(dbResult.Urn).To(Equal(flipKick.Urn))
 			Expect(dbResult.Tab).To(Equal(flipKick.Tab))
+			Expect(dbResult.TransactionIndex).To(Equal(flipKick.TransactionIndex))
 			Expect(dbResult.Raw).To(MatchJSON(flipKick.Raw))
 		})
 

pkg/transformers/test_data/flip_kick.go

@@ -61,32 +61,34 @@ var EthFlipKickLog = types.Log{
 	Data:        hexutil.MustDecode(flipKickData),
 	BlockNumber: uint64(FlipKickBlockNumber),
 	TxHash:      common.HexToHash(flipKickTransactionHash),
-	TxIndex:     0,
+	TxIndex:     999,
 	BlockHash:   common.HexToHash(flipKickBlockHash),
 	Index:       0,
 	Removed:     false,
 }
 
 var FlipKickEntity = flip_kick.FlipKickEntity{
-	Id:  id,
+	Id:               id,
-	Lot: lot,
+	Lot:              lot,
-	Bid: bid,
+	Bid:              bid,
-	Gal: common.HexToAddress(gal),
+	Gal:              common.HexToAddress(gal),
-	End: big.NewInt(end),
+	End:              big.NewInt(end),
-	Urn: urn,
+	Urn:              urn,
-	Tab: tab,
+	Tab:              tab,
-	Raw: EthFlipKickLog,
+	TransactionIndex: EthFlipKickLog.TxIndex,
+	Raw:              EthFlipKickLog,
 }
 
 var FlipKickModel = flip_kick.FlipKickModel{
-	Id:  idString,
+	Id:               idString,
-	Lot: lotString,
+	Lot:              lotString,
-	Bid: bidString,
+	Bid:              bidString,
-	Gal: gal,
+	Gal:              gal,
-	End: time.Unix(end, 0),
+	End:              time.Unix(end, 0),
-	Urn: urnString,
+	Urn:              urnString,
-	Tab: tabString,
+	Tab:              tabString,
-	Raw: rawLogString,
+	TransactionIndex: EthFlipKickLog.TxIndex,
+	Raw:              rawLogString,
 }
 
 type FlipKickDBRow struct {