fix: Improve pagination

api/handlers/datasets.go

@@ -102,19 +102,15 @@ func (h *DatasetHandlers) ZipDatasetHandler(w http.ResponseWriter, r *http.Reque
 }
 
 func (h *DatasetHandlers) listDatasetsHandler(w http.ResponseWriter, r *http.Request) {
-	p := util.PageFromRequest(r)
+	args := core.ListParamsFromRequest(r)
+	args.OrderBy = "created"
 	res := []*repo.DatasetRef{}
-	args := &core.ListParams{
-		Limit:   p.Limit(),
-		Offset:  p.Offset(),
-		OrderBy: "created",
-	}
-	if err := h.List(args, &res); err != nil {
+	if err := h.List(&args, &res); err != nil {
 		h.log.Infof("error listing datasets: %s", err.Error())
 		util.WriteErrResponse(w, http.StatusInternalServerError, err)
 		return
 	}
-
+	p = args.Page()
 	if err := util.WritePageResponse(w, res, r, p); err != nil {
 		h.log.Infof("error list datasests response: %s", err.Error())
 	}
@@ -225,8 +221,8 @@ func (h *DatasetHandlers) deleteDatasetHandler(w http.ResponseWriter, r *http.Re
 }
 
 func (h *DatasetHandlers) getStructuredDataHandler(w http.ResponseWriter, r *http.Request) {
-	page := util.PageFromRequest(r)
-
+	listParams := core.ListParamsFromRequest(r)
+	page := listParams.Page()
 	all, err := util.ReqParamBool("all", r)
 	if err != nil {
 		all = false
@@ -241,8 +237,8 @@ func (h *DatasetHandlers) getStructuredDataHandler(w http.ResponseWriter, r *htt
 		Format:  dataset.JsonDataFormat,
 		Path:    datastore.NewKey(r.URL.Path[len("/data"):]),
 		Objects: objectRows,
-		Limit:   page.Limit(),
-		Offset:  page.Offset(),
+		Limit:   listParams.Limit,
+		Offset:  listParams.Offset,
 		All:     all,
 	}
 	data := &core.StructuredData{}

api/handlers/peers.go

@@ -81,14 +81,11 @@ func (d *PeerHandlers) ConnectionsHandler(w http.ResponseWriter, r *http.Request
 }
 
 func (h *PeerHandlers) listPeersHandler(w http.ResponseWriter, r *http.Request) {
-	p := util.PageFromRequest(r)
+	args := core.ListParamsFromRequest(r)
+	args.OrderBy = "created"
+	p := args.Page()
 	res := []*profile.Profile{}
-	args := &core.ListParams{
-		Limit:   p.Limit(),
-		Offset:  p.Offset(),
-		OrderBy: "created",
-	}
-	if err := h.List(args, &res); err != nil {
+	if err := h.List(&args, &res); err != nil {
 		h.log.Infof("list peers: %s", err.Error())
 		util.WriteErrResponse(w, http.StatusInternalServerError, err)
 		return
@@ -97,9 +94,11 @@ func (h *PeerHandlers) listPeersHandler(w http.ResponseWriter, r *http.Request)
 }
 
 func (h *PeerHandlers) listConnectionsHandler(w http.ResponseWriter, r *http.Request) {
-	limit := 0
+	//limit := 0
+	// TODO: double check with @b5 on this change
+	listParams := core.ListParamsFromRequest(r)
 	peers := []string{}
-	if err := h.ConnectedPeers(&limit, &peers); err != nil {
+	if err := h.ConnectedPeers(&listParams.Limit, &peers); err != nil {
 		h.log.Infof("error showing connected peers: %s", err.Error())
 		util.WriteErrResponse(w, http.StatusInternalServerError, err)
 		return
@@ -142,11 +141,11 @@ func (h *PeerHandlers) getPeerHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *PeerHandlers) peerNamespaceHandler(w http.ResponseWriter, r *http.Request) {
-	page := util.PageFromRequest(r)
+	listParams := core.ListParamsFromRequest(r)
 	args := &core.NamespaceParams{
 		PeerId: r.URL.Path[len("/peernamespace/"):],
-		Limit:  page.Limit(),
-		Offset: page.Offset(),
+		Limit:  listParams.Limit,
+		Offset: listParams.Offset,
 	}
 	res := []*repo.DatasetRef{}
 	if err := h.GetNamespace(args, &res); err != nil {

api/handlers/queries.go

@@ -60,14 +60,11 @@ func (d *QueryHandlers) ListHandler(w http.ResponseWriter, r *http.Request) {
 // }
 
 func (h *QueryHandlers) listQueriesHandler(w http.ResponseWriter, r *http.Request) {
-	p := util.PageFromRequest(r)
+	args := core.ListParamsFromRequest(r)
+	args.OrderBy = "created"
+	p := args.Page()
 	res := []*repo.DatasetRef{}
-	args := &core.ListParams{
-		Limit:   p.Limit(),
-		Offset:  p.Offset(),
-		OrderBy: "created",
-	}
-	err := h.List(args, &res)
+	err := h.List(&args, &res)
 	if err != nil {
 		h.log.Infof("error listing datasets: %s", err.Error())
 		util.WriteErrResponse(w, http.StatusInternalServerError, err)