Refactor rdb and http module generator (#3)

* fix build bug

* ♻️ reafactor  and  generator

Author: mint-leaf

config/template.go

@@ -26,14 +26,13 @@ const (
 	ColsGroupTmpl   = "cols_group.tmpl"
 
 	RdbTmpl       = "rdb.tmpl"
-	RdbRepoTmpl   = "rdb_repo.tmpl"
 	RdbDeleteTmpl = "rdb_delete.tmpl"
 	RdbFetchTmpl  = "rdb_fetch.tmpl"
 	RdbUpdateTmpl = "rdb_update.tmpl"
 	RdbInsertTmpl = "rdb_insert.tmpl"
 
 	RepoTmpl       = "repo.tmpl"
-	RepoRepoTmpl   = "repo_repo.tmpl"
+	RepoExtTmpl    = "repo_ext.tmpl"
 	RepoDeleteTmpl = "repo_delete.tmpl"
 	RepoFetchTmpl  = "repo_fetch.tmpl"
 	RepoUpdateTmpl = "repo_update.tmpl"
@@ -44,6 +43,7 @@ const (
 	HttpProtocolTmpl        = "http_protocol.tmpl"
 	HttpProtocolMethodTmpl  = "http_protocol_method.tmpl"
 	HttpProtocolTierTmpl    = "http_protocol_tier.tmpl"
+	HttpParamImplTmpl       = "http_param_impl.tmpl"
 )
 
 var (
@@ -69,14 +69,13 @@ var templateNames = []string{
 	ColsGroupTmpl,
 
 	RepoTmpl,
-	RepoRepoTmpl,
+	RepoExtTmpl,
 	RepoDeleteTmpl,
 	RepoFetchTmpl,
 	RepoUpdateTmpl,
 	RepoInsertTmpl,
 
 	RdbTmpl,
-	RdbRepoTmpl,
 	RdbDeleteTmpl,
 	RdbFetchTmpl,
 	RdbUpdateTmpl,
@@ -87,6 +86,7 @@ var templateNames = []string{
 	HttpProtocolTmpl,
 	HttpProtocolMethodTmpl,
 	HttpProtocolTierTmpl,
+	HttpParamImplTmpl,
 }
 
 func init() {

config/templates/http_handler.tmpl

@@ -33,3 +33,7 @@ func (handler *{{.ServiceName}}HttpHandler) GetRoutersMap() map[string]http.Hand
 func (handler *{{.ServiceName}}HttpHandler) GetRouterGroupBase() string {
 	return "{{.RouterBasePath}}"
 }
+
+func (handler *{{.ServiceName}}HttpHandler) DecodeKey(key string) (string, string, error) {
+	return handler.container.DecodeKey(key)
+}

config/templates/http_handler_register.tmpl

@@ -1,5 +1,7 @@
-handler.container.Set("{{.HttpMethod}}", "{{.HttpMethodPath}}", func(w http.ResponseWriter, r *http.Request) {
-	ctx, request := handler.tier.Build{{.MethodName}}Request(r)
-	response, err := handler.service.{{.MethodName}}(ctx, request)
-	handler.tier.Wrap{{.MethodName}}Response(w, response, err)
+handler.container.Set(
+    handler.container.EncodeKey("{{.HttpMethod}}", "{{.HttpMethodPath}}"),
+    func(w http.ResponseWriter, r *http.Request) {
+	    ctx, request := handler.tier.Before{{.MethodName}}Request(r)
+	    response, err := handler.service.{{.MethodName}}(ctx, request)
+	    handler.tier.After{{.MethodName}}Response(w, response, err)
 })

config/templates/http_param_impl.tmpl

@@ -0,0 +1,23 @@
+func (m *{{.ModelType}}) GetCode() string {
+    return m.Code
+}
+
+func (m *{{.ModelType}}) SetCode(code string) {
+    m.Code = code
+}
+
+func (m *{{.ModelType}}) GetMessage() string {
+    return m.Message
+}
+
+func (m *{{.ModelType}}) SetMessage(message string) {
+    m.Message = message
+}
+
+func (m *{{.ModelType}}) GetBody() interface{} {
+    return m.Body
+}
+
+func (m *{{.ModelType}}) ResetBody(){
+    m.Body = nil
+}

config/templates/http_protocol.tmpl

@@ -11,7 +11,9 @@ type {{.ServiceName}}ServiceTier interface {
 }
 
 type {{.ServiceName}}ServiceContainer interface {
-    Set(method string, path string, runner  func(w http.ResponseWriter, r *http.Request))
-    Get(method string, path string) (func(w http.ResponseWriter, r *http.Request), bool)
+    Set(key string, runner  func(w http.ResponseWriter, r *http.Request))
+    Get(key string) (func(w http.ResponseWriter, r *http.Request), bool)
     ToMap() map[string]http.HandlerFunc
+    EncodeKey(method, path string) string
+    DecodeKey(key string) (string, string, error)
 }

config/templates/http_protocol_tier.tmpl

@@ -1,2 +1,2 @@
-Build{{.MethodName}}Request(input *http.Request) (context.Context, {{.RequestType}})
-Wrap{{.MethodName}}Response(output http.ResponseWriter, resp {{.ResponseType}}, err error)
+Before{{.MethodName}}Request(input *http.Request) (context.Context, {{.RequestType}})
+After{{.MethodName}}Response(output http.ResponseWriter, resp {{.ResponseType}}, err error)

config/templates/rdb.tmpl

@@ -6,14 +6,25 @@ import (
 	"context"
 
 	"github.com/Masterminds/squirrel"
+	"github.com/ncuhome/cato/core/rdb"
 
     {{- if not .IsModelAnotherPackage}}
 	{{.ModelPackageAlias}} "{{.ModelPackage}}"
 	{{- end}}
 )
 
+type RdbRepo{{.ModelType}} struct {
+	basicRepo
+	e rdb.Engine[{{.ModelPackageAlias}}.{{.ModelType}}]
+}
+
+func NewRdbRepo{{.ModelType}}(eg rdb.Engine[{{.ModelPackageAlias}}.{{.ModelType}}]) *RdbRepo{{.ModelType}} {
+	return &RdbRepo{{.ModelType}}{basicRepo: basicRepo{eg}, e: eg}
+}
+
+
 type basicRepo struct {
-	engine
+    rdb.Engine[{{.ModelPackageAlias}}.{{.ModelType}}]
 }
 
 

config/templates/rdb_repo.tmpl

@@ -10,6 +10,20 @@ import (
     {{- end}}
 )
 
+var (
+	repo Repo
+)
+
+func GetRepo() Repo {
+	return repo
+}
+
+type Repo interface {
+	basic
+	extension
+}
+
+
 type basic interface {
 	{{- range .RepoFuncs}}
 	{{.}}

config/templates/repo.tmpl

@@ -0,0 +1,5 @@
+package {{.RepoPackageName}}
+
+
+type extension interface {}
+