Replace interface by function

Author: minhduc140583

diff_handler.go

@@ -15,22 +15,22 @@ type DiffModelConfig struct {
 	Action   string `mapstructure:"action" json:"action,omitempty" gorm:"column:action" bson:"action,omitempty" dynamodbav:"action,omitempty" firestore:"action,omitempty"`
 }
 type DiffHandler struct {
-	DiffService DiffService
-	Keys        []string
-	ModelType   reflect.Type
-	Error       func(context.Context, string)
-	Indexes     map[string]int
-	Offset      int
-	Log         func(ctx context.Context, resource string, action string, success bool, desc string) error
-	Resource    string
-	Action      string
-	Config      *DiffModelConfig
+	GetDiff   func(ctx context.Context, id interface{}) (*DiffModel, error)
+	Keys      []string
+	ModelType reflect.Type
+	Error     func(context.Context, string)
+	Indexes   map[string]int
+	Offset    int
+	Log       func(ctx context.Context, resource string, action string, success bool, desc string) error
+	Resource  string
+	Action    string
+	Config    *DiffModelConfig
 }
 
-func NewDiffHandler(diffService DiffService, modelType reflect.Type, logError func(context.Context, string), config *DiffModelConfig, writeLog func(context.Context, string, string, bool, string) error, options ...int) *DiffHandler {
-	return NewDiffHandlerWithKeys(diffService, nil, modelType, logError, config, writeLog, options...)
+func NewDiffHandler(diff func(context.Context, interface{}) (*DiffModel, error), modelType reflect.Type, logError func(context.Context, string), config *DiffModelConfig, writeLog func(context.Context, string, string, bool, string) error, options ...int) *DiffHandler {
+	return NewDiffHandlerWithKeys(diff, nil, modelType, logError, config, writeLog, options...)
 }
-func NewDiffHandlerWithKeys(diffService DiffService, keys []string, modelType reflect.Type, logError func(context.Context, string), config *DiffModelConfig, writeLog func(context.Context, string, string, bool, string) error, options ...int) *DiffHandler {
+func NewDiffHandlerWithKeys(diff func(context.Context, interface{}) (*DiffModel, error), keys []string, modelType reflect.Type, logError func(context.Context, string), config *DiffModelConfig, writeLog func(context.Context, string, string, bool, string) error, options ...int) *DiffHandler {
 	offset := 1
 	if len(options) > 0 {
 		offset = options[0]
@@ -50,15 +50,15 @@ func NewDiffHandlerWithKeys(diffService DiffService, keys []string, modelType re
 	if len(action) == 0 {
 		action = "diff"
 	}
-	return &DiffHandler{Log: writeLog, DiffService: diffService, ModelType: modelType, Keys: keys, Indexes: indexes, Resource: resource, Offset: offset, Config: config, Error: logError}
+	return &DiffHandler{Log: writeLog, GetDiff: diff, ModelType: modelType, Keys: keys, Indexes: indexes, Resource: resource, Offset: offset, Config: config, Error: logError}
 }
 
 func (c *DiffHandler) Diff(w http.ResponseWriter, r *http.Request) {
 	id, err := buildId(r, c.ModelType, c.Keys, c.Indexes, c.Offset)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 	} else {
-		result, err := c.DiffService.Diff(r.Context(), id)
+		result, err := c.GetDiff(r.Context(), id)
 		if err != nil {
 			handleError(w, r, http.StatusInternalServerError, internalServerError, c.Error, c.Resource, c.Action, err, c.Log)
 		} else {

diff_list_handler.go

@@ -8,21 +8,21 @@ import (
 )
 
 type DiffListHandler struct {
-	DiffListService DiffListService
-	Keys            []string
-	ModelType       reflect.Type
-	modelTypeId     reflect.Type
-	Error           func(context.Context, string)
-	Log             func(ctx context.Context, resource string, action string, success bool, desc string) error
-	Resource        string
-	Action          string
-	Config          *DiffModelConfig
+	GetDiff     func(ctx context.Context, ids interface{}) (*[]DiffModel, error)
+	Keys        []string
+	ModelType   reflect.Type
+	modelTypeId reflect.Type
+	Error       func(context.Context, string)
+	Log         func(ctx context.Context, resource string, action string, success bool, desc string) error
+	Resource    string
+	Action      string
+	Config      *DiffModelConfig
 }
 
-func NewDiffListHandler(diffListService DiffListService, modelType reflect.Type, logError func(context.Context, string), config *DiffModelConfig, writeLog func(context.Context, string, string, bool, string) error) *DiffListHandler {
-	return NewDiffListHandlerWithKeys(diffListService, nil, modelType, logError, config, writeLog)
+func NewDiffListHandler(diff func(context.Context, interface{}) (*[]DiffModel, error), modelType reflect.Type, logError func(context.Context, string), config *DiffModelConfig, writeLog func(context.Context, string, string, bool, string) error) *DiffListHandler {
+	return NewDiffListHandlerWithKeys(diff, nil, modelType, logError, config, writeLog)
 }
-func NewDiffListHandlerWithKeys(diffListService DiffListService, keys []string, modelType reflect.Type, logError func(context.Context, string), config *DiffModelConfig, writeLog func(context.Context, string, string, bool, string) error) *DiffListHandler {
+func NewDiffListHandlerWithKeys(diff func(context.Context, interface{}) (*[]DiffModel, error), keys []string, modelType reflect.Type, logError func(context.Context, string), config *DiffModelConfig, writeLog func(context.Context, string, string, bool, string) error) *DiffListHandler {
 	if keys == nil || len(keys) == 0 {
 		keys = getJsonPrimaryKeys(modelType)
 	}
@@ -38,15 +38,15 @@ func NewDiffListHandlerWithKeys(diffListService DiffListService, keys []string,
 	if len(action) == 0 {
 		action = "diff"
 	}
-	return &DiffListHandler{Log: writeLog, DiffListService: diffListService, ModelType: modelType, modelTypeId: modelTypeId, Keys: keys, Resource: resource, Action: action, Config: config, Error: logError}
+	return &DiffListHandler{Log: writeLog, GetDiff: diff, ModelType: modelType, modelTypeId: modelTypeId, Keys: keys, Resource: resource, Action: action, Config: config, Error: logError}
 }
 
 func (c *DiffListHandler) DiffList(w http.ResponseWriter, r *http.Request) {
 	ids, err := buildIds(r, c.modelTypeId, c.Keys)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 	} else {
-		list, err := c.DiffListService.Diff(r.Context(), ids)
+		list, err := c.GetDiff(r.Context(), ids)
 		if err != nil {
 			handleError(w, r, http.StatusInternalServerError, internalServerError, c.Error, c.Resource, c.Action, err, c.Log)
 		} else {