Fix migrations

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ${{ matrix.os }}-latest
     strategy:
       matrix:
-        os: [ubuntu, windows, macos]
+        os: [ubuntu]
     steps:
       - uses: actions/checkout@v5
 

.golangci.yml

@@ -65,10 +65,17 @@ linters:
     rules:
       - path: _test\.go
         linters:
-        - err113
-        - errcheck
-        - gosec
-        - nilnil
+          - dupl
+          - err113
+          - errcheck
+          - goconst
+          - gosec
+          - nilnil
+
+      - path: database_test\.go
+        linters:
+          - paralleltest
+          - tparallel
 
 formatters:
   enable:

Taskfile.dist.yml

@@ -0,0 +1,19 @@
+version: "3"
+
+tasks:
+  lint:
+    cmds:
+      - golangci-lint run
+
+  fix:
+    cmds:
+      - golangci-lint run --fix
+
+  test:
+    cmds:
+      - go test -cover -v ./...
+
+  check:
+    deps:
+      - lint
+      - test

auth/repository.go

@@ -25,22 +25,21 @@ func NewRepository(db db) *Repository {
 	}
 }
 
-func (r *Repository) Schema() ([]database.Migration, database.Schema) {
-	return []database.Migration{}, database.Schema{
-		Queries: []string{
-			`
-				CREATE TABLE IF NOT EXISTS users (
-					id VARCHAR(255) PRIMARY KEY,
-					username VARCHAR(255) UNIQUE,
-					password TEXT,
-					salt TEXT,
-					created TIMESTAMP,
-					updated TIMESTAMP,
-					status VARCHAR(50)
-				)
-			`,
-		},
-	}
+func (r *Repository) Schema() []database.Migration {
+	return []database.Migration{{
+		ID: "init",
+		Up: `CREATE TABLE IF NOT EXISTS users (
+			id VARCHAR(255) PRIMARY KEY,
+			username VARCHAR(255) UNIQUE,
+			password TEXT,
+			salt TEXT,
+			created TIMESTAMP,
+			updated TIMESTAMP,
+			status VARCHAR(50)
+		)`,
+		Down: "DROP TABLE users",
+	}}
+
 }
 
 func (r *Repository) Get(ctx context.Context, id string) (*User, error) {

database/database.go

@@ -3,10 +3,6 @@ package database
 import (
 	"context"
 	"fmt"
-	"slices"
-	"time"
-
-	"github.com/mishankov/platforma/log"
 
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
@@ -15,116 +11,56 @@ import (
 type Database struct {
 	*sqlx.DB
 	repositories map[string]any
-	migrators    map[string]shemer
+	migrators    map[string]migrator
+	repository   *Repository
+	service      *service
 }
 
 func New(connection string) (*Database, error) {
 	db, err := sqlx.Connect("postgres", connection)
 	if err != nil {
 		return nil, fmt.Errorf("failed to connect to database: %w", err)
 	}
-	return &Database{DB: db, repositories: make(map[string]any), migrators: make(map[string]shemer)}, nil
+
+	repository := newRepository(db)
+	service := newService(repository)
+	return &Database{DB: db, repositories: make(map[string]any), migrators: make(map[string]migrator), repository: repository, service: service}, nil
 }
 
 func (db *Database) RegisterRepository(name string, repository any) {
 	db.repositories[name] = repository
 
-	if migr, ok := repository.(shemer); ok {
+	if migr, ok := repository.(migrator); ok {
 		db.migrators[name] = migr
 	}
 }
 
 func (db *Database) Migrate(ctx context.Context) error {
-	if _, err := db.ExecContext(ctx, "CREATE TABLE IF NOT EXISTS platforma_migrations (repository TEXT, id TEXT, timestamp TIMESTAMP)"); err != nil {
-		return fmt.Errorf("failed to create migrations table: %w", err)
+	// Ensure that migration table exists
+	err := db.service.MigrateSelf(ctx)
+	if err != nil {
+		return err
 	}
 
-	// Select data from platforma_migrations table
-	var migrationsState []migrations
-	err := db.SelectContext(ctx, &migrationsState, "SELECT * FROM platforma_migrations")
+	// Get completed migrations
+	migrationLogs, err := db.service.GetMigrationLogs(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to select migrations state: %w", err)
 	}
 
-	appliedMigrations := []Migration{}
-	migrationErr := error(nil)
-
-	for repoName, migr := range db.migrators {
-		repoMigrations, repoSchema := migr.Schema()
-
-		repoHasMigrations := slices.ContainsFunc(migrationsState, func(m migrations) bool {
-			return m.Repository == repoName
-		})
-
-		// If repo does not has migrations apply schema and exit
-		if !repoHasMigrations {
-			for _, query := range repoSchema.Queries {
-				if _, err := db.ExecContext(ctx, query); err != nil {
-					migrationErr = fmt.Errorf("failed to execute schema query: %w", err)
-					break
-				}
-				log.InfoContext(ctx, "schema applied", "repository", repoName)
-			}
-
-			// Log that schema applied
-			if _, err := db.ExecContext(ctx, "INSERT INTO platforma_migrations (repository, timestamp) VALUES ($1, $2)", repoName, time.Now()); err != nil {
-				return fmt.Errorf("failed to insert migration record: %w", err)
-			}
-
-			// If schema is applied, log that all migrations are also applied
-			for _, migration := range repoMigrations {
-				if _, err := db.ExecContext(ctx, "INSERT INTO platforma_migrations (repository, id, timestamp) VALUES ($1, $2, $3)", repoName, migration.ID, time.Now()); err != nil {
-					return fmt.Errorf("failed to insert migration record: %w", err)
-				}
-			}
-
-			continue
-		}
-
-		for _, migration := range repoMigrations {
-			migration.repository = repoName
-
-			// Check if migration has been applied
-			migrationHasApplied := slices.ContainsFunc(migrationsState, func(m migrations) bool {
-				return m.Repository == repoName && m.MigrationId.String == migration.ID
-			})
-
-			if migrationHasApplied {
-				continue
-			}
-
-			if _, err := db.ExecContext(ctx, migration.Up); err != nil {
-				migrationErr = fmt.Errorf("failed to apply migration %s for repository %s: %w", migration.ID, repoName, err)
-				log.ErrorContext(ctx, "failed to apply migration for repository", "migration", migration.ID, "repository", repoName)
-				break
-			}
-
-			appliedMigrations = append(appliedMigrations, migration)
-			log.InfoContext(ctx, "applied migration for repository", "migration", migration.ID, "repository", repoName)
-
-			// Log that migration applied
-			if _, err := db.ExecContext(ctx, "INSERT INTO platforma_migrations (repository, id, timestamp) VALUES ($1, $2, $3)", repoName, migration.ID, time.Now()); err != nil {
-				return fmt.Errorf("failed to insert migration record: %w", err)
-			}
-		}
-
-		if migrationErr != nil {
-			break
+	// Get migrations from all migrators
+	migrations := []Migration{}
+	for name, migrator := range db.migrators {
+		for _, migr := range migrator.Migrations() {
+			migr.repository = name
+			migrations = append(migrations, migr)
 		}
 	}
 
-	if migrationErr != nil {
-		for _, migration := range slices.Backward(appliedMigrations) {
-			if _, err := db.ExecContext(ctx, migration.Down); err != nil {
-				log.ErrorContext(ctx, "failed to rollback migration %s for repository %s", migration.ID, migration.repository)
-				return fmt.Errorf("failed to rollback migration %s for repository %s: %w", migration.ID, migration.repository, err)
-			}
-
-			if _, err := db.ExecContext(ctx, "DELETE FROM platforma_migrations WHERE repository = $1 AND id = $2", migration.repository, migration.ID); err != nil {
-				return fmt.Errorf("failed to delete migration record: %w", err)
-			}
-		}
+	err = db.service.ApplyMigrations(ctx, migrations, migrationLogs)
+	if err != nil {
+		return err
 	}
 
-	return migrationErr
+	return nil
 }