From 2e227f658424848dd46b7b16d8e5f1616363dd27 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Fri, 28 Jan 2022 12:13:13 +0100
Subject: [PATCH] feat(integrations): changed response structure

---
 .../integrations/integration/elasticsearch.go | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/backend/services/integrations/integration/elasticsearch.go b/backend/services/integrations/integration/elasticsearch.go
index 28f03a3b5..51201ffdb 100644
--- a/backend/services/integrations/integration/elasticsearch.go
+++ b/backend/services/integrations/integration/elasticsearch.go
@@ -27,20 +27,30 @@ type elasticsearchLog struct {
 	Message string
 	Time    time.Time `json:"utc_time"` // Should be parsed automatically from RFC3339
 }
-
-type elasticResponce struct {
-	Hits struct {
-		//Total struct {
-		//	Value int
-		//}
-		Hits []struct {
-			Id     string          `json:"_id"`
-			Source json.RawMessage `json:"_source"`
-		} `json:"hits"`
-	} `json:"hits"`
+//map[string]interface{}
+// SearchResult represents the result of the search operation
+type elasticResponse struct {
+	Hits         ResultHits      `json:"hits"`
 	ScrollId string `json:"_scroll_id"`
 }
 
+// ResultHits represents the result of the search hits
+type ResultHits struct {
+	Hits     []struct {
+		Id        string              `json:"_id"`
+		Source    json.RawMessage     `json:"_source"`
+	} `json:"hits"`
+}
+//type elasticResponse struct {
+//	Hits struct {
+//		Hits []struct {
+//			Id     string          `json:"_id"`
+//			Source json.RawMessage `json:"_source"`
+//		} `json:"hits"`
+//	} `json:"hits"`
+//	ScrollId string `json:"_scroll_id"`
+//}
+
 func (es *elasticsearch) Request(c *client) error {
 	address := es.Host + ":" + es.Port.String()
 	apiKey := b64.StdEncoding.EncodeToString([]byte(es.ApiKeyId + ":" + es.ApiKey))
@@ -150,7 +160,7 @@ func (es *elasticsearch) Request(c *client) error {
 		//	log.Println(mapResp)
 		//}
 
-		var esResp elasticResponce
+		var esResp elasticResponse
 		if err := json.NewDecoder(res.Body).Decode(&esResp); err != nil {
 			log.Printf("Error parsing the response body: %s\n", err)
 			return fmt.Errorf("Error parsing the response body: %s", err)