fix: remove db utils

db/auth_test.go

@@ -1,8 +1,6 @@
 package db
 
 import (
-	"me-fit/utils"
-
 	"database/sql"
 	"testing"
 	"time"
@@ -20,7 +18,7 @@ func setupDb(t *testing.T) *sql.DB {
 		db.Close()
 	})
 
-	err = utils.RunMigrations(db, "../")
+	err = RunMigrations(db, "../")
 	if err != nil {
 		t.Fatalf("Error running migrations: %v", err)
 	}

db/default.go

@@ -1,4 +1,4 @@
-package utils
+package db
 
 import (
 	"me-fit/log"
@@ -38,3 +38,4 @@ func RunMigrations(db *sql.DB, pathPrefix string) error {
 
 	return nil
 }
+

main.go

@@ -7,7 +7,6 @@ import (
 	"me-fit/middleware"
 	"me-fit/service"
 	"me-fit/types"
-	"me-fit/utils"
 
 	"context"
 	"database/sql"
@@ -38,7 +37,7 @@ func main() {
 	run(context.Background(), db, os.Getenv)
 }
 
-func run(ctx context.Context, db *sql.DB, env func(string) string) {
+func run(ctx context.Context, database *sql.DB, env func(string) string) {
 	ctx, cancel := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM)
 	defer cancel()
 
@@ -48,7 +47,7 @@ func run(ctx context.Context, db *sql.DB, env func(string) string) {
 	serverSettings := types.NewServerSettingsFromEnv(env)
 
 	// init db
-	err := utils.RunMigrations(db, "")
+	err := db.RunMigrations(database, "")
 	if err != nil {
 		log.Error("Could not run migrations: %v", err)
 		os.Exit(1)
@@ -66,7 +65,7 @@ func run(ctx context.Context, db *sql.DB, env func(string) string) {
 
 	httpServer := &http.Server{
 		Addr:    ":" + serverSettings.Port,
-		Handler: createHandler(db, serverSettings),
+		Handler: createHandler(database, serverSettings),
 	}
 	go startServer(httpServer)
 

main_test.go

@@ -1,10 +1,10 @@
 package main
 
 import (
+	"me-fit/db"
 	"me-fit/log"
 	"me-fit/service"
 	"me-fit/types"
-	"me-fit/utils"
 
 	"context"
 	"database/sql"
@@ -83,27 +83,27 @@ func setupIntegrationTest(t *testing.T, port string) (*sql.DB, context.Context)
 	ctx, done := context.WithCancel(context.Background())
 	t.Cleanup(done)
 
-	db, err := sql.Open("sqlite3", ":memory:")
+	database, err := sql.Open("sqlite3", ":memory:")
 	if err != nil {
 		t.Fatalf("Could not open Database data.db: %v", err)
 	}
 	t.Cleanup(func() {
-		db.Close()
+		database.Close()
 	})
 
-	err = utils.RunMigrations(db, "")
+	err = db.RunMigrations(database, "")
 	if err != nil {
 		t.Fatalf("Could not run migrations: %v", err)
 	}
 
-	go run(ctx, db, getEnv(port))
+	go run(ctx, database, getEnv(port))
 
 	err = waitForReady(ctx, 5*time.Second, "http://localhost:8080")
 	if err != nil {
 		t.Fatalf("Failed to start server: %v", err)
 	}
 
-	return db, ctx
+	return database, ctx
 }
 
 func getEnv(port string) func(string) string {