#69 Proxy service. Add search pagination

cosmos/poc/app/rpc.go

@@ -8,9 +8,6 @@ import (
 )
 
 func (app *CyberdApp) Search(cid string, page, perPage int) ([]RankedCid, int, error) {
-	if perPage == 0 {
-		perPage = 100
-	}
 	result, totalSize, err := app.memStorage.GetCidRankedLinks(Cid(cid), page, perPage)
 	if err != nil {
 		return nil, totalSize, err

cosmos/poc/cyberd/rpc/search.go

@@ -4,10 +4,15 @@ import "github.com/cybercongress/cyberd/cosmos/poc/app/storage"
 
 type ResultSearch struct {
 	Cids       []storage.RankedCid `json:"cids"`
-	TotalCount int                 `json:"totalCount"`
+	TotalCount int                 `json:"total"`
+	Page       int                 `json:"page"`
+	PerPage    int                 `json:"perPage"`
 }
 
 func Search(cid string, page, perPage int) (*ResultSearch, error) {
+	if perPage == 0 {
+		perPage = 100
+	}
 	links, totalSize, err := cyberdApp.Search(cid, page, perPage)
-	return &ResultSearch{links, totalSize}, err
+	return &ResultSearch{links, totalSize, page, perPage}, err
 }

cosmos/poc/http/util/util.go

@@ -32,15 +32,15 @@ func GetSingleParamValue(name string, r *http.Request) (string, error) {
 	return param, nil
 }
 
-func GetBooleanParamValue(name string, r *http.Request) (bool, error) {
+func GetBooleanParamValue(name string, defaultVal bool, r *http.Request) (bool, error) {
 	paramStr, err := GetSingleParamValue(name, r)
 	if err != nil {
-		return false, nil
+		return defaultVal, nil
 	}
 
 	param, err := strconv.ParseBool(paramStr)
 	if err != nil {
-		return false, err
+		return defaultVal, err
 	}
 
 	return param, nil

cosmos/poc/proxy/client/start.go

@@ -28,8 +28,8 @@ func StartCmd() *cobra.Command {
 			mux := http.NewServeMux()
 			mux.HandleFunc("/link", core.TxHandlerFn(ctx, core.UnmarshalLinkRequest))
 			mux.HandleFunc("/send", core.TxHandlerFn(ctx, core.UnmarshalSendRequest))
-			mux.HandleFunc("/search", core.GetWithParamHandlerFn(ctx, "/search", "cid"))
-			mux.HandleFunc("/account", core.GetWithParamHandlerFn(ctx, "/account", "address"))
+			mux.HandleFunc("/search", core.GetWithParamsHandlerFn(ctx, "/search", []string{"cid", "page", "perPage"}))
+			mux.HandleFunc("/account", core.GetWithParamsHandlerFn(ctx, "/account", []string{"address"}))
 			mux.HandleFunc("/health", core.GetHandlerFn(ctx, "/health"))
 			mux.HandleFunc("/status", core.GetHandlerFn(ctx, "/status"))
 
@@ -59,4 +59,4 @@ func StartCmd() *cobra.Command {
 
 	return cmd
 
-}
+}

cosmos/poc/proxy/core/get.go

@@ -22,19 +22,21 @@ func GetHandlerFn(ctx ProxyContext, endpoint string) func(http.ResponseWriter, *
 	}
 }
 
-func GetWithParamHandlerFn(ctx ProxyContext, endpoint string, param string) func(http.ResponseWriter, *http.Request) {
+func GetWithParamsHandlerFn(ctx ProxyContext, endpoint string, params []string) func(http.ResponseWriter, *http.Request) {
 
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		w.Header().Set("Content-Type", "application/json")
 
-		paramValue, err := util.GetSingleParamValue(param, r)
-		if err != nil {
-			util.HandleError(err, w)
-			return
+		paramValues := make(url.Values)
+		for _, param := range params {
+			value, err := util.GetSingleParamValue(param, r)
+			if err == nil {
+				paramValues[param] = []string{"\"" + value + "\""}
+			}
 		}
 
-		resp, err := ctx.Get(endpoint + "?" + param + "=\"" + url.QueryEscape(paramValue) + "\"")
+		resp, err := ctx.Get(endpoint + "?" + paramValues.Encode())
 		if err != nil {
 			util.HandleError(err, w)
 			return

cosmos/poc/proxy/core/tx.go

@@ -42,7 +42,7 @@ func TxHandlerFn(ctx ProxyContext, unmarshal UnmarshalTxRequest) func(http.Respo
 			return
 		}
 
-		commit, err := util.GetBooleanParamValue("commit", r)
+		commit, err := util.GetBooleanParamValue("commit", false, r)
 		if err != nil {
 			util.HandleError(err, w)
 			return