Move ParsePagination from httpapi to coderd and unexport, return codersdk sturct

mafredri · mafredri · commit 61410a52d99c · 2022-05-10T07:29:07.000Z
diff --git a/coderd/httpapi/httpapi.go b/coderd/httpapi/httpapi.go
@@ -8,12 +8,9 @@ import (
 	"net/http"
 	"reflect"
 	"regexp"
-	"strconv"
 	"strings"
 
 	"github.com/go-playground/validator/v10"
-	"github.com/google/uuid"
-	"golang.org/x/xerrors"
 )
 
 var (
@@ -136,42 +133,3 @@ func WebsocketCloseSprintf(format string, vars ...any) string {
 
 	return msg
 }
-
-type Pagination struct {
-	AfterID uuid.UUID
-	Limit   int
-	Offset  int
-}
-
-func ParsePagination(r *http.Request) (p Pagination, err error) {
-	var (
-		afterID = uuid.Nil
-		limit   = -1 // Default to no limit and return all results.
-		offset  = 0
-	)
-
-	if s := r.URL.Query().Get("after_id"); s != "" {
-		afterID, err = uuid.Parse(r.URL.Query().Get("after_id"))
-		if err != nil {
-			return p, xerrors.Errorf("after_id must be a valid uuid: %w", err.Error())
-		}
-	}
-	if s := r.URL.Query().Get("limit"); s != "" {
-		limit, err = strconv.Atoi(s)
-		if err != nil {
-			return p, xerrors.Errorf("limit must be an integer: %w", err.Error())
-		}
-	}
-	if s := r.URL.Query().Get("offset"); s != "" {
-		offset, err = strconv.Atoi(s)
-		if err != nil {
-			return p, xerrors.Errorf("offset must be an integer: %w", err.Error())
-		}
-	}
-
-	return Pagination{
-		AfterID: afterID,
-		Limit:   limit,
-		Offset:  offset,
-	}, nil
-}
diff --git a/coderd/pagination.go b/coderd/pagination.go
@@ -0,0 +1,44 @@
+package coderd
+
+import (
+	"net/http"
+	"strconv"
+
+	"github.com/google/uuid"
+	"golang.org/x/xerrors"
+
+	"github.com/coder/coder/codersdk"
+)
+
+func parsePagination(r *http.Request) (p codersdk.Pagination, err error) {
+	var (
+		afterID = uuid.Nil
+		limit   = -1 // Default to no limit and return all results.
+		offset  = 0
+	)
+
+	if s := r.URL.Query().Get("after_id"); s != "" {
+		afterID, err = uuid.Parse(r.URL.Query().Get("after_id"))
+		if err != nil {
+			return p, xerrors.Errorf("after_id must be a valid uuid: %w", err.Error())
+		}
+	}
+	if s := r.URL.Query().Get("limit"); s != "" {
+		limit, err = strconv.Atoi(s)
+		if err != nil {
+			return p, xerrors.Errorf("limit must be an integer: %w", err.Error())
+		}
+	}
+	if s := r.URL.Query().Get("offset"); s != "" {
+		offset, err = strconv.Atoi(s)
+		if err != nil {
+			return p, xerrors.Errorf("offset must be an integer: %w", err.Error())
+		}
+	}
+
+	return codersdk.Pagination{
+		AfterID: afterID,
+		Limit:   limit,
+		Offset:  offset,
+	}, nil
+}
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -75,7 +75,7 @@ func (api *api) deleteTemplate(rw http.ResponseWriter, r *http.Request) {
 func (api *api) templateVersionsByTemplate(rw http.ResponseWriter, r *http.Request) {
 	template := httpmw.TemplateParam(r)
 
-	paginationParams, err := httpapi.ParsePagination(r)
+	paginationParams, err := parsePagination(r)
 	if err != nil {
 		httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{Message: fmt.Sprintf("parse pagination request: %s", err.Error())})
 		return
diff --git a/coderd/users.go b/coderd/users.go
@@ -109,7 +109,7 @@ func (api *api) users(rw http.ResponseWriter, r *http.Request) {
 		statusFilter = r.URL.Query().Get("status")
 	)
 
-	paginationParams, err := httpapi.ParsePagination(r)
+	paginationParams, err := parsePagination(r)
 	if err != nil {
 		httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{Message: fmt.Sprintf("parse pagination request: %s", err.Error())})
 		return

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func (api api) users(rw http.ResponseWriter, r http.Request) {`
`109`	`109`	`statusFilter = r.URL.Query().Get("status")`
`110`	`110`	`)`
`111`	`111`
`112`		`- paginationParams, err := httpapi.ParsePagination(r)`
	`112`	`+ paginationParams, err := parsePagination(r)`
`113`	`113`	`if err != nil {`
`114`	`114`	`httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{Message: fmt.Sprintf("parse pagination request: %s", err.Error())})`
`115`	`115`	`return`