change: actionExecutor

Author: glennliao

@doc/action.md

@@ -1,2 +1,3 @@
 # 非开放请求
 
+structures 不能省略层级, 可为空(则代表所有内容都开放)

action/action.go

@@ -38,7 +38,6 @@ type Action struct {
 	// jsonFieldStyle 数据库返回的字段
 	JsonFieldStyle config.FieldStyle
 
-	Functions    *config.Functions
 	actionConfig *config.ActionConfig
 }
 

action/hook.go

@@ -20,8 +20,6 @@ type Hook struct {
 	AfterExecutorDo  func(ctx context.Context, n *Node, method string) error
 }
 
-// todo hook可获取到executor的返回值
-
 var hooksMap = map[string][]Hook{}
 
 func RegHook(h Hook) {

action/node.go

@@ -24,6 +24,7 @@ type Node struct {
 
 	Data   []model.Map // 需写入数据库的数据
 	Where  []model.Map // 条件
+	Ret    model.Map   // 节点返回值
 	RowKey string      // 主键
 
 	structure *config.Structure
@@ -56,25 +57,27 @@ func (n *Node) parseReq(method string) {
 		n.Where = append(n.Where, model.Map{})
 
 		for key, val := range item {
+
 			if key == consts.Role {
 				n.Role = util.String(val)
-			} else {
-				key = n.action.DbFieldStyle(n.ctx, n.tableName, key)
+				continue
+			}
 
-				if method == http.MethodDelete {
+			key = n.action.DbFieldStyle(n.ctx, n.tableName, key)
+
+			switch method {
+			case http.MethodPost:
+				n.Data[i][key] = val
+			case http.MethodDelete:
+				n.Where[i][key] = val
+			case http.MethodPut:
+				if key == n.RowKey || key == n.RowKey+"{}" {
 					n.Where[i][key] = val
 				} else {
-					if key == n.RowKey || key == n.RowKey+"{}" {
-						if method == http.MethodPut {
-							n.Where[i][key] = val
-						} else {
-							n.Data[i][key] = val
-						}
-					} else {
-						n.Data[i][key] = val
-					}
+					n.Data[i][key] = val
 				}
 			}
+
 		}
 	}
 
@@ -103,10 +106,9 @@ func (n *Node) parse(ctx context.Context, method string) error {
 	if err != nil {
 		return err
 	}
-
+	var accessRoles []string
 	if n.action.NoAccessVerify == false {
 		// 1. 检查权限, 无权限就不用做参数检查了
-		var accessRoles []string
 
 		switch method {
 		case http.MethodPost:
@@ -129,6 +131,8 @@ func (n *Node) parse(ctx context.Context, method string) error {
 		return err
 	}
 
+	n.whereUpdate(ctx, method, accessRoles)
+
 	return nil
 }
 
@@ -169,12 +173,18 @@ func (n *Node) checkAccess(ctx context.Context, method string, accessRoles []str
 		return gerror.Newf("node not access: %s with %s", n.Key, n.Role)
 	}
 
+	return nil
+}
+
+// ? todo 整合到哪
+func (n *Node) whereUpdate(ctx context.Context, method string, accessRoles []string) error {
+
 	for i, item := range n.req {
 
 		condition := config.NewConditionRet()
 
 		conditionReq := config.ConditionReq{
-			AccessName:          n.tableName,
+			AccessName:          n.Key,
 			TableAccessRoleList: accessRoles,
 			Method:              method,
 			NodeRole:            n.Role,
@@ -252,7 +262,7 @@ func (n *Node) reqUpdate() error {
 					}
 				}
 				k := key[0 : len(key)-2]
-				val, err := n.action.Functions.Call(n.ctx, functionName, param)
+				val, err := n.action.actionConfig.CallFunc(n.ctx, functionName, param)
 				if err != nil {
 					return err
 				}
@@ -296,15 +306,13 @@ func (n *Node) reqUpdateBeforeDo() error {
 	return nil
 }
 
-func (n *Node) do(ctx context.Context, method string, dataIndex int) (ret model.Map, err error) {
+func (n *Node) do(ctx context.Context, method string) (ret model.Map, err error) {
 
 	err = EmitHook(ctx, BeforeExecutorDo, n, method)
 	if err != nil {
 		return nil, err
 	}
 
-	var count int64
-
 	switch method {
 	case http.MethodPost:
 
@@ -334,20 +342,17 @@ func (n *Node) do(ctx context.Context, method string, dataIndex int) (ret model.
 			}
 		}
 
-		var id int64
-
-		id, count, err = executor.GetActionExecutor(n.executor).Insert(ctx, n.tableName, n.Data)
+		ret, err := executor.GetActionExecutor(n.executor).Do(ctx, executor.ActionExecutorReq{
+			Method: method,
+			Table:  n.tableName,
+			Data:   n.Data,
+			Where:  nil,
+		})
 
 		if err != nil {
 			return nil, err
 		}
 
-		ret = model.Map{
-			"code":  200,
-			"count": count,
-			"id":    id,
-		}
-
 		if len(n.Data) > 0 { //多条插入时返回值已经应该无意义了
 
 			jsonStyle := n.action.JsonFieldStyle
@@ -363,31 +368,25 @@ func (n *Node) do(ctx context.Context, method string, dataIndex int) (ret model.
 		}
 
 	case http.MethodPut:
-		count, err = executor.GetActionExecutor(n.executor).Update(ctx, n.tableName, n.Data[dataIndex], n.Where[dataIndex])
-		if err != nil {
-			return nil, err
-		}
-
-		ret = model.Map{
-			"code":  200,
-			"count": count,
-		}
 	case http.MethodDelete:
-		count, err = executor.GetActionExecutor(n.executor).Delete(ctx, n.tableName, n.Where[dataIndex])
-		if err != nil {
-			return nil, err
-		}
 
-		ret = model.Map{
-			"code":  200,
-			"count": count,
-		}
+	default:
+		return nil, gerror.New("undefined method:" + method)
 	}
 
-	if ret == nil {
-		return nil, gerror.New("undefined method:" + method)
+	ret, err = executor.GetActionExecutor(n.executor).Do(ctx, executor.ActionExecutorReq{
+		Method: method,
+		Table:  n.tableName,
+		Data:   n.Data,
+		Where:  n.Where,
+	})
+
+	if err != nil {
+		return nil, err
 	}
 
+	n.Ret = ret
+
 	err = EmitHook(ctx, AfterExecutorDo, n, method)
 	if err != nil {
 		return nil, err
@@ -403,22 +402,11 @@ func (n *Node) execute(ctx context.Context, method string) (model.Map, error) {
 		return nil, err
 	}
 
-	if method == http.MethodPost { // 新增时可以合并新增
-		ret, err := n.do(ctx, method, 0)
-		if err != nil {
-			return nil, err
-		}
-		return ret, nil
-	} else {
-		for i, _ := range n.req {
-			_, err := n.do(ctx, method, i)
-			if err != nil {
-				return nil, err
-			}
-		}
+	ret, err := n.do(ctx, method)
+	if err != nil {
+		return nil, err
 	}
 
-	return model.Map{
-		"code": 200,
-	}, nil
+	n.Ret = ret
+	return n.Ret, nil
 }

apijson.go

@@ -60,7 +60,6 @@ func (a *ApiJson) NewQuery(ctx context.Context, req model.Map) *query.Query {
 	q := query.New(ctx, a.Config().QueryConfig(), req)
 
 	q.DbMeta = a.config.DbMeta
-	q.Functions = a.config.Functions
 	q.DbFieldStyle = a.config.DbFieldStyle
 	q.JsonFieldStyle = a.config.JsonFieldStyle
 
@@ -76,7 +75,6 @@ func (a *ApiJson) NewAction(ctx context.Context, method string, req model.Map) *
 	act.NoAccessVerify = a.config.Access.NoVerify
 	act.DbFieldStyle = a.config.DbFieldStyle
 	act.JsonFieldStyle = a.config.JsonFieldStyle
-	act.Functions = a.config.Functions
 
 	return act
 }

config/access.go

@@ -37,7 +37,9 @@ func (c *ConditionRet) AddRaw(k string, v any) {
 }
 
 func (c *ConditionRet) Where() map[string]any {
-	c.condition[consts.Raw] = c.rawCondition
+	if len(c.rawCondition) > 0 {
+		c.condition[consts.Raw] = c.rawCondition
+	}
 	return c.condition
 }
 

config/action_config.go

@@ -8,7 +8,7 @@ import (
 type ActionConfig struct {
 	requestConfig    *RequestConfig
 	access           *Access
-	functions        *Functions
+	functions        *functions
 	rowKeyGenFuncMap map[string]RowKeyGenFuncHandler
 	defaultRoleFunc  DefaultRole
 }

config/config.go

@@ -29,7 +29,7 @@ func RegDbMetaProvider(name string, provider DbMetaProvider) {
 type Config struct {
 	Access *Access
 
-	Functions *Functions
+	Functions *functions
 
 	MaxTreeWidth int
 	MaxTreeDeep  int
@@ -70,7 +70,7 @@ func New() *Config {
 	a.DbFieldStyle = CaseSnake
 	a.JsonFieldStyle = CaseCamel
 
-	a.Functions = &Functions{}
+	a.Functions = &functions{}
 	a.Functions.funcMap = make(map[string]Func)
 
 	return a

config/executor/action.go

@@ -7,12 +7,16 @@ import (
 )
 
 type ActionExecutor interface {
-	Insert(ctx context.Context, table string, data any) (id int64, count int64, err error)
-	Update(ctx context.Context, table string, data model.Map, where model.Map) (count int64, err error)
-	Delete(ctx context.Context, table string, where model.Map) (count int64, err error)
+	Do(ctx context.Context, req ActionExecutorReq) (ret model.Map, err error)
+}
+
+type ActionExecutorReq struct {
+	Method string
+	Table  string
+	Data   []model.Map
+	Where  []model.Map
 }
 
-// todo 调整executor
 var actionExecutorMap = map[string]ActionExecutor{}
 
 func RegActionExecutor(name string, e ActionExecutor) {

config/functions.go

@@ -13,24 +13,23 @@ type ParamItem struct {
 	Desc string
 }
 
-// todo Func会和下方functions混淆,不利于代码补全
 type Func struct {
 	ParamList []ParamItem
 	Handler   func(ctx context.Context, param model.Map) (res any, err error)
 }
 
-type Functions struct {
+type functions struct {
 	funcMap map[string]Func
 }
 
-func (f *Functions) Bind(name string, _func Func) {
+func (f *functions) Bind(name string, _func Func) {
 	if _, exists := f.funcMap[name]; exists {
 		panic(fmt.Errorf(" function %s has exists", name))
 	}
 	f.funcMap[name] = _func
 }
 
-func (f *Functions) Call(ctx context.Context, name string, param g.Map) (any, error) {
+func (f *functions) Call(ctx context.Context, name string, param g.Map) (any, error) {
 	return f.funcMap[name].Handler(ctx, param)
 }