fix: issues

backend/pkg/service/http/http.go

@@ -0,0 +1,79 @@
+package http
+
+import (
+	"backend/modules/medias"
+	"backend/modules/middlewares"
+	"backend/modules/users"
+	"backend/providers/app"
+	"backend/providers/hashids"
+	"backend/providers/http"
+	"backend/providers/jwt"
+	"backend/providers/postgres"
+	"backend/providers/storage"
+	"backend/providers/wechat"
+
+	"git.ipao.vip/rogeecn/atom"
+	"git.ipao.vip/rogeecn/atom/container"
+	"git.ipao.vip/rogeecn/atom/contracts"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+	"go.uber.org/dig"
+)
+
+func defaultProviders(providers ...container.ProviderContainer) container.Providers {
+	return append(container.Providers{
+		app.DefaultProvider(),
+		http.DefaultProvider(),
+		postgres.DefaultProvider(),
+		jwt.DefaultProvider(),
+		hashids.DefaultProvider(),
+	}, providers...)
+}
+
+func Command() atom.Option {
+	return atom.Command(
+		atom.Name("serve"),
+		atom.Short("run http server"),
+		atom.RunE(Serve),
+		atom.Providers(defaultProviders(
+			storage.DefaultProvider(),
+			wechat.DefaultProvider(),
+		).With(
+			middlewares.Provide,
+			users.Provide,
+			medias.Provide,
+		)),
+	)
+}
+
+type Http struct {
+	dig.In
+
+	App         *app.Config
+	Service     *http.Service
+	Initials    []contracts.Initial   `group:"initials"`
+	Routes      []contracts.HttpRoute `group:"routes"`
+	Middlewares *middlewares.Middlewares
+}
+
+func Serve(cmd *cobra.Command, args []string) error {
+	return container.Container.Invoke(func(http Http) error {
+		if http.App.Mode == app.AppModeDevelopment {
+			log.SetLevel(log.DebugLevel)
+		}
+
+		mid := http.Middlewares
+		http.Service.Engine.Use(mid.DebugMode)
+		http.Service.Engine.Use(mid.WeChatVerify)
+		http.Service.Engine.Use(mid.WeChatAuthUserInfo)
+		http.Service.Engine.Use(mid.WeChatSilentAuth)
+		http.Service.Engine.Use(mid.ParseJWT)
+
+		group := http.Service.Engine.Group("/v1")
+		for _, route := range http.Routes {
+			route.Register(group)
+		}
+
+		return http.Service.Serve()
+	})
+}

backend/pkg/service/migrate/migrate.go

@@ -0,0 +1,52 @@
+package migrate
+
+import (
+	"context"
+	"database/sql"
+
+	"backend/database"
+	"backend/providers/postgres"
+
+	"git.ipao.vip/rogeecn/atom"
+	"git.ipao.vip/rogeecn/atom/container"
+	"github.com/pressly/goose/v3"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+	"go.uber.org/dig"
+)
+
+func Default(providers ...container.ProviderContainer) container.Providers {
+	return append(container.Providers{
+		postgres.DefaultProvider(),
+	}, providers...)
+}
+
+func Command() atom.Option {
+	return atom.Command(
+		atom.Name("migrate"),
+		atom.Short("run migrations"),
+		atom.RunE(Serve),
+		atom.Providers(Default()),
+	)
+}
+
+type Migrate struct {
+	dig.In
+	DB *sql.DB
+}
+
+func Serve(cmd *cobra.Command, args []string) error {
+	return container.Container.Invoke(func(migrate Migrate) error {
+		if len(args) == 0 {
+			args = append(args, "up")
+		}
+
+		action, args := args[0], args[1:]
+		log.Infof("migration action: %s args: %+v", action, args)
+
+		goose.SetBaseFS(database.MigrationFS)
+		goose.SetTableName("migrations")
+
+		return goose.RunContext(context.Background(), action, migrate.DB, "migrations", args...)
+	})
+}

backend/pkg/service/model/gen.go

@@ -0,0 +1,129 @@
+package model
+
+import (
+	"database/sql"
+	"fmt"
+	"strings"
+
+	db "backend/providers/postgres"
+
+	"git.ipao.vip/rogeecn/atom"
+	"git.ipao.vip/rogeecn/atom/container"
+	"github.com/go-jet/jet/v2/generator/metadata"
+	"github.com/go-jet/jet/v2/generator/postgres"
+	"github.com/go-jet/jet/v2/generator/template"
+	pg "github.com/go-jet/jet/v2/postgres"
+	"github.com/gofiber/fiber/v3/log"
+	_ "github.com/lib/pq"
+	"github.com/samber/lo"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"go.uber.org/dig"
+)
+
+func Default(providers ...container.ProviderContainer) container.Providers {
+	return append(container.Providers{
+		db.DefaultProvider(),
+	}, providers...)
+}
+
+func Options() []atom.Option {
+	return []atom.Option{
+		atom.Name("model"),
+		atom.Short("run model generator"),
+		atom.RunE(Serve),
+		atom.Providers(Default()),
+		atom.Arguments(func(cmd *cobra.Command) {
+			cmd.Flags().String("path", "./database/models", "generate to path")
+			cmd.Flags().String("transform", "./database/.transform.yaml", "transform config")
+		}),
+	}
+}
+
+func Command() atom.Option {
+	return atom.Command(Options()...)
+}
+
+type Migrate struct {
+	dig.In
+	DB     *sql.DB
+	Config *db.Config
+}
+
+type Transformer struct {
+	Ignores []string                     `mapstructure:"ignores"`
+	Types   map[string]map[string]string `mapstructure:"types"`
+}
+
+func Serve(cmd *cobra.Command, args []string) error {
+	v := viper.New()
+	v.SetConfigType("yaml")
+	v.SetConfigFile(cmd.Flag("transform").Value.String())
+
+	if err := v.ReadInConfig(); err != nil {
+		return err
+	}
+
+	var conf Transformer
+	if err := v.Unmarshal(&conf); err != nil {
+		return err
+	}
+
+	return container.Container.Invoke(func(migrate Migrate) error {
+		return postgres.GenerateDSN(
+			migrate.Config.DSN(),
+			migrate.Config.Schema,
+			cmd.Flag("path").Value.String(),
+			template.Default(pg.Dialect).
+				UseSchema(func(schema metadata.Schema) template.Schema {
+					return template.
+						DefaultSchema(schema).
+						UseModel(
+							template.
+								DefaultModel().
+								UseTable(func(table metadata.Table) template.TableModel {
+									if lo.Contains(conf.Ignores, table.Name) {
+										table := template.DefaultTableModel(table)
+										table.Skip = true
+										return table
+									}
+
+									return template.DefaultTableModel(table).UseField(func(column metadata.Column) template.TableModelField {
+										defaultTableModelField := template.DefaultTableModelField(column)
+										defaultTableModelField = defaultTableModelField.UseTags(fmt.Sprintf(`json:"%s"`, column.Name))
+
+										if schema.Name != migrate.Config.Schema {
+											return defaultTableModelField
+										}
+
+										fields, ok := conf.Types[table.Name]
+										if !ok {
+											return defaultTableModelField
+										}
+
+										toType, ok := fields[column.Name]
+										if !ok {
+											return defaultTableModelField
+										}
+
+										splits := strings.Split(toType, ".")
+										typeName := splits[len(splits)-1]
+
+										pkgSplits := strings.Split(splits[0], "/")
+										typePkg := pkgSplits[len(pkgSplits)-1]
+
+										defaultTableModelField = defaultTableModelField.
+											UseType(template.Type{
+												Name:       fmt.Sprintf("%s.%s", typePkg, typeName),
+												ImportPath: splits[0],
+											})
+
+										log.Infof("Convert table %s field %s type to : %s", table.Name, column.Name, toType)
+										return defaultTableModelField
+									})
+								}),
+						)
+				}),
+		)
+	})
+}

backend/pkg/service/tasks/tasks.go

@@ -0,0 +1,62 @@
+package tasks
+
+import (
+	"backend/modules/commands/discover"
+	"backend/modules/commands/store"
+	"backend/modules/medias"
+	"backend/providers/app"
+	"backend/providers/postgres"
+	"backend/providers/storage"
+
+	"git.ipao.vip/rogeecn/atom"
+	"git.ipao.vip/rogeecn/atom/container"
+	"github.com/spf13/cobra"
+)
+
+func defaultProviders(providers ...container.ProviderContainer) container.Providers {
+	return append(container.Providers{
+		app.DefaultProvider(),
+		storage.DefaultProvider(),
+		postgres.DefaultProvider(),
+	}, providers...)
+}
+
+func Command() atom.Option {
+	return atom.Command(
+		atom.Name("tasks"),
+		atom.Short("run tasks"),
+		atom.Command(
+			atom.Name("discover"),
+			atom.Arguments(func(cmd *cobra.Command) {
+				cmd.Flags().String("from", "", "from path")
+				cmd.Flags().String("to", "", "to path")
+			}),
+			atom.Providers(defaultProviders().With(
+				medias.Provide,
+				discover.Provide,
+			)),
+			atom.RunE(func(cmd *cobra.Command, args []string) error {
+				return container.Container.Invoke(func(task *discover.DiscoverMedias) error {
+					from, to := cmd.Flag("from").Value.String(), cmd.Flag("to").Value.String()
+					return task.RunE(from, to)
+				})
+			}),
+		),
+		atom.Command(
+			atom.Name("store"),
+			atom.Providers(defaultProviders().With(
+				medias.Provide,
+				store.Provide,
+			)),
+			atom.Arguments(func(cmd *cobra.Command) {
+				cmd.Flags().String("from", "", "from path")
+			}),
+			atom.RunE(func(cmd *cobra.Command, args []string) error {
+				return container.Container.Invoke(func(task *store.StoreMedias) error {
+					from := cmd.Flag("from").Value.String()
+					return task.RunE(from)
+				})
+			}),
+		),
+	)
+}

backend/pkg/service/tenants/tenants.go

@@ -0,0 +1,74 @@
+package tenants
+
+import (
+	"time"
+
+	"backend/modules/commands/tenant"
+	"backend/modules/medias"
+	"backend/modules/users"
+	"backend/providers/app"
+	"backend/providers/postgres"
+	"backend/providers/storage"
+
+	"git.ipao.vip/rogeecn/atom"
+	"git.ipao.vip/rogeecn/atom/container"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+func defaultProviders(providers ...container.ProviderContainer) container.Providers {
+	return append(container.Providers{
+		app.DefaultProvider(),
+		storage.DefaultProvider(),
+		postgres.DefaultProvider(),
+	}, providers...)
+}
+
+func Command() atom.Option {
+	return atom.Command(
+		atom.Name("tenants"),
+		atom.Short("租户相关操作"),
+		atom.Command(
+			atom.Name("create"),
+			atom.Providers(defaultProviders().With(
+				medias.Provide,
+				users.Provide,
+				tenant.Provide,
+			)),
+			atom.Arguments(func(cmd *cobra.Command) {
+				cmd.Flags().String("slug", "", "slug")
+			}),
+			atom.RunE(func(cmd *cobra.Command, args []string) error {
+				return container.Container.Invoke(func(t *tenant.Create) error {
+					slug := cmd.Flag("slug").Value.String()
+					return t.RunE(args[0], slug)
+				})
+			}),
+		),
+		atom.Command(
+			atom.Name("expire"),
+			atom.Short("设置用户的过期时间"),
+			atom.Example("expire [slug] [2024-01-01]"),
+			atom.Providers(defaultProviders().With(
+				medias.Provide,
+				users.Provide,
+				tenant.Provide,
+			)),
+			atom.Arguments(func(cmd *cobra.Command) {
+			}),
+			atom.RunE(func(cmd *cobra.Command, args []string) error {
+				return container.Container.Invoke(func(t *tenant.Expire) error {
+					slug := args[0]
+					expireStr := args[1] // format 2024-01-01
+					// parse expire string as time.Time
+					expire, err := time.Parse("2006-01-02", expireStr)
+					if err != nil {
+						return errors.Wrapf(err, "parse expire time failed: %s", expireStr)
+					}
+
+					return t.RunE(slug, expire)
+				})
+			}),
+		),
+	)
+}

backend/pkg/service/testx/testing.go

@@ -0,0 +1,29 @@
+package testx
+
+import (
+	"os"
+	"testing"
+
+	"git.ipao.vip/rogeecn/atom"
+	"git.ipao.vip/rogeecn/atom/container"
+	"github.com/rogeecn/fabfile"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func Default(providers ...container.ProviderContainer) container.Providers {
+	return append(container.Providers{}, providers...)
+}
+
+func Serve(providers container.Providers, t *testing.T, invoke any) {
+	Convey("tests boot up", t, func() {
+		file := fabfile.MustFind("config.toml")
+
+		localEnv := os.Getenv("ENV_LOCAL")
+		if localEnv != "" {
+			file = fabfile.MustFind("config." + localEnv + ".toml")
+		}
+
+		So(atom.LoadProviders(file, providers), ShouldBeNil)
+		So(container.Container.Invoke(invoke), ShouldBeNil)
+	})
+}