IO-1551 Refactor messaging.

2021-12-08 12:38:26 -08:00
parent 26d22388c0
commit 1f7b53ee22
30 changed files with 614 additions and 302 deletions
--- a/server/firebase/firebase-handler.js
+++ b/server/firebase/firebase-handler.js
@@ -74,31 +74,48 @@ exports.updateUser = (req, res) => {
    });
 };

-exports.sendNotification = (req, res) => {
-  var registrationToken =
-    "fqIWg8ENDFyrRrMWJ1sItR:APA91bHirdZ05Zo66flMlvala97SMXoiQGwP4oCvMwd-vVrSauD_WoNim3kXHGqyP-bzENjkXwA5icyUAReFbeHn6dIaPcbpcsXuY73-eJAXvZiu1gIsrd1BOsnj3dEMT7Q4F6mTPth1";
-  var message = {
-    notification: { title: "The Title", body: "The Body" },
-    data: {
-      jobid: "1234",
-    },
-    token: registrationToken,
-  };
+exports.sendNotification = async (req, res) => {
+  setTimeout(() => {
+    // Send a message to the device corresponding to the provided
+    // registration token.
+    admin
+      .messaging()
+      .send({
+        topic: "PRD_PATRICK-messaging",
+        notification: {
+          title: `ImEX Online Message - +16049992002"`,
+          body: "Test Noti.",
+          imageUrl: "https://thinkimex.com/img/logo512.png",
+        },
+        data: {
+          type: "messaging-inbound",
+          conversationid: "e0eb17c3-3a78-4e3f-b932-55ef35aa2297",
+          text: "Hello. ",
+          image_path: "",
+          phone_num: "+16049992002",
+        },
+      })
+      .then((response) => {
+        // Response is a message ID string.
+        console.log("Successfully sent message:", response);
+      })
+      .catch((error) => {
+        console.log("Error sending message:", error);
+      });

-  // Send a message to the device corresponding to the provided
-  // registration token.
-  admin
+    res.sendStatus(200);
+  }, 500);
+};
+
+exports.subscribe = async (req, res) => {
+  const result = await admin
    .messaging()
-    .send(message)
-    .then((response) => {
-      // Response is a message ID string.
-      console.log("Successfully sent message:", response);
-    })
-    .catch((error) => {
-      console.log("Error sending message:", error);
-    });
+    .subscribeToTopic(
+      req.body.fcm_tokens,
+      `${req.body.imexshopid}-${req.body.type}`
+    );

-  res.sendStatus(200);
+  res.json(result);
 };

 exports.validateFirebaseIdToken = async (req, res, next) => {
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -22,48 +22,74 @@ mutation UNARCHIVE_CONVERSATION($id: uuid!) {

 exports.RECEIVE_MESSAGE = `
 mutation RECEIVE_MESSAGE($msg: [messages_insert_input!]!) {
-
-    insert_messages(objects: $msg) {
+  insert_messages(objects: $msg) {
    returning {
      conversation {
        id
        archived
-        bodyshop {
-          associations(where: {active: {_eq: true}}) {
-            user {
-              fcmtokens
-            }
-          }
+        bodyshop{
+          imexshopid
        }
+        created_at
+        updated_at
+        unreadcnt
+        phone_num
      }
+      conversationid
+      created_at
+      id
+      image_path
+      image
+      isoutbound
+      msid
+      read
+      text
+      updated_at
+      status
+      userid
    }
  }
 }

+
  `;

 exports.INSERT_MESSAGE = `
 mutation INSERT_MESSAGE($msg: [messages_insert_input!]!, $conversationid: uuid!) {
  update_conversations_by_pk(pk_columns: {id: $conversationid}, _set: {archived: false}) {
    id
+    archived
  }
-    insert_messages(objects: $msg) {
+  insert_messages(objects: $msg) {
    returning {
      conversation {
        id
        archived
-        bodyshop {
-          associations(where: {active: {_eq: true}}) {
-            user {
-              fcmtokens
-            }
-          }
+        bodyshop{
+          imexshopid
        }
+        created_at
+        updated_at
+        unreadcnt
+        phone_num
      }
+      conversationid
+      created_at
+      id
+      image_path
+      image
+      isoutbound
+      msid
+      read
+      text
+      updated_at
+      status
+      userid
    }
  }
 }

+
  `;

 exports.UPDATE_MESSAGE_STATUS = `
--- a/server/sms/receive.js
+++ b/server/sms/receive.js
@@ -9,7 +9,7 @@ require("dotenv").config({
 const client = require("../graphql-client/graphql-client").client;
 const queries = require("../graphql-client/queries");
 const { phone } = require("phone");
-const admin = require("../firebase/firebase-handler").admin;
+const { admin } = require("../firebase/firebase-handler");
 const logger = require("../utils/logger");
 exports.receive = async (req, res) => {
  //Perform request validation
@@ -78,21 +78,43 @@ exports.receive = async (req, res) => {
          });
        }
        try {
+          let insertresp;
          if (response.bodyshops[0].conversations[0]) {
-            const r3 = await client.request(queries.INSERT_MESSAGE, {
+            insertresp = await client.request(queries.INSERT_MESSAGE, {
              msg: newMessage,
              conversationid:
                response.bodyshops[0].conversations[0] &&
                response.bodyshops[0].conversations[0].id,
            });
          } else {
-            const r2 = await client.request(queries.RECEIVE_MESSAGE, {
+            insertresp = await client.request(queries.RECEIVE_MESSAGE, {
              msg: newMessage,
            });
          }
+          const message = insertresp.insert_messages.returning[0];
+          const data = {
+            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 || "",
+          };
+
+          const fcmresp = await admin.messaging().send({
+            topic: `${message.conversation.bodyshop.imexshopid}-messaging`,
+            notification: {
+              title: `ImEX Online Message - ${data.phone_num}`,
+              body: message.image_path ? `Image ${message.text}` : message.text,
+              imageUrl: "https://thinkimex.com/img/logo512.png",
+            },
+            data,
+          });

          logger.log("sms-inbound-success", "DEBUG", "api", null, {
            newMessage,
+            fcmresp,
          });
          res.status(200).send("");
        } catch (e2) {
--- a/server/sms/status.js
+++ b/server/sms/status.js
@@ -10,6 +10,7 @@ const client = require("../graphql-client/graphql-client").client;
 const queries = require("../graphql-client/queries");
 const { phone } = require("phone");
 const logger = require("../utils/logger");
+const { admin } = require("../firebase/firebase-handler");

 exports.status = (req, res) => {
  const { SmsSid, SmsStatus } = req.body;
@@ -34,6 +35,23 @@ exports.status = (req, res) => {
  res.sendStatus(200);
 };

+exports.markConversationRead = async (req, res) => {
+  const { conversationid, imexshopid } = req.body;
+  admin.messaging().send({
+    topic: `${imexshopid}-messaging`,
+    // notification: {
+    //   title: `ImEX Online Message - ${data.phone_num}`,
+    //   body: message.image_path ? `Image ${message.text}` : message.text,
+    //   imageUrl: "https://thinkimex.com/img/logo512.png",
+    // },
+    data: {
+      type: "messaging-mark-conversation-read",
+      conversationid: conversationid || "",
+    },
+  });
+  res.send(200);
+};
+
 // Inbound Sample
 // {
 //     "SmsSid": "SM5205ea340e06437799d9345e7283457c",
--- a/server/utils/logger.js
+++ b/server/utils/logger.js
@@ -5,13 +5,14 @@ const logger = new graylog2.graylog({
 });

 function log(message, type, user, record, object) {
-  console.log(message, {
-    type,
-    env: process.env.NODE_ENV || "development",
-    user,
-    record,
-    ...object,
-  });
+  if (type !== "ioevent")
+    console.log(message, {
+      type,
+      env: process.env.NODE_ENV || "development",
+      user,
+      record,
+      ...object,
+    });
  logger.log(message, {
    type,
    env: process.env.NODE_ENV || "development",