Merge branch 'release-5.0.0' of https://github.com/samagra-comms/inbound

into v2-integration
samagra-comms · Aug 24, 2022 · 71f143a · 71f143a
2 parents 10bb1ed + 94ed899
commit 71f143a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,10 +3,10 @@ name: Maven Build
 on: 
   push:
     branches:
-      ["release-4.9.0", "release-4.10.0", "v2-integration"]
+      ["release-4.9.0", "release-4.10.0", "release-5.0.0", "v2-integration"]
   pull_request:
     branches:
-      ["release-4.9.0", "release-4.10.0", "v2-integration"]
+      ["release-4.9.0", "release-4.10.0", "release-5.0.0", "v2-integration"]
 
 jobs:
   build:
@@ -56,4 +56,4 @@ jobs:
           GITHUB_USERNAME: ${{ secrets.USERNAME }}
           GITHUB_TOKEN: ${{ secrets.TOKEN }}
         run: mvn clean install -s $GITHUB_WORKSPACE/settings.xml -DskipTests
-
+
diff --git a/src/main/java/com/uci/inbound/xmsg/XmsgHistoryController.java b/src/main/java/com/uci/inbound/xmsg/XmsgHistoryController.java
@@ -281,7 +281,7 @@ public List<Map<String, Object>> filterMessageState(List<XMessageDAO> xMessageDA
             daoMap.put("sessionId", xMessageDAO.getSessionId());
             daoMap.put("botUuid", xMessageDAO.getBotUuid());
 //            daoMap.put("xMessage", xMessageDAO.getXMessage());
-            daoMap.put("timestamp", xMessageDAO.getTimestamp());
+//            daoMap.put("timestamp", xMessageDAO.getTimestamp());
             try{
                 if(sentMap.get(xMessageDAO.getMessageId()) != null) {
                     String xMessage = sentMap.get(xMessageDAO.getMessageId()).getXMessage();
@@ -303,6 +303,19 @@ 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());
+                } else {
+                    daoMap.put("sentTimestamp", null);
+                }
+                if(deliverdMap.get(xMessageDAO.getMessageId()) != null) {
+                    daoMap.put("deliveryTimestamp", deliverdMap.get(xMessageDAO.getMessageId()).getTimestamp());
+                } else {
+                    daoMap.put("deliveryTimestamp", null);
+                }
+                if(readMap.get(xMessageDAO.getMessageId()) != null) {
+                    daoMap.put("readTimestamp", readMap.get(xMessageDAO.getMessageId()).getTimestamp());
+                } else {
+                    daoMap.put("readTimestamp", null);
                 }
             } catch (Exception ex) {
                 log.error("Exception when fetching payload: "+ex.getMessage());