aboutsummaryrefslogtreecommitdiffstats
path: root/internal/commands
diff options
context:
space:
mode:
authorEugene Triguba <eugenetriguba@gmail.com>2024-02-29 19:53:20 -0500
committerEugene Triguba <eugenetriguba@gmail.com>2024-02-29 19:53:20 -0500
commitbf1d3b3e1fc42132678b244e479839416a03a6ce (patch)
treefbe4f5e7e41b77bc990ebdece673c7f16102f61f /internal/commands
parentTweak error and doc for storage module (diff)
downloadcli-bf1d3b3e1fc42132678b244e479839416a03a6ce.zip
Add service tests
Diffstat (limited to 'internal/commands')
-rw-r--r--internal/commands/down.go28
-rw-r--r--internal/commands/new.go16
-rw-r--r--internal/commands/status.go34
-rw-r--r--internal/commands/up.go28
4 files changed, 45 insertions, 61 deletions
diff --git a/internal/commands/down.go b/internal/commands/down.go
index 2b98011..8e88fc7 100644
--- a/internal/commands/down.go
+++ b/internal/commands/down.go
@@ -3,10 +3,10 @@ package commands
import (
"context"
"flag"
+ "fmt"
"github.com/eugenetriguba/bolt/internal/configloader"
"github.com/eugenetriguba/bolt/internal/output"
- "github.com/eugenetriguba/bolt/internal/repositories"
"github.com/eugenetriguba/bolt/internal/services"
"github.com/eugenetriguba/bolt/internal/storage"
"github.com/google/subcommands"
@@ -49,7 +49,7 @@ func (cmd *DownCmd) Execute(
cfg, err := configloader.NewConfig()
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(fmt.Errorf("unable to retrieve configuration: %w", err))
return subcommands.ExitFailure
}
@@ -58,39 +58,31 @@ func (cmd *DownCmd) Execute(
storage.DBConnectionString(&cfg.Connection),
)
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(fmt.Errorf("unable to connect to database: %w", err))
return subcommands.ExitFailure
}
defer db.Close()
- migrationDBRepo, err := repositories.NewMigrationDBRepo(db)
- if err != nil {
- consoleOutputter.Error(err)
- return subcommands.ExitFailure
- }
-
- migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations)
+ migrationService, err := services.NewMigrationServiceFromConfig(
+ db,
+ consoleOutputter,
+ *cfg,
+ )
if err != nil {
consoleOutputter.Error(err)
return subcommands.ExitFailure
}
- migrationService := services.NewMigrationService(
- migrationDBRepo,
- migrationFsRepo,
- consoleOutputter,
- )
-
if cmd.version == "" {
err = migrationService.RevertAllMigrations()
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(fmt.Errorf("unable to revert all migrations: %w", err))
return subcommands.ExitFailure
}
} else {
err = migrationService.RevertDownToVersion(cmd.version)
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(fmt.Errorf("unable to revert migrations down to %s: %w", cmd.version, err))
return subcommands.ExitFailure
}
}
diff --git a/internal/commands/new.go b/internal/commands/new.go
index 7298dad..96ddd98 100644
--- a/internal/commands/new.go
+++ b/internal/commands/new.go
@@ -3,6 +3,7 @@ package commands
import (
"context"
"flag"
+ "fmt"
"github.com/eugenetriguba/bolt/internal/configloader"
"github.com/eugenetriguba/bolt/internal/output"
@@ -48,29 +49,28 @@ func (cmd *NewCmd) Execute(
cfg, err := configloader.NewConfig()
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(fmt.Errorf("unable to retrieve configuration: %w", err))
return subcommands.ExitFailure
}
migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations)
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(
+ fmt.Errorf("unable to setup local migrations directory: %w", err),
+ )
return subcommands.ExitFailure
}
migrationService := services.NewMigrationService(
nil,
migrationFsRepo,
+ *cfg,
consoleOutputter,
)
- if err != nil {
- consoleOutputter.Error(err)
- return subcommands.ExitFailure
- }
- err = migrationService.CreateMigration(cfg.Migrations.VersionStyle, cmd.message)
+ _, err = migrationService.CreateMigration(cmd.message)
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(fmt.Errorf("unable to create new migration: %w", err))
return subcommands.ExitFailure
}
diff --git a/internal/commands/status.go b/internal/commands/status.go
index 85f3824..eaf4332 100644
--- a/internal/commands/status.go
+++ b/internal/commands/status.go
@@ -3,10 +3,10 @@ package commands
import (
"context"
"flag"
+ "fmt"
"github.com/eugenetriguba/bolt/internal/configloader"
"github.com/eugenetriguba/bolt/internal/output"
- "github.com/eugenetriguba/bolt/internal/repositories"
"github.com/eugenetriguba/bolt/internal/services"
"github.com/eugenetriguba/bolt/internal/storage"
"github.com/google/subcommands"
@@ -39,7 +39,7 @@ func (m *StatusCmd) Execute(
cfg, err := configloader.NewConfig()
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(fmt.Errorf("unable to retrieve configuration: %w", err))
return subcommands.ExitFailure
}
@@ -48,31 +48,24 @@ func (m *StatusCmd) Execute(
storage.DBConnectionString(&cfg.Connection),
)
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(fmt.Errorf("unable to connect to database: %w", err))
return subcommands.ExitFailure
}
defer db.Close()
- migrationDBRepo, err := repositories.NewMigrationDBRepo(db)
- if err != nil {
- consoleOutputter.Error(err)
- return subcommands.ExitFailure
- }
-
- migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations)
+ migrationService, err := services.NewMigrationServiceFromConfig(
+ db,
+ consoleOutputter,
+ *cfg,
+ )
if err != nil {
consoleOutputter.Error(err)
return subcommands.ExitFailure
}
- migrationService := services.NewMigrationService(
- migrationDBRepo,
- migrationFsRepo,
- consoleOutputter,
- )
migrations, err := migrationService.ListMigrations(services.SortOrderAsc)
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(fmt.Errorf("unable to list migrations: %w", err))
return subcommands.ExitFailure
}
@@ -95,6 +88,13 @@ func (m *StatusCmd) Execute(
rows[i] = []string{migration.Version, migration.Message, applied}
}
- consoleOutputter.Table(headers, rows)
+ err = consoleOutputter.Table(headers, rows)
+ if err != nil {
+ consoleOutputter.Error(
+ fmt.Errorf("unable to output migrations as table: %w", err),
+ )
+ return subcommands.ExitFailure
+ }
+
return subcommands.ExitSuccess
}
diff --git a/internal/commands/up.go b/internal/commands/up.go
index 5cbc262..e10386a 100644
--- a/internal/commands/up.go
+++ b/internal/commands/up.go
@@ -3,10 +3,10 @@ package commands
import (
"context"
"flag"
+ "fmt"
"github.com/eugenetriguba/bolt/internal/configloader"
"github.com/eugenetriguba/bolt/internal/output"
- "github.com/eugenetriguba/bolt/internal/repositories"
"github.com/eugenetriguba/bolt/internal/services"
"github.com/eugenetriguba/bolt/internal/storage"
"github.com/google/subcommands"
@@ -49,7 +49,7 @@ func (cmd *UpCmd) Execute(
cfg, err := configloader.NewConfig()
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(fmt.Errorf("unable to retrieve configuration: %w", err))
return subcommands.ExitFailure
}
@@ -58,39 +58,31 @@ func (cmd *UpCmd) Execute(
storage.DBConnectionString(&cfg.Connection),
)
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(fmt.Errorf("unable to connect to database: %w", err))
return subcommands.ExitFailure
}
defer db.Close()
- migrationDBRepo, err := repositories.NewMigrationDBRepo(db)
- if err != nil {
- consoleOutputter.Error(err)
- return subcommands.ExitFailure
- }
-
- migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations)
+ migrationService, err := services.NewMigrationServiceFromConfig(
+ db,
+ consoleOutputter,
+ *cfg,
+ )
if err != nil {
consoleOutputter.Error(err)
return subcommands.ExitFailure
}
- migrationService := services.NewMigrationService(
- migrationDBRepo,
- migrationFsRepo,
- consoleOutputter,
- )
-
if cmd.version == "" {
err = migrationService.ApplyAllMigrations()
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(fmt.Errorf("unable to apply all migrations: %w", err))
return subcommands.ExitFailure
}
} else {
err = migrationService.ApplyUpToVersion(cmd.version)
if err != nil {
- consoleOutputter.Error(err)
+ consoleOutputter.Error(fmt.Errorf("unable to apply migrations up to %s: %w", cmd.version, err))
return subcommands.ExitFailure
}
}