bug fixes for saving feedback comment in ES

Created by: shishirsuman092

src/main/java/org/upsmf/grievance/controller/FeedbackController.java

@@ -8,11 +8,14 @@ import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.upsmf.grievance.dto.FeedbackDto;
+import org.upsmf.grievance.model.es.Feedback;
 import org.upsmf.grievance.model.reponse.FeedbackResponse;
 import org.upsmf.grievance.model.reponse.Response;
+import org.upsmf.grievance.service.DashboardService;
 import org.upsmf.grievance.service.FeedbackService;
 
 import javax.validation.Valid;
+import java.util.List;
 
 @Controller
 @RequestMapping("/api/feedback")
@@ -23,6 +26,9 @@ public class FeedbackController {
     @Autowired
     private FeedbackService feedbackService;
 
+    @Autowired
+    private DashboardService dashboardService;
+
     @PostMapping("/save")
     public ResponseEntity saveFeedback(@Valid  @RequestBody FeedbackDto feedbackDto) {
         try {
@@ -37,7 +43,7 @@ public class FeedbackController {
     public ResponseEntity saveFeedback(@Valid @RequestParam(name = "id") String id) {
         try {
             log.info(" get feedback by ID payload - {} ", id);
-            FeedbackResponse feedbackByTicketId = feedbackService.getFeedbackByTicketId(id);
+            List<Feedback> feedbackByTicketId = dashboardService.getFeedbackByTicketId(id);
             log.info(" get feedback by ID response - {} ", feedbackByTicketId);
             return new ResponseEntity(new Response(HttpStatus.OK.value(), feedbackByTicketId), HttpStatus.OK);
         }catch (Exception e){

src/main/java/org/upsmf/grievance/service/impl/DashboardServiceImpl.java

@@ -18,6 +18,7 @@ import org.upsmf.grievance.dto.SearchDateRange;
 import org.upsmf.grievance.dto.SearchRequest;
 import org.upsmf.grievance.enums.TicketPriority;
 import org.upsmf.grievance.enums.TicketStatus;
+import org.upsmf.grievance.model.es.Feedback;
 import org.upsmf.grievance.model.es.Ticket;
 import org.upsmf.grievance.service.DashboardService;
 
@@ -554,4 +555,76 @@ public class DashboardServiceImpl implements DashboardService {
         esQuery.must(QueryBuilders.rangeQuery("created_date_ts").gte(date.getFrom()).lt(date.getTo()));
         return esQuery;
     }
+
+    public List<Feedback> getFeedbackByTicketId(String ticketId) {
+        BoolQueryBuilder esQuery = createESQueryForFeedbackByTicketId(ticketId);
+        return executeQueryForFeedback(esQuery);
+    }
+
+    private static BoolQueryBuilder createESQueryForFeedbackByTicketId(String ticketId) {
+        BoolQueryBuilder esQuery = QueryBuilders.boolQuery();
+        // looping to add filter params in the main query
+        esQuery.must(QueryBuilders.matchQuery("ticket_id", ticketId));
+        return esQuery;
+    }
+
+    private List<Feedback> executeQueryForFeedback(BoolQueryBuilder esQuery) {
+        try {
+            SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder()
+                    .query(esQuery).size(10000);
+            org.elasticsearch.action.search.SearchRequest searchRequest = new org.elasticsearch.action.search.SearchRequest("feedback");
+            searchRequest.searchType(SearchType.QUERY_THEN_FETCH);
+            searchRequest.source(searchSourceBuilder);
+            SearchResponse searchResponse = esConfig.elasticsearchClient().search(searchRequest, RequestOptions.DEFAULT);
+            return getFeedbackDocumentsFromHits(searchResponse.getHits());
+        } catch (IOException e) {
+            log.error("Error while searching ticket by ticket id list", e);
+        }
+        return null;
+    }
+
+    private List<Feedback> getFeedbackDocumentsFromHits(SearchHits hits) {
+        List<Feedback> documents = new ArrayList<>();
+        for (SearchHit hit : hits) {
+            Feedback feedback = new Feedback();
+            for (Map.Entry entry : hit.getSourceAsMap().entrySet()) {
+                String key = (String) entry.getKey();
+                mapEsTicketDtoToFeedbackDto(entry, key, feedback);
+            }
+            if(hit.getId() != null && !hit.getId().isBlank()) {
+                feedback.setId(hit.getId());
+            }
+            documents.add(feedback);
+        }
+        return documents;
+    }
+
+    private void mapEsTicketDtoToFeedbackDto(Map.Entry entry, String key, Feedback feedback) {
+        switch (key) {
+            case "ticket_id":
+                feedback.setTicketId((String) entry.getValue());
+                break;
+            case "first_name":
+                feedback.setFirstName((String) entry.getValue());
+                break;
+            case "last_name":
+                feedback.setLastName((String) entry.getValue());
+                break;
+            case "phone":
+                feedback.setPhone((String) entry.getValue());
+                break;
+            case "email":
+                feedback.setEmail((String) entry.getValue());
+                break;
+            case "rating":
+                Integer intValue = ((Number) entry.getValue()).intValue();
+                feedback.setRating(intValue);
+                break;
+            case "comment":
+                feedback.setComment((String) entry.getValue());
+                break;
+            default:
+                break;
+        }
+    }
 }

src/main/java/org/upsmf/grievance/service/DashboardService.java

 package org.upsmf.grievance.service;
 
 import org.upsmf.grievance.dto.SearchRequest;
+import org.upsmf.grievance.model.es.Feedback;
 
+import java.util.List;
 import java.util.Map;
 
 public interface DashboardService {
 
     public Map<String, Object> dashboardReport(SearchRequest searchRequest);
+
+    public List<Feedback> getFeedbackByTicketId(String ticketId);
 }