浏览代码

Refactor pagination constants

Kailash Nadh 5 年之前
父节点
当前提交
ccf1c499ad
共有 4 个文件被更改,包括 5 次插入15 次删除
  1. 1 1
      campaigns.go
  2. 2 12
      handlers.go
  3. 1 1
      lists.go
  4. 1 1
      subscribers.go

+ 1 - 1
campaigns.go

@@ -69,7 +69,7 @@ var (
 func handleGetCampaigns(c echo.Context) error {
 	var (
 		app = c.Get("app").(*App)
-		pg  = getPagination(c.QueryParams())
+		pg  = getPagination(c.QueryParams(), 20, 50)
 		out campsWrap
 
 		id, _     = strconv.Atoi(c.Param("id"))

+ 2 - 12
handlers.go

@@ -12,12 +12,6 @@ import (
 const (
 	// stdInputMaxLen is the maximum allowed length for a standard input field.
 	stdInputMaxLen = 200
-
-	// defaultPerPage is the default number of results returned in an GET call.
-	defaultPerPage = 20
-
-	// maxPerPage is the maximum number of allowed for paginated records.
-	maxPerPage = 100
 )
 
 type okResp struct {
@@ -191,12 +185,8 @@ func subscriberExists(next echo.HandlerFunc, params ...string) echo.HandlerFunc
 }
 
 // getPagination takes form values and extracts pagination values from it.
-func getPagination(q url.Values) pagination {
-	var (
-		page, _ = strconv.Atoi(q.Get("page"))
-		perPage = defaultPerPage
-	)
-
+func getPagination(q url.Values, perPage, maxPerPage int) pagination {
+	page, _ := strconv.Atoi(q.Get("page"))
 	pp := q.Get("per_page")
 	if pp == "all" {
 		// No limit.

+ 1 - 1
lists.go

@@ -26,7 +26,7 @@ func handleGetLists(c echo.Context) error {
 		app = c.Get("app").(*App)
 		out listsWrap
 
-		pg        = getPagination(c.QueryParams())
+		pg        = getPagination(c.QueryParams(), 20, 50)
 		listID, _ = strconv.Atoi(c.Param("id"))
 		single    = false
 	)

+ 1 - 1
subscribers.go

@@ -83,7 +83,7 @@ func handleGetSubscriber(c echo.Context) error {
 func handleQuerySubscribers(c echo.Context) error {
 	var (
 		app = c.Get("app").(*App)
-		pg  = getPagination(c.QueryParams())
+		pg  = getPagination(c.QueryParams(), 30, 100)
 
 		// Limit the subscribers to a particular list?
 		listID, _ = strconv.Atoi(c.FormValue("list_id"))