From 5e9fc2defc488a65c761b95eba575a48f950322d Mon Sep 17 00:00:00 2001
From: stasatdaglabs <39559713+stasatdaglabs@users.noreply.github.com>
Date: Thu, 28 Nov 2019 17:31:19 +0200
Subject: [PATCH] [NOD-464] Fix error messages in GetBlocks. (#500)

---
 apiserver/server/routes.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apiserver/server/routes.go b/apiserver/server/routes.go
index 89336a1df..134392e41 100644
--- a/apiserver/server/routes.go
+++ b/apiserver/server/routes.go
@@ -86,7 +86,11 @@ func convertQueryParamToInt(queryParams map[string]string, param string, default
 	if _, ok := queryParams[param]; ok {
 		intValue, err := strconv.Atoi(queryParams[param])
 		if err != nil {
-			return 0, httpserverutils.NewHandlerError(http.StatusUnprocessableEntity, errors.Wrap(err, fmt.Sprintf("Couldn't parse the '%s' query parameter", param)))
+			errorMessage := fmt.Sprintf("Couldn't parse the '%s' query parameter", param)
+			return 0, httpserverutils.NewHandlerErrorWithCustomClientMessage(
+				http.StatusUnprocessableEntity,
+				errors.Wrap(err, errorMessage),
+				errorMessage)
 		}
 		return intValue, nil
 	}
@@ -159,7 +163,8 @@ func getBlocksHandler(_ *httpserverutils.ServerContext, _ *http.Request, _ map[s
 	order := defaultGetBlocksOrder
 	if orderParamValue, ok := queryParams[queryParamOrder]; ok {
 		if orderParamValue != controllers.OrderAscending && orderParamValue != controllers.OrderDescending {
-			return nil, httpserverutils.NewHandlerError(http.StatusUnprocessableEntity, errors.Errorf("'%s' is not a valid value for the '%s' query parameter", orderParamValue, queryParamLimit))
+			return nil, httpserverutils.NewHandlerError(http.StatusUnprocessableEntity, errors.Errorf(
+				"Couldn't parse the '%s' query parameter", queryParamLimit))
 		}
 		order = orderParamValue
 	}