Move Database to service package

api/cmd/main.go

@@ -5,16 +5,16 @@ import (
 	"syscall"
 
 	"github.com/echo-webkom/ludo/api/config"
-	"github.com/echo-webkom/ludo/api/database"
 	"github.com/echo-webkom/ludo/api/server"
+	"github.com/echo-webkom/ludo/pkg/service"
 	"github.com/jesperkha/notifier"
 )
 
 func main() {
 	config := config.Load()
 	notif := notifier.New()
 	// db := database.NewTurso(config.TursoURL, config.TursoToken)
-	db := database.NewSQLite(config.DatabaseURL)
+	db := service.NewSQLiteService(config.DatabaseURL)
 	server := server.New(config, db)
 
 	go server.ListenAndServe(notif)

api/server/server.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 
 	"github.com/echo-webkom/ludo/api/config"
-	"github.com/echo-webkom/ludo/api/database"
 	"github.com/echo-webkom/ludo/api/server/routes"
+	"github.com/echo-webkom/ludo/pkg/service"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/jesperkha/notifier"
@@ -18,13 +18,13 @@ type Server struct {
 	router http.Handler
 }
 
-func New(config *config.Config, db *database.Database) *Server {
+func New(config *config.Config, service service.LudoService) *Server {
 	r := chi.NewRouter()
 	r.Use(middleware.Logger)
 
-	r.Mount("/users", routes.UsersHandler(db))
-	r.Mount("/items", routes.ItemsHandler(db))
-	r.Mount("/boards", routes.BoardsHandler(db))
+	r.Mount("/users", routes.UsersHandler(service))
+	r.Mount("/items", routes.ItemsHandler(service))
+	r.Mount("/boards", routes.BoardsHandler(service))
 
 	return &Server{
 		router: r,

api/server/server_test.go

@@ -11,17 +11,17 @@ import (
 	"testing"
 
 	"github.com/echo-webkom/ludo/api/config"
-	"github.com/echo-webkom/ludo/api/database"
 	"github.com/echo-webkom/ludo/api/server"
 	"github.com/echo-webkom/ludo/pkg/model"
+	"github.com/echo-webkom/ludo/pkg/service"
 )
 
 func setupTestServer(t *testing.T) (*server.Server, func()) {
 	tempFile, err := os.CreateTemp("", "testdb-*.sqlite")
 	if err != nil {
 		t.Fatalf("failed to create temp file: %v", err)
 	}
-	db := database.NewSQLite(tempFile.Name())
+	db := service.NewSQLiteService(tempFile.Name())
 
 	cfg := &config.Config{Port: ":8080"}
 	srv := server.New(cfg, db)

api/database/query.go → pkg/service/database.go

@@ -1,6 +1,63 @@
-package database
+package service
 
-import "github.com/echo-webkom/ludo/pkg/model"
+import (
+	"log"
+	"strings"
+
+	"github.com/echo-webkom/ludo/pkg/model"
+	_ "github.com/mattn/go-sqlite3"
+	_ "github.com/tursodatabase/libsql-client-go/libsql"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+)
+
+// Implements LudoService
+type Database struct {
+	db *gorm.DB
+}
+
+func newDatabase(db *gorm.DB) *Database {
+	if err := db.AutoMigrate(&model.Board{}, &model.Item{}, &model.User{}); err != nil {
+		log.Fatalf("migration: %v", err)
+	}
+	return &Database{db}
+}
+
+func NewTursoService(url, token string) *Database {
+	dbUrl := url + token
+	db, err := gorm.Open(sqlite.Open(dbUrl), &gorm.Config{
+		Logger: logger.Default.LogMode(logger.Silent),
+	})
+	if err != nil {
+		log.Fatalf("failed to connect to database: %v", err)
+	}
+
+	return newDatabase(db)
+}
+
+func NewSQLiteService(filename string) *Database {
+	if !strings.HasPrefix(filename, "file:") {
+		filename = "file:" + filename
+	}
+
+	db, err := gorm.Open(sqlite.Open(filename), &gorm.Config{
+		Logger: logger.Default.LogMode(logger.Silent),
+	})
+	if err != nil {
+		log.Fatalf("failed to connect to database: %v", err)
+	}
+
+	return newDatabase(db)
+}
+
+func (db *Database) Close() error {
+	raw, err := db.db.DB()
+	if err != nil {
+		return err
+	}
+	return raw.Close()
+}
 
 func (db *Database) User(id uint) (model.User, error) {
 	var user model.User

api/database/database_test.go → pkg/service/database_test.go

@@ -1,4 +1,4 @@
-package database
+package service
 
 import (
 	"os"
@@ -12,7 +12,7 @@ func createTestDB(t *testing.T) *Database {
 	tmpfile, err := os.CreateTemp("", "testdb-*.sqlite")
 	assert.NoError(t, err)
 
-	db := NewSQLite(tmpfile.Name())
+	db := NewSQLiteService(tmpfile.Name())
 
 	t.Cleanup(func() {
 		os.Remove(tmpfile.Name())