fix up paging

superseriousbusiness · Apr 30, 2024 · b6f594a · b6f594a
1 parent 17e6512
commit b6f594a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/internal/api/client/admin/accountsgetv1.go b/internal/api/client/admin/accountsgetv1.go
@@ -209,19 +209,12 @@ func (m *Module) AccountsGETV1Handler(c *gin.Context) {
 		return
 	}
 
-	limit, errWithCode := apiutil.ParseLimit(c.Query(apiutil.LimitKey), 1, 200, 50)
+	page, errWithCode := paging.ParseIDPage(c, 1, 200, 50)
 	if errWithCode != nil {
 		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
 		return
 	}
 
-	// Use min / max for paging.
-	page := &paging.Page{
-		Min:   paging.MinID(c.Query(apiutil.MinIDKey)),
-		Max:   paging.MaxID(c.Query(apiutil.MaxIDKey)),
-		Limit: limit,
-	}
-
 	/* Translate to v2 `origin` query param */
 
 	local, errWithCode := apiutil.ParseLocal(c.Query(apiutil.LocalKey), false)

diff --git a/internal/api/client/admin/accountsgetv2.go b/internal/api/client/admin/accountsgetv2.go
@@ -182,19 +182,12 @@ func (m *Module) AccountsGETV2Handler(c *gin.Context) {
 		return
 	}
 
-	limit, errWithCode := apiutil.ParseLimit(c.Query(apiutil.LimitKey), 1, 200, 50)
+	page, errWithCode := paging.ParseIDPage(c, 1, 200, 50)
 	if errWithCode != nil {
 		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
 		return
 	}
 
-	// Use min / max for paging.
-	page := &paging.Page{
-		Min:   paging.MinID(c.Query(apiutil.MinIDKey)),
-		Max:   paging.MaxID(c.Query(apiutil.MaxIDKey)),
-		Limit: limit,
-	}
-
 	// Parse out all optional params from the query.
 	params := &apimodel.AdminGetAccountsRequest{
 		Origin:      c.Query(apiutil.AdminOriginKey),