Extract common repository methods

- Inject column names to reduce duplication across common behavior
- Extract checked headers column names to constants

pkg/transformers/cat_file/chop_lump/repository.go

@@ -18,6 +18,8 @@ import (
 	"fmt"
 	"github.com/vulcanize/vulcanizedb/pkg/core"
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres"
+	"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
+	"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
 )
 
 type CatFileChopLumpRepository struct {
@@ -47,10 +49,8 @@ func (repository CatFileChopLumpRepository) Create(headerID int64, models []inte
 			return err
 		}
 	}
-	_, err = tx.Exec(`INSERT INTO public.checked_headers (header_id, cat_file_chop_lump_checked)
-			VALUES ($1, $2)
-		ON CONFLICT (header_id) DO
-			UPDATE SET cat_file_chop_lump_checked = $2`, headerID, true)
+
+	err = shared.MarkHeaderCheckedInTransaction(headerID, tx, constants.CatFileChopLumpChecked)
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -59,28 +59,11 @@ func (repository CatFileChopLumpRepository) Create(headerID int64, models []inte
 }
 
 func (repository CatFileChopLumpRepository) MarkHeaderChecked(headerID int64) error {
-	_, err := repository.db.Exec(`INSERT INTO public.checked_headers (header_id, cat_file_chop_lump_checked)
-			VALUES ($1, $2)
-		ON CONFLICT (header_id) DO
-			UPDATE SET cat_file_chop_lump_checked = $2`, headerID, true)
-	return err
+	return shared.MarkHeaderChecked(headerID, repository.db, constants.CatFileChopLumpChecked)
 }
 
 func (repository CatFileChopLumpRepository) MissingHeaders(startingBlockNumber, endingBlockNumber int64) ([]core.Header, error) {
-	var result []core.Header
-	err := repository.db.Select(
-		&result,
-		`SELECT headers.id, headers.block_number FROM headers
-			LEFT JOIN checked_headers on headers.id = header_id
-		WHERE (header_id ISNULL OR cat_file_chop_lump_checked IS FALSE)
-			AND headers.block_number >= $1
-			AND headers.block_number <= $2
-			AND headers.eth_node_fingerprint = $3`,
-		startingBlockNumber,
-		endingBlockNumber,
-		repository.db.Node.ID,
-	)
-	return result, err
+	return shared.MissingHeaders(startingBlockNumber, endingBlockNumber, repository.db, constants.CatFileChopLumpChecked)
 }
 
 func (repository *CatFileChopLumpRepository) SetDB(db *postgres.DB) {

pkg/transformers/cat_file/chop_lump/repository_test.go

@@ -21,6 +21,7 @@ import (
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories"
 	"github.com/vulcanize/vulcanizedb/pkg/fakes"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/cat_file/chop_lump"
+	"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data/shared_behaviors"
 	"github.com/vulcanize/vulcanizedb/test_config"
@@ -43,7 +44,7 @@ var _ = Describe("Cat file chop lump repository", func() {
 		modelWithDifferentLogIdx := test_data.CatFileChopLumpModel
 		modelWithDifferentLogIdx.LogIndex++
 		inputs := shared_behaviors.CreateBehaviorInputs{
-			CheckedHeaderColumnName:  "cat_file_chop_lump_checked",
+			CheckedHeaderColumnName:  constants.CatFileChopLumpChecked,
 			LogEventTableName:        "maker.cat_file_chop_lump",
 			TestModel:                test_data.CatFileChopLumpModel,
 			ModelWithDifferentLogIdx: modelWithDifferentLogIdx,
@@ -73,7 +74,7 @@ var _ = Describe("Cat file chop lump repository", func() {
 
 	Describe("MarkHeaderChecked", func() {
 		inputs := shared_behaviors.MarkedHeaderCheckedBehaviorInputs{
-			CheckedHeaderColumnName: "cat_file_chop_lump_checked",
+			CheckedHeaderColumnName: constants.CatFileChopLumpChecked,
 			Repository:              &catFileRepository,
 		}
 

pkg/transformers/cat_file/flip/repository.go

@@ -18,6 +18,8 @@ import (
 	"fmt"
 	"github.com/vulcanize/vulcanizedb/pkg/core"
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres"
+	"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
+	"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
 )
 
 type CatFileFlipRepository struct {
@@ -46,11 +48,8 @@ func (repository CatFileFlipRepository) Create(headerID int64, models []interfac
 			return err
 		}
 	}
-	_, err = tx.Exec(`INSERT INTO public.checked_headers (header_id, cat_file_flip_checked)
-			VALUES ($1, $2)
-		ON CONFLICT (header_id) DO
-			UPDATE SET cat_file_flip_checked = $2`, headerID, true)
 
+	err = shared.MarkHeaderCheckedInTransaction(headerID, tx, constants.CatFileFlipChecked)
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -59,28 +58,11 @@ func (repository CatFileFlipRepository) Create(headerID int64, models []interfac
 }
 
 func (repository CatFileFlipRepository) MarkHeaderChecked(headerID int64) error {
-	_, err := repository.db.Exec(`INSERT INTO public.checked_headers (header_id, cat_file_flip_checked)
-			VALUES ($1, $2)
-		ON CONFLICT (header_id) DO
-			UPDATE SET cat_file_flip_checked = $2`, headerID, true)
-	return err
+	return shared.MarkHeaderChecked(headerID, repository.db, constants.CatFileFlipChecked)
 }
 
 func (repository CatFileFlipRepository) MissingHeaders(startingBlockNumber, endingBlockNumber int64) ([]core.Header, error) {
-	var result []core.Header
-	err := repository.db.Select(
-		&result,
-		`SELECT headers.id, headers.block_number FROM headers
-			LEFT JOIN checked_headers on headers.id = header_id
-		WHERE (header_id ISNULL OR cat_file_flip_checked IS FALSE)
-			AND headers.block_number >= $1
-			AND headers.block_number <= $2
-			AND headers.eth_node_fingerprint = $3`,
-		startingBlockNumber,
-		endingBlockNumber,
-		repository.db.Node.ID,
-	)
-	return result, err
+	return shared.MissingHeaders(startingBlockNumber, endingBlockNumber, repository.db, constants.CatFileFlipChecked)
 }
 
 func (repository *CatFileFlipRepository) SetDB(db *postgres.DB) {

pkg/transformers/cat_file/flip/repository_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories"
 	"github.com/vulcanize/vulcanizedb/pkg/fakes"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/cat_file/flip"
+	"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data/shared_behaviors"
 	"github.com/vulcanize/vulcanizedb/test_config"
@@ -47,7 +48,7 @@ var _ = Describe("Cat file flip repository", func() {
 		catFileFlipWithDifferentIdx := test_data.CatFileFlipModel
 		catFileFlipWithDifferentIdx.LogIndex++
 		inputs := shared_behaviors.CreateBehaviorInputs{
-			CheckedHeaderColumnName:  "cat_file_flip_checked",
+			CheckedHeaderColumnName:  constants.CatFileFlipChecked,
 			LogEventTableName:        "maker.cat_file_flip",
 			TestModel:                test_data.CatFileFlipModel,
 			ModelWithDifferentLogIdx: catFileFlipWithDifferentIdx,
@@ -76,7 +77,7 @@ var _ = Describe("Cat file flip repository", func() {
 
 	Describe("MarkHeaderChecked", func() {
 		inputs := shared_behaviors.MarkedHeaderCheckedBehaviorInputs{
-			CheckedHeaderColumnName: "cat_file_flip_checked",
+			CheckedHeaderColumnName: constants.CatFileFlipChecked,
 			Repository:              &catFileFlipRepository,
 		}
 

pkg/transformers/cat_file/pit_vow/repository.go

@@ -18,6 +18,8 @@ import (
 	"fmt"
 	"github.com/vulcanize/vulcanizedb/pkg/core"
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres"
+	"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
+	"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
 )
 
 type CatFilePitVowRepository struct {
@@ -46,10 +48,8 @@ func (repository CatFilePitVowRepository) Create(headerID int64, models []interf
 			return err
 		}
 	}
-	_, err = tx.Exec(`INSERT INTO public.checked_headers (header_id, cat_file_pit_vow_checked)
-			VALUES ($1, $2)
-		ON CONFLICT (header_id) DO
-			UPDATE SET cat_file_pit_vow_checked = $2`, headerID, true)
+
+	err = shared.MarkHeaderCheckedInTransaction(headerID, tx, constants.CatFilePitVowChecked)
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -58,28 +58,11 @@ func (repository CatFilePitVowRepository) Create(headerID int64, models []interf
 }
 
 func (repository CatFilePitVowRepository) MarkHeaderChecked(headerID int64) error {
-	_, err := repository.db.Exec(`INSERT INTO public.checked_headers (header_id, cat_file_pit_vow_checked)
-			VALUES ($1, $2)
-		ON CONFLICT (header_id) DO
-			UPDATE SET cat_file_pit_vow_checked = $2`, headerID, true)
-	return err
+	return shared.MarkHeaderChecked(headerID, repository.db, constants.CatFilePitVowChecked)
 }
 
 func (repository CatFilePitVowRepository) MissingHeaders(startingBlockNumber, endingBlockNumber int64) ([]core.Header, error) {
-	var result []core.Header
-	err := repository.db.Select(
-		&result,
-		`SELECT headers.id, headers.block_number FROM headers
-			LEFT JOIN checked_headers on headers.id = header_id
-		WHERE (header_id ISNULL OR cat_file_pit_vow_checked IS FALSE)
-			AND headers.block_number >= $1
-			AND headers.block_number <= $2
-			AND headers.eth_node_fingerprint = $3`,
-		startingBlockNumber,
-		endingBlockNumber,
-		repository.db.Node.ID,
-	)
-	return result, err
+	return shared.MissingHeaders(startingBlockNumber, endingBlockNumber, repository.db, constants.CatFilePitVowChecked)
 }
 
 func (repository *CatFilePitVowRepository) SetDB(db *postgres.DB) {

pkg/transformers/cat_file/pit_vow/repository_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories"
 	"github.com/vulcanize/vulcanizedb/pkg/fakes"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/cat_file/pit_vow"
+	"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data/shared_behaviors"
 	"github.com/vulcanize/vulcanizedb/test_config"
@@ -47,7 +48,7 @@ var _ = Describe("Cat file pit vow repository", func() {
 		modelWithDifferentLogIdx := test_data.CatFilePitVowModel
 		modelWithDifferentLogIdx.LogIndex++
 		inputs := shared_behaviors.CreateBehaviorInputs{
-			CheckedHeaderColumnName:  "cat_file_pit_vow_checked",
+			CheckedHeaderColumnName:  constants.CatFilePitVowChecked,
 			LogEventTableName:        "maker.cat_file_pit_vow",
 			TestModel:                test_data.CatFilePitVowModel,
 			ModelWithDifferentLogIdx: modelWithDifferentLogIdx,
@@ -75,7 +76,7 @@ var _ = Describe("Cat file pit vow repository", func() {
 
 	Describe("MarkHeaderChecked", func() {
 		inputs := shared_behaviors.MarkedHeaderCheckedBehaviorInputs{
-			CheckedHeaderColumnName: "cat_file_pit_vow_checked",
+			CheckedHeaderColumnName: constants.CatFilePitVowChecked,
 			Repository:              &catFilePitVowRepository,
 		}
 		shared_behaviors.SharedRepositoryMarkHeaderCheckedBehaviors(&inputs)