rogee/atom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issues

Browse Source
This commit is contained in:
yanghao05
2023-04-28 18:13:55 +08:00
parent ebcd25f776
commit e0e48fe83a
10 changed files with 192 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/migration.go
View File

@@ -8,3 +8,5 @@ type Migration interface {
Up(tx *gorm.DB) error
Down(tx *gorm.DB) error
}
type MigrationProvider func() Migration

2
contracts/seeder.go
View File

@@ -9,3 +9,5 @@ import (
type Seeder interface {
Run(*gofakeit.Faker, *gorm.DB)
}
type SeederProvider func() Seeder

3
go.mod
View File

@@ -10,6 +10,7 @@ require (
github.com/gofrs/uuid v4.0.0+incompatible
github.com/golang-jwt/jwt/v4 v4.4.3
github.com/mojocn/base64Captcha v1.3.5
github.com/pkg/errors v0.9.1
github.com/rogeecn/gen v1.0.11
github.com/spf13/cobra v1.5.0
github.com/spf13/viper v1.15.0
@@ -50,11 +51,11 @@ require (
github.com/leodido/go-urn v1.2.1 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/microsoft/go-mssqldb v0.21.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
github.com/spf13/afero v1.9.3 // indirect
github.com/spf13/cast v1.5.0 // indirect

2
go.sum
View File

@@ -290,8 +290,8 @@ github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A
github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/microsoft/go-mssqldb v0.17.0 h1:Fto83dMZPnYv1Zwx5vHHxpNraeEaUlQ/hhHLgZiaenE=
github.com/microsoft/go-mssqldb v0.17.0/go.mod h1:OkoNGhGEs8EZqchVTtochlXruEhEOaO4S0d2sB5aeGQ=
github.com/microsoft/go-mssqldb v0.21.0 h1:p2rpHIL7TlSv1QrbXJUAcbyRKnIT0C9rRkH2E4OjLn8=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

63
migrate.go
View File

@@ -13,35 +13,9 @@ import (
"gorm.io/gorm"
)
func WithMigration(rootCmd *cobra.Command) *cobra.Command {
rootCmd.AddCommand(migrateCmd)
migrateCmd.AddCommand(migrateUpCmd)
migrateCmd.AddCommand(migrateDownCmd)
migrateCmd.PersistentFlags().StringVar(&migrateToId, "to", "", "migration to id")
return rootCmd
}
// migrateCmd represents the migrate command
var migrateCmd = &cobra.Command{
Use: "migrate",
Short: "migrate database tables",
Long: `migrate database tables`,
}
var migrateToId string
// MigrationInfo http service container
type MigrationInfo struct {
dig.In
DB *gorm.DB
Migrations []contracts.Migration `group:"migrations"`
}
// migrateUpCmd represents the migrateUp command
var migrateUpCmd = &cobra.Command{
func withMigrationCommand(rootCmd *cobra.Command) *cobra.Command {
// migrateUpCmd represents the migrateUp command
var migrateUpCmd = &cobra.Command{
Use: "up",
Short: "migrate up database tables",
Long: `migrate up database tables`,
@@ -58,10 +32,10 @@ var migrateUpCmd = &cobra.Command{
PostRun: func(cmd *cobra.Command, args []string) {
log.Println("BINGO! migrate up done")
},
}
}
// migrateDownCmd represents the migrateDown command
var migrateDownCmd = &cobra.Command{
// migrateDownCmd represents the migrateDown command
var migrateDownCmd = &cobra.Command{
Use: "down",
Short: "migrate down database tables",
Long: `migrate down database tables`,
@@ -79,6 +53,31 @@ var migrateDownCmd = &cobra.Command{
PostRun: func(cmd *cobra.Command, args []string) {
log.Println("BINGO! migrate down done")
},
}
// migrateCmd represents the migrate command
var migrateCmd = &cobra.Command{
Use: "migrate",
Short: "migrate database tables",
Long: `migrate database tables`,
}
rootCmd.AddCommand(migrateCmd)
migrateCmd.AddCommand(migrateUpCmd)
migrateCmd.AddCommand(migrateDownCmd)
migrateCmd.PersistentFlags().StringVar(&migrateToId, "to", "", "migration to id")
return rootCmd
}
var migrateToId string
// MigrationInfo http service container
type MigrationInfo struct {
dig.In
DB *gorm.DB
Migrations []contracts.Migration `group:"migrations"`
}
func sortedMigrations(ms []contracts.Migration) []*gormigrate.Migration {

14
model.go
View File

@@ -14,11 +14,6 @@ import (
"gorm.io/gorm"
)
func WithModel(rootCmd *cobra.Command) *cobra.Command {
rootCmd.AddCommand(modelCmd)
return rootCmd
}
// MigrationInfo http service container
type GenQueryGenerator struct {
dig.In
@@ -32,8 +27,9 @@ type GenQueryGenerator struct {
// FilterWithNameAndRole(name, role string) ([]gen.T, error)
// }
// modelCmd represents the gen command
var modelCmd = &cobra.Command{
func withModelCommand(rootCmd *cobra.Command) *cobra.Command {
// modelCmd represents the gen command
var modelCmd = &cobra.Command{
Use: "model",
Short: "gorm model&query generator",
Long: `gorm model&query generator. more info, see https://gorm.io/gen`,
@@ -90,4 +86,8 @@ var modelCmd = &cobra.Command{
return nil
})
},
}
rootCmd.AddCommand(modelCmd)
return rootCmd
}

34
root.go
View File

@@ -1,14 +1,22 @@
package atom
import (
"log"
"github.com/pkg/errors"
"github.com/rogeecn/atom/container"
"github.com/rogeecn/atom/contracts"
"github.com/rogeecn/atom/providers/config"
"github.com/spf13/cobra"
"go.uber.org/dig"
)
var cfgFile string
var (
GroupRoutes = dig.Group("routes")
)
func Serve(providers container.Providers, opts ...Option) error {
var rootCmd = &cobra.Command{}
rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "config.toml", "config file path")
@@ -17,9 +25,9 @@ func Serve(providers container.Providers, opts ...Option) error {
opt(rootCmd)
}
WithMigration(rootCmd)
WithModel(rootCmd)
WithSeeder(rootCmd)
withMigrationCommand(rootCmd)
withModelCommand(rootCmd)
withSeederCommand(rootCmd)
// parse config files
configure, err := config.Load(cfgFile)
@@ -94,3 +102,23 @@ func Config(file string) Option {
_ = cmd.PersistentFlags().Set("config", file)
}
}
func Seeders(seeders ...contracts.SeederProvider) Option {
return func(cmd *cobra.Command) {
for _, seeder := range seeders {
if err := container.Container.Provide(seeder, dig.Group("seeder")); err != nil {
log.Fatal(err)
}
}
}
}
func Migrations(migrations ...contracts.MigrationProvider) Option {
return func(cmd *cobra.Command) {
for _, migration := range migrations {
if err := container.Container.Provide(migration, dig.Group("migrations")); err != nil {
log.Fatal(err)
}
}
}
}

49
seed.go
View File

@@ -1,49 +0,0 @@
package atom
import (
"log"
"github.com/rogeecn/atom/container"
"github.com/rogeecn/atom/contracts"
"github.com/brianvoe/gofakeit/v6"
"github.com/spf13/cobra"
"go.uber.org/dig"
"gorm.io/gorm"
)
func WithSeeder(rootCmd *cobra.Command) *cobra.Command {
rootCmd.AddCommand(seedCmd)
return rootCmd
}
// seedCmd represents the seed command
var seedCmd = &cobra.Command{
Use: "seed",
Short: "seed databases",
Long: `seed your database with data using seeders.`,
RunE: func(cmd *cobra.Command, args []string) error {
return container.Container.Invoke(func(c SeedersContainer) error {
if len(c.Seeders) == 0 {
log.Print("no seeder exists")
return nil
}
for _, seeder := range c.Seeders {
seeder.Run(c.Faker, c.DB)
}
return nil
})
},
PostRun: func(cmd *cobra.Command, args []string) {
log.Println("BINGO! seeding done")
},
}
type SeedersContainer struct {
dig.In
DB *gorm.DB
Faker *gofakeit.Faker
Seeders []contracts.Seeder `group:"seeders"`
}

48
seeder.go Normal file
View File

@@ -0,0 +1,48 @@
package atom
import (
"log"
"github.com/rogeecn/atom/container"
"github.com/rogeecn/atom/contracts"
"github.com/brianvoe/gofakeit/v6"
"github.com/spf13/cobra"
"go.uber.org/dig"
"gorm.io/gorm"
)
type SeedersContainer struct {
dig.In
DB *gorm.DB
Faker *gofakeit.Faker
Seeders []contracts.Seeder `group:"seeders"`
}
func withSeederCommand(rootCmd *cobra.Command) *cobra.Command {
// seedCmd represents the seed command
var seedCmd = &cobra.Command{
Use: "seed",
Short: "seed databases",
Long: `seed your database with data using seeders.`,
RunE: func(cmd *cobra.Command, args []string) error {
return container.Container.Invoke(func(c SeedersContainer) error {
if len(c.Seeders) == 0 {
log.Print("no seeder exists")
return nil
}
for _, seeder := range c.Seeders {
seeder.Run(c.Faker, c.DB)
}
return nil
})
},
PostRun: func(cmd *cobra.Command, args []string) {
log.Println("BINGO! seeding done")
},
}
rootCmd.AddCommand(seedCmd)
return rootCmd
}

2
services/http.go
View File

@@ -10,7 +10,7 @@ type Http struct {
dig.In
Service http.Service
Routes []http.Route `group:"route"`
Routes []http.Route `group:"routes"`
}
func ServeHttp() error {