diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2024-01-06 16:23:02 -0500 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2024-01-06 16:23:02 -0500 |
| commit | 263ce3e4b368a50efee1a53af11a76a12af0a119 (patch) | |
| tree | 8917754f3b43830604f6ad4c7115934ed633f1d8 /internal/commands | |
| parent | Fix syntax (diff) | |
| download | cli-263ce3e4b368a50efee1a53af11a76a12af0a119.zip | |
Break up migration repo into fs and db with a service
Diffstat (limited to 'internal/commands')
| -rw-r--r-- | internal/commands/create.go | 12 | ||||
| -rw-r--r-- | internal/commands/list.go | 21 | ||||
| -rw-r--r-- | internal/commands/migrate.go | 29 |
3 files changed, 36 insertions, 26 deletions
diff --git a/internal/commands/create.go b/internal/commands/create.go index 9372157..57f4c69 100644 --- a/internal/commands/create.go +++ b/internal/commands/create.go @@ -10,7 +10,7 @@ import ( "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/models" "github.com/eugenetriguba/bolt/internal/repositories" - "github.com/eugenetriguba/bolt/internal/storage" + "github.com/eugenetriguba/bolt/internal/services" "github.com/google/subcommands" ) @@ -48,24 +48,20 @@ func (cmd *CreateCmd) Execute( return subcommands.ExitFailure } - db, err := storage.DBConnect( - cfg.Connection.Driver, - storage.DBConnectionString(&cfg.Connection), - ) + migrationFsRepo, err := repositories.NewMigrationFsRepo(cfg.MigrationsDir) if err != nil { fmt.Fprintln(os.Stderr, err) return subcommands.ExitFailure } - defer db.Close() - migrationRepo, err := repositories.NewMigrationRepo(db, cfg) + migrationService := services.NewMigrationService(nil, migrationFsRepo) if err != nil { fmt.Fprintln(os.Stderr, err) return subcommands.ExitFailure } migration := models.NewMigration(time.Now(), cmd.message) - err = migrationRepo.Create(migration) + err = migrationService.CreateMigration(migration) if err != nil { fmt.Fprintln(os.Stderr, err) return subcommands.ExitFailure diff --git a/internal/commands/list.go b/internal/commands/list.go index 0f03712..8224820 100644 --- a/internal/commands/list.go +++ b/internal/commands/list.go @@ -8,13 +8,15 @@ import ( "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/repositories" + "github.com/eugenetriguba/bolt/internal/services" "github.com/eugenetriguba/bolt/internal/storage" "github.com/google/subcommands" ) type ListCmd struct{} -func (*ListCmd) Name() string { return "list" } +func (*ListCmd) Name() string { return "list" } + func (*ListCmd) Synopsis() string { return "List the database migrations and their statuses." } func (*ListCmd) Usage() string { return `list: @@ -24,7 +26,11 @@ func (*ListCmd) Usage() string { func (m *ListCmd) SetFlags(f *flag.FlagSet) {} -func (m *ListCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus { +func (m *ListCmd) Execute( + _ context.Context, + f *flag.FlagSet, + _ ...interface{}, +) subcommands.ExitStatus { cfg, err := configloader.NewConfig() if err != nil { fmt.Fprintln(os.Stderr, err) @@ -41,13 +47,20 @@ func (m *ListCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) } defer db.Close() - migrationRepo, err := repositories.NewMigrationRepo(db, cfg) + migrationDBRepo, err := repositories.NewMigrationDBRepo(db) + if err != nil { + fmt.Fprintln(os.Stderr, err) + return subcommands.ExitFailure + } + + migrationFsRepo, err := repositories.NewMigrationFsRepo(cfg.MigrationsDir) if err != nil { fmt.Fprintln(os.Stderr, err) return subcommands.ExitFailure } - migrations, err := migrationRepo.List() + migrationService := services.NewMigrationService(migrationDBRepo, migrationFsRepo) + migrations, err := migrationService.ListMigrations(services.SortOrderAsc) if err != nil { fmt.Fprintln(os.Stderr, err) return subcommands.ExitFailure diff --git a/internal/commands/migrate.go b/internal/commands/migrate.go index df1377a..7c7a228 100644 --- a/internal/commands/migrate.go +++ b/internal/commands/migrate.go @@ -8,13 +8,15 @@ import ( "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/repositories" + "github.com/eugenetriguba/bolt/internal/services" "github.com/eugenetriguba/bolt/internal/storage" "github.com/google/subcommands" ) type MigrateCmd struct{} -func (*MigrateCmd) Name() string { return "migrate" } +func (*MigrateCmd) Name() string { return "migrate" } + func (*MigrateCmd) Synopsis() string { return "Migrate the database to the latest migration." } func (*MigrateCmd) Usage() string { return `migrate: @@ -24,7 +26,11 @@ func (*MigrateCmd) Usage() string { func (m *MigrateCmd) SetFlags(f *flag.FlagSet) {} -func (m *MigrateCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus { +func (m *MigrateCmd) Execute( + _ context.Context, + f *flag.FlagSet, + _ ...interface{}, +) subcommands.ExitStatus { cfg, err := configloader.NewConfig() if err != nil { fmt.Fprintln(os.Stderr, err) @@ -41,28 +47,23 @@ func (m *MigrateCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{ } defer db.Close() - migrationRepo, err := repositories.NewMigrationRepo(db, cfg) + migrationDBRepo, err := repositories.NewMigrationDBRepo(db) if err != nil { fmt.Fprintln(os.Stderr, err) return subcommands.ExitFailure } - migrations, err := migrationRepo.List() + migrationFsRepo, err := repositories.NewMigrationFsRepo(cfg.MigrationsDir) if err != nil { fmt.Fprintln(os.Stderr, err) return subcommands.ExitFailure } - for _, migration := range migrations { - if !migration.Applied { - fmt.Printf("Applying migration for %s..\n", migration.Dirname()) - err = migrationRepo.Apply(migration) - if err != nil { - fmt.Fprintln(os.Stderr, err) - return subcommands.ExitFailure - } - fmt.Printf("%s [x]\n", migration.Dirname()) - } + migrationService := services.NewMigrationService(migrationDBRepo, migrationFsRepo) + err = migrationService.ApplyAllMigrations() + if err != nil { + fmt.Fprintln(os.Stderr, err) + return subcommands.ExitFailure } return subcommands.ExitSuccess |