Remove roadmap.NewRepository

.golangci.yml

@@ -2,6 +2,7 @@ run:
   deadline: 10m
   build-tags:
     - integration
+    - e2e
 
 linters:
   enable:

cmd/roadmapper/components.go

@@ -3,6 +3,7 @@ package main
 import (
 	"github.com/peteraba/roadmapper/pkg/code"
 	"github.com/peteraba/roadmapper/pkg/migrations"
+	"github.com/peteraba/roadmapper/pkg/repository"
 	"github.com/peteraba/roadmapper/pkg/roadmap"
 	"go.uber.org/zap"
 )
@@ -18,7 +19,8 @@ func newLogger() *zap.Logger {
 }
 
 func newRoadmapRepo(dbHost, dbPort, dbName, dbUser, dbPass string, logger *zap.Logger) roadmap.Repository {
-	return roadmap.NewRepository(AppName, dbHost, dbPort, dbName, dbUser, dbPass, logger)
+	baseRepo := repository.NewPgRepository(AppName, dbHost, dbPort, dbName, dbUser, dbPass, logger)
+	return roadmap.Repository{PgRepository: baseRepo}
 }
 
 func newCodeBuilder() code.Builder {

pkg/roadmap/repository.go

@@ -11,7 +11,6 @@ import (
 	"github.com/peteraba/roadmapper/pkg/code"
 	"github.com/peteraba/roadmapper/pkg/herr"
 	"github.com/peteraba/roadmapper/pkg/repository"
-	"go.uber.org/zap"
 )
 
 type DbReadWriter interface {
@@ -24,13 +23,6 @@ type Repository struct {
 	repository.PgRepository
 }
 
-// NewPgRepository creates a Repository instance
-func NewRepository(applicationName, dbHost, dbPort, dbName, dbUser, dbPass string, logger *zap.Logger) Repository {
-	return Repository{
-		PgRepository: repository.NewPgRepository(applicationName, dbHost, dbPort, dbName, dbUser, dbPass, logger),
-	}
-}
-
 // Get retrieves a Roadmap from the database
 func (drw Repository) Get(code code.Code) (*Roadmap, error) {
 	db := drw.Connect()

pkg/testutils/testutils.go

@@ -59,6 +59,7 @@ func SaveFile(t *testing.T, content []byte, pathParts ...string) {
 	}
 }
 
+// SetupRepository returns a new repository and a tear down function
 func SetupRepository(t *testing.T, appName, dbUser, dbPass, dbName string, logger *zap.Logger, fixture ...interface{}) (repository.PgRepository, func()) {
 	pool, resource, port := setupDb(t, dbUser, dbPass, dbName)