Add log index to Vat move

pkg/transformers/vat_move/converter.go

@@ -43,6 +43,7 @@ func (VatMoveConverter) ToModels(ethLogs []types.Log) ([]interface{}, error) {
 			Src:              src.String(),
 			Dst:              dst.String(),
 			Rad:              rad.String(),
+			LogIndex:         ethLog.Index,
 			TransactionIndex: ethLog.TxIndex,
 			Raw:              raw,
 		})

pkg/transformers/vat_move/converter_test.go

@@ -41,6 +41,7 @@ var _ = Describe("Vat move converter", func() {
 		models, err := converter.ToModels([]types.Log{test_data.EthVatMoveLog})
 
 		Expect(err).NotTo(HaveOccurred())
+		Expect(len(models)).To(Equal(1))
 		Expect(models[0]).To(Equal(test_data.VatMoveModel))
 	})
 })

pkg/transformers/vat_move/model.go

@@ -18,6 +18,7 @@ type VatMoveModel struct {
 	Src              string
 	Dst              string
 	Rad              string
+	LogIndex         uint   `db:"log_idx"`
 	TransactionIndex uint   `db:"tx_idx"`
 	Raw              []byte `db:"raw_log"`
 }

pkg/transformers/vat_move/repository.go

@@ -38,9 +38,9 @@ func (repository VatMoveRepository) Create(headerID int64, models []interface{})
 		}
 
 		_, err = tx.Exec(
-			`INSERT INTO maker.vat_move (header_id, src, dst, rad, tx_idx, raw_log)
-        	VALUES ($1, $2, $3, $4::NUMERIC, $5, $6)`,
-			headerID, vatMove.Src, vatMove.Dst, vatMove.Rad, vatMove.TransactionIndex, vatMove.Raw,
+			`INSERT INTO maker.vat_move (header_id, src, dst, rad, log_idx, tx_idx, raw_log)
+				VALUES ($1, $2, $3, $4::NUMERIC, $5, $6, $7)`,
+			headerID, vatMove.Src, vatMove.Dst, vatMove.Rad, vatMove.LogIndex, vatMove.TransactionIndex, vatMove.Raw,
 		)
 
 		if err != nil {

pkg/transformers/vat_move/repository_test.go

@@ -49,22 +49,40 @@ var _ = Describe("Vat Move", func() {
 		BeforeEach(func() {
 			headerID, err = headerRepository.CreateOrUpdateHeader(fakes.FakeHeader)
 			Expect(err).NotTo(HaveOccurred())
-			err = vatMoveRepository.Create(headerID, []interface{}{test_data.VatMoveModel})
-			Expect(err).NotTo(HaveOccurred())
 		})
 
 		It("adds a vat move event", func() {
+			err = vatMoveRepository.Create(headerID, []interface{}{test_data.VatMoveModel})
+
+			Expect(err).NotTo(HaveOccurred())
 			var dbVatMove vat_move.VatMoveModel
-			err = db.Get(&dbVatMove, `SELECT src, dst, rad, tx_idx, raw_log FROM maker.vat_move WHERE header_id = $1`, headerID)
+			err = db.Get(&dbVatMove, `SELECT src, dst, rad, log_idx, tx_idx, raw_log FROM maker.vat_move WHERE header_id = $1`, headerID)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(dbVatMove.Src).To(Equal(test_data.VatMoveModel.Src))
 			Expect(dbVatMove.Dst).To(Equal(test_data.VatMoveModel.Dst))
 			Expect(dbVatMove.Rad).To(Equal(test_data.VatMoveModel.Rad))
+			Expect(dbVatMove.LogIndex).To(Equal(test_data.VatMoveModel.LogIndex))
 			Expect(dbVatMove.TransactionIndex).To(Equal(test_data.VatMoveModel.TransactionIndex))
 			Expect(dbVatMove.Raw).To(MatchJSON(test_data.VatMoveModel.Raw))
 		})
 
 		It("marks header id as checked for vat move logs", func() {
+			err = vatMoveRepository.Create(headerID, []interface{}{test_data.VatMoveModel})
+
+			Expect(err).NotTo(HaveOccurred())
+			var headerChecked bool
+			err = db.Get(&headerChecked, `SELECT vat_move_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(headerChecked).To(BeTrue())
+		})
+
+		It("updates the header to checked if checked headers row already exists", func() {
+			_, err = db.Exec(`INSERT INTO public.checked_headers (header_id) VALUES ($1)`, headerID)
+			Expect(err).NotTo(HaveOccurred())
+
+			err = vatMoveRepository.Create(headerID, []interface{}{test_data.VatMoveModel})
+
+			Expect(err).NotTo(HaveOccurred())
 			var headerChecked bool
 			err = db.Get(&headerChecked, `SELECT vat_move_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
 			Expect(err).NotTo(HaveOccurred())
@@ -73,16 +91,23 @@ var _ = Describe("Vat Move", func() {
 
 		It("returns an error if insertion fails", func() {
 			err = vatMoveRepository.Create(headerID, []interface{}{test_data.VatMoveModel})
+			Expect(err).NotTo(HaveOccurred())
+
+			err = vatMoveRepository.Create(headerID, []interface{}{test_data.VatMoveModel})
+
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(ContainSubstring("pq: duplicate key value violates unique constraint"))
 		})
 
 		It("removes vat move event if corresponding header is deleted", func() {
-			_, err = db.Exec(`DELETE FROM headers WHERE id = $1`, headerID)
+			err = vatMoveRepository.Create(headerID, []interface{}{test_data.VatMoveModel})
 			Expect(err).NotTo(HaveOccurred())
 
+			_, err = db.Exec(`DELETE FROM headers WHERE id = $1`, headerID)
+
+			Expect(err).NotTo(HaveOccurred())
 			var dbVatMove vat_move.VatMoveModel
-			err = db.Get(&dbVatMove, `SELECT src, dst, rad, tx_idx, raw_log FROM maker.vat_move WHERE header_id = $1`, headerID)
+			err = db.Get(&dbVatMove, `SELECT src, dst, rad, log_idx, tx_idx, raw_log FROM maker.vat_move WHERE header_id = $1`, headerID)
 			Expect(err).To(HaveOccurred())
 			Expect(err).To(MatchError(sql.ErrNoRows))
 		})