refactor: Stores are configured outside of server

Author: NeedleInAJayStack

main.go

@@ -38,6 +38,10 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
+	err = db.AutoMigrate(&gormHis{}, &gormRec{})
+	if err != nil {
+		log.Fatal(err)
+	}
 
 	// OTEL
 	metricExporter, err := prometheus.New()
@@ -57,14 +61,20 @@ func main() {
 	otel.SetMeterProvider(meterProvider) // Sets global
 	go serveMetrics()
 
+	// Stores
+	historyStore := newGormHistoryStore(db)
+	recStore := newGormRecStore(db)
+	currentStore := newInMemoryCurrentStore()
+
 	serverConfig := ServerConfig{
 		username:             os.Getenv("USERNAME"),
 		password:             os.Getenv("PASSWORD"),
 		jwtSecret:            os.Getenv("JWT_SECRET"),
 		tokenDurationSeconds: 60 * 60, // 1 hour
 
-		db:            db,
-		dbAutoMigrate: true,
+		historyStore: historyStore,
+		recStore:     recStore,
+		currentStore: currentStore,
 	}
 	server, err := NewServer(serverConfig)
 	if err != nil {

server.go

@@ -4,7 +4,6 @@ import (
 	"net/http"
 
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
-	"gorm.io/gorm"
 )
 
 type ServerConfig struct {
@@ -14,20 +13,13 @@ type ServerConfig struct {
 	jwtSecret            string
 	tokenDurationSeconds int
 
-	// Database
-	db            *gorm.DB
-	dbAutoMigrate bool
+	// Stores
+	historyStore historyStore
+	recStore     recStore
+	currentStore currentStore
 }
 
 func NewServer(serverConfig ServerConfig) (http.Handler, error) {
-
-	if serverConfig.dbAutoMigrate {
-		err := serverConfig.db.AutoMigrate(&gormHis{}, &gormRec{})
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	// Register paths
 	server := http.NewServeMux()
 	tokenAuth := http.NewServeMux()
@@ -38,9 +30,9 @@ func NewServer(serverConfig ServerConfig) (http.Handler, error) {
 		username:             serverConfig.username,
 		password:             serverConfig.password,
 	}
-	hisController := hisController{store: newGormHistoryStore(serverConfig.db)}
-	recController := recController{store: newGormRecStore(serverConfig.db)}
-	currentController := currentController{store: newInMemoryCurrentStore()}
+	hisController := hisController{store: serverConfig.historyStore}
+	recController := recController{store: serverConfig.recStore}
+	currentController := currentController{store: serverConfig.currentStore}
 
 	// handleFunc is a replacement for mux.HandleFunc that adds route data to the metrics.
 	handleFunc := func(mux *http.ServeMux, pattern string, handlerFunc func(http.ResponseWriter, *http.Request)) {

server_test.go

@@ -30,15 +30,22 @@ func TestServerTestSuite(t *testing.T) {
 func (suite *ServerTestSuite) SetupTest() {
 	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
 	assert.Nil(suite.T(), err)
+	err = db.AutoMigrate(&gormHis{}, &gormRec{})
+	assert.Nil(suite.T(), err)
+
+	historyStore := newGormHistoryStore(db)
+	recStore := newGormRecStore(db)
+	currentStore := newInMemoryCurrentStore()
 
 	server, err := NewServer(ServerConfig{
 		username:             "test",
 		password:             "password",
 		jwtSecret:            "aaa",
 		tokenDurationSeconds: 60,
 
-		db:            db,
-		dbAutoMigrate: true,
+		historyStore: historyStore,
+		recStore:     recStore,
+		currentStore: currentStore,
 	})
 	assert.Nil(suite.T(), err)