添加对offset的兼容

Author: yumaojun03

http/request/pagging.go

@@ -18,10 +18,17 @@ func NewPageRequestFromHTTP(req *http.Request) *PageRequest {
 
 	ps := qs.Get("page_size")
 	pn := qs.Get("page_number")
+	os := qs.Get("offset")
 
 	psUint64, _ := strconv.ParseUint(ps, 10, 64)
 	pnUint64, _ := strconv.ParseUint(pn, 10, 64)
 
+	var offset *int64
+	if os != "" {
+		osInt64, _ := strconv.ParseInt(os, 10, 64)
+		offset = &osInt64
+	}
+
 	if psUint64 == 0 {
 		psUint64 = DefaultPageSize
 	}
@@ -32,6 +39,7 @@ func NewPageRequestFromHTTP(req *http.Request) *PageRequest {
 	return &PageRequest{
 		PageSize:   uint(psUint64),
 		PageNumber: uint(pnUint64),
+		offset:     offset,
 	}
 }
 
@@ -47,9 +55,15 @@ func NewPageRequest(ps uint, pn uint) *PageRequest {
 type PageRequest struct {
 	PageSize   uint `json:"page_size,omitempty" validate:"gte=1,lte=200"`
 	PageNumber uint `json:"page_number,omitempty" validate:"gte=1"`
+	offset     *int64
 }
 
 // Offset skip
+// 如果传入了offset则使用传入的offset参数
 func (p *PageRequest) Offset() int64 {
+	if p.offset != nil {
+		return *p.offset
+	}
+
 	return int64(p.PageSize * (p.PageNumber - 1))
 }

http/request/pagging_test.go

@@ -0,0 +1,42 @@
+package request_test
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/infraboard/mcube/http/request"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestOffSet(t *testing.T) {
+	shoud := assert.New(t)
+
+	req, _ := http.NewRequest("GET", "/", nil)
+	pr := request.NewPageRequestFromHTTP(req)
+	shoud.Equal(int64(0), pr.Offset())
+	shoud.Equal(uint(20), pr.PageSize)
+	shoud.Equal(uint(1), pr.PageNumber)
+
+	req, _ = http.NewRequest("GET", "/?page_size=20&page_number=1", nil)
+	pr = request.NewPageRequestFromHTTP(req)
+	shoud.Equal(int64(0), pr.Offset())
+
+	req, _ = http.NewRequest("GET", "/?page_size=20&page_number=2", nil)
+	pr = request.NewPageRequestFromHTTP(req)
+	shoud.Equal(int64(20), pr.Offset())
+
+	req, _ = http.NewRequest("GET", "/?page_size=20&page_number=2&offset=18", nil)
+	pr = request.NewPageRequestFromHTTP(req)
+	shoud.Equal(int64(18), pr.Offset())
+
+	req, _ = http.NewRequest("GET", "/?page_size=20&offset=18", nil)
+	pr = request.NewPageRequestFromHTTP(req)
+	shoud.Equal(int64(18), pr.Offset())
+	shoud.Equal(uint(20), pr.PageSize)
+
+	req, _ = http.NewRequest("GET", "/?offset=18", nil)
+	pr = request.NewPageRequestFromHTTP(req)
+	shoud.Equal(int64(18), pr.Offset())
+	shoud.Equal(uint(20), pr.PageSize)
+
+}