Apply new version

minhduc140583 · minhduc140583 · commit c9dda8d0d96c · 2021-10-24T12:36:55.000+07:00
diff --git a/configs/config.yml b/configs/config.yml
@@ -29,3 +29,9 @@ status:
   version_error: 2
   validation_error: 4
   error: 4
+
+action:
+  create: create
+  update: update
+  patch: patch
+  delete: delete
diff --git a/go.mod b/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/core-go/health v0.4.7
 	github.com/core-go/log v0.0.7
 	github.com/core-go/mongo v0.2.8
-	github.com/core-go/search v0.2.1
-	github.com/core-go/service v0.1.5
+	github.com/core-go/search v0.2.2
+	github.com/core-go/service v0.1.6
 	github.com/core-go/sql v0.2.27
 	github.com/go-playground/validator/v10 v10.9.0 // indirect
 	github.com/go-sql-driver/mysql v1.6.0
diff --git a/go.sum b/go.sum
@@ -34,10 +34,10 @@ github.com/core-go/log v0.0.7 h1:81MypmjviFMHGabaHFy7CL2Neh5BbW+EuQtWRB6DBG8=
 github.com/core-go/log v0.0.7/go.mod h1:nLtakp+tnvjYestj7RVMXHnZ3GMfMpeZvl9Gzo7xz6o=
 github.com/core-go/mongo v0.2.8 h1:IDmhSD3/DQrnYB7WajRCe2hw9NvyWikm5gvGo1WdAnc=
 github.com/core-go/mongo v0.2.8/go.mod h1:ujZ+OILNHPNhPMUOtxu5K/HC/VK+O3gilL367B/eONk=
-github.com/core-go/search v0.2.1 h1:QzGRCyk2PXlOSP+cvxiE5wc4uvZ0OJDJyF13urUba+Y=
-github.com/core-go/search v0.2.1/go.mod h1:wgb0haY0xDvg1msrqkr3RTtYH6zXYANprVpWZUbRLRM=
-github.com/core-go/service v0.1.5 h1:+OQ0PNXnWXwtniNbZjtdidCu5TPkLg4nrZMGd97OmC0=
-github.com/core-go/service v0.1.5/go.mod h1:LUwlp3n/9D6/w5dHoUtcndhDA73Z6dZeB7esgD0hcKs=
+github.com/core-go/search v0.2.2 h1:i1mWQYOU7oRFqbHDHtPBDD8HQm5XfAY9j40Eb0g+6jA=
+github.com/core-go/search v0.2.2/go.mod h1:wgb0haY0xDvg1msrqkr3RTtYH6zXYANprVpWZUbRLRM=
+github.com/core-go/service v0.1.6 h1:lGIUg8fwNiWlP3xba6yzoLmgsQ/tQjn5FrKQt7N3n1w=
+github.com/core-go/service v0.1.6/go.mod h1:LUwlp3n/9D6/w5dHoUtcndhDA73Z6dZeB7esgD0hcKs=
 github.com/core-go/sql v0.2.27 h1:t71RNQQy+GFqtV6JmMQ36cfTxpyYczuyTH7gKeGWdWM=
 github.com/core-go/sql v0.2.27/go.mod h1:8hRTaaPVqey2TKPhKQyG/Gc1MVB5o2WcsslleHqPAGw=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
diff --git a/internal/app/app.go b/internal/app/app.go
@@ -33,10 +33,11 @@ func NewApp(ctx context.Context, root Root) (*ApplicationContext, error) {
 	}
 	logError := log.ErrorMsg
 	status := sv.InitializeStatus(root.Status)
+	action := sv.InitializeAction(root.Action)
 	validator := v.NewValidator()
 
 	var userRepository sv.Repository
-	var searchUser func(context.Context, interface{}, interface{}, int64,...int64) (int64, string, error)
+	var searchUser func(context.Context, interface{}, interface{}, int64, ...int64) (int64, string, error)
 	userType := reflect.TypeOf(User{})
 	if root.Provider != "mongo" {
 		userQueryBuilder := query.NewBuilder(db, "users", userType)
@@ -56,7 +57,7 @@ func NewApp(ctx context.Context, root Root) (*ApplicationContext, error) {
 		userRepository = mgo.NewRepository(mongoDb, "users", userType)
 	}
 	userService := NewUserService(userRepository)
-	userHandler := NewUserHandler(searchUser, userService, status, validator.Validate, logError)
+	userHandler := NewUserHandler(searchUser, userService, status, logError, validator.Validate, &action)
 
 	sqlChecker := q.NewHealthChecker(db)
 	mongoChecker := mgo.NewHealthChecker(mongoDb)
diff --git a/internal/app/root.go b/internal/app/root.go
@@ -16,4 +16,5 @@ type Root struct {
 	Log        log.Config        `mapstructure:"log"`
 	MiddleWare mid.LogConfig     `mapstructure:"middleware"`
 	Status     *sv.StatusConfig  `mapstructure:"status"`
+	Action     *sv.ActionConfig  `mapstructure:"action"`
 }
diff --git a/internal/usecase/user/user_handler.go b/internal/usecase/user/user_handler.go
@@ -17,23 +17,18 @@ type UserHandler interface {
 	Delete(w http.ResponseWriter, r *http.Request)
 }
 
-func NewUserHandler(find func(context.Context, interface{}, interface{}, int64, ...int64) (int64, string, error), service UserService, status sv.StatusConfig, validate func(ctx context.Context, model interface{}) ([]sv.ErrorMessage, error), logError func(context.Context, string)) UserHandler {
+func NewUserHandler(find func(context.Context, interface{}, interface{}, int64, ...int64) (int64, string, error), service UserService, status sv.StatusConfig, logError func(context.Context, string), validate func(ctx context.Context, model interface{}) ([]sv.ErrorMessage, error), action *sv.ActionConfig) UserHandler {
 	searchModelType := reflect.TypeOf(UserFilter{})
 	modelType := reflect.TypeOf(User{})
-	keys, indexes, _ := sv.BuildHandlerParams(modelType)
-	searchHandler := search.NewJSONSearchHandler(find, modelType, searchModelType, logError, nil)
-	return &userHandler{SearchHandler: searchHandler, service: service, keys: keys, indexes: indexes, modelType: modelType, Status: status, Validate: validate, Error: logError}
+	params := sv.CreateParams(modelType, &status, logError, validate, action)
+	searchHandler := search.NewSearchHandler(find, modelType, searchModelType, logError, params.Log)
+	return &userHandler{service: service, SearchHandler: searchHandler, Params: params}
 }
 
 type userHandler struct {
+	service UserService
 	*search.SearchHandler
-	service   UserService
-	keys      []string
-	indexes   map[string]int
-	modelType reflect.Type
-	Status    sv.StatusConfig
-	Validate  func(ctx context.Context, model interface{}) ([]sv.ErrorMessage, error)
-	Error     func(context.Context, string)
+	*sv.Params
 }
 
 func (h *userHandler) Load(w http.ResponseWriter, r *http.Request) {
@@ -48,38 +43,38 @@ func (h *userHandler) Create(w http.ResponseWriter, r *http.Request) {
 	er1 := sv.Decode(w, r, &user)
 	if er1 == nil {
 		errors, er2 := h.Validate(r.Context(), &user)
-		if !sv.HasError(w, r, errors, er2, *h.Status.ValidationError, h.Error, nil) {
+		if !sv.HasError(w, r, errors, er2, *h.Status.ValidationError, h.Error, h.Log, h.Resource, h.Action.Create) {
 			result, er3 := h.service.Create(r.Context(), &user)
-			sv.AfterCreated(w, r, &user, result, er3, h.Status, h.Error, nil)
+			sv.AfterCreated(w, r, &user, result, er3, h.Status, h.Error, h.Log, h.Resource, h.Action.Create)
 		}
 	}
 }
 func (h *userHandler) Update(w http.ResponseWriter, r *http.Request) {
 	var user User
-	er1 := sv.DecodeAndCheckId(w, r, &user, h.keys, h.indexes)
+	er1 := sv.DecodeAndCheckId(w, r, &user, h.Keys, h.Indexes)
 	if er1 == nil {
 		errors, er2 := h.Validate(r.Context(), &user)
-		if !sv.HasError(w, r, errors, er2, *h.Status.ValidationError, h.Error, nil) {
+		if !sv.HasError(w, r, errors, er2, *h.Status.ValidationError, h.Error, h.Log, h.Resource, h.Action.Update) {
 			result, er3 := h.service.Update(r.Context(), &user)
-			sv.HandleResult(w, r, &user, result, er3, h.Status, h.Error, nil)
+			sv.HandleResult(w, r, &user, result, er3, h.Status, h.Error, h.Log, h.Resource, h.Action.Update)
 		}
 	}
 }
 func (h *userHandler) Patch(w http.ResponseWriter, r *http.Request) {
 	var user User
-	r, json, er1 := sv.BuildMapAndCheckId(w, r, &user, h.keys, h.indexes)
+	r, json, er1 := sv.BuildMapAndCheckId(w, r, &user, h.Keys, h.Indexes)
 	if er1 == nil {
 		errors, er2 := h.Validate(r.Context(), &user)
-		if !sv.HasError(w, r, errors, er2, *h.Status.ValidationError, h.Error, nil) {
+		if !sv.HasError(w, r, errors, er2, *h.Status.ValidationError, h.Error, h.Log, h.Resource, h.Action.Patch) {
 			result, er3 := h.service.Patch(r.Context(), json)
-			sv.HandleResult(w, r, json, result, er3, h.Status, h.Error, nil)
+			sv.HandleResult(w, r, json, result, er3, h.Status, h.Error, h.Log, h.Resource, h.Action.Patch)
 		}
 	}
 }
 func (h *userHandler) Delete(w http.ResponseWriter, r *http.Request) {
 	id := sv.GetRequiredParam(w, r)
 	if len(id) > 0 {
 		result, err := h.service.Delete(r.Context(), id)
-		sv.HandleDelete(w, r, result, err, h.Error, nil)
+		sv.HandleDelete(w, r, result, err, h.Error, h.Log, h.Resource, h.Action.Delete)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,5 @@ type Root struct {`
`16`	`16`	Log log.Config `mapstructure:"log"`
`17`	`17`	MiddleWare mid.LogConfig `mapstructure:"middleware"`
`18`	`18`	Status *sv.StatusConfig `mapstructure:"status"`
	`19`	+ Action *sv.ActionConfig `mapstructure:"action"`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,23 +17,18 @@ type UserHandler interface {`
`17`	`17`	`Delete(w http.ResponseWriter, r *http.Request)`
`18`	`18`	`}`
`19`	`19`
`20`		`-func NewUserHandler(find func(context.Context, interface{}, interface{}, int64, ...int64) (int64, string, error), service UserService, status sv.StatusConfig, validate func(ctx context.Context, model interface{}) ([]sv.ErrorMessage, error), logError func(context.Context, string)) UserHandler {`
	`20`	`+func NewUserHandler(find func(context.Context, interface{}, interface{}, int64, ...int64) (int64, string, error), service UserService, status sv.StatusConfig, logError func(context.Context, string), validate func(ctx context.Context, model interface{}) ([]sv.ErrorMessage, error), action *sv.ActionConfig) UserHandler {`
`21`	`21`	`searchModelType := reflect.TypeOf(UserFilter{})`
`22`	`22`	`modelType := reflect.TypeOf(User{})`
`23`		`- keys, indexes, _ := sv.BuildHandlerParams(modelType)`
`24`		`- searchHandler := search.NewJSONSearchHandler(find, modelType, searchModelType, logError, nil)`
`25`		`- return &userHandler{SearchHandler: searchHandler, service: service, keys: keys, indexes: indexes, modelType: modelType, Status: status, Validate: validate, Error: logError}`
	`23`	`+ params := sv.CreateParams(modelType, &status, logError, validate, action)`
	`24`	`+ searchHandler := search.NewSearchHandler(find, modelType, searchModelType, logError, params.Log)`
	`25`	`+ return &userHandler{service: service, SearchHandler: searchHandler, Params: params}`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`type userHandler struct {`
	`29`	`+ service UserService`
`29`	`30`	`*search.SearchHandler`
`30`		`- service UserService`
`31`		`- keys []string`
`32`		`- indexes map[string]int`
`33`		`- modelType reflect.Type`
`34`		`- Status sv.StatusConfig`
`35`		`- Validate func(ctx context.Context, model interface{}) ([]sv.ErrorMessage, error)`
`36`		`- Error func(context.Context, string)`
	`31`	`+ *sv.Params`
`37`	`32`	`}`
`38`	`33`
`39`	`34`	`func (h userHandler) Load(w http.ResponseWriter, r http.Request) {`
`@@ -48,38 +43,38 @@ func (h userHandler) Create(w http.ResponseWriter, r http.Request) {`
`48`	`43`	`er1 := sv.Decode(w, r, &user)`
`49`	`44`	`if er1 == nil {`
`50`	`45`	`errors, er2 := h.Validate(r.Context(), &user)`
`51`		`- if !sv.HasError(w, r, errors, er2, *h.Status.ValidationError, h.Error, nil) {`
	`46`	`+ if !sv.HasError(w, r, errors, er2, *h.Status.ValidationError, h.Error, h.Log, h.Resource, h.Action.Create) {`
`52`	`47`	`result, er3 := h.service.Create(r.Context(), &user)`
`53`		`- sv.AfterCreated(w, r, &user, result, er3, h.Status, h.Error, nil)`
	`48`	`+ sv.AfterCreated(w, r, &user, result, er3, h.Status, h.Error, h.Log, h.Resource, h.Action.Create)`
`54`	`49`	`}`
`55`	`50`	`}`
`56`	`51`	`}`
`57`	`52`	`func (h userHandler) Update(w http.ResponseWriter, r http.Request) {`
`58`	`53`	`var user User`
`59`		`- er1 := sv.DecodeAndCheckId(w, r, &user, h.keys, h.indexes)`
	`54`	`+ er1 := sv.DecodeAndCheckId(w, r, &user, h.Keys, h.Indexes)`
`60`	`55`	`if er1 == nil {`
`61`	`56`	`errors, er2 := h.Validate(r.Context(), &user)`
`62`		`- if !sv.HasError(w, r, errors, er2, *h.Status.ValidationError, h.Error, nil) {`
	`57`	`+ if !sv.HasError(w, r, errors, er2, *h.Status.ValidationError, h.Error, h.Log, h.Resource, h.Action.Update) {`
`63`	`58`	`result, er3 := h.service.Update(r.Context(), &user)`
`64`		`- sv.HandleResult(w, r, &user, result, er3, h.Status, h.Error, nil)`
	`59`	`+ sv.HandleResult(w, r, &user, result, er3, h.Status, h.Error, h.Log, h.Resource, h.Action.Update)`
`65`	`60`	`}`
`66`	`61`	`}`
`67`	`62`	`}`
`68`	`63`	`func (h userHandler) Patch(w http.ResponseWriter, r http.Request) {`
`69`	`64`	`var user User`
`70`		`- r, json, er1 := sv.BuildMapAndCheckId(w, r, &user, h.keys, h.indexes)`
	`65`	`+ r, json, er1 := sv.BuildMapAndCheckId(w, r, &user, h.Keys, h.Indexes)`
`71`	`66`	`if er1 == nil {`
`72`	`67`	`errors, er2 := h.Validate(r.Context(), &user)`
`73`		`- if !sv.HasError(w, r, errors, er2, *h.Status.ValidationError, h.Error, nil) {`
	`68`	`+ if !sv.HasError(w, r, errors, er2, *h.Status.ValidationError, h.Error, h.Log, h.Resource, h.Action.Patch) {`
`74`	`69`	`result, er3 := h.service.Patch(r.Context(), json)`
`75`		`- sv.HandleResult(w, r, json, result, er3, h.Status, h.Error, nil)`
	`70`	`+ sv.HandleResult(w, r, json, result, er3, h.Status, h.Error, h.Log, h.Resource, h.Action.Patch)`
`76`	`71`	`}`
`77`	`72`	`}`
`78`	`73`	`}`
`79`	`74`	`func (h userHandler) Delete(w http.ResponseWriter, r http.Request) {`
`80`	`75`	`id := sv.GetRequiredParam(w, r)`
`81`	`76`	`if len(id) > 0 {`
`82`	`77`	`result, err := h.service.Delete(r.Context(), id)`
`83`		`- sv.HandleDelete(w, r, result, err, h.Error, nil)`
	`78`	`+ sv.HandleDelete(w, r, result, err, h.Error, h.Log, h.Resource, h.Action.Delete)`
`84`	`79`	`}`
`85`	`80`	`}`