From 28cc092bb7772ade564d4f560a577b9f261743fa Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Mon, 13 Dec 2021 12:58:56 -0800
Subject: [PATCH] IO-1551 Include outbound fcm to update timestamps.

---
 .../chat-send-message.component.jsx              |  1 +
 client/src/utils/fcm-handler.js                  | 16 ++++++++++++++++
 server/sms/receive.js                            |  2 --
 server/sms/send.js                               | 16 ++++++++++++++--
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/client/src/components/chat-send-message/chat-send-message.component.jsx b/client/src/components/chat-send-message/chat-send-message.component.jsx
index 33b5656fa..bc0c0af7c 100644
--- a/client/src/components/chat-send-message/chat-send-message.component.jsx
+++ b/client/src/components/chat-send-message/chat-send-message.component.jsx
@@ -55,6 +55,7 @@ function ChatSendMessageComponent({
         messagingServiceSid: bodyshop.messagingservicesid,
         conversationid: conversation.id,
         selectedMedia: selectedImages,
+        imexshopid: bodyshop.imexshopid,
       });
       setSelectedMedia(
         selectedMedia.map((i) => {
diff --git a/client/src/utils/fcm-handler.js b/client/src/utils/fcm-handler.js
index 0418f97cf..0b4999b9c 100644
--- a/client/src/utils/fcm-handler.js
+++ b/client/src/utils/fcm-handler.js
@@ -14,6 +14,22 @@ export default async function FcmHandler({ client, payload }) {
         },
       });
       break;
+    case "messaging-outbound":
+      client.cache.modify({
+        id: client.cache.identify({
+          __typename: "conversations",
+          id: payload.conversationid,
+        }),
+        fields: {
+          updated_at(oldupdated0) {
+            return new Date();
+          },
+          messages_aggregate(cached) {
+            return { aggregate: { count: cached.aggregate.count + 1 } };
+          },
+        },
+      });
+      break;
     case "messaging-mark-conversation-read":
       client.cache.modify({
         id: client.cache.identify({
diff --git a/server/sms/receive.js b/server/sms/receive.js
index 36d30cb34..e081b96b3 100644
--- a/server/sms/receive.js
+++ b/server/sms/receive.js
@@ -96,8 +96,6 @@ exports.receive = async (req, res) => {
             type: "messaging-inbound",
             conversationid: message.conversationid || "",
             text: message.text || "",
-            image_path: message.image_path || "",
-            image: (message.image && message.image.toString()) || "",
             messageid: message.id || "",
             phone_num: message.conversation.phone_num || "",
           };
diff --git a/server/sms/send.js b/server/sms/send.js
index f19a51dfd..916cc01aa 100644
--- a/server/sms/send.js
+++ b/server/sms/send.js
@@ -13,11 +13,12 @@ const logger = require("../utils/logger");
 const client = twilio(
   process.env.TWILIO_AUTH_TOKEN,
   process.env.TWILIO_AUTH_KEY
-);
+);const { admin } = require("../firebase/firebase-handler");
+
 const gqlClient = require("../graphql-client/graphql-client").client;
 
 exports.send = (req, res) => {
-  const { to, messagingServiceSid, body, conversationid, selectedMedia } =
+  const { to, messagingServiceSid, body, conversationid, selectedMedia, imexshopid } =
     req.body;
 
   logger.log("sms-outbound", "DEBUG", req.user.email, null, {
@@ -63,6 +64,17 @@ exports.send = (req, res) => {
               conversationid,
             });
 
+            const data = {
+              type: "messaging-outbound",
+              conversationid: newMessage.conversationid || "",
+
+            };
+
+      admin.messaging().send({
+              topic: `${imexshopid}-messaging`,
+              data,
+            });
+
             res.sendStatus(200);
           })
           .catch((e2) => {