Merge pull request #14 from dung13890/generate_project

Change registry

README.md

@@ -14,7 +14,7 @@ USAGE:
    go-base-gen [global options] command [command options] [arguments...]
 
 VERSION:
-   v1.0.9
+   v1.0.10
 
 COMMANDS:
    project  Generate base code for go project use clean architecture

cmd/project.go

@@ -35,7 +35,7 @@ var (
 		"pkg/cache",
 		"pkg/errors",
 		"pkg/logger",
-		"pkg/postgres",
+		"pkg/database",
 		"pkg/redis",
 		"pkg/utils",
 		"pkg/validate",
@@ -96,8 +96,8 @@ var (
 		"pkg/errors/code.go.tmpl",
 		"pkg/errors/errors.go.tmpl",
 		"pkg/logger/logger.go.tmpl",
-		"pkg/postgres/migrate.go.tmpl",
-		"pkg/postgres/postgres.go.tmpl",
+		"pkg/database/migrate.go.tmpl",
+		"pkg/database/postgres.go.tmpl",
 		"pkg/redis/redis.go.tmpl",
 		"pkg/utils/bcrypt.go.tmpl",
 		"pkg/utils/md5.go.tmpl",

main.go

@@ -9,7 +9,7 @@ import (
 )
 
 var (
-	version string = "v1.0.9"
+	version string = "v1.0.10"
 )
 
 func main() {

template/tmpl/cmd/migrate/main.go.tmpl

@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"{{.Project}}/config"
+	"{{.Project}}/pkg/database"
 	"{{.Project}}/pkg/logger"
-	"{{.Project}}/pkg/postgres"
 )
 
 func main() {
@@ -30,7 +30,7 @@ func main() {
 
 	db := config.GetDBConfig()
 
-	if err := postgres.Migrate(db); err != nil {
+	if err := database.Migrate(db); err != nil {
 		logger.Error().Fatal(err)
 	}
 }

template/tmpl/config/redis.go.tmpl

@@ -35,5 +35,4 @@ func GetRedisConfig() Redis {
 
 	return redisConf
 }
-
 {{end}}

template/tmpl/internal/app/app.go.tmpl

@@ -16,9 +16,9 @@ import (
 	"{{.Project}}/internal/constants"
 	"{{.Project}}/internal/registry"
 	"{{.Project}}/pkg/cache"
+	"{{.Project}}/pkg/database"
 	"{{.Project}}/pkg/errors"
 	"{{.Project}}/pkg/logger"
-	"{{.Project}}/pkg/postgres"
 	"{{.Project}}/pkg/redis"
 
 	"github.com/labstack/echo/v4"
@@ -31,7 +31,7 @@ func Run(conf config.AppConfig) error {
 	var db *gorm.DB
 	var err error
 	for {
-		db, err = postgres.NewGormDB(dbConf)
+		db, err = database.NewGormDB(dbConf)
 		if err != nil {
 			logger.Info().Printf("Wait for starting db: %v", err)
 			time.Sleep(constants.ConnectWaitDuration)

template/tmpl/internal/app/seed.go.tmpl

@@ -11,8 +11,8 @@ import (
 	"{{.Project}}/config"
 	"{{.Project}}/internal/domain"
 	authModule "{{.Project}}/internal/modules/auth/repository"
+	"{{.Project}}/pkg/database"
 	"{{.Project}}/pkg/errors"
-	"{{.Project}}/pkg/postgres"
 
 	"github.com/spf13/viper"
 )
@@ -26,12 +26,16 @@ type seedData struct {
 
 // Seed is function that seed data
 func Seed(dbConfig config.Database) error {
-	db, err := postgres.NewGormDB(dbConfig)
+	db, err := database.NewGormDB(dbConfig)
 	if err != nil {
 		return errors.ErrInternalServerError.Wrap(err)
 	}
 
-	authModule := authModule.NewRepository(db)
+	authMD := &authModule.Repository{
+		RoleR:     authModule.NewRoleRepository(db),
+		UserR:     authModule.NewUserRepository(db),
+		PasswordR: authModule.NewPasswordResetRepository(db),
+	}
 
 	viper.SetConfigFile(pathJSON)
 	if err = viper.ReadInConfig(); err != nil {
@@ -43,7 +47,7 @@ func Seed(dbConfig config.Database) error {
 		return errors.ErrInternalServerError.Wrap(err)
 	}
 
-	if err := data.seedAuth(authModule); err != nil {
+	if err := data.seedAuth(authMD); err != nil {
 		return errors.Throw(err)
 	}
 

template/tmpl/internal/modules/auth/repository/password_reset_repo.go.tmpl

@@ -21,6 +21,13 @@ type PasswordResetRepository struct {
 	*gorm.DB
 }
 
+// NewPasswordResetRepository will implement of domain.PasswordResetRepository interface
+func NewPasswordResetRepository(db *gorm.DB) *PasswordResetRepository {
+	return &PasswordResetRepository{
+		DB: db,
+	}
+}
+
 // StoreOrUpdate will store or update password reset by email
 func (rp *PasswordResetRepository) StoreOrUpdate(ctx context.Context, email, token string) error {
 	dao := &PasswordReset{

template/tmpl/internal/modules/auth/repository/repository.go.tmpl

@@ -7,8 +7,6 @@ Mit License (MIT)
 
 import (
 	"{{.Project}}/internal/domain"
-
-	"gorm.io/gorm"
 )
 
 // Repository for module auth
@@ -17,13 +15,4 @@ type Repository struct {
 	UserR     domain.UserRepository
 	PasswordR domain.PasswordResetRepository
 }
-
-// NewRepository will create new postgres object
-func NewRepository(db *gorm.DB) *Repository {
-	return &Repository{
-		RoleR:     &RoleRepository{DB: db},
-		UserR:     &UserRepository{DB: db},
-		PasswordR: &PasswordResetRepository{DB: db},
-	}
-}
 {{end}}

template/tmpl/internal/modules/auth/repository/role_repo.go.tmpl

@@ -19,6 +19,13 @@ type RoleRepository struct {
 	*gorm.DB
 }
 
+// NewRoleRepository will implement of domain.RoleRepository interface
+func NewRoleRepository(db *gorm.DB) *RoleRepository {
+	return &RoleRepository{
+		DB: db,
+	}
+}
+
 // Fetch will fetch content from db
 func (rp *RoleRepository) Fetch(ctx context.Context) ([]domain.Role, error) {
 	dao := []Role{}

template/tmpl/internal/modules/auth/repository/user_repo.go.tmpl

@@ -19,6 +19,13 @@ type UserRepository struct {
 	*gorm.DB
 }
 
+// NewUserRepository will implement of domain.UserRepository interface
+func NewUserRepository(db *gorm.DB) *UserRepository {
+	return &UserRepository{
+		DB: db,
+	}
+}
+
 // Fetch will fetch content from db
 func (rp *UserRepository) Fetch(ctx context.Context) ([]domain.User, error) {
 	dao := []User{}

template/tmpl/internal/modules/auth/usecase/usecase.go.tmpl

@@ -7,7 +7,6 @@ Mit License (MIT)
 
 import (
 	"{{.Project}}/internal/domain"
-	"{{.Project}}/internal/modules/auth/repository"
 )
 
 // Usecase for module auth
@@ -16,17 +15,4 @@ type Usecase struct {
 	UserUC domain.UserUsecase
 	AuthUC domain.AuthUsecase
 }
-
-// NewUsecase implements from interface
-func NewUsecase(
-	repo *repository.Repository,
-	jwtSvc domain.JWTService,
-	thrSvc domain.ThrottleService,
-) *Usecase {
-	return &Usecase{
-		RoleUC: NewRoleUsecase(repo.RoleR),
-		UserUC: NewUserUsecase(repo.UserR),
-		AuthUC: NewAuthUsecase(jwtSvc, thrSvc, repo.UserR, repo.PasswordR),
-	}
-}
 {{end}}

template/tmpl/internal/modules/name/repository/domain_repo.go.tmpl

@@ -19,6 +19,13 @@ type {{.Domain | capitalize}}Repository struct {
 	*gorm.DB
 }
 
+// New{{.Domain | capitalize}}Repository will implement of domain.{{.Domain | capitalize}}Repository
+func New{{.Domain | capitalize}}Repository(db *gorm.DB) *{{.Domain | capitalize}}Repository {
+	return &{{.Domain | capitalize}}Repository{
+		DB: db,
+	}
+}
+
 // Fetch will fetch content from db
 func (rp *{{.Domain | capitalize}}Repository) Fetch(ctx context.Context) ([]domain.{{.Domain | capitalize}}, error) {
 	dao := []{{.Domain | capitalize}}{}

template/tmpl/internal/modules/name/repository/repository.go.tmpl

@@ -7,19 +7,10 @@ Mit License (MIT)
 
 import (
 	"{{.Project}}/internal/domain"
-
-	"gorm.io/gorm"
 )
 
 // Repository for module auth
 type Repository struct {
 	{{.Domain | capitalize}}R domain.{{.Domain | capitalize}}Repository
 }
-
-// NewRepository will create new postgres object
-func NewRepository(db *gorm.DB) *Repository {
-	return &Repository{
-		{{.Domain | capitalize}}R: &{{.Domain | capitalize}}Repository{DB: db},
-	}
-}
 {{end}}

template/tmpl/internal/modules/name/usecase/domain_uc.go.tmpl

@@ -17,7 +17,7 @@ type {{.Domain | capitalize}}Usecase struct {
 	repo domain.{{.Domain | capitalize}}Repository
 }
 
-// New{{.Domain | capitalize}}Usecase will create new an {{.Domain}}Usecase object representation of domain.{{.Domain | capitalize}}Usecase interface
+// New{{.Domain | capitalize}}Usecase will implement of domain.{{.Domain | capitalize}}Usecase interface
 func New{{.Domain | capitalize}}Usecase(repo domain.{{.Domain | capitalize}}Repository) *{{.Domain | capitalize}}Usecase {
 	return &{{.Domain | capitalize}}Usecase{
 		repo: repo,

template/tmpl/internal/modules/name/usecase/usecase.go.tmpl

@@ -7,20 +7,10 @@ Mit License (MIT)
 
 import (
 	"{{.Project}}/internal/domain"
-	"{{.Project}}/internal/modules/{{.Module}}/repository"
 )
 
 // Usecase for module auth
 type Usecase struct {
 	{{.Domain | capitalize}}UC domain.{{.Domain | capitalize}}Usecase
 }
-
-// NewUsecase implements from interface
-func NewUsecase(
-	repo *repository.Repository,
-) *Usecase {
-	return &Usecase{
-		{{.Domain | capitalize}}UC: New{{.Domain | capitalize}}Usecase(repo.{{.Domain | capitalize}}R),
-	}
-}
 {{end}}

template/tmpl/internal/registry/repository.go.tmpl

@@ -19,7 +19,11 @@ type Repository struct {
 // NewRepository implements from interface for modules
 func NewRepository(db *gorm.DB) *Repository {
 	return &Repository{
-		AuthModule: authRepo.NewRepository(db),
+		AuthModule: &authRepo.Repository{
+			RoleR:     authRepo.NewRoleRepository(db),
+			UserR:     authRepo.NewUserRepository(db),
+			PasswordR: authRepo.NewPasswordResetRepository(db),
+		},
 	}
 }
 {{end}}

template/tmpl/internal/registry/usecase.go.tmpl

@@ -17,11 +17,20 @@ type Usecase struct {
 // NewUsecase implements from interface for modules
 func NewUsecase(repo *Repository, svc *Service) *Usecase {
 	return &Usecase{
-		AuthModule: authUC.NewUsecase(
-			repo.AuthModule,
-			svc.JWTSvc,
-			svc.ThrottleSvc,
-		),
+		AuthModule: &authUC.Usecase{
+			RoleUC: authUC.NewRoleUsecase(
+				repo.AuthModule.RoleR,
+			),
+			UserUC: authUC.NewUserUsecase(
+				repo.AuthModule.UserR,
+			),
+			AuthUC: authUC.NewAuthUsecase(
+				svc.JWTSvc,
+				svc.ThrottleSvc,
+				repo.AuthModule.UserR,
+				repo.AuthModule.PasswordR,
+			),
+		},
 	}
 }
 {{end}}

template/tmpl/internal/repository/domain_repo.go.tmpl

@@ -19,6 +19,13 @@ type {{.Domain | capitalize}}Repository struct {
 	*gorm.DB
 }
 
+// New{{.Domain | capitalize}}Repository will implement of domain.{{.Domain | capitalize}}Repository interface
+func New{{.Domain | capitalize}}Repository(db *gorm.DB) *{{.Domain | capitalize}}Repository {
+	return &{{.Domain | capitalize}}Repository{
+		DB: db,
+	}
+}
+
 // Fetch will fetch content from db
 func (rp *{{.Domain | capitalize}}Repository) Fetch(ctx context.Context) ([]domain.{{.Domain | capitalize}}, error) {
 	dao := []{{.Domain | capitalize}}{}

template/tmpl/internal/repository/repository.go.tmpl

@@ -13,11 +13,4 @@ import (
 type Repository struct {
 	{{.Domain | capitalize}}R domain.{{.Domain | capitalize}}Repository
 }
-
-// NewRepository will create new postgres object
-func NewRepository() *Repository {
-	return &Repository{
-		{{.Domain | capitalize}}R: &{{.Domain | capitalize}}Repository{},
-	}
-}
 {{end}}

template/tmpl/internal/usecase/domain_uc.go.tmpl

@@ -17,7 +17,7 @@ type {{.Domain | capitalize}}Usecase struct {
 	repo domain.{{.Domain | capitalize}}Repository
 }
 
-// New{{.Domain | capitalize}}Usecase will create new an {{.Domain}}Usecase object representation of domain.{{.Domain | capitalize}}Usecase interface
+// New{{.Domain | capitalize}}Usecase will implement of domain.{{.Domain | capitalize}}Usecase interface
 func New{{.Domain | capitalize}}Usecase(repo domain.{{.Domain | capitalize}}Repository) *{{.Domain | capitalize}}Usecase {
 	return &{{.Domain | capitalize}}Usecase{
 		repo: repo,

template/tmpl/internal/usecase/usecase.go.tmpl

@@ -7,20 +7,10 @@ Mit License (MIT)
 
 import (
 	"{{.Project}}/internal/domain"
-	"{{.Project}}/internal/repository"
 )
 
 // Usecase for all usecase
 type Usecase struct {
 	{{.Domain | capitalize}}UC domain.{{.Domain | capitalize}}Usecase
 }
-
-// NewUsecase implements from interface
-func NewUsecase(
-	repo *repository.Repository,
-) *Usecase {
-	return &Usecase{
-		{{.Domain | capitalize}}UC: New{{.Domain | capitalize}}Usecase(repo.{{.Domain | capitalize}}R),
-	}
-}
 {{end}}

template/tmpl/pkg/postgres/migrate.go.tmpl → template/tmpl/pkg/database/migrate.go.tmpl

@@ -3,7 +3,7 @@ Copyright (c) 2023 dung13890. All rights reserved.
 Mit License (MIT)
 */}}
 
-{{define "pkg/postgres/migrate.go"}}package postgres
+{{define "pkg/database/migrate.go"}}package database
 
 import (
 	"flag"

template/tmpl/pkg/postgres/postgres.go.tmpl → template/tmpl/pkg/database/postgres.go.tmpl

@@ -3,7 +3,7 @@ Copyright (c) 2023 dung13890. All rights reserved.
 Mit License (MIT)
 */}}
 
-{{define "pkg/postgres/postgres.go"}}package postgres
+{{define "pkg/database/postgres.go"}}package database
 
 import (
 	"fmt"