[Hot Fix] - Fixed timestamp error

samagra-comms · May 5, 2023 · f6b8baa · f6b8baa
1 parent fdd20fb
commit f6b8baa
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/main/java/com/uci/inbound/xmsg/XmsgHistoryController.java b/src/main/java/com/uci/inbound/xmsg/XmsgHistoryController.java
@@ -235,7 +235,7 @@ public Mono<Object> getConversationHistory(@RequestParam(value = "botId", requir
             log.info("/conversation-history api call... Request: {" + request + "}");
             HttpApiResponse response = HttpApiResponse.builder()
                     .status(HttpStatus.OK.value())
-                    .path("/xmsg/history")
+                    .path("/xmsg/conversation-history")
                     .build();
             if (botId == null || botId.isEmpty()) {
                 response.setStatus(HttpStatus.BAD_REQUEST.value());
@@ -400,17 +400,17 @@ public List<Map<String, Object>> filterMessageState(List<XMessageDAO> xMessageDA
                         payloadMap.put("contactCard", currentXmsg.getPayload().getContactCard());
                     }
                     daoMap.put("payload", payloadMap);
-                    daoMap.put("sentTimestamp", sentMap.get(xMessageDAO.getMessageId()).getTimestamp());
+                    daoMap.put("sentTimestamp", sentMap.get(xMessageDAO.getMessageId()).getTimestamp().toString());
                 } else {
                     daoMap.put("sentTimestamp", null);
                 }
                 if (deliverdMap.get(xMessageDAO.getMessageId()) != null) {
-                    daoMap.put("deliveryTimestamp", deliverdMap.get(xMessageDAO.getMessageId()).getTimestamp());
+                    daoMap.put("deliveryTimestamp", deliverdMap.get(xMessageDAO.getMessageId()).getTimestamp().toString());
                 } else {
                     daoMap.put("deliveryTimestamp", null);
                 }
                 if (readMap.get(xMessageDAO.getMessageId()) != null) {
-                    daoMap.put("readTimestamp", readMap.get(xMessageDAO.getMessageId()).getTimestamp());
+                    daoMap.put("readTimestamp", readMap.get(xMessageDAO.getMessageId()).getTimestamp().toString());
                 } else {
                     daoMap.put("readTimestamp", null);
                 }
@@ -465,22 +465,22 @@ public List<Map<String, Object>> filterConversationHistory(List<XMessageDAO> xMe
                 }
                 daoMap.put("payload", payloadMap);
                 if (xMessageDAO.getMessageState().equalsIgnoreCase(XMessage.MessageState.SENT.name())) {
-                    daoMap.put("sentTimestamp", xMessageDAO.getTimestamp());
+                    daoMap.put("sentTimestamp", xMessageDAO.getTimestamp().toString());
                 } else {
-                    daoMap.put("repliedTimestamp", null);
+                    daoMap.put("sentTimestamp", null);
                 }
                 if (xMessageDAO.getMessageState().equalsIgnoreCase(XMessage.MessageState.REPLIED.name())) {
-                    daoMap.put("repliedTimestamp", xMessageDAO.getTimestamp());
+                    daoMap.put("repliedTimestamp", xMessageDAO.getTimestamp().toString());
                 } else {
                     daoMap.put("repliedTimestamp", null);
                 }
                 if (xMessageDAO.getMessageState().equalsIgnoreCase(XMessage.MessageState.DELIVERED.name())) {
-                    daoMap.put("deliveredTimestamp", xMessageDAO.getTimestamp());
+                    daoMap.put("deliveredTimestamp", xMessageDAO.getTimestamp().toString());
                 } else {
                     daoMap.put("deliveredTimestamp", null);
                 }
                 if (xMessageDAO.getMessageState().equalsIgnoreCase(XMessage.MessageState.READ.name())) {
-                    daoMap.put("readTimestamp", xMessageDAO.getTimestamp());
+                    daoMap.put("readTimestamp", xMessageDAO.getTimestamp().toString());
                 } else {
                     daoMap.put("readTimestamp", null);
                 }