优化delivery

protoc-gen-go-crud/deliveries/deliveries.go

@@ -55,6 +55,7 @@ func genService(_ *protogen.Plugin, file *protogen.File, g *protogen.GeneratedFi
 		ServiceType: service.GoName,
 		ServiceName: string(service.Desc.FullName()),
 		Metadata:    file.Desc.Path(),
+		PackageName: string(file.GoPackageName),
 	}
 
 	for _, method := range service.Methods {

protoc-gen-go-crud/deliveries/template.go

@@ -7,17 +7,20 @@ import (
 )
 
 var crudTemplate = `
-type {{.ServiceType}}Service struct {
-}
+
 
 {{$firstLetter := (GetFirstLetter .ServiceType)}}
+{{$packageName := .PackageName}}
 {{$svrType := .ServiceType}}
 {{$svrName := .ServiceName}}
+
+type {{.ServiceType}}Service struct {
+	{{$firstLetter}}c usecase.I{{.ServiceType}}UseCase
+}
+
 {{- range .MethodSets}}
 {{$request := .Request}}
 {{$reply := .Reply}}
-
-
 {{- if not (IsHasPackagePrefix .Request)}}
 {{$request = printf "%s.%s" .PackageName .Request}}
 {{- end}}
@@ -35,6 +38,15 @@ func ({{$firstLetter}} {{.ServiceType}}Service) Log(c *gin.Context) *zap.Sugared
 	return global.Logger(c).Named("{{.ServiceType}}Repo")
 }
 
+func New{{.ServiceType}}Service({{$firstLetter}}c usecase.I{{$svrType}}UseCase) {{$packageName}}.{{.ServiceType}}HTTPServer{
+	return &{{.ServiceType}}Service{
+		{{$firstLetter}}c: {{$firstLetter}}c,
+	}
+}
+
+
+
+
 `
 
 type serviceDesc struct {
@@ -43,6 +55,7 @@ type serviceDesc struct {
 	Metadata    string // api/helloworld/helloworld.proto
 	Methods     []*methodDesc
 	MethodSets  map[string]*methodDesc
+	PackageName string
 }
 
 type methodDesc struct {

protoc-gen-go-crud/internal/authorization/deliveries/authorization.go

@@ -5,6 +5,7 @@ import (
 )
 
 type AuthService struct {
+	ac usecase.IAuthUseCase
 }
 
 func (a AuthService) ListMenus(c *gin.Context, in *empty.Empty) (*authorizationV1.Menus, error) {
@@ -14,3 +15,9 @@ func (a AuthService) ListMenus(c *gin.Context, in *empty.Empty) (*authorizationV
 func (a AuthService) Log(c *gin.Context) *zap.SugaredLogger {
 	return global.Logger(c).Named("AuthRepo")
 }
+
+func NewAuthService(ac usecase.IAuthUseCase) authorizationV1.AuthHTTPServer {
+	return &AuthService{
+		ac: ac,
+	}
+}

protoc-gen-go-crud/internal/authorization/deliveries/role.go

@@ -1,11 +1,15 @@
 package deliveries
 
 import (
+	authorizationV1 "github.com/fynntang/protobuf-gen-go/protoc-gen-go-crud/api/v1/authorization"
 	components "github.com/fynntang/protobuf-gen-go/protoc-gen-go-crud/api/v1/components"
+	"github.com/fynntang/protobuf-gen-go/protoc-gen-go-crud/internal/authorization/usecase"
+	"github.com/gin-gonic/gin"
 	empty "github.com/golang/protobuf/ptypes/empty"
 )
 
 type RoleService struct {
+	rc usecase.IRoleUseCase
 }
 
 func (r RoleService) CreateRole(c *gin.Context, in *authorizationV1.CreateRoleRequest) (*empty.Empty, error) {
@@ -31,3 +35,9 @@ func (r RoleService) UpdateRole(c *gin.Context, in *authorizationV1.UpdateRoleRe
 func (r RoleService) Log(c *gin.Context) *zap.SugaredLogger {
 	return global.Logger(c).Named("RoleRepo")
 }
+
+func NewRoleService(rc usecase.IRoleUseCase) authorizationV1.RoleHTTPServer {
+	return &RoleService{
+		rc: rc,
+	}
+}

protoc-gen-go-crud/internal/users/deliveries/users.go

@@ -6,6 +6,7 @@ import (
 )
 
 type UserService struct {
+	uc usecase.IUserUseCase
 }
 
 func (u UserService) ChangePassword(c *gin.Context, in *usersV1.ChangePasswordRequest) (*empty.Empty, error) {
@@ -63,3 +64,9 @@ func (u UserService) User(c *gin.Context, in *empty.Empty) (*components.User, er
 func (u UserService) Log(c *gin.Context) *zap.SugaredLogger {
 	return global.Logger(c).Named("UserRepo")
 }
+
+func NewUserService(uc usecase.IUserUseCase) usersV1.UserHTTPServer {
+	return &UserService{
+		uc: uc,
+	}
+}