From 69f46e1b88aa857dd5d32c18bd638dfb096deff8 Mon Sep 17 00:00:00 2001 From: "Brian H. Buchholz" <4773480+bhb603@users.noreply.github.com> Date: Wed, 20 Jan 2021 17:56:49 -0500 Subject: [PATCH 1/2] Use `PaginatorPageKey` and `PaginatorPerPageKey` variables --- paginator.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paginator.go b/paginator.go index 1a2f3dd2..1da4d438 100644 --- a/paginator.go +++ b/paginator.go @@ -75,9 +75,9 @@ type PaginationParams interface { // `PaginatorPerPageKey`. Defaults are `1` for the page and // PaginatorPerPageDefault for the per page value. func NewPaginatorFromParams(params PaginationParams) *Paginator { - page := defaults.String(params.Get("page"), "1") + page := defaults.String(params.Get(PaginatorPageKey), "1") - perPage := defaults.String(params.Get("per_page"), strconv.Itoa(PaginatorPerPageDefault)) + perPage := defaults.String(params.Get(PaginatorPerPageKey), strconv.Itoa(PaginatorPerPageDefault)) p, err := strconv.Atoi(page) if err != nil { From c5d3cfce4633e05ac6ddf2a376888537ffa7ef51 Mon Sep 17 00:00:00 2001 From: "Brian H. Buchholz" <4773480+bhb603@users.noreply.github.com> Date: Fri, 22 Jan 2021 10:57:48 -0500 Subject: [PATCH 2/2] update pagination_test --- pagination_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pagination_test.go b/pagination_test.go index 08811420..f8284b8c 100644 --- a/pagination_test.go +++ b/pagination_test.go @@ -31,12 +31,12 @@ func Test_NewPaginatorFromParams(t *testing.T) { a.Equal(p.Page, 1) a.Equal(p.PerPage, 20) - params.Set("page", "2") + params.Set(PaginatorPageKey, "2") p = NewPaginatorFromParams(params) a.Equal(p.Page, 2) a.Equal(p.PerPage, 20) - params.Set("per_page", "30") + params.Set(PaginatorPerPageKey, "30") p = NewPaginatorFromParams(params) a.Equal(p.Page, 2) a.Equal(p.PerPage, 30)