From 8283d62d3cded14180732f67836dbfe1d50f43ef Mon Sep 17 00:00:00 2001 From: varnit-goyal_navi Date: Tue, 10 Sep 2024 10:19:01 +0530 Subject: [PATCH] TP-55555 | fix es query for pagination --- pkg/utils/ErrorResponse.go | 17 +++++++++++++++++ service/searchService.go | 8 ++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 pkg/utils/ErrorResponse.go diff --git a/pkg/utils/ErrorResponse.go b/pkg/utils/ErrorResponse.go new file mode 100644 index 0000000..c6087fe --- /dev/null +++ b/pkg/utils/ErrorResponse.go @@ -0,0 +1,17 @@ +package utils + +import ( + "github.com/gin-gonic/gin" + "net/http" +) + +func ErrorResponse(c *gin.Context, errMsg string) { + if errMsg == "" { + errMsg = "Something went wrong" + } + + c.JSON(http.StatusInternalServerError, gin.H{ + "status": "error", + "message": errMsg, + }) +} diff --git a/service/searchService.go b/service/searchService.go index cf9e68a..29b3e03 100644 --- a/service/searchService.go +++ b/service/searchService.go @@ -65,7 +65,11 @@ func (s *SearchService) GetErrorDetails(c *gin.Context) { searchRequestformatted := es_query fields := []string{"error", "significant_stack", "title"} - var response, _, total, _ = s.elasticSearchClient.SearchDocuments(searchRequestformatted, fields) + response, _, total, err := s.elasticSearchClient.SearchDocuments(searchRequestformatted, fields) + + if err != nil { + utils.ErrorResponse(c, "Failed to search please try again later") + } c.JSON(http.StatusOK, gin.H{ "results": response, "total": total, @@ -152,7 +156,7 @@ func (s *SearchService) GetErrorList(c *gin.Context) { var _, aggs, total, err = s.elasticSearchClient.SearchDocuments(final_query, fields) if err != nil { - c.JSON(http.StatusVariantAlsoNegotiates, "something went wrong ") + utils.ErrorResponse(c, "search failed please try again") return }