Merge pull request YaoApp#237 from yflau/main

url param: support with limit
trheyi · Dec 10, 2024 · abbf144 · abbf144
2 parents 7bba5ea + c1c3a4b
commit abbf144
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/model/url.go b/model/url.go
@@ -3,9 +3,11 @@ package model
 import (
 	"net/url"
 	"regexp"
+	"strconv"
 	"strings"
 
 	jsoniter "github.com/json-iterator/go"
+	"github.com/yaoapp/kun/log"
 )
 
 const reURLWhereStr = "(where|orwhere|wherein|orwherein)\\.(.+)\\.(eq|gt|lt|ge|le|like|match|in|null|notnull)"
@@ -61,6 +63,9 @@ func URLToQueryParam(values url.Values) QueryParam {
 		} else if strings.HasSuffix(name, ".select") {
 			param.setWithSelect(name, values.Get(name))
 			continue
+		} else if strings.HasSuffix(name, ".limit") {
+			param.setWithLimit(name, values.Get(name))
+			continue
 		}
 	}
 
@@ -207,3 +212,21 @@ func (param *QueryParam) setWithSelect(name string, value string) {
 	with.Query.Select = selects
 	param.Withs[withName] = with
 }
+
+func (param *QueryParam) setWithLimit(name string, value string) {
+	namer := strings.Split(name, ".")
+	withName := namer[0]
+	if _, has := param.Withs[withName]; !has {
+		param.setWith(withName)
+	}
+
+	limit, err := strconv.ParseInt(value, 10, 64)
+	if err != nil {
+		log.Error("got invalid limit value: %v", value)
+		return
+	}
+
+	with := param.Withs[withName]
+	with.Query.Limit = int(limit)
+	param.Withs[withName] = with
+}
diff --git a/types/query.url.go b/types/query.url.go
@@ -3,9 +3,11 @@ package types
 import (
 	"net/url"
 	"regexp"
+	"strconv"
 	"strings"
 
 	jsoniter "github.com/json-iterator/go"
+	"github.com/yaoapp/kun/log"
 )
 
 const reURLWhereStr = "(where|orwhere|wherein|orwherein)\\.(.+)\\.(eq|gt|lt|ge|le|like|match|in|null|notnull)[\\[]*[\\]]*"
@@ -61,6 +63,9 @@ func URLToQueryParam(values url.Values) QueryParam {
 		} else if strings.HasSuffix(name, ".select") {
 			param.setWithSelect(name, values.Get(name))
 			continue
+		} else if strings.HasSuffix(name, ".limit") {
+			param.setWithLimit(name, values.Get(name))
+			continue
 		}
 	}
 
@@ -207,3 +212,21 @@ func (param *QueryParam) setWithSelect(name string, value string) {
 	with.Query.Select = selects
 	param.Withs[withName] = with
 }
+
+func (param *QueryParam) setWithLimit(name string, value string) {
+	namer := strings.Split(name, ".")
+	withName := namer[0]
+	if _, has := param.Withs[withName]; !has {
+		param.setWith(withName)
+	}
+
+	limit, err := strconv.ParseInt(value, 10, 64)
+	if err != nil {
+		log.Error("got invalid limit value: %v", value)
+		return
+	}
+
+	with := param.Withs[withName]
+	with.Query.Limit = int(limit)
+	param.Withs[withName] = with
+}