x/spend-sparrow
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix: remove db utils

Browse Source
This commit is contained in:
Tim Wundenberg
2024-12-04 22:13:59 +01:00
parent 521119fc02
commit 3ee26cd32b
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
db/auth_test.go
View File

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

3
utils/db.go → db/default.go
View File

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

7
main.go
View File

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

12
main_test.go
View File

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