Refactor code

minhduc140583 · minhduc140583 · commit ffd1dc2e7f4f · 2021-10-10T17:35:55.000+07:00
diff --git a/code.go b/code.go
@@ -20,23 +20,23 @@ const (
 )
 
 type Model struct {
-	Id       string `mapstructure:"id" json:"id,omitempty" gorm:"column:id" bson:"id,omitempty" dynamodbav:"id,omitempty" firestore:"id,omitempty"`
-	Code     string `mapstructure:"code" json:"code,omitempty" gorm:"column:code" bson:"code,omitempty" dynamodbav:"code,omitempty" firestore:"code,omitempty"`
-	Value    string `mapstructure:"value" json:"value,omitempty" gorm:"column:value" bson:"value,omitempty" dynamodbav:"value,omitempty" firestore:"value,omitempty"`
-	Name     string `mapstructure:"name" json:"name,omitempty" gorm:"column:name" bson:"name,omitempty" dynamodbav:"name,omitempty" firestore:"name,omitempty"`
-	Text     string `mapstructure:"text" json:"text,omitempty" gorm:"column:text" bson:"text,omitempty" dynamodbav:"text,omitempty" firestore:"text,omitempty"`
-	Sequence int32  `mapstructure:"sequence" json:"sequence,omitempty" gorm:"column:sequence" bson:"sequence,omitempty" dynamodbav:"sequence,omitempty" firestore:"sequence,omitempty"`
+	Id       string `yaml:"id" mapstructure:"id" json:"id,omitempty" gorm:"column:id" bson:"id,omitempty" dynamodbav:"id,omitempty" firestore:"id,omitempty"`
+	Code     string `yaml:"code" mapstructure:"code" json:"code,omitempty" gorm:"column:code" bson:"code,omitempty" dynamodbav:"code,omitempty" firestore:"code,omitempty"`
+	Value    string `yaml:"value" mapstructure:"value" json:"value,omitempty" gorm:"column:value" bson:"value,omitempty" dynamodbav:"value,omitempty" firestore:"value,omitempty"`
+	Name     string `yaml:"name"" mapstructure:"name" json:"name,omitempty" gorm:"column:name" bson:"name,omitempty" dynamodbav:"name,omitempty" firestore:"name,omitempty"`
+	Text     string `yaml:"text" mapstructure:"text" json:"text,omitempty" gorm:"column:text" bson:"text,omitempty" dynamodbav:"text,omitempty" firestore:"text,omitempty"`
+	Sequence int32  `yaml:"sequence mapstructure:"sequence" json:"sequence,omitempty" gorm:"column:sequence" bson:"sequence,omitempty" dynamodbav:"sequence,omitempty" firestore:"sequence,omitempty"`
 }
 type StructureConfig struct {
-	Master   string      `mapstructure:"master" json:"master,omitempty" gorm:"column:master" bson:"master,omitempty" dynamodbav:"master,omitempty" firestore:"master,omitempty"`
-	Id       string      `mapstructure:"id" json:"id,omitempty" gorm:"column:id" bson:"id,omitempty" dynamodbav:"id,omitempty" firestore:"id,omitempty"`
-	Code     string      `mapstructure:"code" json:"code,omitempty" gorm:"column:code" bson:"code,omitempty" dynamodbav:"code,omitempty" firestore:"code,omitempty"`
-	Text     string      `mapstructure:"text" json:"text,omitempty" gorm:"column:text" bson:"text,omitempty" dynamodbav:"text,omitempty" firestore:"text,omitempty"`
-	Name     string      `mapstructure:"name" json:"name,omitempty" gorm:"column:name" bson:"name,omitempty" dynamodbav:"name,omitempty" firestore:"name,omitempty"`
-	Value    string      `mapstructure:"value" json:"value,omitempty" gorm:"column:value" bson:"value,omitempty" dynamodbav:"value,omitempty" firestore:"value,omitempty"`
-	Sequence string      `mapstructure:"sequence" json:"sequence,omitempty" gorm:"column:sequence" bson:"sequence,omitempty" dynamodbav:"sequence,omitempty" firestore:"sequence,omitempty"`
-	Status   string      `mapstructure:"status" json:"status,omitempty" gorm:"column:status" bson:"status,omitempty" dynamodbav:"status,omitempty" firestore:"status,omitempty"`
-	Active   interface{} `mapstructure:"active" json:"active,omitempty" gorm:"column:active" bson:"active,omitempty" dynamodbav:"active,omitempty" firestore:"active,omitempty"`
+	Master   string      `yaml:"master" mapstructure:"master" json:"master,omitempty" gorm:"column:master" bson:"master,omitempty" dynamodbav:"master,omitempty" firestore:"master,omitempty"`
+	Id       string      `yaml:"id" mapstructure:"id" json:"id,omitempty" gorm:"column:id" bson:"id,omitempty" dynamodbav:"id,omitempty" firestore:"id,omitempty"`
+	Code     string      `yaml:"code" mapstructure:"code" json:"code,omitempty" gorm:"column:code" bson:"code,omitempty" dynamodbav:"code,omitempty" firestore:"code,omitempty"`
+	Text     string      `yaml:"text" mapstructure:"text" json:"text,omitempty" gorm:"column:text" bson:"text,omitempty" dynamodbav:"text,omitempty" firestore:"text,omitempty"`
+	Name     string      `yaml:"name" mapstructure:"name" json:"name,omitempty" gorm:"column:name" bson:"name,omitempty" dynamodbav:"name,omitempty" firestore:"name,omitempty"`
+	Value    string      `yaml:"value" mapstructure:"value" json:"value,omitempty" gorm:"column:value" bson:"value,omitempty" dynamodbav:"value,omitempty" firestore:"value,omitempty"`
+	Sequence string      `yaml:"sequence" mapstructure:"sequence" json:"sequence,omitempty" gorm:"column:sequence" bson:"sequence,omitempty" dynamodbav:"sequence,omitempty" firestore:"sequence,omitempty"`
+	Status   string      `yaml:"status" mapstructure:"status" json:"status,omitempty" gorm:"column:status" bson:"status,omitempty" dynamodbav:"status,omitempty" firestore:"status,omitempty"`
+	Active   interface{} `yaml:"active" mapstructure:"active" json:"active,omitempty" gorm:"column:active" bson:"active,omitempty" dynamodbav:"active,omitempty" firestore:"active,omitempty"`
 }
 type Loader interface {
 	Load(ctx context.Context, master string) ([]Model, error)
diff --git a/config.go b/config.go
@@ -1,6 +1,6 @@
 package code
 
 type Config struct {
-	Handler HandlerConfig   `mapstructure:"handler" json:"handler,omitempty" gorm:"column:handler" bson:"handler,omitempty" dynamodbav:"handler,omitempty" firestore:"handler,omitempty"`
-	Loader  StructureConfig `mapstructure:"loader" json:"loader,omitempty" gorm:"column:loader" bson:"loader,omitempty" dynamodbav:"loader,omitempty" firestore:"loader,omitempty"`
+	Handler HandlerConfig   `yaml:"handler" mapstructure:"handler" json:"handler,omitempty" gorm:"column:handler" bson:"handler,omitempty" dynamodbav:"handler,omitempty" firestore:"handler,omitempty"`
+	Loader  StructureConfig `yaml:"loader" mapstructure:"loader" json:"loader,omitempty" gorm:"column:loader" bson:"loader,omitempty" dynamodbav:"loader,omitempty" firestore:"loader,omitempty"`
 }
diff --git a/echo/handler.go b/echo/handler.go
@@ -14,22 +14,22 @@ const internalServerError = "Internal Server Error"
 type Handler struct {
 	Codes          func(ctx context.Context, master string) ([]co.Model, error)
 	RequiredMaster bool
-	Error          func(context.Context, string)
+	Error          func(context.Context, string, ...map[string]interface{})
 	Log            func(ctx context.Context, resource string, action string, success bool, desc string) error
 	Resource       string
 	Action         string
 	Id             string
 	Name           string
 }
 
-func NewDefaultCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string), options ...func(context.Context, string, string, bool, string) error) *Handler {
+func NewDefaultCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string, ...map[string]interface{}), options ...func(context.Context, string, string, bool, string) error) *Handler {
 	var writeLog func(context.Context, string, string, bool, string) error
 	if len(options) >= 1 {
 		writeLog = options[0]
 	}
 	return NewCodeHandlerWithLog(load, logError, true, writeLog, "", "")
 }
-func NewCodeHandlerByConfig(load func(ctx context.Context, master string) ([]co.Model, error), c co.HandlerConfig, logError func(context.Context, string), options ...func(context.Context, string, string, bool, string) error) *Handler {
+func NewCodeHandlerByConfig(load func(ctx context.Context, master string) ([]co.Model, error), c co.HandlerConfig, logError func(context.Context, string, ...map[string]interface{}), options ...func(context.Context, string, string, bool, string) error) *Handler {
 	var requireMaster bool
 	if c.Master != nil {
 		requireMaster = *c.Master
@@ -45,14 +45,14 @@ func NewCodeHandlerByConfig(load func(ctx context.Context, master string) ([]co.
 	h.Name = c.Name
 	return h
 }
-func NewCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string), requiredMaster bool, options ...func(context.Context, string, string, bool, string) error) *Handler {
+func NewCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string, ...map[string]interface{}), requiredMaster bool, options ...func(context.Context, string, string, bool, string) error) *Handler {
 	var writeLog func(context.Context, string, string, bool, string) error
 	if len(options) >= 1 {
 		writeLog = options[0]
 	}
 	return NewCodeHandlerWithLog(load, logError, requiredMaster, writeLog, "", "")
 }
-func NewCodeHandlerWithLog(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string), requiredMaster bool, writeLog func(context.Context, string, string, bool, string) error, options ...string) *Handler {
+func NewCodeHandlerWithLog(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string, ...map[string]interface{}), requiredMaster bool, writeLog func(context.Context, string, string, bool, string) error, options ...string) *Handler {
 	var resource, action string
 	if len(options) >= 1 && len(options[0]) > 0 {
 		resource = options[0]
@@ -111,7 +111,7 @@ func respond(ctx echo.Context, code int, result interface{}, writeLog func(conte
 	}
 	return err
 }
-func respondError(ctx echo.Context, code int, result interface{}, logError func(context.Context, string), resource string, action string, err error, writeLog func(context.Context, string, string, bool, string) error) error {
+func respondError(ctx echo.Context, code int, result interface{}, logError func(context.Context, string, ...map[string]interface{}), resource string, action string, err error, writeLog func(context.Context, string, string, bool, string) error) error {
 	if logError != nil {
 		logError(ctx.Request().Context(), err.Error())
 	}
diff --git a/echo_v3/handler.go b/echo_v3/handler.go
@@ -14,22 +14,22 @@ const internalServerError = "Internal Server Error"
 type Handler struct {
 	Codes          func(ctx context.Context, master string) ([]co.Model, error)
 	RequiredMaster bool
-	Error          func(context.Context, string)
+	Error          func(context.Context, string, ...map[string]interface{})
 	Log            func(ctx context.Context, resource string, action string, success bool, desc string) error
 	Resource       string
 	Action         string
 	Id             string
 	Name           string
 }
 
-func NewDefaultCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string), options ...func(context.Context, string, string, bool, string) error) *Handler {
+func NewDefaultCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string, ...map[string]interface{}), options ...func(context.Context, string, string, bool, string) error) *Handler {
 	var writeLog func(context.Context, string, string, bool, string) error
 	if len(options) >= 1 {
 		writeLog = options[0]
 	}
 	return NewCodeHandlerWithLog(load, logError, true, writeLog, "", "")
 }
-func NewCodeHandlerByConfig(load func(ctx context.Context, master string) ([]co.Model, error), c co.HandlerConfig, logError func(context.Context, string), options ...func(context.Context, string, string, bool, string) error) *Handler {
+func NewCodeHandlerByConfig(load func(ctx context.Context, master string) ([]co.Model, error), c co.HandlerConfig, logError func(context.Context, string, ...map[string]interface{}), options ...func(context.Context, string, string, bool, string) error) *Handler {
 	var requireMaster bool
 	if c.Master != nil {
 		requireMaster = *c.Master
@@ -45,14 +45,14 @@ func NewCodeHandlerByConfig(load func(ctx context.Context, master string) ([]co.
 	h.Name = c.Name
 	return h
 }
-func NewCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string), requiredMaster bool, options ...func(context.Context, string, string, bool, string) error) *Handler {
+func NewCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string, ...map[string]interface{}), requiredMaster bool, options ...func(context.Context, string, string, bool, string) error) *Handler {
 	var writeLog func(context.Context, string, string, bool, string) error
 	if len(options) >= 1 {
 		writeLog = options[0]
 	}
 	return NewCodeHandlerWithLog(load, logError, requiredMaster, writeLog, "", "")
 }
-func NewCodeHandlerWithLog(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string), requiredMaster bool, writeLog func(context.Context, string, string, bool, string) error, options ...string) *Handler {
+func NewCodeHandlerWithLog(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string, ...map[string]interface{}), requiredMaster bool, writeLog func(context.Context, string, string, bool, string) error, options ...string) *Handler {
 	var resource, action string
 	if len(options) >= 1 && len(options[0]) > 0 {
 		resource = options[0]
@@ -111,7 +111,7 @@ func respond(ctx echo.Context, code int, result interface{}, writeLog func(conte
 	}
 	return err
 }
-func respondError(ctx echo.Context, code int, result interface{}, logError func(context.Context, string), resource string, action string, err error, writeLog func(context.Context, string, string, bool, string) error) error {
+func respondError(ctx echo.Context, code int, result interface{}, logError func(context.Context, string, ...map[string]interface{}), resource string, action string, err error, writeLog func(context.Context, string, string, bool, string) error) error {
 	if logError != nil {
 		logError(ctx.Request().Context(), err.Error())
 	}
diff --git a/gin/handler.go b/gin/handler.go
@@ -14,22 +14,22 @@ const internalServerError = "Internal Server Error"
 type Handler struct {
 	Codes          func(ctx context.Context, master string) ([]co.Model, error)
 	RequiredMaster bool
-	Error          func(context.Context, string)
+	Error          func(context.Context, string, ...map[string]interface{})
 	Log            func(ctx context.Context, resource string, action string, success bool, desc string) error
 	Resource       string
 	Action         string
 	Id             string
 	Name           string
 }
 
-func NewDefaultCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string), options ...func(context.Context, string, string, bool, string) error) *Handler {
+func NewDefaultCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string, ...map[string]interface{}), options ...func(context.Context, string, string, bool, string) error) *Handler {
 	var writeLog func(context.Context, string, string, bool, string) error
 	if len(options) >= 1 {
 		writeLog = options[0]
 	}
 	return NewCodeHandlerWithLog(load, logError, true, writeLog, "", "")
 }
-func NewCodeHandlerByConfig(load func(ctx context.Context, master string) ([]co.Model, error), c co.HandlerConfig, logError func(context.Context, string), options ...func(context.Context, string, string, bool, string) error) *Handler {
+func NewCodeHandlerByConfig(load func(ctx context.Context, master string) ([]co.Model, error), c co.HandlerConfig, logError func(context.Context, string, ...map[string]interface{}), options ...func(context.Context, string, string, bool, string) error) *Handler {
 	var requireMaster bool
 	if c.Master != nil {
 		requireMaster = *c.Master
@@ -45,14 +45,14 @@ func NewCodeHandlerByConfig(load func(ctx context.Context, master string) ([]co.
 	h.Name = c.Name
 	return h
 }
-func NewCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string), requiredMaster bool, options ...func(context.Context, string, string, bool, string) error) *Handler {
+func NewCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string, ...map[string]interface{}), requiredMaster bool, options ...func(context.Context, string, string, bool, string) error) *Handler {
 	var writeLog func(context.Context, string, string, bool, string) error
 	if len(options) >= 1 {
 		writeLog = options[0]
 	}
 	return NewCodeHandlerWithLog(load, logError, requiredMaster, writeLog, "", "")
 }
-func NewCodeHandlerWithLog(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string), requiredMaster bool, writeLog func(context.Context, string, string, bool, string) error, options ...string) *Handler {
+func NewCodeHandlerWithLog(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string, ...map[string]interface{}), requiredMaster bool, writeLog func(context.Context, string, string, bool, string) error, options ...string) *Handler {
 	var resource, action string
 	if len(options) >= 1 && len(options[0]) > 0 {
 		resource = options[0]
@@ -110,7 +110,7 @@ func respond(ctx *gin.Context, code int, result interface{}, writeLog func(conte
 		writeLog(ctx.Request.Context(), resource, action, success, desc)
 	}
 }
-func respondError(ctx *gin.Context, code int, result interface{}, logError func(context.Context, string), resource string, action string, err error, writeLog func(context.Context, string, string, bool, string) error) {
+func respondError(ctx *gin.Context, code int, result interface{}, logError func(context.Context, string, ...map[string]interface{}), resource string, action string, err error, writeLog func(context.Context, string, string, bool, string) error) {
 	if logError != nil {
 		logError(ctx.Request.Context(), err.Error())
 	}
diff --git a/handler.go b/handler.go

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package code`
`2`	`2`
`3`	`3`	`type Config struct {`
`4`		- Handler HandlerConfig `mapstructure:"handler" json:"handler,omitempty" gorm:"column:handler" bson:"handler,omitempty" dynamodbav:"handler,omitempty" firestore:"handler,omitempty"`
`5`		- Loader StructureConfig `mapstructure:"loader" json:"loader,omitempty" gorm:"column:loader" bson:"loader,omitempty" dynamodbav:"loader,omitempty" firestore:"loader,omitempty"`
	`4`	+ Handler HandlerConfig `yaml:"handler" mapstructure:"handler" json:"handler,omitempty" gorm:"column:handler" bson:"handler,omitempty" dynamodbav:"handler,omitempty" firestore:"handler,omitempty"`
	`5`	+ Loader StructureConfig `yaml:"loader" mapstructure:"loader" json:"loader,omitempty" gorm:"column:loader" bson:"loader,omitempty" dynamodbav:"loader,omitempty" firestore:"loader,omitempty"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,22 +14,22 @@ const internalServerError = "Internal Server Error"`
`14`	`14`	`type Handler struct {`
`15`	`15`	`Codes func(ctx context.Context, master string) ([]co.Model, error)`
`16`	`16`	`RequiredMaster bool`
`17`		`- Error func(context.Context, string)`
	`17`	`+ Error func(context.Context, string, ...map[string]interface{})`
`18`	`18`	`Log func(ctx context.Context, resource string, action string, success bool, desc string) error`
`19`	`19`	`Resource string`
`20`	`20`	`Action string`
`21`	`21`	`Id string`
`22`	`22`	`Name string`
`23`	`23`	`}`
`24`	`24`
`25`		`-func NewDefaultCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string), options ...func(context.Context, string, string, bool, string) error) *Handler {`
	`25`	`+func NewDefaultCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string, ...map[string]interface{}), options ...func(context.Context, string, string, bool, string) error) *Handler {`
`26`	`26`	`var writeLog func(context.Context, string, string, bool, string) error`
`27`	`27`	`if len(options) >= 1 {`
`28`	`28`	`writeLog = options[0]`
`29`	`29`	`}`
`30`	`30`	`return NewCodeHandlerWithLog(load, logError, true, writeLog, "", "")`
`31`	`31`	`}`
`32`		`-func NewCodeHandlerByConfig(load func(ctx context.Context, master string) ([]co.Model, error), c co.HandlerConfig, logError func(context.Context, string), options ...func(context.Context, string, string, bool, string) error) *Handler {`
	`32`	`+func NewCodeHandlerByConfig(load func(ctx context.Context, master string) ([]co.Model, error), c co.HandlerConfig, logError func(context.Context, string, ...map[string]interface{}), options ...func(context.Context, string, string, bool, string) error) *Handler {`
`33`	`33`	`var requireMaster bool`
`34`	`34`	`if c.Master != nil {`
`35`	`35`	`requireMaster = *c.Master`
`@@ -45,14 +45,14 @@ func NewCodeHandlerByConfig(load func(ctx context.Context, master string) ([]co.`
`45`	`45`	`h.Name = c.Name`
`46`	`46`	`return h`
`47`	`47`	`}`
`48`		`-func NewCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string), requiredMaster bool, options ...func(context.Context, string, string, bool, string) error) *Handler {`
	`48`	`+func NewCodeHandler(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string, ...map[string]interface{}), requiredMaster bool, options ...func(context.Context, string, string, bool, string) error) *Handler {`
`49`	`49`	`var writeLog func(context.Context, string, string, bool, string) error`
`50`	`50`	`if len(options) >= 1 {`
`51`	`51`	`writeLog = options[0]`
`52`	`52`	`}`
`53`	`53`	`return NewCodeHandlerWithLog(load, logError, requiredMaster, writeLog, "", "")`
`54`	`54`	`}`
`55`		`-func NewCodeHandlerWithLog(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string), requiredMaster bool, writeLog func(context.Context, string, string, bool, string) error, options ...string) *Handler {`
	`55`	`+func NewCodeHandlerWithLog(load func(ctx context.Context, master string) ([]co.Model, error), logError func(context.Context, string, ...map[string]interface{}), requiredMaster bool, writeLog func(context.Context, string, string, bool, string) error, options ...string) *Handler {`
`56`	`56`	`var resource, action string`
`57`	`57`	`if len(options) >= 1 && len(options[0]) > 0 {`
`58`	`58`	`resource = options[0]`
`@@ -111,7 +111,7 @@ func respond(ctx echo.Context, code int, result interface{}, writeLog func(conte`
`111`	`111`	`}`
`112`	`112`	`return err`
`113`	`113`	`}`
`114`		`-func respondError(ctx echo.Context, code int, result interface{}, logError func(context.Context, string), resource string, action string, err error, writeLog func(context.Context, string, string, bool, string) error) error {`
	`114`	`+func respondError(ctx echo.Context, code int, result interface{}, logError func(context.Context, string, ...map[string]interface{}), resource string, action string, err error, writeLog func(context.Context, string, string, bool, string) error) error {`
`115`	`115`	`if logError != nil {`
`116`	`116`	`logError(ctx.Request().Context(), err.Error())`
`117`	`117`	`}`