Extract common repository methods

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

pkg/transformers/pit_file/debt_ceiling/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 PitFileDebtCeilingRepository struct {
@@ -49,11 +51,7 @@ func (repository PitFileDebtCeilingRepository) Create(headerID int64, models []i
 		}
 	}
 
-	_, err = tx.Exec(`INSERT INTO public.checked_headers (header_id, pit_file_debt_ceiling_checked)
-		VALUES ($1, $2) 
-		ON CONFLICT (header_id) DO
-			UPDATE SET pit_file_debt_ceiling_checked = $2`, headerID, true)
-
+	err = shared.MarkHeaderCheckedInTransaction(headerID, tx, constants.PitFileDebtCeilingChecked)
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -63,28 +61,11 @@ func (repository PitFileDebtCeilingRepository) Create(headerID int64, models []i
 }
 
 func (repository PitFileDebtCeilingRepository) MarkHeaderChecked(headerID int64) error {
-	_, err := repository.db.Exec(`INSERT INTO public.checked_headers (header_id, pit_file_debt_ceiling_checked)
-		VALUES ($1, $2) 
-		ON CONFLICT (header_id) DO
-			UPDATE SET pit_file_debt_ceiling_checked = $2`, headerID, true)
-	return err
+	return shared.MarkHeaderChecked(headerID, repository.db, constants.PitFileDebtCeilingChecked)
 }
 
 func (repository PitFileDebtCeilingRepository) 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 pit_file_debt_ceiling_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.PitFileDebtCeilingChecked)
 }
 
 func (repository *PitFileDebtCeilingRepository) SetDB(db *postgres.DB) {

pkg/transformers/pit_file/debt_ceiling/repository_test.go

@@ -22,6 +22,7 @@ import (
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories"
 	"github.com/vulcanize/vulcanizedb/pkg/fakes"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/pit_file/debt_ceiling"
+	"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"
@@ -46,7 +47,7 @@ var _ = Describe("Pit file debt ceiling repository", func() {
 		modelWithDifferentLogIdx := test_data.PitFileDebtCeilingModel
 		modelWithDifferentLogIdx.LogIndex = modelWithDifferentLogIdx.LogIndex + 1
 		inputs := shared_behaviors.CreateBehaviorInputs{
-			CheckedHeaderColumnName:  "pit_file_debt_ceiling_checked",
+			CheckedHeaderColumnName:  constants.PitFileDebtCeilingChecked,
 			LogEventTableName:        "maker.pit_file_debt_ceiling",
 			TestModel:                test_data.PitFileDebtCeilingModel,
 			ModelWithDifferentLogIdx: modelWithDifferentLogIdx,
@@ -74,7 +75,7 @@ var _ = Describe("Pit file debt ceiling repository", func() {
 
 	Describe("MarkHeaderChecked", func() {
 		inputs := shared_behaviors.MarkedHeaderCheckedBehaviorInputs{
-			CheckedHeaderColumnName: "pit_file_debt_ceiling_checked",
+			CheckedHeaderColumnName: constants.PitFileDebtCeilingChecked,
 			Repository:              &pitFileDebtCeilingRepository,
 		}
 

pkg/transformers/pit_file/ilk/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 PitFileIlkRepository struct {
@@ -47,10 +49,8 @@ func (repository PitFileIlkRepository) Create(headerID int64, models []interface
 			return err
 		}
 	}
-	_, err = tx.Exec(`INSERT INTO public.checked_headers (header_id, pit_file_ilk_checked)
-		VALUES ($1, $2) 
-	ON CONFLICT (header_id) DO
-		UPDATE SET pit_file_ilk_checked = $2`, headerID, true)
+
+	err = shared.MarkHeaderCheckedInTransaction(headerID, tx, constants.PitFileIlkChecked)
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -59,28 +59,11 @@ func (repository PitFileIlkRepository) Create(headerID int64, models []interface
 }
 
 func (repository PitFileIlkRepository) MarkHeaderChecked(headerID int64) error {
-	_, err := repository.db.Exec(`INSERT INTO public.checked_headers (header_id, pit_file_ilk_checked)
-		VALUES ($1, $2) 
-	ON CONFLICT (header_id) DO
-		UPDATE SET pit_file_ilk_checked = $2`, headerID, true)
-	return err
+	return shared.MarkHeaderChecked(headerID, repository.db, constants.PitFileIlkChecked)
 }
 
 func (repository PitFileIlkRepository) 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 pit_file_ilk_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.PitFileIlkChecked)
 }
 
 func (repository *PitFileIlkRepository) SetDB(db *postgres.DB) {

pkg/transformers/pit_file/ilk/repository_test.go

@@ -22,6 +22,7 @@ import (
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories"
 	"github.com/vulcanize/vulcanizedb/pkg/fakes"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/pit_file/ilk"
+	"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"
@@ -46,7 +47,7 @@ var _ = Describe("Pit file ilk repository", func() {
 		modelWithDifferentLogIdx := test_data.PitFileIlkModel
 		modelWithDifferentLogIdx.LogIndex = modelWithDifferentLogIdx.LogIndex + 1
 		inputs := shared_behaviors.CreateBehaviorInputs{
-			CheckedHeaderColumnName:  "pit_file_ilk_checked",
+			CheckedHeaderColumnName:  constants.PitFileIlkChecked,
 			LogEventTableName:        "maker.pit_file_ilk",
 			TestModel:                test_data.PitFileIlkModel,
 			ModelWithDifferentLogIdx: modelWithDifferentLogIdx,
@@ -75,7 +76,7 @@ var _ = Describe("Pit file ilk repository", func() {
 
 	Describe("MarkHeaderChecked", func() {
 		inputs := shared_behaviors.MarkedHeaderCheckedBehaviorInputs{
-			CheckedHeaderColumnName: "pit_file_ilk_checked",
+			CheckedHeaderColumnName: constants.PitFileIlkChecked,
 			Repository:              &pitFileIlkRepository,
 		}
 

pkg/transformers/pit_file/stability_fee/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 PitFileStabilityFeeRepository struct {
@@ -49,11 +51,7 @@ func (repository PitFileStabilityFeeRepository) Create(headerID int64, models []
 		}
 	}
 
-	_, err = tx.Exec(`INSERT INTO public.checked_headers (header_id, pit_file_stability_fee_checked)
-		VALUES ($1, $2) 
-	ON CONFLICT (header_id) DO
-		UPDATE SET pit_file_stability_fee_checked = $2`, headerID, true)
-
+	err = shared.MarkHeaderCheckedInTransaction(headerID, tx, constants.PitFileStabilityFeeChecked)
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -63,28 +61,11 @@ func (repository PitFileStabilityFeeRepository) Create(headerID int64, models []
 }
 
 func (repository PitFileStabilityFeeRepository) MarkHeaderChecked(headerID int64) error {
-	_, err := repository.db.Exec(`INSERT INTO public.checked_headers (header_id, pit_file_stability_fee_checked)
-		VALUES ($1, $2) 
-	ON CONFLICT (header_id) DO
-		UPDATE SET pit_file_stability_fee_checked = $2`, headerID, true)
-	return err
+	return shared.MarkHeaderChecked(headerID, repository.db, constants.PitFileStabilityFeeChecked)
 }
 
 func (repository PitFileStabilityFeeRepository) 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 pit_file_stability_fee_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.PitFileStabilityFeeChecked)
 }
 
 func (repository *PitFileStabilityFeeRepository) SetDB(db *postgres.DB) {

pkg/transformers/pit_file/stability_fee/repository_test.go

@@ -22,6 +22,7 @@ import (
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories"
 	"github.com/vulcanize/vulcanizedb/pkg/fakes"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/pit_file/stability_fee"
+	"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"
@@ -46,7 +47,7 @@ var _ = Describe("Pit file stability fee repository", func() {
 		modelWithDifferentLogIdx := test_data.PitFileStabilityFeeModel
 		modelWithDifferentLogIdx.LogIndex = modelWithDifferentLogIdx.LogIndex + 1
 		inputs := shared_behaviors.CreateBehaviorInputs{
-			CheckedHeaderColumnName:  "pit_file_stability_fee_checked",
+			CheckedHeaderColumnName:  constants.PitFileStabilityFeeChecked,
 			LogEventTableName:        "maker.pit_file_stability_fee",
 			TestModel:                test_data.PitFileStabilityFeeModel,
 			ModelWithDifferentLogIdx: modelWithDifferentLogIdx,
@@ -74,7 +75,7 @@ var _ = Describe("Pit file stability fee repository", func() {
 
 	Describe("MarkHeaderChecked", func() {
 		inputs := shared_behaviors.MarkedHeaderCheckedBehaviorInputs{
-			CheckedHeaderColumnName: "pit_file_stability_fee_checked",
+			CheckedHeaderColumnName: constants.PitFileStabilityFeeChecked,
 			Repository:              &pitFileStabilityFeeRepository,
 		}