MessageDto instead of String in Event history

src/main/java/com/release11/klaus/controller/EventController.java

@@ -1,6 +1,5 @@
 package com.release11.klaus.controller;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.release11.klaus.model.Event;
 import com.release11.klaus.model.EventRequestDto;
 import com.release11.klaus.service.EtrackService;
@@ -26,7 +25,6 @@ import java.util.UUID;
 @AllArgsConstructor
 public class EventController {
 
-    private final ObjectMapper objectMapper;
     private final EtrackService etrackService;
     private final List<Event> eventList = new LinkedList<>();
     private final List<String> messageDtoList = new ArrayList<>();

src/main/java/com/release11/klaus/controller/KlausController.java

@@ -1,7 +1,6 @@
 package com.release11.klaus.controller;
 
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.release11.klaus.model.MockedMessageDto;
 import com.release11.klaus.service.KlausService;
 import com.release11.klaus.utilis.BusinessKey;
@@ -10,6 +9,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -49,9 +49,22 @@ public class KlausController {
     }
 
     @RequestMapping(value = "klaus/v1/get/{clientUUID}/{mockedResponseId}")
-    public ResponseEntity getMockedResponse(@PathVariable UUID clientUUID,
-                                            @PathVariable int mockedResponseId) throws JsonProcessingException {
-        TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse",
+    public ResponseEntity getMockedResponse(RequestEntity<String> requestEntity,
+                                            @PathVariable UUID clientUUID,
+                                            @PathVariable int mockedResponseId) {
+        TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse - request",
+                BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
+                BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));
+//        MockedMessageDto.builder()
+//                .httpHeaders(requestEntity.getHeaders().toSingleValueMap())
+//                .httpStatus(requestEntity.)
+//                .messageBody()
+//                .mediaType()
+//                .mockedResponseId(mockedResponseId)
+//                .clientUUID(clientUUID)
+//                .build();
+//        log.info(objectMapper.writeValueAsString(mockedMessageDto));
+        TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse - response",
                 BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
                 BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));
         MockedMessageDto mockedMessageDto = klausService.getMockedResponse(clientUUID, mockedResponseId);

src/main/java/com/release11/klaus/service/KlausServiceImpl.java

@@ -30,8 +30,10 @@ public class KlausServiceImpl implements KlausService {
     @Override
     public void deleteMockedResponse(UUID clientUUID, int mockedResponseId) {
         String key = clientUUID.toString() + "_" + mockedResponseId;
+        MockedMessage mockedMessage =
+                mockedResponseRepository.getByCompositePrimaryKey(clientUUID.toString() + "_" + mockedResponseId);
         mockedResponseRepository.deleteById(key);
-        log.info("\"Message\" : \"message" + mockedResponseId + "has been removed. \"");
+        log.info(String.valueOf(mockedMessageMapper.mockedMessageToMockedMessageDto(mockedMessage)));
     }
 
     @Override
@@ -49,9 +51,7 @@ public class KlausServiceImpl implements KlausService {
         MockedMessageDto mockedMessageDto = KlausMvcController.getGlobalMockedMessageDto();
         if (optionalMockedMessage.isPresent()) {
             mockedMessageDto = mockedMessageMapper.mockedMessageToMockedMessageDto(optionalMockedMessage.get());
-            String s = objectMapper.writeValueAsString(mockedMessageDto);
             log.info(objectMapper.writeValueAsString(mockedMessageDto));
-//            log.info(mockedMessageDto.toString());
             return mockedMessageDto;
         }
         log.info(mockedMessageDto.toString());
@@ -62,7 +62,6 @@ public class KlausServiceImpl implements KlausService {
     @Override
     public ResponseEntity<String> setMockedResponse(MockedMessageDto mockedMessageDto) {
         mockedResponseRepository.save(mockedMessageMapper.mockedMessageDtoToMockedMessage(mockedMessageDto));
-        String s = mockedMessageDto.toString().replaceAll("\"","\\\\\"");
         log.info(objectMapper.writeValueAsString(mockedMessageDto));
         return new ResponseEntity<>("MockedResponse has been setup successfully!", new HttpHeaders(),
                 HttpStatus.ACCEPTED);

src/main/resources/application.properties

@@ -1,5 +1,5 @@
 #environment:
-server.port = 8097
+server.port = 8098
 spring.application.name = klaus
 eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/
 spring.cloud.config.discovery.service-id = klaus-config-service

src/main/resources/static/js/etrackPaggination.js

@@ -14,9 +14,7 @@ var state = {
 }
 
 var myList, data, previousSort, messageList;
-
 messageList = messageListForPagination;
-dupalsit = listForPagination;
 state.querySet = listForPagination;
 buildTable();