diff options
Diffstat (limited to 'cmd/app')
-rw-r--r-- | cmd/app/main.go | 34 | ||||
-rw-r--r-- | cmd/app/migrator/migrate/init.go | 16 | ||||
-rw-r--r-- | cmd/app/migrator/migrate/migrate.go | 30 | ||||
-rw-r--r-- | cmd/app/migrator/migrate/rollback.go | 30 | ||||
-rw-r--r-- | cmd/app/migrator/migrator.go | 83 | ||||
-rw-r--r-- | cmd/app/migrator/migrator/migrator.go | 23 | ||||
-rw-r--r-- | cmd/app/serve/serve.go | 56 |
7 files changed, 272 insertions, 0 deletions
diff --git a/cmd/app/main.go b/cmd/app/main.go new file mode 100644 index 0000000..ab30493 --- /dev/null +++ b/cmd/app/main.go @@ -0,0 +1,34 @@ +package main + +import ( + "log" + "os" + + "github.com/urfave/cli/v2" + + "go.neonxp.ru/framework/cmd/app/migrator" + "go.neonxp.ru/framework/cmd/app/serve" +) + +func main() { + app := &cli.App{ + Name: "app", + Commands: []*cli.Command{ + { + Name: "serve", + Action: serve.Run, + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "config", + Value: "./config/dev.yaml", + Usage: "config", + }, + }, + }, + migrator.Migrator(), + }, + } + if err := app.Run(os.Args); err != nil { + log.Fatal(err) + } +} diff --git a/cmd/app/migrator/migrate/init.go b/cmd/app/migrator/migrate/init.go new file mode 100644 index 0000000..ec689f8 --- /dev/null +++ b/cmd/app/migrator/migrate/init.go @@ -0,0 +1,16 @@ +package migrate + +import ( + "github.com/urfave/cli/v2" + "go.neonxp.ru/framework/cmd/app/migrator/migrator" + "go.neonxp.ru/framework/migrations" +) + +func Init(c *cli.Context) error { + m, err := migrator.New(c, migrations.Migrations) + if err != nil { + return err + } + + return m.Init(c.Context) +} diff --git a/cmd/app/migrator/migrate/migrate.go b/cmd/app/migrator/migrate/migrate.go new file mode 100644 index 0000000..0cef9b4 --- /dev/null +++ b/cmd/app/migrator/migrate/migrate.go @@ -0,0 +1,30 @@ +package migrate + +import ( + "fmt" + + "github.com/urfave/cli/v2" + "go.neonxp.ru/framework/cmd/app/migrator/migrator" + "go.neonxp.ru/framework/migrations" +) + +func Migrate(c *cli.Context) error { + m, err := migrator.New(c, migrations.Migrations) + if err != nil { + return err + } + + group, err := m.Migrate(c.Context) + if err != nil { + return err + } + + if group.ID == 0 { + fmt.Printf("there are no new migrations to run\n") + return nil + } + + fmt.Printf("migrated to %s\n", group) + + return nil +} diff --git a/cmd/app/migrator/migrate/rollback.go b/cmd/app/migrator/migrate/rollback.go new file mode 100644 index 0000000..39f2171 --- /dev/null +++ b/cmd/app/migrator/migrate/rollback.go @@ -0,0 +1,30 @@ +package migrate + +import ( + "fmt" + + "github.com/urfave/cli/v2" + "go.neonxp.ru/framework/cmd/app/migrator/migrator" + "go.neonxp.ru/framework/migrations" +) + +func Rollback(c *cli.Context) error { + m, err := migrator.New(c, migrations.Migrations) + if err != nil { + return err + } + + group, err := m.Rollback(c.Context) + if err != nil { + return err + } + + if group.ID == 0 { + fmt.Printf("there are no groups to roll back\n") + return nil + } + + fmt.Printf("rolled back %s\n", group) + + return nil +} diff --git a/cmd/app/migrator/migrator.go b/cmd/app/migrator/migrator.go new file mode 100644 index 0000000..fa5b03b --- /dev/null +++ b/cmd/app/migrator/migrator.go @@ -0,0 +1,83 @@ +package migrator + +import ( + "fmt" + "strings" + + "github.com/urfave/cli/v2" + "go.neonxp.ru/framework/cmd/app/migrator/migrate" + "go.neonxp.ru/framework/cmd/app/migrator/migrator" + "go.neonxp.ru/framework/migrations" +) + +func Migrator() *cli.Command { + return &cli.Command{ + Name: "db", + Usage: "manage database migrations", + Subcommands: []*cli.Command{ + { + Name: "init", + Usage: "create migration tables", + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "config", + Value: "./config/config.yaml", + Usage: "config", + }, + }, + Action: migrate.Init, + }, + { + Name: "migrate", + Usage: "migrate database", + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "config", + Value: "./config/config.yaml", + Usage: "config", + }, + }, + Action: migrate.Migrate, + }, + { + Name: "rollback", + Usage: "rollback the last migration group", + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "config", + Value: "./config/config.yaml", + Usage: "config", + }, + }, + Action: migrate.Rollback, + }, + + { + Name: "create", + Usage: "create migration", + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "config", + Value: "./config/config.yaml", + Usage: "config", + }, + }, + Action: func(c *cli.Context) error { + migrator, err := migrator.New(c, migrations.Migrations) + if err != nil { + return err + } + + name := strings.Join(c.Args().Slice(), "_") + mf, err := migrator.CreateGoMigration(c.Context, name) + if err != nil { + return err + } + fmt.Printf("created migration %s (%s)\n", mf.Name, mf.Path) + + return nil + }, + }, + }, + } +} diff --git a/cmd/app/migrator/migrator/migrator.go b/cmd/app/migrator/migrator/migrator.go new file mode 100644 index 0000000..cd22dd5 --- /dev/null +++ b/cmd/app/migrator/migrator/migrator.go @@ -0,0 +1,23 @@ +package migrator + +import ( + "github.com/uptrace/bun/migrate" + "github.com/urfave/cli/v2" + "go.neonxp.ru/framework/pkg/config" + "go.neonxp.ru/framework/pkg/db" +) + +func New(c *cli.Context, mig *migrate.Migrations) (*migrate.Migrator, error) { + configFile := c.String("config") + + cfg, err := config.New(configFile) + if err != nil { + return nil, err + } + + dbClient := db.New(cfg.DB) + + migrator := migrate.NewMigrator(dbClient, mig) + + return migrator, nil +} diff --git a/cmd/app/serve/serve.go b/cmd/app/serve/serve.go new file mode 100644 index 0000000..fabdb7c --- /dev/null +++ b/cmd/app/serve/serve.go @@ -0,0 +1,56 @@ +package serve + +import ( + echosession "github.com/labstack/echo-contrib/session" + "github.com/labstack/echo/v4" + echomiddleware "github.com/labstack/echo/v4/middleware" + "github.com/uptrace/bun/extra/bundebug" + "github.com/urfave/cli/v2" + "go.neonxp.ru/framework/pkg/config" + "go.neonxp.ru/framework/pkg/db" + "go.neonxp.ru/framework/pkg/handler" + "go.neonxp.ru/framework/pkg/handler/user" + "go.neonxp.ru/framework/pkg/middleware" + "go.neonxp.ru/framework/pkg/middleware/session" + userservice "go.neonxp.ru/framework/pkg/service/user" + "go.neonxp.ru/framework/static" +) + +func Run(c *cli.Context) error { + configFile := c.String("config") + + cfg, err := config.New(configFile) + if err != nil { + return err + } + + dbClient := db.New(cfg.DB) + dbClient.AddQueryHook(bundebug.NewQueryHook(bundebug.WithVerbose(cfg.Debug))) + + store, err := session.New(dbClient, cfg.Keypairs) + if err != nil { + return err + } + + e := echo.New() + e.HTTPErrorHandler = handler.ErrorHandler + e.Use( + echomiddleware.Recover(), + echomiddleware.Logger(), + echomiddleware.RemoveTrailingSlash(), + echosession.Middleware(store), + middleware.Context("config", cfg), + middleware.User(), + ) + + userService := userservice.NewService(dbClient) + + router := handler.Router{ + "/user": user.NewHandler(userService), + } + router.Register(e) + + e.StaticFS("/", static.FS) + + return e.Start(cfg.Listen) +} |