Merge pull request #23 from 846413979/syb/format_page_request

pageRequest nil judge
irisnet · Jul 20, 2022 · 4d825ad · 4d825ad
2 parents 6d9d3db + 4eabefc
commit 4d825ad
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/types/query/format_page_request.go b/types/query/format_page_request.go
@@ -5,9 +5,18 @@ import sdk "github.com/irisnet/core-sdk-go/types"
 const (
 	CountTotalErrMsg = "pageRequest error: CountTotal is not supported, must be false"
 	LimitErrMsg      = "pageRequest error: Limit cannot be empty and cannot exceed 100"
+	OffsetKeyErrMsg  = "pageRequest error: Only one Offset or Key is allowed"
 )
 
 func FormatPageRequest(pageReq *PageRequest) (*PageRequest, sdk.Error) {
+	if pageReq == nil {
+		return &PageRequest{
+			Offset:     0,
+			Limit:      100,
+			CountTotal: false,
+		}, nil
+	}
+
 	if pageReq.CountTotal {
 		return pageReq, sdk.Wrapf(CountTotalErrMsg)
 	}
@@ -16,5 +25,9 @@ func FormatPageRequest(pageReq *PageRequest) (*PageRequest, sdk.Error) {
 		return pageReq, sdk.Wrapf(LimitErrMsg)
 	}
 
+	if pageReq.Offset != 0 && len(pageReq.Key) > 0 {
+		return pageReq, sdk.Wrapf(OffsetKeyErrMsg)
+	}
+
 	return pageReq, nil
 }