feature/IO-3000-Migrate-MSG-to-Sockets - Progress Checkpoint

Signed-off-by: Dave Richer <dave@imexsystems.ca>

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -20702,27 +20702,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>time</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>total</name>
                                         <definition_loaded>false</definition_loaded>
@@ -21895,48 +21874,6 @@
                             <folder_node>
                                 <name>columns</name>
                                 <children>
-                                    <concept_node>
-                                        <name>average_human_readable</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
-                                    <concept_node>
-                                        <name>average_value</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>duration</name>
                                         <definition_loaded>false</definition_loaded>
@@ -31872,27 +31809,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>tlos_ind</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>towin</name>
                                         <definition_loaded>false</definition_loaded>
@@ -36442,27 +36358,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>total_repairs_cash_discount</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>total_sales</name>
                                         <definition_loaded>false</definition_loaded>

certs/io-ftp-test.key

@@ -1,12 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAArAAAABNlY2RzYS
-1zaGEyLW5pc3RwNTIxAAAACG5pc3RwNTIxAAAAhQQBYJnAujo17diR0fM2Ze1d1Ft6XHm5
-U31pXdFEN+rGC4SoYTdZE8q3relxMS5GwwBOvgvVUuayfid2XS8ls/CMDiMBJAYqEK4CRY
-PbbPB7lLnMWsF7muFhvs+SIpPQC+vtDwM2TKlxF0Y8p+iVRpvCADoggsSze7skmJWKmMTt
-8jEdEOcAAAEQIyXsOSMl7DkAAAATZWNkc2Etc2hhMi1uaXN0cDUyMQAAAAhuaXN0cDUyMQ
-AAAIUEAWCZwLo6Ne3YkdHzNmXtXdRbelx5uVN9aV3RRDfqxguEqGE3WRPKt63pcTEuRsMA
-Tr4L1VLmsn4ndl0vJbPwjA4jASQGKhCuAkWD22zwe5S5zFrBe5rhYb7PkiKT0Avr7Q8DNk
-ypcRdGPKfolUabwgA6IILEs3u7JJiVipjE7fIxHRDnAAAAQUO5dO9G7i0bxGTP0zV3eIwv
-5g0NhrQJfW/bMHS6XWwaxdpr+QZ+DbBJVzZPwYC0wLMW4bJAf+kjqUnj4wGocoTeAAAAD2
-lvLWZ0cC10ZXN0LWtleQECAwQ=
------END OPENSSH PRIVATE KEY-----

certs/io-ftp-test.key.pub

@@ -1 +0,0 @@
-ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFgmcC6OjXt2JHR8zZl7V3UW3pceblTfWld0UQ36sYLhKhhN1kTyret6XExLkbDAE6+C9VS5rJ+J3ZdLyWz8IwOIwEkBioQrgJFg9ts8HuUucxawXua4WG+z5Iik9AL6+0PAzZMqXEXRjyn6JVGm8IAOiCCxLN7uySYlYqYxO3yMR0Q5w== io-ftp-test-key

certs/io-ftp-test.ppk

@@ -1,12 +0,0 @@
-PuTTY-User-Key-File-3: ecdsa-sha2-nistp521
-Encryption: none
-Comment: io-ftp-test-key
-Public-Lines: 4
-AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFgmcC6OjXt
-2JHR8zZl7V3UW3pceblTfWld0UQ36sYLhKhhN1kTyret6XExLkbDAE6+C9VS5rJ+
-J3ZdLyWz8IwOIwEkBioQrgJFg9ts8HuUucxawXua4WG+z5Iik9AL6+0PAzZMqXEX
-Rjyn6JVGm8IAOiCCxLN7uySYlYqYxO3yMR0Q5w==
-Private-Lines: 2
-AAAAQUO5dO9G7i0bxGTP0zV3eIwv5g0NhrQJfW/bMHS6XWwaxdpr+QZ+DbBJVzZP
-wYC0wLMW4bJAf+kjqUnj4wGocoTe
-Private-MAC: d67001d47e13c43dc8bdb9c68a25356a96c1c4a6714f3c5a1836fca646b78b54

client/package-lock.json

@@ -85,7 +85,6 @@
         "web-vitals": "^3.5.2"
       },
       "devDependencies": {
-        "@ant-design/icons": "^5.5.1",
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
         "@babel/preset-react": "^7.24.7",
         "@dotenvx/dotenvx": "^1.14.1",

client/package.json

@@ -132,7 +132,6 @@
     "@rollup/rollup-linux-x64-gnu": "4.6.1"
   },
   "devDependencies": {
-    "@ant-design/icons": "^5.5.1",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-react": "^7.24.7",
     "@dotenvx/dotenvx": "^1.14.1",

client/public/firebase-messaging-sw.js

@@ -1,6 +1,6 @@
 // Scripts for firebase and firebase messaging
-importScripts("https://www.gstatic.com/firebasejs/10.14.1/firebase-app-compat.js");
-importScripts("https://www.gstatic.com/firebasejs/10.14.1/firebase-messaging-compat.js");
+importScripts("https://www.gstatic.com/firebasejs/8.2.0/firebase-app.js");
+importScripts("https://www.gstatic.com/firebasejs/8.2.0/firebase-messaging.js");
 
 // Initialize the Firebase app in the service worker by passing the generated config
 let firebaseConfig;
@@ -14,7 +14,7 @@ switch (this.location.hostname) {
       storageBucket: "imex-dev.appspot.com",
       messagingSenderId: "759548147434",
       appId: "1:759548147434:web:e8239868a48ceb36700993",
-      measurementId: "G-K5XRBVVB4S"
+      measurementId: "G-K5XRBVVB4S",
     };
     break;
   case "test.imex.online":
@@ -24,7 +24,7 @@ switch (this.location.hostname) {
       projectId: "imex-test",
       storageBucket: "imex-test.appspot.com",
       messagingSenderId: "991923618608",
-      appId: "1:991923618608:web:633437569cdad78299bef5"
+      appId: "1:991923618608:web:633437569cdad78299bef5",
       // measurementId: "${config.measurementId}",
     };
     break;
@@ -38,7 +38,7 @@ switch (this.location.hostname) {
       storageBucket: "imex-prod.appspot.com",
       messagingSenderId: "253497221485",
       appId: "1:253497221485:web:3c81c483b94db84b227a64",
-      measurementId: "G-NTWBKG2L0M"
+      measurementId: "G-NTWBKG2L0M",
     };
 }
 
@@ -49,6 +49,8 @@ const messaging = firebase.messaging();
 
 messaging.onBackgroundMessage(function (payload) {
   // Customize notification here
-  console.log("[firebase-messaging-sw.js] Received background message ", payload);
-  self.registration.showNotification(notificationTitle, notificationOptions);
+  const channel = new BroadcastChannel("imex-sw-messages");
+  channel.postMessage(payload);
+
+  //self.registration.showNotification(notificationTitle, notificationOptions);
 });

client/src/components/chat-affix/chat-affix.container.jsx

@@ -1,50 +1,89 @@
 import { useApolloClient } from "@apollo/client";
-import { getToken } from "@firebase/messaging";
+import { getToken, onMessage } from "@firebase/messaging";
+import { Button, notification, Space } from "antd";
 import axios from "axios";
-import React, { useContext, useEffect } from "react";
+import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
-import SocketContext from "../../contexts/SocketIO/socketContext";
 import { messaging, requestForToken } from "../../firebase/firebase.utils";
+import FcmHandler from "../../utils/fcm-handler";
 import ChatPopupComponent from "../chat-popup/chat-popup.component";
 import "./chat-affix.styles.scss";
-import { registerMessagingHandlers, unregisterMessagingHandlers } from "./registerMessagingSocketHandlers";
 
 export function ChatAffixContainer({ bodyshop, chatVisible }) {
   const { t } = useTranslation();
   const client = useApolloClient();
-  const { socket } = useContext(SocketContext);
 
   useEffect(() => {
     if (!bodyshop || !bodyshop.messagingservicesid) return;
 
-    async function SubscribeToTopicForFCMNotification() {
+    async function SubscribeToTopic() {
       try {
-        await requestForToken();
-        await axios.post("/notifications/subscribe", {
+        const r = await axios.post("/notifications/subscribe", {
           fcm_tokens: await getToken(messaging, {
             vapidKey: import.meta.env.VITE_APP_FIREBASE_PUBLIC_VAPID_KEY
           }),
           type: "messaging",
           imexshopid: bodyshop.imexshopid
         });
+        console.log("FCM Topic Subscription", r.data);
       } catch (error) {
         console.log("Error attempting to subscribe to messaging topic: ", error);
+        notification.open({
+          key: "fcm",
+          type: "warning",
+          message: t("general.errors.fcm"),
+          btn: (
+            <Space>
+              <Button
+                onClick={async () => {
+                  await requestForToken();
+                  SubscribeToTopic();
+                }}
+              >
+                {t("general.actions.tryagain")}
+              </Button>
+              <Button
+                onClick={() => {
+                  const win = window.open(
+                    "https://help.imex.online/en/article/enabling-notifications-o978xi/",
+                    "_blank"
+                  );
+                  win.focus();
+                }}
+              >
+                {t("general.labels.help")}
+              </Button>
+            </Space>
+          )
+        });
       }
     }
 
-    SubscribeToTopicForFCMNotification();
+    SubscribeToTopic();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [bodyshop]);
 
-    //Register WS handlers
-    if (socket && socket.connected) {
-      registerMessagingHandlers({ socket, client });
+  useEffect(() => {
+    function handleMessage(payload) {
+      FcmHandler({
+        client,
+        payload: (payload && payload.data && payload.data.data) || payload.data
+      });
     }
 
+    let stopMessageListener, channel;
+    try {
+      stopMessageListener = onMessage(messaging, handleMessage);
+      channel = new BroadcastChannel("imex-sw-messages");
+      channel.addEventListener("message", handleMessage);
+    } catch (error) {
+      console.log("Unable to set event listeners.");
+    }
     return () => {
-      if (socket && socket.connected) {
-        unregisterMessagingHandlers({ socket });
-      }
+      stopMessageListener && stopMessageListener();
+      channel && channel.removeEventListener("message", handleMessage);
     };
-  }, [bodyshop, socket, t, client]);
+  }, [client]);
 
   if (!bodyshop || !bodyshop.messagingservicesid) return <></>;
 

client/src/components/chat-affix/registerMessagingSocketHandlers.js

@@ -1,388 +0,0 @@
-import { CONVERSATION_LIST_QUERY, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
-import { gql } from "@apollo/client";
-
-const logLocal = (message, ...args) => {
-  if (import.meta.env.VITE_APP_IS_TEST || !import.meta.env.PROD) {
-    console.log(`==================== ${message} ====================`);
-    console.dir({ ...args });
-  }
-};
-
-// Utility function to enrich conversation data
-const enrichConversation = (conversation, isOutbound) => ({
-  ...conversation,
-  updated_at: conversation.updated_at || new Date().toISOString(),
-  unreadcnt: conversation.unreadcnt || 0,
-  archived: conversation.archived || false,
-  label: conversation.label || null,
-  job_conversations: conversation.job_conversations || [],
-  messages_aggregate: conversation.messages_aggregate || {
-    __typename: "messages_aggregate",
-    aggregate: {
-      __typename: "messages_aggregate_fields",
-      count: isOutbound ? 0 : 1
-    }
-  },
-  __typename: "conversations"
-});
-
-export const registerMessagingHandlers = ({ socket, client }) => {
-  if (!(socket && client)) return;
-
-  const handleNewMessageSummary = async (message) => {
-    const { conversationId, newConversation, existingConversation, isoutbound } = message;
-
-    logLocal("handleNewMessageSummary - Start", { message, isNew: !existingConversation });
-
-    const queryVariables = { offset: 0 };
-
-    if (!existingConversation && conversationId) {
-      // Attempt to read from the cache to determine if this is actually a new conversation
-      try {
-        const cachedConversation = client.cache.readFragment({
-          id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-          fragment: gql`
-            fragment ExistingConversationCheck on conversations {
-              id
-            }
-          `
-        });
-
-        if (cachedConversation) {
-          logLocal("handleNewMessageSummary - Existing Conversation inferred from cache", {
-            conversationId
-          });
-          return handleNewMessageSummary({
-            ...message,
-            existingConversation: true
-          });
-        }
-      } catch (error) {
-        logLocal("handleNewMessageSummary - Cache miss", { conversationId });
-      }
-    }
-
-    // Handle new conversation
-    if (!existingConversation && newConversation?.phone_num) {
-      logLocal("handleNewMessageSummary - New Conversation", newConversation);
-
-      try {
-        const queryResults = client.cache.readQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: queryVariables
-        });
-
-        const existingConversations = queryResults?.conversations || [];
-        const enrichedConversation = enrichConversation(newConversation, isoutbound);
-
-        if (!existingConversations.some((conv) => conv.id === enrichedConversation.id)) {
-          client.cache.modify({
-            id: "ROOT_QUERY",
-            fields: {
-              conversations(existingConversations = []) {
-                return [enrichedConversation, ...existingConversations];
-              }
-            }
-          });
-        }
-      } catch (error) {
-        console.error("Error updating cache for new conversation:", error);
-      }
-      return;
-    }
-
-    // Handle existing conversation
-    if (existingConversation) {
-      try {
-        client.cache.modify({
-          id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-          fields: {
-            updated_at: () => new Date().toISOString(),
-            archived: () => false,
-            messages_aggregate(cached = { aggregate: { count: 0 } }) {
-              const currentCount = cached.aggregate?.count || 0;
-              if (!isoutbound) {
-                return {
-                  __typename: "messages_aggregate",
-                  aggregate: {
-                    __typename: "messages_aggregate_fields",
-                    count: currentCount + 1
-                  }
-                };
-              }
-              return cached;
-            }
-          }
-        });
-      } catch (error) {
-        console.error("Error updating cache for existing conversation:", error);
-      }
-
-      return;
-    }
-
-    logLocal("New Conversation Summary finished without work", { message });
-  };
-
-  const handleNewMessageDetailed = (message) => {
-    const { conversationId, newMessage } = message;
-
-    logLocal("handleNewMessageDetailed - Start", message);
-
-    try {
-      // Check if the conversation exists in the cache
-      const queryResults = client.cache.readQuery({
-        query: GET_CONVERSATION_DETAILS,
-        variables: { conversationId }
-      });
-
-      if (!queryResults?.conversations_by_pk) {
-        console.warn("Conversation not found in cache:", { conversationId });
-        return;
-      }
-
-      // Append the new message to the conversation's message list using cache.modify
-      client.cache.modify({
-        id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-        fields: {
-          messages(existingMessages = []) {
-            return [...existingMessages, newMessage];
-          }
-        }
-      });
-
-      logLocal("handleNewMessageDetailed - Message appended successfully", {
-        conversationId,
-        newMessage
-      });
-    } catch (error) {
-      console.error("Error updating conversation messages in cache:", error);
-    }
-  };
-
-  const handleMessageChanged = (message) => {
-    if (!message) {
-      logLocal("handleMessageChanged - No message provided", message);
-      return;
-    }
-
-    logLocal("handleMessageChanged - Start", message);
-
-    try {
-      client.cache.modify({
-        id: client.cache.identify({ __typename: "conversations", id: message.conversationid }),
-        fields: {
-          messages(existingMessages = [], { readField }) {
-            return existingMessages.map((messageRef) => {
-              // Check if this is the message to update
-              if (readField("id", messageRef) === message.id) {
-                const currentStatus = readField("status", messageRef);
-
-                // Handle known types of message changes
-                switch (message.type) {
-                  case "status-changed":
-                    // Prevent overwriting if the current status is already "delivered"
-                    if (currentStatus === "delivered") {
-                      logLocal("handleMessageChanged - Status already delivered, skipping update", {
-                        messageId: message.id
-                      });
-                      return messageRef;
-                    }
-
-                    // Update the status field
-                    return {
-                      ...messageRef,
-                      status: message.status
-                    };
-
-                  case "text-updated":
-                    // Handle changes to the message text
-                    return {
-                      ...messageRef,
-                      text: message.text
-                    };
-
-                  // Add cases for other known message types as needed
-
-                  default:
-                    // Log a warning for unhandled message types
-                    logLocal("handleMessageChanged - Unhandled message type", { type: message.type });
-                    return messageRef;
-                }
-              }
-
-              return messageRef; // Keep other messages unchanged
-            });
-          }
-        }
-      });
-
-      logLocal("handleMessageChanged - Message updated successfully", {
-        messageId: message.id,
-        type: message.type
-      });
-    } catch (error) {
-      console.error("handleMessageChanged - Error modifying cache:", error);
-    }
-  };
-
-  const handleConversationChanged = async (data) => {
-    if (!data) {
-      logLocal("handleConversationChanged - No data provided", data);
-      return;
-    }
-
-    const { conversationId, type, job_conversations, messageIds, ...fields } = data;
-    logLocal("handleConversationChanged - Start", data);
-
-    const updatedAt = new Date().toISOString();
-
-    const updateConversationList = (newConversation) => {
-      try {
-        const existingList = client.cache.readQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: { offset: 0 }
-        });
-
-        const updatedList = existingList?.conversations
-          ? [
-              newConversation,
-              ...existingList.conversations.filter((conv) => conv.id !== newConversation.id) // Prevent duplicates
-            ]
-          : [newConversation];
-
-        client.cache.writeQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: { offset: 0 },
-          data: {
-            conversations: updatedList
-          }
-        });
-
-        logLocal("handleConversationChanged - Conversation list updated successfully", newConversation);
-      } catch (error) {
-        console.error("Error updating conversation list in the cache:", error);
-      }
-    };
-
-    // Handle specific types
-    try {
-      switch (type) {
-        case "conversation-marked-read":
-          if (conversationId && messageIds?.length > 0) {
-            client.cache.modify({
-              id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-              fields: {
-                messages(existingMessages = [], { readField }) {
-                  return existingMessages.map((message) => {
-                    if (messageIds.includes(readField("id", message))) {
-                      return { ...message, read: true };
-                    }
-                    return message;
-                  });
-                },
-                messages_aggregate: () => ({
-                  __typename: "messages_aggregate",
-                  aggregate: { __typename: "messages_aggregate_fields", count: 0 }
-                })
-              }
-            });
-          }
-          break;
-
-        case "conversation-created":
-          updateConversationList({ ...fields, job_conversations, updated_at: updatedAt });
-          break;
-
-        case "conversation-unarchived":
-        case "conversation-archived":
-          // Would like to someday figure out how to get this working without refetch queries,
-          // But I have but a solid 4 hours into it, and there are just too many weird occurrences
-          try {
-            const listQueryVariables = { offset: 0 };
-            const detailsQueryVariables = { conversationId };
-
-            // Check if conversation details exist in the cache
-            const detailsExist = !!client.cache.readQuery({
-              query: GET_CONVERSATION_DETAILS,
-              variables: detailsQueryVariables
-            });
-
-            // Refetch conversation list
-            await client.refetchQueries({
-              include: [CONVERSATION_LIST_QUERY, ...(detailsExist ? [GET_CONVERSATION_DETAILS] : [])],
-              variables: [
-                { query: CONVERSATION_LIST_QUERY, variables: listQueryVariables },
-                ...(detailsExist
-                  ? [
-                      {
-                        query: GET_CONVERSATION_DETAILS,
-                        variables: detailsQueryVariables
-                      }
-                    ]
-                  : [])
-              ]
-            });
-
-            logLocal("handleConversationChanged - Refetched queries after state change", {
-              conversationId,
-              type
-            });
-          } catch (error) {
-            console.error("Error refetching queries after conversation state change:", error);
-          }
-          break;
-
-        case "tag-added":
-          client.cache.modify({
-            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: {
-              job_conversations: (existing = []) => [...existing, ...job_conversations]
-            }
-          });
-          break;
-
-        case "tag-removed":
-          client.cache.modify({
-            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: {
-              job_conversations: (existing = [], { readField }) => {
-                return existing.filter((jobRef) => {
-                  // Read the `jobid` field safely, even if the structure is normalized
-                  const jobId = readField("jobid", jobRef);
-                  return jobId !== fields.jobId;
-                });
-              }
-            }
-          });
-          break;
-
-        default:
-          logLocal("handleConversationChanged - Unhandled type", { type });
-          client.cache.modify({
-            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: {
-              ...Object.fromEntries(
-                Object.entries(fields).map(([key, value]) => [key, (cached) => (value !== undefined ? value : cached)])
-              )
-            }
-          });
-      }
-    } catch (error) {
-      console.error("Error handling conversation changes:", { type, error });
-    }
-  };
-
-  socket.on("new-message-summary", handleNewMessageSummary);
-  socket.on("new-message-detailed", handleNewMessageDetailed);
-  socket.on("message-changed", handleMessageChanged);
-  socket.on("conversation-changed", handleConversationChanged);
-};
-
-export const unregisterMessagingHandlers = ({ socket }) => {
-  if (!socket) return;
-  socket.off("new-message-summary");
-  socket.off("new-message-detailed");
-  socket.off("message-changed");
-  socket.off("conversation-changed");
-};

client/src/components/chat-archive-button/chat-archive-button.component.jsx

@@ -1,49 +1,27 @@
 import { useMutation } from "@apollo/client";
 import { Button } from "antd";
-import React, { useContext, useState } from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { TOGGLE_CONVERSATION_ARCHIVE } from "../../graphql/conversations.queries";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
-import { connect } from "react-redux";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-const mapDispatchToProps = () => ({});
-
-export function ChatArchiveButton({ conversation, bodyshop }) {
+export default function ChatArchiveButton({ conversation }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [updateConversation] = useMutation(TOGGLE_CONVERSATION_ARCHIVE);
-  const { socket } = useContext(SocketContext);
-
   const handleToggleArchive = async () => {
     setLoading(true);
 
-    const updatedConversation = await updateConversation({
-      variables: { id: conversation.id, archived: !conversation.archived }
+    await updateConversation({
+      variables: { id: conversation.id, archived: !conversation.archived },
+      refetchQueries: ["CONVERSATION_LIST_QUERY"]
     });
 
-    if (socket) {
-      socket.emit("conversation-modified", {
-        type: "conversation-archived",
-        conversationId: conversation.id,
-        bodyshopId: bodyshop.id,
-        archived: updatedConversation.data.update_conversations_by_pk.archived
-      });
-    }
-
     setLoading(false);
   };
 
   return (
-    <Button onClick={handleToggleArchive} loading={loading} className="archive-button" type="primary">
+    <Button onClick={handleToggleArchive} loading={loading} type="primary">
       {conversation.archived ? t("messaging.labels.unarchive") : t("messaging.labels.archive")}
     </Button>
   );
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChatArchiveButton);

client/src/components/chat-conversation-list/chat-conversation-list.component.jsx

@@ -1,5 +1,5 @@
 import { Badge, Card, List, Space, Tag } from "antd";
-import React, { useEffect, useState } from "react";
+import React from "react";
 import { connect } from "react-redux";
 import { Virtuoso } from "react-virtuoso";
 import { createStructuredSelector } from "reselect";
@@ -19,26 +19,14 @@ const mapDispatchToProps = (dispatch) => ({
   setSelectedConversation: (conversationId) => dispatch(setSelectedConversation(conversationId))
 });
 
-function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation }) {
-  // That comma is there for a reason, do not remove it
-  const [, forceUpdate] = useState(false);
-
-  // Re-render every minute
-  useEffect(() => {
-    const interval = setInterval(() => {
-      forceUpdate((prev) => !prev); // Toggle state to trigger re-render
-    }, 60000); // 1 minute in milliseconds
-
-    return () => clearInterval(interval); // Cleanup on unmount
-  }, []);
-
-  // Memoize the sorted conversation list
-  const sortedConversationList = React.useMemo(() => {
-    return _.orderBy(conversationList, ["updated_at"], ["desc"]);
-  }, [conversationList]);
-
+function ChatConversationListComponent({
+  conversationList,
+  selectedConversation,
+  setSelectedConversation,
+  loadMoreConversations
+}) {
   const renderConversation = (index) => {
-    const item = sortedConversationList[index];
+    const item = conversationList[index];
     const cardContentRight = <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>;
     const cardContentLeft =
       item.job_conversations.length > 0
@@ -60,7 +48,7 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
       </>
     );
 
-    const cardExtra = <Badge count={item.messages_aggregate.aggregate.count} />;
+    const cardExtra = <Badge count={item.messages_aggregate.aggregate.count || 0} />;
 
     const getCardStyle = () =>
       item.id === selectedConversation
@@ -84,9 +72,10 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
   return (
     <div className="chat-list-container">
       <Virtuoso
-        data={sortedConversationList}
+        data={conversationList}
         itemContent={(index) => renderConversation(index)}
         style={{ height: "100%", width: "100%" }}
+        endReached={loadMoreConversations} // Calls loadMoreConversations when scrolled to the bottom
       />
     </div>
   );

client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx

@@ -1,29 +1,18 @@
 import { useMutation } from "@apollo/client";
 import { Tag } from "antd";
-import React, { useContext } from "react";
+import React from "react";
 import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { REMOVE_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
-import { connect } from "react-redux";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-const mapDispatchToProps = () => ({});
-
-export function ChatConversationTitleTags({ jobConversations, bodyshop }) {
+export default function ChatConversationTitleTags({ jobConversations }) {
   const [removeJobConversation] = useMutation(REMOVE_CONVERSATION_TAG);
-  const { socket } = useContext(SocketContext);
 
-  const handleRemoveTag = async (jobId) => {
+  const handleRemoveTag = (jobId) => {
     const convId = jobConversations[0].conversationid;
     if (!!convId) {
-      await removeJobConversation({
+      removeJobConversation({
         variables: {
           conversationId: convId,
           jobId: jobId
@@ -39,17 +28,6 @@ export function ChatConversationTitleTags({ jobConversations, bodyshop }) {
           });
         }
       });
-
-      if (socket) {
-        // Emit the `conversation-modified` event
-        socket.emit("conversation-modified", {
-          bodyshopId: bodyshop.id,
-          conversationId: convId,
-          type: "tag-removed",
-          jobId: jobId
-        });
-      }
-
       logImEXEvent("messaging_remove_job_tag", {
         conversationId: convId,
         jobId: jobId
@@ -76,5 +54,3 @@ export function ChatConversationTitleTags({ jobConversations, bodyshop }) {
     </div>
   );
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChatConversationTitleTags);

client/src/components/chat-conversation-title/chat-conversation-title.component.jsx

@@ -6,16 +6,10 @@ import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conv
 import ChatLabelComponent from "../chat-label/chat-label.component";
 import ChatPrintButton from "../chat-print-button/chat-print-button.component";
 import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container";
-import { createStructuredSelector } from "reselect";
-import { connect } from "react-redux";
 
-const mapStateToProps = createStructuredSelector({});
-
-const mapDispatchToProps = () => ({});
-
-export function ChatConversationTitle({ conversation }) {
+export default function ChatConversationTitle({ conversation }) {
   return (
-    <Space className="chat-title" wrap>
+    <Space wrap>
       <PhoneNumberFormatter>{conversation && conversation.phone_num}</PhoneNumberFormatter>
       <ChatLabelComponent conversation={conversation} />
       <ChatPrintButton conversation={conversation} />
@@ -25,5 +19,3 @@ export function ChatConversationTitle({ conversation }) {
     </Space>
   );
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChatConversationTitle);

client/src/components/chat-conversation/chat-conversation.component.jsx

@@ -5,26 +5,10 @@ import ChatMessageListComponent from "../chat-messages-list/chat-message-list.co
 import ChatSendMessage from "../chat-send-message/chat-send-message.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component.jsx";
 import "./chat-conversation.styles.scss";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
-import { connect } from "react-redux";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-const mapDispatchToProps = () => ({});
-
-export function ChatConversationComponent({
-  subState,
-  conversation,
-  messages,
-  handleMarkConversationAsRead,
-  bodyshop
-}) {
+export default function ChatConversationComponent({ subState, conversation, messages, handleMarkConversationAsRead }) {
   const [loading, error] = subState;
 
-  if (conversation?.archived) return null;
   if (loading) return <LoadingSkeleton />;
   if (error) return <AlertComponent message={error.message} type="error" />;
 
@@ -34,11 +18,9 @@ export function ChatConversationComponent({
       onMouseDown={handleMarkConversationAsRead}
       onKeyDown={handleMarkConversationAsRead}
     >
-      <ChatConversationTitle conversation={conversation} bodyshop={bodyshop} />
+      <ChatConversationTitle conversation={conversation} />
       <ChatMessageListComponent messages={messages} />
       <ChatSendMessage conversation={conversation} />
     </div>
   );
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChatConversationComponent);

client/src/components/chat-conversation/chat-conversation.container.jsx

@@ -1,174 +1,83 @@
-import { gql, useApolloClient, useQuery, useSubscription } from "@apollo/client";
-import axios from "axios";
-import React, { useCallback, useContext, useEffect, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import SocketContext from "../../contexts/SocketIO/socketContext";
-import { GET_CONVERSATION_DETAILS, CONVERSATION_SUBSCRIPTION_BY_PK } from "../../graphql/conversations.queries";
 import { selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ChatConversationComponent from "./chat-conversation.component";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   selectedConversation: selectSelectedConversation,
   bodyshop: selectBodyshop
 });
 
-function ChatConversationContainer({ bodyshop, selectedConversation }) {
-  const client = useApolloClient();
+const mapDispatchToProps = (dispatch) => ({});
+
+export function ChatConversationContainer({ bodyshop, selectedConversation }) {
   const { socket } = useContext(SocketContext);
+  const [conversationDetails, setConversationDetails] = useState({});
+  const [messages, setMessages] = useState([]);
   const [markingAsReadInProgress, setMarkingAsReadInProgress] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [error] = useState(null);
 
-  // Fetch conversation details
-  const {
-    loading: convoLoading,
-    error: convoError,
-    data: convoData
-  } = useQuery(GET_CONVERSATION_DETAILS, {
-    variables: { conversationId: selectedConversation },
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only"
-  });
+  // Fetch conversation details and messages when a conversation is selected
+  useEffect(() => {
+    if (socket && selectedConversation) {
+      setLoading(true);
+      socket.emit("join-conversation", selectedConversation);
 
-  // Subscription for conversation updates
-  useSubscription(CONVERSATION_SUBSCRIPTION_BY_PK, {
-    skip: socket?.connected,
-    variables: { conversationId: selectedConversation },
-    onData: ({ data: subscriptionResult, client }) => {
-      // Extract the messages array from the result
-      const messages = subscriptionResult?.data?.messages;
-      if (!messages || messages.length === 0) {
-        console.warn("No messages found in subscription result.");
-        return;
-      }
-
-      messages.forEach((message) => {
-        const messageRef = client.cache.identify(message);
-        // Write the new message to the cache
-        client.cache.writeFragment({
-          id: messageRef,
-          fragment: gql`
-            fragment NewMessage on messages {
-              id
-              status
-              text
-              isoutbound
-              image
-              image_path
-              userid
-              created_at
-              read
-            }
-          `,
-          data: message
-        });
-
-        // Update the conversation cache to include the new message
-        client.cache.modify({
-          id: client.cache.identify({ __typename: "conversations", id: selectedConversation }),
-          fields: {
-            messages(existingMessages = []) {
-              const alreadyExists = existingMessages.some((msg) => msg.__ref === messageRef);
-              if (alreadyExists) return existingMessages;
-              return [...existingMessages, { __ref: messageRef }];
-            },
-            updated_at() {
-              return message.created_at;
-            }
-          }
-        });
+      socket.on("conversation-details", (data) => {
+        setConversationDetails(data.conversation);
+        setMessages(data.messages);
+        setLoading(false);
       });
+
+      socket.on("new-message", (message) => {
+        setMessages((prevMessages) => [...prevMessages, message]);
+      });
+
+      socket.on("conversation-list-updated", (data) => {
+        setConversationDetails(data.conversation);
+        setMessages(data.messages);
+      });
+
+      return () => {
+        socket.emit("leave-conversation", selectedConversation);
+        socket.off("conversation-details");
+        socket.off("new-message");
+        socket.off("conversation-list-updated");
+      };
     }
-  });
+  }, [socket, selectedConversation]);
 
-  const updateCacheWithReadMessages = useCallback(
-    (conversationId, messageIds) => {
-      if (!conversationId || !messageIds?.length) return;
-
-      messageIds.forEach((messageId) => {
-        client.cache.modify({
-          id: client.cache.identify({ __typename: "messages", id: messageId }),
-          fields: {
-            read: () => true
-          }
-        });
-      });
-    },
-    [client.cache]
-  );
-
-  // WebSocket event handlers
-  useEffect(() => {
-    if (!socket?.connected) return;
-
-    const handleConversationChange = (data) => {
-      if (data.type === "conversation-marked-read") {
-        const { conversationId, messageIds } = data;
-        updateCacheWithReadMessages(conversationId, messageIds);
-      }
-    };
-
-    socket.on("conversation-changed", handleConversationChange);
-
-    return () => {
-      socket.off("conversation-changed", handleConversationChange);
-    };
-  }, [socket, updateCacheWithReadMessages]);
-
-  // Join and leave conversation via WebSocket
-  useEffect(() => {
-    if (!socket?.connected || !selectedConversation || !bodyshop?.id) return;
-
-    socket.emit("join-bodyshop-conversation", {
-      bodyshopId: bodyshop.id,
-      conversationId: selectedConversation
-    });
-
-    return () => {
-      socket.emit("leave-bodyshop-conversation", {
-        bodyshopId: bodyshop.id,
-        conversationId: selectedConversation
-      });
-    };
-  }, [socket, bodyshop, selectedConversation]);
-
-  // Mark conversation as read
+  // Mark messages as read
   const handleMarkConversationAsRead = async () => {
-    if (!convoData || markingAsReadInProgress) return;
-
-    const conversation = convoData.conversations_by_pk;
-    if (!conversation) return;
-
-    const unreadMessageIds = conversation.messages
-      ?.filter((message) => !message.read && !message.isoutbound)
-      .map((message) => message.id);
-
-    if (unreadMessageIds?.length > 0) {
+    if (messages.some((msg) => !msg.read) && !markingAsReadInProgress) {
       setMarkingAsReadInProgress(true);
-      try {
-        await axios.post("/sms/markConversationRead", {
-          conversation,
-          imexshopid: bodyshop?.imexshopid,
-          bodyshopid: bodyshop?.id
-        });
+      // Emit a WebSocket event to mark messages as read
+      socket.emit("mark-as-read", {
+        conversationId: selectedConversation,
+        imexshopid: bodyshop.imexshopid,
+        bodyshopId: bodyshop.id
+      });
 
-        updateCacheWithReadMessages(selectedConversation, unreadMessageIds);
-      } catch (error) {
-        console.error("Error marking conversation as read:", error.message);
-      } finally {
-        setMarkingAsReadInProgress(false);
-      }
+      setMarkingAsReadInProgress(false);
     }
   };
 
+  if (!messages || !conversationDetails || !messages.length) {
+    return null;
+  }
+
   return (
     <ChatConversationComponent
-      subState={[convoLoading, convoError]}
-      conversation={convoData?.conversations_by_pk || {}}
-      messages={convoData?.conversations_by_pk?.messages || []}
+      subState={[loading, error]}
+      conversation={conversationDetails}
+      messages={messages}
       handleMarkConversationAsRead={handleMarkConversationAsRead}
     />
   );
 }
 
-export default connect(mapStateToProps)(ChatConversationContainer);
+export default connect(mapStateToProps, mapDispatchToProps)(ChatConversationContainer);

client/src/components/chat-label/chat-label.component.jsx

@@ -1,25 +1,14 @@
 import { PlusOutlined } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
 import { Input, notification, Spin, Tag, Tooltip } from "antd";
-import React, { useContext, useState } from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_CONVERSATION_LABEL } from "../../graphql/conversations.queries";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
-import { connect } from "react-redux";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-const mapDispatchToProps = (dispatch) => ({});
-
-export function ChatLabel({ conversation, bodyshop }) {
+export default function ChatLabel({ conversation }) {
   const [loading, setLoading] = useState(false);
   const [editing, setEditing] = useState(false);
   const [value, setValue] = useState(conversation.label);
-  const { socket } = useContext(SocketContext);
 
   const { t } = useTranslation();
   const [updateLabel] = useMutation(UPDATE_CONVERSATION_LABEL);
@@ -37,14 +26,6 @@ export function ChatLabel({ conversation, bodyshop }) {
           })
         });
       } else {
-        if (socket) {
-          socket.emit("conversation-modified", {
-            type: "label-updated",
-            conversationId: conversation.id,
-            bodyshopId: bodyshop.id,
-            label: value
-          });
-        }
         setEditing(false);
       }
     } catch (error) {
@@ -76,5 +57,3 @@ export function ChatLabel({ conversation, bodyshop }) {
     );
   }
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChatLabel);

client/src/components/chat-messages-list/chat-message-list.component.jsx

@@ -1,85 +1,89 @@
-import React, { useEffect, useRef, useState } from "react";
+import Icon from "@ant-design/icons";
+import { Tooltip } from "antd";
+import i18n from "i18next";
+import dayjs from "../../utils/day";
+import React, { useRef, useEffect } from "react";
+import { MdDone, MdDoneAll } from "react-icons/md";
 import { Virtuoso } from "react-virtuoso";
-import { renderMessage } from "./renderMessage";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
 import "./chat-message-list.styles.scss";
 
 export default function ChatMessageListComponent({ messages }) {
   const virtuosoRef = useRef(null);
-  const [atBottom, setAtBottom] = useState(true);
-  const loadedImagesRef = useRef(0);
 
-  const handleScrollStateChange = (isAtBottom) => {
-    setAtBottom(isAtBottom);
-  };
+  // Scroll to the bottom after a short delay when the component mounts
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      if (virtuosoRef.current) {
+        virtuosoRef.current.scrollToIndex({
+          index: messages.length - 1,
+          behavior: "auto" // Instantly scroll to the bottom
+        });
+      }
+    }, 100); // Delay of 100ms to allow rendering
+    return () => clearTimeout(timer); // Cleanup the timer on unmount
+  }, [messages.length]); // Run only once on component mount
 
-  const resetImageLoadState = () => {
-    loadedImagesRef.current = 0;
-  };
-
-  const preloadImages = (imagePaths, onComplete) => {
-    resetImageLoadState();
-
-    if (imagePaths.length === 0) {
-      onComplete();
-      return;
+  // Scroll to the bottom after the new messages are rendered
+  useEffect(() => {
+    if (virtuosoRef.current) {
+      // Allow the DOM and Virtuoso to fully render the new data
+      setTimeout(() => {
+        virtuosoRef.current.scrollToIndex({
+          index: messages.length - 1,
+          align: "end", // Ensure the last message is fully visible
+          behavior: "smooth" // Smooth scrolling
+        });
+      }, 50); // Slight delay to ensure layout recalculates
     }
+  }, [messages]); // Triggered when new messages are added
 
-    imagePaths.forEach((url) => {
-      const img = new Image();
-      img.src = url;
-      img.onload = img.onerror = () => {
-        loadedImagesRef.current += 1;
-        if (loadedImagesRef.current === imagePaths.length) {
-          onComplete();
-        }
-      };
-    });
+  const renderMessage = (index) => {
+    const message = messages[index];
+    return (
+      <div key={index} className={`${message.isoutbound ? "mine messages" : "yours messages"}`}>
+        <div className="message msgmargin">
+          <Tooltip title={DateTimeFormatter({ children: message.created_at })}>
+            <div>
+              {message.image_path &&
+                message.image_path.map((i, idx) => (
+                  <div key={idx} style={{ display: "flex", justifyContent: "center" }}>
+                    <a href={i} target="__blank" rel="noopener noreferrer">
+                      <img alt="Received" className="message-img" src={i} />
+                    </a>
+                  </div>
+                ))}
+              <div>{message.text}</div>
+            </div>
+          </Tooltip>
+          {message.status && (
+            <div className="message-status">
+              <Icon
+                component={message.status === "sent" ? MdDone : message.status === "delivered" ? MdDoneAll : null}
+                className="message-icon"
+              />
+            </div>
+          )}
+        </div>
+        {message.isoutbound && (
+          <div style={{ fontSize: 10 }}>
+            {i18n.t("messaging.labels.sentby", {
+              by: message.userid,
+              time: dayjs(message.created_at).format("MM/DD/YYYY @ hh:mm a")
+            })}
+          </div>
+        )}
+      </div>
+    );
   };
 
-  // Ensure all images are loaded on initial render
-  useEffect(() => {
-    const imagePaths = messages
-      .filter((message) => message.image && message.image_path?.length > 0)
-      .flatMap((message) => message.image_path);
-
-    preloadImages(imagePaths, () => {
-      if (virtuosoRef.current) {
-        virtuosoRef.current.scrollToIndex({
-          index: messages.length - 1,
-          align: "end",
-          behavior: "auto"
-        });
-      }
-    });
-  }, [messages]);
-
-  // Handle scrolling when new messages are added
-  useEffect(() => {
-    if (!atBottom) return;
-
-    const latestMessage = messages[messages.length - 1];
-    const imagePaths = latestMessage?.image_path || [];
-
-    preloadImages(imagePaths, () => {
-      if (virtuosoRef.current) {
-        virtuosoRef.current.scrollToIndex({
-          index: messages.length - 1,
-          align: "end",
-          behavior: "smooth"
-        });
-      }
-    });
-  }, [messages, atBottom]);
-
   return (
     <div className="chat">
       <Virtuoso
         ref={virtuosoRef}
         data={messages}
-        overscan={!!messages.reduce((acc, message) => acc + (message.image_path?.length || 0), 0) ? messages.length : 0}
-        itemContent={(index) => renderMessage(messages, index)}
-        followOutput={(isAtBottom) => handleScrollStateChange(isAtBottom)}
-        initialTopMostItemIndex={messages.length - 1}
+        itemContent={(index) => renderMessage(index)}
+        followOutput="smooth" // Ensure smooth scrolling when new data is appended
         style={{ height: "100%", width: "100%" }}
       />
     </div>

client/src/components/chat-messages-list/chat-message-list.styles.scss

@@ -1,131 +1,110 @@
+.message-icon {
+  color: whitesmoke;
+  border: #000000;
+  position: absolute;
+  margin: 0 0.1rem;
+  bottom: 0.1rem;
+  right: 0.3rem;
+  z-index: 5;
+}
+
 .chat {
+  flex: 1;
   display: flex;
   flex-direction: column;
-  height: 100%;
-  width: 100%;
-}
-.archive-button {
-  height: 20px;
-  border-radius: 4px;
-}
-.chat-title {
-  margin-bottom: 5px;
+  margin: 0.8rem 0rem;
+  overflow: hidden; // Ensure the content scrolls correctly
 }
+
 .messages {
   display: flex;
   flex-direction: column;
-  padding: 0.5rem; // Prevent edge clipping
+  padding: 0.5rem; // Add padding to avoid edge clipping
 }
 
 .message {
-  position: relative;
   border-radius: 20px;
   padding: 0.25rem 0.8rem;
-  word-wrap: break-word;
 
-  &-img {
+  .message-img {
     max-width: 10rem;
     max-height: 10rem;
     object-fit: contain;
     margin: 0.2rem;
-    border-radius: 4px;
   }
+}
 
-  &-images {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-  }
-}
-.chat-send-message-button{
-  margin: 0.3rem;
-  padding-left: 0.5rem;
-  
-}
-.message-icon {
-  position: absolute;
-  bottom: 0.1rem;
-  right: 0.3rem;
-  margin: 0 0.1rem;
-  color: whitesmoke;
-  z-index: 5;
+.yours {
+  align-items: flex-start;
 }
 
 .msgmargin {
-  margin: 0.1rem 0;
+  margin-top: 0.1rem;
+  margin-bottom: 0.1rem;
 }
 
-.yours,
-.mine {
-  display: flex;
-  flex-direction: column;
-
-  .message {
-    position: relative;
-
-    &:last-child:before,
-    &:last-child:after {
-      content: "";
-      position: absolute;
-      bottom: 0;
-      height: 20px;
-      width: 20px;
-      z-index: 0;
-    }
-
-    &:last-child:after {
-      width: 10px;
-      background: white;
-      z-index: 1;
-    }
-  }
+.yours .message {
+  margin-right: 20%;
+  background-color: #eee;
+  position: relative;
 }
 
-/* "Yours" (incoming) message styles */
-.yours {
-  align-items: flex-start;
-
-  .message {
-    margin-right: 20%;
-    background-color: #eee;
-
-    &:last-child:before {
-      left: -7px;
-      background: #eee;
-      border-bottom-right-radius: 15px;
-    }
-
-    &:last-child:after {
-      left: -10px;
-      border-bottom-right-radius: 10px;
-    }
-  }
+.yours .message:last-child:before {
+  content: "";
+  position: absolute;
+  z-index: 0;
+  bottom: 0;
+  left: -7px;
+  height: 20px;
+  width: 20px;
+  background: #eee;
+  border-bottom-right-radius: 15px;
+}
+
+.yours .message:last-child:after {
+  content: "";
+  position: absolute;
+  z-index: 1;
+  bottom: 0;
+  left: -10px;
+  width: 10px;
+  height: 20px;
+  background: white;
+  border-bottom-right-radius: 10px;
 }
 
-/* "Mine" (outgoing) message styles */
 .mine {
   align-items: flex-end;
-
-  .message {
-    color: white;
-    margin-left: 25%;
-    background: linear-gradient(to bottom, #00d0ea 0%, #0085d1 100%);
-    padding-bottom: 0.6rem;
-
-    &:last-child:before {
-      right: -8px;
-      background: linear-gradient(to bottom, #00d0ea 0%, #0085d1 100%);
-      border-bottom-left-radius: 15px;
-    }
-
-    &:last-child:after {
-      right: -10px;
-      border-bottom-left-radius: 10px;
-    }
-  }
 }
 
-.virtuoso-container {
-  flex: 1;
-  overflow: auto;
+.mine .message {
+  color: white;
+  margin-left: 25%;
+  background: linear-gradient(to bottom, #00d0ea 0%, #0085d1 100%);
+  position: relative;
+  padding-bottom: 0.6rem;
+}
+
+.mine .message:last-child:before {
+  content: "";
+  position: absolute;
+  z-index: 0;
+  bottom: 0;
+  right: -8px;
+  height: 20px;
+  width: 20px;
+  background: linear-gradient(to bottom, #00d0ea 0%, #0085d1 100%);
+  border-bottom-left-radius: 15px;
+}
+
+.mine .message:last-child:after {
+  content: "";
+  position: absolute;
+  z-index: 1;
+  bottom: 0;
+  right: -10px;
+  width: 10px;
+  height: 20px;
+  background: white;
+  border-bottom-left-radius: 10px;
 }

client/src/components/chat-messages-list/renderMessage.jsx

@@ -1,52 +0,0 @@
-import Icon from "@ant-design/icons";
-import { Tooltip } from "antd";
-import i18n from "i18next";
-import dayjs from "../../utils/day";
-import { MdDone, MdDoneAll } from "react-icons/md";
-import { DateTimeFormatter } from "../../utils/DateFormatter";
-
-export const renderMessage = (messages, index) => {
-  const message = messages[index];
-
-  return (
-    <div key={index} className={`${message.isoutbound ? "mine messages" : "yours messages"}`}>
-      <div className="message msgmargin">
-        <Tooltip title={DateTimeFormatter({ children: message.created_at })}>
-          <div>
-            {/* Render images if available */}
-            {message.image && message.image_path?.length > 0 && (
-              <div className="message-images">
-                {message.image_path.map((url, idx) => (
-                  <div key={idx} style={{ display: "flex", justifyContent: "center" }}>
-                    <a href={url} target="_blank" rel="noopener noreferrer">
-                      <img alt="Received" className="message-img" src={url} />
-                    </a>
-                  </div>
-                ))}
-              </div>
-            )}
-            {/* Render text if available */}
-            {message.text && <div>{message.text}</div>}
-          </div>
-        </Tooltip>
-
-        {/* Message status icons */}
-        {message.status && (message.status === "sent" || message.status === "delivered") && (
-          <div className="message-status">
-            <Icon component={message.status === "sent" ? MdDone : MdDoneAll} className="message-icon" />
-          </div>
-        )}
-      </div>
-
-      {/* Outbound message metadata */}
-      {message.isoutbound && (
-        <div style={{ fontSize: 10 }}>
-          {i18n.t("messaging.labels.sentby", {
-            by: message.userid,
-            time: dayjs(message.created_at).format("MM/DD/YYYY @ hh:mm a")
-          })}
-        </div>
-      )}
-    </div>
-  );
-};

client/src/components/chat-new-conversation/chat-new-conversation.component.jsx

@@ -1,12 +1,11 @@
 import { PlusCircleFilled } from "@ant-design/icons";
 import { Button, Form, Popover } from "antd";
-import React, { useContext } from "react";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { openChatByPhone } from "../../redux/messaging/messaging.actions";
 import PhoneFormItem, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -18,10 +17,8 @@ const mapDispatchToProps = (dispatch) => ({
 export function ChatNewConversation({ openChatByPhone }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
-  const { socket } = useContext(SocketContext);
-
   const handleFinish = (values) => {
-    openChatByPhone({ phone_num: values.phoneNumber, socket });
+    openChatByPhone({ phone_num: values.phoneNumber });
     form.resetFields();
   };
 

client/src/components/chat-open-button/chat-open-button.component.jsx

@@ -1,6 +1,6 @@
 import { notification } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
-import React, { useContext } from "react";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { openChatByPhone } from "../../redux/messaging/messaging.actions";
@@ -9,7 +9,6 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { searchingForConversation } from "../../redux/messaging/messaging.selectors";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -22,8 +21,6 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ChatOpenButton({ bodyshop, searchingForConversation, phone, jobid, openChatByPhone }) {
   const { t } = useTranslation();
-  const { socket } = useContext(SocketContext);
-
   if (!phone) return <></>;
 
   if (!bodyshop.messagingservicesid) return <PhoneNumberFormatter>{phone}</PhoneNumberFormatter>;
@@ -36,7 +33,7 @@ export function ChatOpenButton({ bodyshop, searchingForConversation, phone, jobi
         const p = parsePhoneNumber(phone, "CA");
         if (searchingForConversation) return; //This is to prevent finding the same thing twice.
         if (p && p.isValid()) {
-          openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid, socket });
+          openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid });
         } else {
           notification["error"]({ message: t("messaging.error.invalidphone") });
         }

client/src/components/chat-popup/chat-popup.component.jsx

@@ -1,100 +1,59 @@
-import { InfoCircleOutlined, MessageOutlined, ShrinkOutlined, SyncOutlined } from "@ant-design/icons";
-import { useApolloClient, useLazyQuery } from "@apollo/client";
-import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
-import React, { useContext, useEffect, useState } from "react";
+import { InfoCircleOutlined, MessageOutlined, ShrinkOutlined } from "@ant-design/icons";
+import { Badge, Card, Col, Row, Space, Tooltip, Typography } from "antd";
+import React, { useCallback, useContext, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { CONVERSATION_LIST_QUERY } from "../../graphql/conversations.queries";
 import { toggleChatVisible } from "../../redux/messaging/messaging.actions";
-import { selectChatVisible, selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
+import {
+  selectChatVisible,
+  selectConversations,
+  selectSelectedConversation,
+  selectUnreadCount
+} from "../../redux/messaging/messaging.selectors";
 import ChatConversationListComponent from "../chat-conversation-list/chat-conversation-list.component";
 import ChatConversationContainer from "../chat-conversation/chat-conversation.container";
 import ChatNewConversation from "../chat-new-conversation/chat-new-conversation.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import "./chat-popup.styles.scss";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import SocketContext from "../../contexts/SocketIO/socketContext";
 
 const mapStateToProps = createStructuredSelector({
   selectedConversation: selectSelectedConversation,
-  chatVisible: selectChatVisible
+  chatVisible: selectChatVisible,
+  bodyshop: selectBodyshop,
+  conversations: selectConversations,
+  unreadCount: selectUnreadCount
 });
-
 const mapDispatchToProps = (dispatch) => ({
   toggleChatVisible: () => dispatch(toggleChatVisible())
 });
 
-export function ChatPopupComponent({ chatVisible, selectedConversation, toggleChatVisible }) {
+export function ChatPopupComponent({
+  chatVisible,
+  selectedConversation,
+  toggleChatVisible,
+  bodyshop,
+  conversations,
+  unreadCount
+}) {
   const { t } = useTranslation();
-  const [pollInterval, setPollInterval] = useState(0);
   const { socket } = useContext(SocketContext);
-  const client = useApolloClient(); // Apollo Client instance for cache operations
 
-  // Lazy query for conversations
-  const [getConversations, { loading, data, refetch }] = useLazyQuery(CONVERSATION_LIST_QUERY, {
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-    skip: !chatVisible,
-    ...(pollInterval > 0 ? { pollInterval } : {})
-  });
-
-  // Socket connection status
+  // Emit event to open messaging when chat becomes visible
   useEffect(() => {
-    const handleSocketStatus = () => {
-      if (socket?.connected) {
-        setPollInterval(15 * 60 * 1000); // 15 minutes
-      } else {
-        setPollInterval(60 * 1000); // 60 seconds
-      }
-    };
-
-    handleSocketStatus();
+    if (chatVisible && socket && bodyshop?.id) {
+      socket.emit("open-messaging", bodyshop.id);
+    }
+  }, [chatVisible, socket, bodyshop?.id]);
 
+  // Handle loading more conversations
+  const loadMoreConversations = useCallback(() => {
     if (socket) {
-      socket.on("connect", handleSocketStatus);
-      socket.on("disconnect", handleSocketStatus);
+      socket.emit("load-more-conversations", { offset: conversations.length });
     }
-
-    return () => {
-      if (socket) {
-        socket.off("connect", handleSocketStatus);
-        socket.off("disconnect", handleSocketStatus);
-      }
-    };
-  }, [socket]);
-
-  // Fetch conversations when chat becomes visible
-  useEffect(() => {
-    if (chatVisible)
-      getConversations({
-        variables: {
-          offset: 0
-        }
-      }).catch((err) => {
-        console.error(`Error fetching conversations: ${(err, err.message || "")}`);
-      });
-  }, [chatVisible, getConversations]);
-
-  // Get unread count from the cache
-  const unreadCount = (() => {
-    try {
-      const cachedData = client.readQuery({
-        query: CONVERSATION_LIST_QUERY,
-        variables: { offset: 0 }
-      });
-
-      if (!cachedData?.conversations) return 0;
-
-      // Aggregate unread message count
-      return cachedData.conversations.reduce((total, conversation) => {
-        const unread = conversation.messages_aggregate?.aggregate?.count || 0;
-        return total + unread;
-      }, 0);
-    } catch (error) {
-      console.warn("Unread count not found in cache:", error);
-      return 0; // Fallback if not in cache
-    }
-  })();
+  }, [socket, conversations.length]);
 
   return (
     <Badge count={unreadCount}>
@@ -107,20 +66,21 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
               <Tooltip title={t("messaging.labels.recentonly")}>
                 <InfoCircleOutlined />
               </Tooltip>
-              <SyncOutlined style={{ cursor: "pointer" }} onClick={() => refetch()} />
-              {!socket?.connected && <Tag color="yellow">{t("messaging.labels.nopush")}</Tag>}
+              <ShrinkOutlined
+                onClick={() => toggleChatVisible()}
+                style={{ position: "absolute", right: ".5rem", top: ".5rem" }}
+              />
             </Space>
-            <ShrinkOutlined
-              onClick={() => toggleChatVisible()}
-              style={{ position: "absolute", right: ".5rem", top: ".5rem" }}
-            />
 
             <Row gutter={[8, 8]} className="chat-popup-content">
               <Col span={8}>
-                {loading ? (
+                {conversations && conversations.length === 0 ? (
                   <LoadingSpinner />
                 ) : (
-                  <ChatConversationListComponent conversationList={data ? data.conversations : []} />
+                  <ChatConversationListComponent
+                    conversationList={conversations.conversations}
+                    loadMoreConversations={loadMoreConversations}
+                  />
                 )}
               </Col>
               <Col span={16}>{selectedConversation ? <ChatConversationContainer /> : null}</Col>

client/src/components/chat-send-message/chat-send-message.component.jsx

@@ -1,44 +1,47 @@
 import { LoadingOutlined, SendOutlined } from "@ant-design/icons";
 import { Input, Spin } from "antd";
-import React, { useEffect, useRef, useState } from "react";
+import React, { useContext, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import { sendMessage, setMessage } from "../../redux/messaging/messaging.actions";
+import { setMessage } from "../../redux/messaging/messaging.actions";
 import { selectIsSending, selectMessage } from "../../redux/messaging/messaging.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import ChatMediaSelector from "../chat-media-selector/chat-media-selector.component";
 import ChatPresetsComponent from "../chat-presets/chat-presets.component";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   isSending: selectIsSending,
-  message: selectMessage
+  message: selectMessage,
+  user: selectCurrentUser
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  sendMessage: (message) => dispatch(sendMessage(message)),
   setMessage: (message) => dispatch(setMessage(message))
 });
 
-function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSending, message, setMessage }) {
+function ChatSendMessageComponent({ conversation, bodyshop, isSending, message, setMessage, user }) {
+  const { socket } = useContext(SocketContext); // Access WebSocket instance
   const inputArea = useRef(null);
   const [selectedMedia, setSelectedMedia] = useState([]);
+  const { t } = useTranslation();
 
   useEffect(() => {
     inputArea.current.focus();
   }, [isSending, setMessage]);
 
-  const { t } = useTranslation();
-
   const handleEnter = () => {
     const selectedImages = selectedMedia.filter((i) => i.isSelected);
     if ((message === "" || !message) && selectedImages.length === 0) return;
+
     logImEXEvent("messaging_send_message");
 
     if (selectedImages.length < 11) {
-      const newMessage = {
+      const messageData = {
+        user,
         to: conversation.phone_num,
         body: message || "",
         messagingServiceSid: bodyshop.messagingservicesid,
@@ -46,12 +49,18 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
         selectedMedia: selectedImages,
         imexshopid: bodyshop.imexshopid
       };
-      sendMessage(newMessage);
+
+      // Emit the send-message event via WebSocket
+      socket.emit("send-message", messageData);
+
       setSelectedMedia(
         selectedMedia.map((i) => {
           return { ...i, isSelected: false };
         })
       );
+
+      // Optionally clear the input message
+      setMessage("");
     }
   };
 
@@ -76,15 +85,11 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
           onChange={(e) => setMessage(e.target.value)}
           onPressEnter={(event) => {
             event.preventDefault();
-            if (!!!event.shiftKey) handleEnter();
+            if (!event.shiftKey) handleEnter();
           }}
         />
       </span>
-      <SendOutlined
-        className="chat-send-message-button"
-        //  disabled={message === "" || !message}
-        onClick={handleEnter}
-      />
+      <SendOutlined className="imex-flex-row__margin" onClick={handleEnter} />
       <Spin
         style={{ display: `${isSending ? "" : "none"}` }}
         indicator={

client/src/components/chat-tag-ro/chat-tag-ro.container.jsx

@@ -2,33 +2,22 @@ import { PlusOutlined } from "@ant-design/icons";
 import { useLazyQuery, useMutation } from "@apollo/client";
 import { Tag } from "antd";
 import _ from "lodash";
-import React, { useContext, useState } from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import { SEARCH_FOR_JOBS } from "../../graphql/jobs.queries";
 import ChatTagRo from "./chat-tag-ro.component";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
-import { connect } from "react-redux";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-const mapDispatchToProps = () => ({});
-
-export function ChatTagRoContainer({ conversation, bodyshop }) {
+export default function ChatTagRoContainer({ conversation }) {
   const { t } = useTranslation();
   const [open, setOpen] = useState(false);
-  const { socket } = useContext(SocketContext);
 
   const [loadRo, { loading, data }] = useLazyQuery(SEARCH_FOR_JOBS);
 
   const executeSearch = (v) => {
     logImEXEvent("messaging_search_job_tag", { searchTerm: v });
-    loadRo(v).catch((e) => console.error("Error in ChatTagRoContainer executeSearch:", e));
+    loadRo(v);
   };
 
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
@@ -41,34 +30,9 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {
     variables: { conversationId: conversation.id }
   });
 
-  const handleInsertTag = async (value, option) => {
+  const handleInsertTag = (value, option) => {
     logImEXEvent("messaging_add_job_tag");
-
-    await insertTag({
-      variables: { jobId: option.key }
-    });
-
-    if (socket) {
-      // Find the job details from the search data
-      const selectedJob = data?.search_jobs.find((job) => job.id === option.key);
-      if (!selectedJob) return;
-      const newJobConversation = {
-        __typename: "job_conversations",
-        jobid: selectedJob.id,
-        conversationid: conversation.id,
-        job: {
-          __typename: "jobs",
-          ...selectedJob
-        }
-      };
-      socket.emit("conversation-modified", {
-        conversationId: conversation.id,
-        bodyshopId: bodyshop.id,
-        type: "tag-added",
-        job_conversations: [newJobConversation]
-      });
-    }
-
+    insertTag({ variables: { jobId: option.key } });
     setOpen(false);
   };
 
@@ -86,10 +50,9 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {
           handleSearch={handleSearch}
           handleInsertTag={handleInsertTag}
           setOpen={setOpen}
-          style={{ cursor: "pointer" }}
         />
       ) : (
-        <Tag style={{ cursor: "pointer" }} onClick={() => setOpen(true)}>
+        <Tag onClick={() => setOpen(true)}>
           <PlusOutlined />
           {t("messaging.actions.link")}
         </Tag>
@@ -97,5 +60,3 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {
     </div>
   );
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChatTagRoContainer);

client/src/components/job-at-change/schedule-event.component.jsx

@@ -3,7 +3,7 @@ import { Button, Divider, Dropdown, Form, Input, notification, Popover, Select,
 import parsePhoneNumber from "libphonenumber-js";
 import dayjs from "../../utils/day";
 import queryString from "query-string";
-import React, { useContext, useState } from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
@@ -24,7 +24,6 @@ import ScheduleEventNote from "./schedule-event.note.component";
 import { useMutation } from "@apollo/client";
 import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
 import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -50,8 +49,6 @@ export function ScheduleEventComponent({
   const searchParams = queryString.parse(useLocation().search);
   const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
   const [title, setTitle] = useState(event.title);
-  const { socket } = useContext(SocketContext);
-
   const blockContent = (
     <Space direction="vertical" wrap>
       <Input
@@ -193,8 +190,7 @@ export function ScheduleEventComponent({
                     if (p && p.isValid()) {
                       openChatByPhone({
                         phone_num: p.formatInternational(),
-                        jobid: event.job.id,
-                        socket
+                        jobid: event.job.id
                       });
                       setMessage(
                         t("appointments.labels.reminder", {

client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx

@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client";
-import { Button, Checkbox, Form, notification, Popover, Tooltip } from "antd";
+import { Button, Form, notification, Popover, Tooltip } from "antd";
 import axios from "axios";
 import { t } from "i18next";
 import React, { useState } from "react";
@@ -60,26 +60,24 @@ export function JobLinesPartPriceChange({ job, line, refetch, technician }) {
     }
   };
 
-  const popcontent =
-    !technician &&
-    InstanceRenderManager({
-      imex: null,
-      rome: (
-        <Form layout="vertical" onFinish={handleFinish} initialValues={{ act_price: line.act_price }}>
-          <Form.Item name="act_price" label={t("jobs.labels.act_price_ppc")} rules={[{ required: true }]}>
-            <CurrencyFormItemComponent />
-          </Form.Item>
-          <Button
-            disabled={InstanceRenderManager({ imex: true, rome: false, promanager: true })}
-            loading={loading}
-            htmlType="primary"
-          >
-            {t("general.actions.save")}
-          </Button>
-        </Form>
-      ),
-      promanager: null
-    });
+  const popcontent = !technician && InstanceRenderManager({
+    imex: null,
+    rome: (
+      <Form layout="vertical" onFinish={handleFinish} initialValues={{ act_price: line.act_price }}>
+        <Form.Item name="act_price" label={t("jobs.labels.act_price_ppc")} rules={[{ required: true }]}>
+          <CurrencyFormItemComponent />
+        </Form.Item>
+        <Button
+          disabled={InstanceRenderManager({ imex: true, rome: false, promanager: true })}
+          loading={loading}
+          htmlType="primary"
+        >
+          {t("general.actions.save")}
+        </Button>
+      </Form>
+    ),
+    promanager: null
+  });
 
   return (
     <JobLineConvertToLabor jobline={line} job={job}>

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -216,9 +216,7 @@ export function JobLinesComponent({
     {
       title: t("joblines.fields.part_qty"),
       dataIndex: "part_qty",
-      key: "part_qty",
-      sorter: (a, b) => a.part_qty - b.part_qty,
-      sortOrder: state.sortedInfo.columnKey === "part_qty" && state.sortedInfo.order
+      key: "part_qty"
     },
     // {
     //   title: t('joblines.fields.tax_part'),

client/src/components/job-payments/job-payments.component.jsx

@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { openChatByPhone, setMessage } from "../../redux/messaging/messaging.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -25,16 +26,21 @@ const mapStateToProps = createStructuredSelector({
 
 const mapDispatchToProps = (dispatch) => ({
   setPaymentContext: (context) => dispatch(setModalContext({ context: context, modal: "payment" })),
-  setCardPaymentContext: (context) =>
-    dispatch(
-      setModalContext({
-        context: context,
-        modal: "cardPayment"
-      })
-    )
+  setCardPaymentContext: (context) => dispatch(setModalContext({ context: context, modal: "cardPayment" })),
+  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
+  setMessage: (text) => dispatch(setMessage(text))
 });
 
-export function JobPayments({ job, jobRO, bodyshop, setPaymentContext, setCardPaymentContext, refetch }) {
+export function JobPayments({
+  job,
+  jobRO,
+  bodyshop,
+  setMessage,
+  openChatByPhone,
+  setPaymentContext,
+  setCardPaymentContext,
+  refetch
+}) {
   const {
     treatments: { ImEXPay }
   } = useSplitTreatments({
@@ -127,7 +133,7 @@ export function JobPayments({ job, jobRO, bodyshop, setPaymentContext, setCardPa
     }
   ];
 
-  //Same as in RO guard. If changed, update in both.
+    //Same as in RO guard. If changed, update in both. 
   const total = useMemo(() => {
     return (
       job.payments &&

client/src/components/job-totals-table/job-totals.table.totals.component.jsx

@@ -7,7 +7,6 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import JobTotalsCashDiscount from "./jobs-totals.cash-discount-display.component";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -23,14 +22,6 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
 
   const data = useMemo(() => {
     return [
-      ...(job.job_totals?.totals?.ttl_adjustment
-        ? [
-            {
-              key: `Subtotal Adj.`,
-              total: job.job_totals?.totals?.ttl_adjustment
-            }
-          ]
-        : []),
       {
         key: t("jobs.labels.subtotal"),
         total: job.job_totals.totals.subtotal,
@@ -111,7 +102,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
                 total: job.job_totals.totals.us_sales_tax_breakdown.ty4Tax
               },
               {
-                key: `${bodyshop.md_responsibility_centers.taxes.tax_ty5?.tax_type5 || "Adj."} - ${[
+                key: `${bodyshop.md_responsibility_centers.taxes.tax_ty5?.tax_type5 || "TT"} - ${[
                   job.cieca_pft.ty5_rate1,
                   job.cieca_pft.ty5_rate2,
                   job.cieca_pft.ty5_rate3,
@@ -122,14 +113,6 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
                   .join(", ")}%`,
                 total: job.job_totals.totals.us_sales_tax_breakdown.ty5Tax
               },
-              ...(job.job_totals?.totals?.ttl_tax_adjustment
-                ? [
-                    {
-                      key: `Tax Adj.`,
-                      total: job.job_totals?.totals?.ttl_tax_adjustment
-                    }
-                  ]
-                : []),
               {
                 key: t("jobs.labels.total_sales_tax"),
                 bold: true,
@@ -138,7 +121,6 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
                   .add(Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty3Tax))
                   .add(Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty4Tax))
                   .add(Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty5Tax))
-                  .add(Dinero(job.job_totals.totals.ttl_tax_adjustment))
                   .toJSON()
               }
             ].filter((item) => item.total.amount !== 0)
@@ -150,27 +132,11 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
             ]
       }),
 
-      ...(bodyshop.intellipay_config?.enable_cash_discount
-        ? [
-            {
-              key: t("jobs.labels.total_repairs_cash_discount"),
-              total: job.job_totals.totals.total_repairs,
-              bold: true
-            },
-            {
-              key: t("jobs.labels.total_repairs"),
-              render: <JobTotalsCashDiscount amountDinero={job.job_totals.totals.total_repairs} />,
-              bold: true
-            }
-          ]
-        : [
-            {
-              key: t("jobs.labels.total_repairs"),
-              total: job.job_totals.totals.total_repairs,
-              bold: true
-            }
-          ]),
-
+      {
+        key: t("jobs.labels.total_repairs"),
+        total: job.job_totals.totals.total_repairs,
+        bold: true
+      },
       {
         key: t("jobs.fields.ded_amt"),
         total: job.job_totals.totals.custPayable.deductible
@@ -203,7 +169,13 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
             },
             {
               key: t("jobs.labels.total_cust_payable"),
-              render: <JobTotalsCashDiscount amountDinero={job.job_totals.totals.custPayable.total} />,
+              total: Dinero(job.job_totals.totals.custPayable.total)
+                .add(
+                  Dinero(job.job_totals.totals.custPayable.total).percentage(
+                    bodyshop.intellipay_config?.cash_discount_percentage || 0
+                  )
+                )
+                .toJSON(),
               bold: true
             }
           ]
@@ -239,7 +211,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
       dataIndex: "total",
       key: "total",
       align: "right",
-      render: (text, record) => (record.render ? record.render : Dinero(record.total).toFormat()),
+      render: (text, record) => Dinero(record.total).toFormat(),
       width: "20%",
       onCell: (record, rowIndex) => {
         return { style: { fontWeight: record.bold && "bold" } };

client/src/components/job-totals-table/jobs-totals.cash-discount-display.component.jsx

@@ -1,60 +0,0 @@
-import { notification, Spin } from "antd";
-import axios from "axios";
-import Dinero from "dinero.js";
-import React, { useCallback, useEffect, useState } from "react";
-
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-const mapDispatchToProps = (dispatch) => ({});
-export default connect(mapStateToProps, mapDispatchToProps)(JobTotalsCashDiscount);
-
-export function JobTotalsCashDiscount({ bodyshop, amountDinero }) {
-  const [loading, setLoading] = useState(true);
-  const [fee, setFee] = useState(0);
-
-  const fetchData = useCallback(async () => {
-    if (amountDinero && bodyshop) {
-      setLoading(true);
-      let response;
-      try {
-        response = await axios.post("/intellipay/checkfee", {
-          bodyshop: { id: bodyshop.id, imexshopid: bodyshop.imexshopid, state: bodyshop.state },
-          amount: Dinero(amountDinero).toFormat("0.00")
-        });
-
-        if (response?.data?.error) {
-          notification.open({
-            type: "error",
-            message:
-              response.data?.error ||
-              "Error encountered when contacting IntelliPay service to determine cash discounted price."
-          });
-        } else {
-          setFee(response.data?.fee || 0);
-        }
-      } catch (error) {
-        notification.open({
-          type: "error",
-          message:
-            error.response?.data?.error ||
-            "Error encountered when contacting IntelliPay service to determine cash discounted price."
-        });
-      } finally {
-        setLoading(false);
-      }
-    }
-  }, [amountDinero, bodyshop]);
-
-  useEffect(() => {
-    fetchData();
-  }, [fetchData, bodyshop, amountDinero]);
-
-  if (loading) return <Spin size="small" />;
-  return Dinero(amountDinero)
-    .add(Dinero({ amount: Math.round(fee * 100) }))
-    .toFormat();
-}

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -1,6 +1,6 @@
 import { gql, useApolloClient, useLazyQuery, useMutation, useQuery } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Col, Row, notification } from "antd"; //import { Button, Col, Row, notification } from "antd";
+import { Col, Row, notification } from "antd";
 import Axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
@@ -408,25 +408,26 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
         updateSchComp={updateSchComp}
         setSchComp={setSchComp}
       />
-      {/* {
-        currentUser.email.includes("@rome.") || currentUser.email.includes("@imex.") ? (
-        <Button
-          onClick={async () => {
-            for (const record of data.available_jobs) {
-              //Query the data
-              console.log("Start Job", record.id);
-              const { data } = await loadEstData({
-                variables: { id: record.id }
-              });
-              console.log("Query has been awaited and is complete");
-              await onOwnerFindModalOk(data);
-            }
-          }}
-        >
-          Add all jobs as new.
-        </Button>
-      ) : null
-      } */}
+      {
+        // currentUser.email.includes("@rome.") ||
+        // currentUser.email.includes("@imex.") ? (
+        //     <Button
+        //         onClick={async () => {
+        //             for (const record of data.available_jobs) {
+        //                 //Query the data
+        //                 console.log("Start Job", record.id);
+        //                 const {data} = await loadEstData({
+        //                     variables: {id: record.id},
+        //                 });
+        //                 console.log("Query has been awaited and is complete");
+        //                 await onOwnerFindModalOk(data);
+        //             }
+        //         }}
+        //     >
+        //         Add all jobs as new.
+        //     </Button>
+        // ) : null
+      }
       <Row gutter={[16, 16]}>
         <Col span={24}>
           <JobsAvailableTableComponent
@@ -616,7 +617,6 @@ function ResolveCCCLineIssues(estData, bodyshop) {
           // ` | Act Price delete. (prev act price = ${estData.joblines.data[indexInEstData].act_price})`;
           estData.joblines.data[indexInEstData].act_price = 0;
           estData.joblines.data[indexInEstData].db_price = 0;
-          estData.joblines.data[indexInEstData].part_type = null;
         });
       });
     }

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -4,7 +4,7 @@ import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Card, Dropdown, Form, Input, Modal, notification, Popconfirm, Popover, Select, Space } from "antd";
 import axios from "axios";
 import parsePhoneNumber from "libphonenumber-js";
-import React, { useContext, useMemo, useState } from "react";
+import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useNavigate } from "react-router-dom";
@@ -30,7 +30,6 @@ import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
 import JobsDetailHeaderActionsToggleProduction from "./jobs-detail-header-actions.toggle-production";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -127,7 +126,6 @@ export function JobsDetailHeaderActions({
   const [updateJob] = useMutation(UPDATE_JOB);
   const [voidJob] = useMutation(VOID_JOB);
   const [cancelAllAppointments] = useMutation(CANCEL_APPOINTMENTS_BY_JOB_ID);
-  const { socket } = useContext(SocketContext);
 
   const {
     treatments: { ImEXPay }
@@ -301,8 +299,7 @@ export function JobsDetailHeaderActions({
           if (p && p.isValid()) {
             openChatByPhone({
               phone_num: p.formatInternational(),
-              jobid: job.id,
-              socket
+              jobid: job.id
             });
             setMessage(
               `${window.location.protocol}//${window.location.host}/csi/${result.data.insert_csi.returning[0].id}`
@@ -345,8 +342,7 @@ export function JobsDetailHeaderActions({
         if (p && p.isValid()) {
           openChatByPhone({
             phone_num: p.formatInternational(),
-            jobid: job.id,
-            socket
+            jobid: job.id
           });
           setMessage(`${window.location.protocol}//${window.location.host}/csi/${job.csiinvites[0].id}`);
         } else {

client/src/components/payments-generate-link/payments-generate-link.component.jsx

@@ -3,14 +3,13 @@ import { Button, Form, message, Popover, Space } from "antd";
 import axios from "axios";
 import Dinero from "dinero.js";
 import { parsePhoneNumber } from "libphonenumber-js";
-import React, { useContext, useState } from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { openChatByPhone, setMessage } from "../../redux/messaging/messaging.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -29,7 +28,6 @@ export function PaymentsGenerateLink({ bodyshop, currentUser, callback, job, ope
   const [open, setOpen] = useState(false);
   const [loading, setLoading] = useState(false);
   const [paymentLink, setPaymentLink] = useState(null);
-  const { socket } = useContext(SocketContext);
 
   const handleFinish = async ({ amount }) => {
     setLoading(true);
@@ -52,8 +50,7 @@ export function PaymentsGenerateLink({ bodyshop, currentUser, callback, job, ope
     if (p) {
       openChatByPhone({
         phone_num: p.formatInternational(),
-        jobid: job.id,
-        socket
+        jobid: job.id
       });
       setMessage(
         t("payments.labels.smspaymentreminder", {
@@ -109,8 +106,7 @@ export function PaymentsGenerateLink({ bodyshop, currentUser, callback, job, ope
                 const p = parsePhoneNumber(job.ownr_ph1, "CA");
                 openChatByPhone({
                   phone_num: p.formatInternational(),
-                  jobid: job.id,
-                  socket
+                  jobid: job.id
                 });
                 setMessage(
                   t("payments.labels.smspaymentreminder", {

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -110,13 +110,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
         to: values.to,
         subject: Templates[values.key]?.subject
       },
-      values.sendbytext === "text"
-        ? values.sendbytext
-        : values.sendbyexcel === "excel"
-          ? "x"
-          : values.sendby === "email"
-            ? "e"
-            : "p",
+      values.sendbytext === "text" ? values.sendbytext : values.sendbyexcel === "excel" ? "x" : values.sendby === "email" ? "e" : "p",
       id
     );
     setLoading(false);
@@ -280,22 +274,6 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                     {
                       required: true
                       //message: t("general.validation.required"),
-                    },
-                    {
-                      validator: (_, value) => {
-                        if (
-                          (!import.meta.env.VITE_APP_IS_TEST && import.meta.env.PROD) &&
-                          value &&
-                          value[0] &&
-                          value[1]
-                        ) {
-                          const diffInDays = (value[1] - value[0]) / (1000 * 3600 * 24);
-                          if (diffInDays > 92) {
-                            return Promise.reject(t("general.validation.dateRangeExceeded"));
-                          }
-                        }
-                        return Promise.resolve();
-                      }
                     }
                   ]}
                 >

client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx

@@ -4334,70 +4334,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           <Input />
         </Form.Item>
       </LayoutFormRow>
-
-      {InstanceRenderManager({
-        promanager: "USE_ROME",
-        rome: (
-          <LayoutFormRow header={<div>Adjustments</div>} id="refund">
-            {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? (
-              <>
-                <Form.Item
-                  label={t("bodyshop.labels.responsibilitycenters.ttl_adjustment")}
-                  rules={[
-                    {
-                      required: true
-                      //message: t("general.validation.required"),
-                    }
-                  ]}
-                  name={["md_responsibility_centers", "ttl_adjustment", "dms_acctnumber"]}
-                >
-                  <Input />
-                </Form.Item>
-                <Form.Item
-                  label={t("bodyshop.labels.responsibilitycenters.ttl_tax_adjustment")}
-                  rules={[
-                    {
-                      required: true
-                      //message: t("general.validation.required"),
-                    }
-                  ]}
-                  name={["md_responsibility_centers", "ttl_tax_adjustment", "dms_acctnumber"]}
-                >
-                  <Input />
-                </Form.Item>
-              </>
-            ) : (
-              <>
-                <Form.Item
-                  label={t("bodyshop.labels.responsibilitycenters.ttl_adjustment")}
-                  rules={[
-                    {
-                      required: true
-                      //message: t("general.validation.required"),
-                    }
-                  ]}
-                  name={["md_responsibility_centers", "ttl_adjustment", "accountitem"]}
-                >
-                  <Input />
-                </Form.Item>
-                <Form.Item
-                  label={t("bodyshop.labels.responsibilitycenters.ttl_tax_adjustment")}
-                  rules={[
-                    {
-                      required: true
-                      //message: t("general.validation.required"),
-                    }
-                  ]}
-                  name={["md_responsibility_centers", "ttl_tax_adjustment", "accountitem"]}
-                >
-                  <Input />
-                </Form.Item>
-              </>
-            )}
-          </LayoutFormRow>
-        )
-      })}
-
       {Qb_Multi_Ar.treatment === "on" && (
         <LayoutFormRow header={<div>Multiple Payers Item</div>} id="accountitem">
           <Form.Item

client/src/components/shop-info/shop-intellipay-config.component.jsx

@@ -37,6 +37,16 @@ export function ShopInfoIntellipay({ bodyshop, form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.cash_discount_percentage")}
+          dependencies={[["intellipay_config", "enable_cash_discount"]]}
+          name={["intellipay_config", "cash_discount_percentage"]}
+          rules={[
+            ({ getFieldsValue }) => ({ required: form.getFieldValue(["intellipay_config", "enable_cash_discount"]) })
+          ]}
+        >
+          <InputNumber min={0} max={100} precision={1} suffix="%" />
+        </Form.Item>
       </LayoutFormRow>
     </>
   );

client/src/components/wss-status-display/wss-status-display.component.jsx

@@ -1,33 +1,18 @@
 import { connect } from "react-redux";
-import { GlobalOutlined, WarningOutlined } from "@ant-design/icons";
+import { GlobalOutlined } from "@ant-design/icons";
 import { createStructuredSelector } from "reselect";
 import React from "react";
 import { selectWssStatus } from "../../redux/application/application.selectors";
-
 const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
   wssStatus: selectWssStatus
 });
-
-const mapDispatchToProps = (dispatch) => ({});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(WssStatusDisplay);
 
 export function WssStatusDisplay({ wssStatus }) {
   console.log("🚀 ~ WssStatusDisplay ~ wssStatus:", wssStatus);
-
-  let icon;
-  let color;
-
-  if (wssStatus === "connected") {
-    icon = <GlobalOutlined />;
-    color = "green";
-  } else if (wssStatus === "error") {
-    icon = <WarningOutlined />;
-    color = "red";
-  } else {
-    icon = <GlobalOutlined />;
-    color = "gray"; // Default for other statuses like "disconnected"
-  }
-
-  return <span style={{ color, marginRight: ".5rem" }}>{icon}</span>;
+  return <GlobalOutlined style={{ color: wssStatus === "connected" ? "green" : "red", marginRight: ".5rem" }} />;
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(WssStatusDisplay);

client/src/contexts/SocketIO/useSocket.js

@@ -3,102 +3,89 @@ import SocketIO from "socket.io-client";
 import { auth } from "../../firebase/firebase.utils";
 import { store } from "../../redux/store";
 import { addAlerts, setWssStatus } from "../../redux/application/application.actions";
+import { useDispatch } from "react-redux";
 
 const useSocket = (bodyshop) => {
   const socketRef = useRef(null);
   const [clientId, setClientId] = useState(null);
+  const dispatch = useDispatch();
 
   useEffect(() => {
-    const initializeSocket = async (token) => {
-      if (!bodyshop || !bodyshop.id) return;
-
-      const endpoint = import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "";
-
-      const socketInstance = SocketIO(endpoint, {
-        path: "/wss",
-        withCredentials: true,
-        auth: { token },
-        reconnectionAttempts: Infinity,
-        reconnectionDelay: 2000,
-        reconnectionDelayMax: 10000
-      });
-
-      socketRef.current = socketInstance;
-
-      // Handle socket events
-      const handleBodyshopMessage = (message) => {
-        if (!message || !message.type) return;
-
-        switch (message.type) {
-          case "alert-update":
-            store.dispatch(addAlerts(message.payload));
-            break;
-          default:
-            break;
-        }
-
-        if (!import.meta.env.DEV) return;
-        console.log(`Received message for bodyshop ${bodyshop.id}:`, message);
-      };
-
-      const handleConnect = () => {
-        socketInstance.emit("join-bodyshop-room", bodyshop.id);
-        setClientId(socketInstance.id);
-        store.dispatch(setWssStatus("connected"));
-      };
-
-      const handleReconnect = () => {
-        store.dispatch(setWssStatus("connected"));
-      };
-
-      const handleConnectionError = (err) => {
-        console.error("Socket connection error:", err);
-
-        // Handle token expiration
-        if (err.message.includes("auth/id-token-expired")) {
-          console.warn("Token expired, refreshing...");
-          auth.currentUser?.getIdToken(true).then((newToken) => {
-            socketInstance.auth = { token: newToken }; // Update socket auth
-            socketInstance.connect(); // Retry connection
-          });
-        } else {
-          store.dispatch(setWssStatus("error"));
-        }
-      };
-
-      const handleDisconnect = (reason) => {
-        console.warn("Socket disconnected:", reason);
-        store.dispatch(setWssStatus("disconnected"));
-
-        // Manually trigger reconnection if necessary
-        if (!socketInstance.connected && reason !== "io server disconnect") {
-          setTimeout(() => {
-            if (socketInstance.disconnected) {
-              console.log("Manually triggering reconnection...");
-              socketInstance.connect();
-            }
-          }, 2000); // Retry after 2 seconds
-        }
-      };
-
-      // Register event handlers
-      socketInstance.on("connect", handleConnect);
-      socketInstance.on("reconnect", handleReconnect);
-      socketInstance.on("connect_error", handleConnectionError);
-      socketInstance.on("disconnect", handleDisconnect);
-      socketInstance.on("bodyshop-message", handleBodyshopMessage);
-    };
-
     const unsubscribe = auth.onIdTokenChanged(async (user) => {
       if (user) {
-        const token = await user.getIdToken();
+        const newToken = await user.getIdToken();
 
         if (socketRef.current) {
-          // Update token if socket exists
-          socketRef.current.emit("update-token", token);
-        } else {
-          // Initialize socket if not already connected
-          initializeSocket(token);
+          // Send new token to server
+          socketRef.current.emit("update-token", newToken);
+        } else if (bodyshop && bodyshop.id) {
+          // Initialize the socket
+          const endpoint = import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "";
+
+          const socketInstance = SocketIO(endpoint, {
+            path: "/wss",
+            withCredentials: true,
+            auth: { token: newToken },
+            reconnectionAttempts: Infinity,
+            reconnectionDelay: 2000,
+            reconnectionDelayMax: 10000
+          });
+
+          socketRef.current = socketInstance;
+
+          const handleBodyshopMessage = (message) => {
+            if (!message || !message?.type) return;
+
+            switch (message.type) {
+              case "alert-update":
+                store.dispatch(addAlerts(message.payload));
+                break;
+            }
+
+            if (!import.meta.env.DEV) return;
+            console.log(`Received message for bodyshop ${bodyshop.id}:`, message);
+          };
+
+          const handleConnect = () => {
+            socketInstance.emit("join-bodyshop-room", bodyshop.id);
+            setClientId(socketInstance.id);
+            store.dispatch(setWssStatus("connected"));
+          };
+
+          const handleReconnect = (attempt) => {
+            store.dispatch(setWssStatus("connected"));
+          };
+
+          const handleConnectionError = (err) => {
+            console.error("Socket connection error:", err);
+            store.dispatch(setWssStatus("error"));
+          };
+
+          const handleDisconnect = () => {
+            store.dispatch(setWssStatus("disconnected"));
+          };
+
+          const handleMessagingList = (data) => {
+            dispatch({ type: "SET_CONVERSATIONS", payload: data.conversations });
+          };
+
+          const handleNewMessage = (message) => {
+            dispatch({ type: "ADD_MESSAGE", payload: message });
+          };
+
+          const handleNewConversation = (data) => {
+            dispatch({ type: "ADD_CONVERSATION", payload: data.conversation });
+            dispatch({ type: "ADD_MESSAGE", payload: data.message });
+          };
+
+          socketInstance.on("messaging-list", handleMessagingList);
+          socketInstance.on("new-message", handleNewMessage);
+          socketInstance.on("connect", handleConnect);
+          socketInstance.on("reconnect", handleReconnect);
+          socketInstance.on("connect_error", handleConnectionError);
+          socketInstance.on("disconnect", handleDisconnect);
+          socketInstance.on("bodyshop-message", handleBodyshopMessage);
+          socketInstance.on("new-conversation", handleNewConversation);
         }
       } else {
         // User is not authenticated
@@ -109,7 +96,7 @@ const useSocket = (bodyshop) => {
       }
     });
 
-    // Clean up on unmount
+    // Clean up the listener on unmount
     return () => {
       unsubscribe();
       if (socketRef.current) {
@@ -117,7 +104,7 @@ const useSocket = (bodyshop) => {
         socketRef.current = null;
       }
     };
-  }, [bodyshop]);
+  }, [bodyshop, dispatch]);
 
   return { socket: socketRef.current, clientId };
 };

client/src/firebase/firebase.utils.js

@@ -4,6 +4,7 @@ import { getAuth, updatePassword, updateProfile } from "firebase/auth";
 import { getFirestore } from "firebase/firestore";
 import { getMessaging, getToken, onMessage } from "firebase/messaging";
 import { store } from "../redux/store";
+import axios from "axios";
 
 const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);
 initializeApp(config);
@@ -65,10 +66,13 @@ export const requestForToken = () => {
     });
 };
 
-onMessage(messaging, (payload) => {
-  console.log("FCM Message received. ", payload);
-  // ...
-});
+export const onMessageListener = () =>
+  new Promise((resolve) => {
+    onMessage(messaging, (payload) => {
+      console.log("Inbound FCM Message", payload);
+      resolve(payload);
+    });
+  });
 
 export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
   const state = stateProp || store.getState();

client/src/graphql/conversations.queries.js

@@ -59,8 +59,6 @@ export const GET_CONVERSATION_DETAILS = gql`
       id
       phone_num
       archived
-      updated_at
-      unreadcnt
       label
       job_conversations {
         jobid
@@ -73,17 +71,6 @@ export const GET_CONVERSATION_DETAILS = gql`
           ro_number
         }
       }
-      messages(order_by: { created_at: asc_nulls_first }) {
-        id
-        status
-        text
-        isoutbound
-        image
-        image_path
-        userid
-        created_at
-        read
-      }
     }
   }
 `;
@@ -92,26 +79,9 @@ export const CONVERSATION_ID_BY_PHONE = gql`
   query CONVERSATION_ID_BY_PHONE($phone: String!) {
     conversations(where: { phone_num: { _eq: $phone } }) {
       id
-      phone_num
-      archived
-      label
-      unreadcnt
-      created_at
       job_conversations {
         jobid
-        conversationid
-        job {
-          id
-          ownr_fn
-          ownr_ln
-          ownr_co_nm
-          ro_number
-        }
-      }
-      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
-        aggregate {
-          count
-        }
+        id
       }
     }
   }
@@ -122,26 +92,6 @@ export const CREATE_CONVERSATION = gql`
     insert_conversations(objects: $conversation) {
       returning {
         id
-        phone_num
-        archived
-        label
-        unreadcnt
-        job_conversations {
-          jobid
-          conversationid
-          job {
-            id
-            ownr_fn
-            ownr_ln
-            ownr_co_nm
-            ro_number
-          }
-        }
-        messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
-          aggregate {
-            count
-          }
-        }
       }
     }
   }
@@ -164,3 +114,22 @@ export const UPDATE_CONVERSATION_LABEL = gql`
     }
   }
 `;
+
+export const GET_CONVERSATION_MESSAGES = gql`
+  query GET_CONVERSATION_MESSAGES($conversationId: uuid!) {
+    conversation: conversations_by_pk(id: $conversationId) {
+      id
+      phone_num
+      updated_at
+      label
+    }
+    messages: messages(where: { conversationid: { _eq: $conversationId } }, order_by: { created_at: asc }) {
+      id
+      text
+      created_at
+      read
+      isoutbound
+      userid
+    }
+  }
+`;

client/src/graphql/jobs-lines.queries.js

@@ -2,7 +2,7 @@ import { gql } from "@apollo/client";
 
 export const GET_ALL_JOBLINES_BY_PK = gql`
   query GET_ALL_JOBLINES_BY_PK($id: uuid!) {
-    joblines(where: { jobid: { _eq: $id }, removed: { _eq: false } }, order_by: { line_no: asc }) {
+    joblines(where: { jobid: { _eq: $id } }, order_by: { line_no: asc }) {
       id
       line_no
       unq_seq

client/src/pages/manage/manage.page.component.jsx

@@ -647,7 +647,7 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
 
   return (
     <>
-      <ChatAffixContainer bodyshop={bodyshop} chatVisible={chatVisible} />
+      {true && <ChatAffixContainer bodyshop={bodyshop} chatVisible={chatVisible} />}
       <Layout style={{ minHeight: "100vh" }} className="layout-container">
         <UpdateAlert />
         <HeaderContainer />

client/src/redux/messaging/messaging.actions.js

@@ -2,9 +2,9 @@ import MessagingActionTypes from "./messaging.types";
 
 export const toggleChatVisible = () => ({
   type: MessagingActionTypes.TOGGLE_CHAT_VISIBLE
-  //payload: user
 });
 
+// Action to handle when a message is sent via WebSocket
 export const sendMessage = (message) => ({
   type: MessagingActionTypes.SEND_MESSAGE,
   payload: message
@@ -19,17 +19,45 @@ export const sendMessageFailure = (error) => ({
   type: MessagingActionTypes.SEND_MESSAGE_FAILURE,
   payload: error
 });
+
+// Set the selected conversation by ID
 export const setSelectedConversation = (conversationId) => ({
   type: MessagingActionTypes.SET_SELECTED_CONVERSATION,
   payload: conversationId
 });
 
+// Open chat by phone number (if there’s a need to search for a conversation)
 export const openChatByPhone = (phoneNumber) => ({
   type: MessagingActionTypes.OPEN_CHAT_BY_PHONE,
   payload: phoneNumber
 });
 
+// Set an individual message (e.g., from a new message event)
 export const setMessage = (message) => ({
   type: MessagingActionTypes.SET_MESSAGE,
   payload: message
 });
+
+// Set the list of conversations received from WebSocket
+export const setConversations = (conversations) => ({
+  type: MessagingActionTypes.SET_CONVERSATIONS,
+  payload: conversations
+});
+
+// Add a message to the conversation messages
+export const addMessage = (message) => ({
+  type: MessagingActionTypes.ADD_MESSAGE,
+  payload: message
+});
+
+// Add a Conversation to the list of conversations
+export const addConversation = (conversation) => ({
+  type: MessagingActionTypes.ADD_CONVERSATION,
+  payload: conversation
+});
+
+// Update unread count for a conversation (e.g., after marking messages as read)
+export const updateUnreadCount = (conversationId, unreadCount) => ({
+  type: MessagingActionTypes.UPDATE_UNREAD_COUNT,
+  payload: { conversationId, unreadCount }
+});

client/src/redux/messaging/messaging.reducer.js

@@ -6,6 +6,11 @@ const INITIAL_STATE = {
   isSending: false,
   error: null,
   message: null,
+  conversations: {
+    conversations: []
+  },
+  messages: [],
+  unreadcnt: 0,
   searchingForConversation: false
 };
 
@@ -13,39 +18,74 @@ const messagingReducer = (state = INITIAL_STATE, action) => {
   switch (action.type) {
     case MessagingActionTypes.SET_MESSAGE:
       return { ...state, message: action.payload };
+
     case MessagingActionTypes.TOGGLE_CHAT_VISIBLE:
       return {
         ...state,
         open: !state.open
       };
+
     case MessagingActionTypes.OPEN_CHAT_BY_PHONE:
       return {
         ...state,
         searchingForConversation: true
       };
+
     case MessagingActionTypes.SET_SELECTED_CONVERSATION:
       return {
         ...state,
         open: true,
         searchingForConversation: false,
-        selectedConversationId: action.payload
+        selectedConversationId: action.payload,
+        messages: [] // Reset messages when a new conversation is selected
       };
+
     case MessagingActionTypes.SEND_MESSAGE:
       return {
         ...state,
         error: null,
         isSending: true
       };
+
     case MessagingActionTypes.SEND_MESSAGE_SUCCESS:
       return {
         ...state,
         message: "",
         isSending: false
       };
+
     case MessagingActionTypes.SEND_MESSAGE_FAILURE:
       return {
         ...state,
-        error: action.payload
+        error: action.payload,
+        isSending: false
+      };
+
+    case MessagingActionTypes.SET_CONVERSATIONS:
+      return {
+        ...state,
+        conversations: action.payload
+      };
+
+    case MessagingActionTypes.ADD_MESSAGE:
+      return {
+        ...state,
+        messages: [...state.messages, action.payload]
+      };
+
+    case MessagingActionTypes.ADD_CONVERSATION:
+      return {
+        ...state,
+        conversations: {
+          ...state.conversations,
+          conversations: [
+            ...(state.conversations.conversations || []),
+            {
+              ...action.payload, // Ensure all fields from payload are included
+              messages_aggregate: action.payload.messages_aggregate || { aggregate: { count: 0 } }
+            }
+          ]
+        }
       };
     default:
       return state;

client/src/redux/messaging/messaging.sagas.js

@@ -2,11 +2,7 @@ import axios from "axios";
 import parsePhoneNumber from "libphonenumber-js";
 import { all, call, put, select, takeLatest } from "redux-saga/effects";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import {
-  CONVERSATION_ID_BY_PHONE,
-  CREATE_CONVERSATION,
-  TOGGLE_CONVERSATION_ARCHIVE
-} from "../../graphql/conversations.queries";
+import { CONVERSATION_ID_BY_PHONE, CREATE_CONVERSATION } from "../../graphql/conversations.queries";
 import { INSERT_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import client from "../../utils/GraphQLClient";
 import { selectBodyshop } from "../user/user.selectors";
@@ -31,73 +27,23 @@ export function* onOpenChatByPhone() {
 
 export function* openChatByPhone({ payload }) {
   logImEXEvent("messaging_open_by_phone");
-  const { socket, phone_num, jobid } = payload;
-  if (!socket || !phone_num) return;
+  const { phone_num, jobid } = payload;
 
   const p = parsePhoneNumber(phone_num, "CA");
   const bodyshop = yield select(selectBodyshop);
-
   try {
-    // Fetch conversations including archived ones
     const {
       data: { conversations }
     } = yield client.query({
       query: CONVERSATION_ID_BY_PHONE,
       variables: { phone: p.number },
-      fetchPolicy: "no-cache" // Ensure the query always gets the latest data
+      fetchPolicy: 'no-cache'
     });
 
-    // Sort conversations by `updated_at` or `created_at` and pick the last one for the given phone number
-    const sortedConversations = conversations
-      ?.filter((c) => c.phone_num === p.number) // Filter to match the phone number
-      .sort((a, b) => new Date(a.created_at) - new Date(b.created_at)); // Sort by `updated_at`
-
-    const existingConversation = sortedConversations?.[sortedConversations.length - 1] || null;
-
-    if (existingConversation) {
-      let updatedConversation = existingConversation;
-
-      if (existingConversation.archived) {
-        // If the conversation is archived, unarchive it
-        const {
-          data: { update_conversations_by_pk: unarchivedConversation }
-        } = yield client.mutate({
-          mutation: TOGGLE_CONVERSATION_ARCHIVE,
-          variables: {
-            id: existingConversation.id,
-            archived: false
-          }
-        });
-
-        updatedConversation = unarchivedConversation;
-
-        // Emit an event indicating the conversation was unarchived
-        socket.emit("conversation-modified", {
-          type: "conversation-unarchived",
-          conversationId: unarchivedConversation.id,
-          bodyshopId: bodyshop.id,
-          archived: false
-        });
-      }
-
-      // Set the unarchived or already active conversation as selected
-      yield put(setSelectedConversation(updatedConversation.id));
-
-      // Add job tag if needed
-      if (jobid && !updatedConversation.job_conversations.find((jc) => jc.jobid === jobid)) {
-        yield client.mutate({
-          mutation: INSERT_CONVERSATION_TAG,
-          variables: {
-            conversationId: updatedConversation.id,
-            jobId: jobid
-          }
-        });
-      }
-    } else {
-      // No conversation exists, create a new one
+    if (conversations.length === 0) {
       const {
         data: {
-          insert_conversations: { returning: newConversations }
+          insert_conversations: { returning: newConversationsId }
         }
       } = yield client.mutate({
         mutation: CREATE_CONVERSATION,
@@ -111,21 +57,26 @@ export function* openChatByPhone({ payload }) {
           ]
         }
       });
+      yield put(setSelectedConversation(newConversationsId[0].id));
+    } else if (conversations.length === 1) {
+      //got the ID. Open it.
+      yield put(setSelectedConversation(conversations[0].id));
 
-      const createdConversation = newConversations[0];
-
-      // Emit event for the new conversation with full details
-      socket.emit("conversation-modified", {
-        bodyshopId: bodyshop.id,
-        type: "conversation-created",
-        ...createdConversation
-      });
-
-      // Set the newly created conversation as selected
-      yield put(setSelectedConversation(createdConversation.id));
+      //Check to see if this job ID is already a child of it. If not add the tag.
+      if (jobid && !conversations[0].job_conversations.find((jc) => jc.jobid === jobid))
+        yield client.mutate({
+          mutation: INSERT_CONVERSATION_TAG,
+          variables: {
+            conversationId: conversations[0].id,
+            jobId: jobid
+          }
+        });
+    } else {
+      console.log("ERROR: Multiple conversations found. ");
+      yield put(setSelectedConversation(null));
     }
   } catch (error) {
-    console.error("Error in openChatByPhone saga.", error);
+    console.log("Error in sendMessage saga.", error);
   }
 }
 

client/src/redux/messaging/messaging.selectors.js

@@ -19,3 +19,8 @@ export const searchingForConversation = createSelector(
   [selectMessaging],
   (messaging) => messaging.searchingForConversation
 );
+
+// New selectors for conversations and unread count
+export const selectConversations = createSelector([selectMessaging], (messaging) => messaging.conversations);
+
+export const selectUnreadCount = createSelector([selectMessaging], (messaging) => messaging.unreadCount);

client/src/redux/messaging/messaging.types.js

@@ -5,6 +5,10 @@ const MessagingActionTypes = {
   SEND_MESSAGE_FAILURE: "SEND_MESSAGE_FAILURE",
   SET_SELECTED_CONVERSATION: "SET_SELECTED_CONVERSATION",
   OPEN_CHAT_BY_PHONE: "OPEN_CHAT_BY_PHONE",
-  SET_MESSAGE: "SET_MESSAGE"
+  SET_MESSAGE: "SET_MESSAGE",
+  ADD_MESSAGE: "ADD_MESSAGE",
+  UPDATE_UNREAD_COUNT: "UPDATE_UNREAD_COUNT",
+  SET_CONVERSATIONS: "SET_CONVERSATIONS",
+  ADD_CONVERSATION: "ADD_CONVERSATION"
 };
 export default MessagingActionTypes;

client/src/utils/GraphQLClient.js

@@ -145,34 +145,14 @@ middlewares.push(
 
 const cache = new InMemoryCache({
   typePolicies: {
-    conversations: {
+    Query: {
       fields: {
-        job_conversations: {
-          merge(existing = [], incoming = [], { readField }) {
-            const merged = new Map();
-
-            // Add existing data to the map
-            existing.forEach((jobConversation) => {
-              // Use `readField` to get the unique `jobid`, fallback to `__ref`
-              const jobId = readField("jobid", jobConversation) || jobConversation.__ref;
-              if (jobId) merged.set(jobId, jobConversation);
-            });
-
-            // Add or replace with incoming data
-            incoming.forEach((jobConversation) => {
-              // Use `readField` to get the unique `jobid`, fallback to `__ref`
-              const jobId = readField("jobid", jobConversation) || jobConversation.__ref;
-              if (jobId) merged.set(jobId, jobConversation);
-            });
-
-            // Return the merged data as an array
-            return Array.from(merged.values());
-          }
-        }
+        conversations: offsetLimitPagination()
       }
     }
   }
 });
+
 const client = new ApolloClient({
   link: ApolloLink.from(middlewares),
   cache,

client/src/utils/fcm-handler.js

@@ -0,0 +1,70 @@
+export default async function FcmHandler({ client, payload }) {
+  console.log("FCM", payload);
+  switch (payload.type) {
+    case "messaging-inbound":
+      client.cache.modify({
+        id: client.cache.identify({
+          __typename: "conversations",
+          id: payload.conversationid
+        }),
+        fields: {
+          messages_aggregate(cached) {
+            return { aggregate: { count: cached.aggregate.count + 1 } };
+          }
+        }
+      });
+      client.cache.modify({
+        fields: {
+          messages_aggregate(cached) {
+            return { aggregate: { count: cached.aggregate.count + 1 } };
+          }
+        }
+      });
+      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":
+      let previousUnreadCount = 0;
+      client.cache.modify({
+        id: client.cache.identify({
+          __typename: "conversations",
+          id: payload.conversationid
+        }),
+        fields: {
+          messages_aggregate(cached) {
+            previousUnreadCount = cached.aggregate.count;
+            return { aggregate: { count: 0 } };
+          }
+        }
+      });
+      client.cache.modify({
+        fields: {
+          messages_aggregate(cached) {
+            return {
+              aggregate: {
+                count: cached.aggregate.count - previousUnreadCount
+              }
+            };
+          }
+        }
+      });
+      break;
+    default:
+      console.log("No payload type set.");
+      break;
+  }
+}

docker-build.ps1

@@ -1,14 +0,0 @@
-# Stop and remove all containers, images, and networks from the Compose file
-docker compose down --rmi all
-
-# Prune all unused Docker objects including volumes
-docker system prune --all --volumes --force
-
-# Prune unused build cache
-docker builder prune --all --force
-
-# Prune all unused volumes
-docker volume prune --all --force
-
-# Rebuild and start the containers
-docker compose up --build

docker-build.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Stop and remove all containers, images, and networks from the Compose file
-docker compose down --rmi all
-
-# Prune all unused Docker objects including volumes
-docker system prune --all --volumes --force
-
-# Prune unused build cache
-docker builder prune --all --force
-
-# Prune all unused volumes
-docker volume prune --all --force
-
-# Rebuild and start the containers
-docker compose up --build

docker-compose.yml

@@ -114,8 +114,8 @@ services:
       "
         aws --endpoint-url=http://localstack:4566 ses verify-domain-identity --domain imex.online --region ca-central-1
         aws --endpoint-url=http://localstack:4566 ses verify-email-identity --email-address noreply@imex.online --region ca-central-1
-        aws --endpoint-url=http://localstack:4566 secretsmanager create-secret --name CHATTER_PRIVATE_KEY --secret-string file:///tmp/certs/io-ftp-test.key
-        aws --endpoint-url=http://localstack:4566 logs create-log-group --log-group-name development --region ca-central-1
+        aws --endpoint-url=http://localstack:4566 secretsmanager create-secret --name CHATTER_PRIVATE_KEY --secret-string file:///tmp/certs/id_rsa
+        aws --endpoint-url=http://localstack:4566 logs create-log-group --log-group-name development --region ca-central-1     
         aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-large-log --create-bucket-configuration LocationConstraint=ca-central-1
       "
   # Node App: The Main IMEX API
@@ -169,7 +169,7 @@ services:
 #      - redis-insight-data:/db
 
 # ##Optional Container for SFTP/SSH Server for testing
-#   ssh-sftp-server: 
+#   ssh-sftp-server:
 #     image: atmoz/sftp:alpine  # Using an image with SFTP support
 #     container_name: ssh-sftp-server
 #     hostname: ssh-sftp-server
@@ -178,10 +178,9 @@ services:
 #     ports:
 #       - "2222:22"  # Expose port 22 for SSH/SFTP (mapped to 2222 on the host)
 #     volumes:
-#       - ./certs/io-ftp-test.key.pub:/home/user/.ssh/keys/io-ftp-test.key.pub:ro  # Mount the SSH public key as authorized_keys
+#       - ./certs/id_rsa.pub:/home/user/.ssh/keys/id_rsa.pub:ro  # Mount the SSH public key
 #       - ./upload:/home/user/upload  # Mount a local directory for SFTP uploads
 #     environment:
-#       # - SFTP_USERS=user::1000::upload
 #       - SFTP_USERS=user:password:1000::upload
 #     command: >
 #       /bin/sh -c "

hasura/metadata/cron_triggers.yaml

@@ -6,15 +6,6 @@
   headers:
     - name: x-imex-auth
       value_from_env: DATAPUMP_AUTH
-- name: Chatter Data Pump
-  webhook: '{{HASURA_API_URL}}/data/chatter'
-  schedule: 45 5 * * *
-  include_in_metadata: true
-  payload: {}
-  headers:
-    - name: x-imex-auth
-      value_from_env: DATAPUMP_AUTH
-  comment: ""
 - name: Claimscorp Data Pump
   webhook: '{{HASURA_API_URL}}/data/cc'
   schedule: 30 6 * * *

job-totals-testing-util.js

@@ -1,12 +1,14 @@
 const path = require("path");
-const fs = require("fs");
 const Dinero = require("dinero.js");
 const { gql } = require("graphql-request");
+const queries = require("./server/graphql-client/queries");
+const GraphQLClient = require("graphql-request").GraphQLClient;
+const logger = require("./server/utils/logger");
 const AxiosLib = require("axios").default;
 const axios = AxiosLib.create();
-const pLimit = require("p-limit");
-const converter = require("json-2-csv");
 
+// Dinero.defaultCurrency = "USD";
+// Dinero.globalLocale = "en-CA";
 Dinero.globalRoundingMode = "HALF_EVEN";
 const client = require("./server/graphql-client/graphql-client").client;
 require("dotenv").config({
@@ -14,9 +16,8 @@ require("dotenv").config({
 });
 
 async function RunTheTest() {
-  const bodyshopids = ["71f8494c-89f0-43e0-8eb2-820b52d723bc"];
-  const bearerToken = `Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImI4Y2FjOTViNGE1YWNkZTBiOTY1NzJkZWU4YzhjOTVlZWU0OGNjY2QiLCJ0eXAiOiJKV1QifQ.eyJuYW1lIjoiUGF0cmljayBGaWMgKERFVikiLCJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLWRlZmF1bHQtcm9sZSI6InVzZXIiLCJ4LWhhc3VyYS1hbGxvd2VkLXJvbGVzIjpbInVzZXIiXSwieC1oYXN1cmEtdXNlci1pZCI6ImhOSjhBRHB0REhRQkRFcXNCOFFNWVRqaURuZjEifSwiaXNzIjoiaHR0cHM6Ly9zZWN1cmV0b2tlbi5nb29nbGUuY29tL2ltZXgtZGV2IiwiYXVkIjoiaW1leC1kZXYiLCJhdXRoX3RpbWUiOjE3MzAxMzIwMjksInVzZXJfaWQiOiJoTko4QURwdERIUUJERXFzQjhRTVlUamlEbmYxIiwic3ViIjoiaE5KOEFEcHRESFFCREVxc0I4UU1ZVGppRG5mMSIsImlhdCI6MTczMDg0MTc2NSwiZXhwIjoxNzMwODQ1MzY1LCJlbWFpbCI6InBhdHJpY2tAaW1leC5kZXYiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsicGF0cmlja0BpbWV4LmRldiJdfSwic2lnbl9pbl9wcm92aWRlciI6InBhc3N3b3JkIn19.npQWkyB5cB4wmkaBsQiY3JbvBM9vKPqf3e22nVHnSydGcQi0p9M2mca9FcDtdcWvQlShUM63FF-6KkzpovC92sHauNmzCSXRInaaCPEussUUNSJEe2gEV03tYX447LkkSmFQbJ5V6qLTIDelm25fF0MoEDVnLTgythK_9927f8cxKZH1kEow0ymDeMaWey1sRyu7n15OJMcu692mfuQnBAArGTHGJ4YmReI7tMmdrV438MLxuVpH5CLb6uzlUdZoJ__7yh0kz0lkZEeHQAL8yq-0fISbPeZ5uXuMzYGrHuuKsIPRoeShVSVnF7ov8yTT3_YrCkhYbxl0eSTfBB5OdQ`;
-
+  const bodyshopids = ["b501bb82-22b2-493a-8a0f-152938194869"];
+  const bearerToken = `Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImJhNjI1OTZmNTJmNTJlZDQ0MDQ5Mzk2YmU3ZGYzNGQyYzY0ZjQ1M2UiLCJ0eXAiOiJKV1QifQ.eyJuYW1lIjoiUm9tZSBEZXZlbG9wbWVudCIsImh0dHBzOi8vaGFzdXJhLmlvL2p3dC9jbGFpbXMiOnsieC1oYXN1cmEtZGVmYXVsdC1yb2xlIjoidXNlciIsIngtaGFzdXJhLWFsbG93ZWQtcm9sZXMiOlsidXNlciJdLCJ4LWhhc3VyYS11c2VyLWlkIjoidDZZbTFORGxDRE9QWnIzRjliZ3VXSDRMaFNYMiJ9LCJpb2FkbWluIjp0cnVlLCJpc3MiOiJodHRwczovL3NlY3VyZXRva2VuLmdvb2dsZS5jb20vcm9tZS1wcm9kLTEiLCJhdWQiOiJyb21lLXByb2QtMSIsImF1dGhfdGltZSI6MTcxMDk1MTg1MCwidXNlcl9pZCI6InQ2WW0xTkRsQ0RPUFpyM0Y5Ymd1V0g0TGhTWDIiLCJzdWIiOiJ0NlltMU5EbENET1BacjNGOWJndVdINExoU1gyIiwiaWF0IjoxNzExNTczODI1LCJleHAiOjE3MTE1Nzc0MjUsImVtYWlsIjoicGF0cmlja0Byb21lLmRldiIsImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwiZmlyZWJhc2UiOnsiaWRlbnRpdGllcyI6eyJlbWFpbCI6WyJwYXRyaWNrQHJvbWUuZGV2Il19LCJzaWduX2luX3Byb3ZpZGVyIjoicGFzc3dvcmQifX0.0kBySA9tJznLYj8TtncHGVWJO0IcmLKP2G1UyyXwaj45kTa25bjT9RWjM-NslX_zjOvrvmQZzisFAb6M1Jf6geNjOMLIqb8bhihhzEZK4CcRfvjT6cpZxnOO2Dp_1Y5OePbvOBS_GlfdsovVWa84OLuhYC5G_3QwHT8_2Cttz4CbrC6M_vd7QsGODJYBbVKMhOdZhzpNq7AbOUh3749WRjLMMobpnZDrmQlsyg3PAqtX1FHO25WQS2rma9QahGDSY736JfbkuZJ2XbNn0axEGpK7RQLUcuRkFUlfKqYplNbR_e1Q3kEfRAZpxBPXZysrDcbDNhbkWCoTmJ3fle55OA`;
   const { jobs } = await client.request(
     gql`
       query GET_JOBS($bodyshopids: [uuid!]!) {
@@ -35,98 +36,69 @@ async function RunTheTest() {
 
   const results = [];
 
-  const limit = pLimit(5); // Set concurrency limit to 3
+  for (const [index, job] of jobs.entries()) {
+    process.stdout.cursorTo(0);
+    process.stdout.write(
+      `Processing job ${index + 1} of ${jobs.length}. Failed jobs: ${results.filter((r) => r.result !== "PASS").length}`
+    );
 
-  const tasks = jobs.map((job, index) => {
-    return limit(async () => {
-      process.stdout.cursorTo(0);
-      process.stdout.write(
-        `Processing job ${index + 1} of ${jobs.length}. Failed jobs: ${results.filter((r) => r.overallTotalCorrect !== "PASS").length}. Correct jobs because of adjustment: ${results.filter((r) => r.correctJobsBecauseOfAdjustment).length}`
+    try {
+      await axios.post(
+        `http://localhost:4000/job/totalsssu`,
+        { id: job.id },
+        { headers: { Authorization: bearerToken } }
+      );
+      const { jobs_by_pk: newjob } = await client.request(
+        gql`
+          query GET_JOBS($id: uuid!) {
+            jobs_by_pk(id: $id) {
+              id
+              ro_number
+              cieca_ttl
+              job_totals
+              ownr_fn
+              ownr_ln
+              ownr_co_nm
+              ins_co_nm
+              comment
+            }
+          }
+        `,
+        {
+          id: job.id
+        }
       );
 
-      try {
-        await axios.post(
-          `http://localhost:4000/job/totalsssu`,
-          { id: job.id },
-          { headers: { Authorization: bearerToken } }
-        );
-        const { jobs_by_pk: newjob } = await client.request(
-          gql`
-            query GET_JOBS($id: uuid!) {
-              jobs_by_pk(id: $id) {
-                id
-                ro_number
-                cieca_ttl
-                job_totals
-                ownr_fn
-                ownr_ln
-                ownr_co_nm
-                ins_co_nm
-                comment
-              }
-            }
-          `,
-          {
-            id: job.id
-          }
-        );
+      const result = {
+        id: newjob.id,
+        owner: `${newjob.ownr_fn} ${newjob.ownr_ln} ${job.ownr_co_nm || ""}`,
+        ins_co: newjob.ins_co_nm,
+        comment: newjob.comment
+      };
 
-        const result = {
-          id: newjob.id,
-          owner: `${newjob.ownr_fn} ${newjob.ownr_ln} ${job.ownr_co_nm || ""}`,
-          ins_co: newjob.ins_co_nm,
-          comment: newjob.comment,
-          imexsubtotal: Dinero(newjob.job_totals.totals.subtotal).toFormat("0.00"),
-          imextotalrepair: Dinero(newjob.job_totals.totals.total_repairs).toFormat("0.00"),
-          g_tax: newjob.cieca_ttl.data.g_tax,
-          n_ttl_amt: newjob.cieca_ttl.data.n_ttl_amt,
-          g_ttl_amt: newjob.cieca_ttl.data.g_ttl_amt
-        };
+      const calcTotal = newjob.job_totals.totals.total_repairs.amount;
+      const ttlTotal = newjob.cieca_ttl.data.g_ttl_amt * 100;
+      result.difference = (calcTotal - ttlTotal) / 100;
 
-        const calcTotal = newjob.job_totals.totals.total_repairs.amount;
-        const ttlTotal = newjob.cieca_ttl.data.g_ttl_amt * 100;
-        result.difference = (calcTotal - ttlTotal) / 100;
-
-        if (Math.abs(calcTotal - ttlTotal) > 3) {
-          result.overallTotalCorrect = "***FAIL***";
-        } else {
-          result.overallTotalCorrect = "PASS";
-        }
-        result.ttl_adjustment = Dinero(newjob.job_totals.totals.ttl_adjustment).toFormat();
-        result.ttl_tax_adjustment = Dinero(newjob.job_totals.totals.ttl_tax_adjustment).toFormat();
-
-        const calcTaxDinero = Dinero(newjob.job_totals.totals.us_sales_tax_breakdown.ty1Tax)
-          .add(Dinero(newjob.job_totals.totals.us_sales_tax_breakdown.ty2Tax))
-          .add(Dinero(newjob.job_totals.totals.us_sales_tax_breakdown.ty3Tax))
-          .add(Dinero(newjob.job_totals.totals.us_sales_tax_breakdown.ty4Tax))
-          .add(Dinero(newjob.job_totals.totals.us_sales_tax_breakdown.ty5Tax))
-          .add(Dinero(newjob.job_totals.totals.ttl_tax_adjustment));
-        result.calcTax = calcTaxDinero.toFormat("0.00");
-        const calcTax = calcTaxDinero.getAmount() / 100;
-        const emsTax = newjob.cieca_ttl.data.g_tax;
-        result.taxDifference = calcTax - emsTax;
-
-        if (Math.abs(calcTax - emsTax) > 3) {
-          result.taxCorrect = "***FAIL***";
-        } else {
-          result.taxCorrect = "PASS";
-        }
-
-        results.push(result);
-      } catch (error) {
-        results.push({
-          ro_number: job.ro_number,
-          id: job.id,
-          result: error.message
-        });
+      if (Math.abs(calcTotal - ttlTotal) > 3) {
+        //Diff is greater than 5 cents. Fail it.
+        result.result = "***FAIL***";
+      } else {
+        result.result = "PASS";
       }
-    });
-  });
+      // console.log(`${result.result} => RO ${job.ro_number} - ${job.id} `);
 
-  await Promise.all(tasks);
+      results.push(result);
+    } catch (error) {
+      results.push({
+        ro_number: job.ro_number,
+        id: job.id,
+        result: "**503 FAILURE**"
+      });
+    }
+  }
 
-  console.table(results.filter((r) => r.overallTotalCorrect !== "PASS"));
-  console.log("=======================================");
+  console.table(results.filter((r) => r.result !== "PASS"));
   const summary = results.reduce(
     (acc, val) => {
       if (val.result === "PASS") {
@@ -138,12 +110,18 @@ async function RunTheTest() {
     { pass: 0, fail: 0 }
   );
   console.log("Pass Rate: ", ((summary.pass / (summary.fail + summary.pass)) * 100).toFixed(1));
-
-  const ret = converter.json2csv(results, { emptyFieldValue: "" });
-
-  fs.writeFile(`./logs/totalstest-${Date.now()}.csv`, ret, (error) => console.log(error));
 }
 
-RunTheTest().catch((error) => {
-  console.log("Error in RunTheTest: ", error);
-});
+RunTheTest();
+
+// mutation {
+//   delete_jobs(where: {shopid: {_eq: "a7ee1503-ee05-4a02-b80e-bdb11d1cc8ac"}}) {
+//     affected_rows
+//   }
+//   delete_owners(where: {shopid: {_eq: "a7ee1503-ee05-4a02-b80e-bdb11d1cc8ac"}}) {
+//     affected_rows
+//   }
+//   delete_vehicles(where: {shopid: {_eq: "a7ee1503-ee05-4a02-b80e-bdb11d1cc8ac"}}) {
+//     affected_rows
+//   }
+// }

package-lock.json

@@ -29,7 +29,6 @@
         "compression": "^1.7.5",
         "cookie-parser": "^1.4.7",
         "cors": "2.8.5",
-        "crisp-status-reporter": "^1.2.2",
         "csrf": "^3.1.0",
         "dinero.js": "^1.9.1",
         "dotenv": "^16.4.5",
@@ -41,7 +40,6 @@
         "intuit-oauth": "^4.1.3",
         "ioredis": "^5.4.1",
         "json-2-csv": "^5.5.6",
-        "juice": "^11.0.0",
         "lodash": "^4.17.21",
         "moment": "^2.30.1",
         "moment-timezone": "^0.5.46",
@@ -56,7 +54,7 @@
         "soap": "^1.1.6",
         "socket.io": "^4.8.1",
         "socket.io-adapter": "^2.5.5",
-        "ssh2-sftp-client": "^11.0.0",
+        "ssh2-sftp-client": "^10.0.3",
         "twilio": "^4.23.0",
         "uuid": "^10.0.0",
         "winston": "^3.17.0",
@@ -67,7 +65,6 @@
       "devDependencies": {
         "@trivago/prettier-plugin-sort-imports": "^4.3.0",
         "concurrently": "^8.2.2",
-        "p-limit": "^3.1.0",
         "prettier": "^3.3.3",
         "source-map-explorer": "^2.5.2"
       },
@@ -3360,15 +3357,6 @@
         "node": ">= 6.0.0"
       }
     },
-    "node_modules/ansi-colors": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -3937,15 +3925,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/commander": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
-      "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/component-emitter": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
@@ -4213,15 +4192,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/crisp-status-reporter": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/crisp-status-reporter/-/crisp-status-reporter-1.2.2.tgz",
-      "integrity": "sha512-uRkNJdeqaQLllEiTO7H1uAgz99TycbyuEwjookSsZCsPmz7Igvv2o/M4GOBcu8OF0+s0R9WbOBG2VzRBdDGTTQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
     "node_modules/cross-fetch": {
       "version": "3.1.8",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
@@ -4623,31 +4593,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/encoding-sniffer": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz",
-      "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==",
-      "license": "MIT",
-      "dependencies": {
-        "iconv-lite": "^0.6.3",
-        "whatwg-encoding": "^3.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/encoding-sniffer?sponsor=1"
-      }
-    },
-    "node_modules/encoding-sniffer/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -4734,18 +4679,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/escape-goat": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-3.0.0.tgz",
-      "integrity": "sha512-w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -6102,69 +6035,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/juice": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/juice/-/juice-11.0.0.tgz",
-      "integrity": "sha512-sGF8hPz9/Wg+YXbaNDqc1Iuoaw+J/P9lBHNQKXAGc9pPNjCd4fyPai0Zxj7MRtdjMr0lcgk5PjEIkP2b8R9F3w==",
-      "license": "MIT",
-      "dependencies": {
-        "cheerio": "^1.0.0",
-        "commander": "^12.1.0",
-        "mensch": "^0.3.4",
-        "slick": "^1.12.2",
-        "web-resource-inliner": "^7.0.0"
-      },
-      "bin": {
-        "juice": "bin/juice"
-      },
-      "engines": {
-        "node": ">=18.17"
-      }
-    },
-    "node_modules/juice/node_modules/cheerio": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz",
-      "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==",
-      "license": "MIT",
-      "dependencies": {
-        "cheerio-select": "^2.1.0",
-        "dom-serializer": "^2.0.0",
-        "domhandler": "^5.0.3",
-        "domutils": "^3.1.0",
-        "encoding-sniffer": "^0.2.0",
-        "htmlparser2": "^9.1.0",
-        "parse5": "^7.1.2",
-        "parse5-htmlparser2-tree-adapter": "^7.0.0",
-        "parse5-parser-stream": "^7.1.2",
-        "undici": "^6.19.5",
-        "whatwg-mimetype": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=18.17"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
-      }
-    },
-    "node_modules/juice/node_modules/htmlparser2": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
-      "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3",
-        "domutils": "^3.1.0",
-        "entities": "^4.5.0"
-      }
-    },
     "node_modules/jwa": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
@@ -6417,12 +6287,6 @@
         "cssom": "^0.5.0"
       }
     },
-    "node_modules/mensch": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/mensch/-/mensch-0.3.4.tgz",
-      "integrity": "sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==",
-      "license": "MIT"
-    },
     "node_modules/merge-descriptors": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
@@ -6833,8 +6697,8 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "devOptional": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -6905,18 +6769,6 @@
         "url": "https://github.com/inikulin/parse5?sponsor=1"
       }
     },
-    "node_modules/parse5-parser-stream": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz",
-      "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==",
-      "license": "MIT",
-      "dependencies": {
-        "parse5": "^7.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
-      }
-    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -7875,17 +7727,16 @@
       }
     },
     "node_modules/ssh2-sftp-client": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-11.0.0.tgz",
-      "integrity": "sha512-lOjgNYtioYquhtgyHwPryFNhllkuENjvCKkUXo18w/Q4UpEffCnEUBfiOTlwFdKIhG1rhrOGnA6DeKPSF2CP6w==",
-      "license": "Apache-2.0",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-10.0.3.tgz",
+      "integrity": "sha512-Wlhasz/OCgrlqC8IlBZhF19Uw/X/dHI8ug4sFQybPE+0sDztvgvDf7Om6o7LbRLe68E7XkFZf3qMnqAvqn1vkQ==",
       "dependencies": {
         "concat-stream": "^2.0.0",
         "promise-retry": "^2.0.1",
         "ssh2": "^1.15.0"
       },
       "engines": {
-        "node": ">=18.20.4"
+        "node": ">=16.20.2"
       },
       "funding": {
         "type": "individual",
@@ -8431,15 +8282,6 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/undici": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.0.tgz",
-      "integrity": "sha512-BUgJXc752Kou3oOIuU1i+yZZypyZRqNPW0vqoMPl8VaoalSfeR0D8/t4iAS3yirs79SSMTxTag+ZC86uswv+Cw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.17"
-      }
-    },
     "node_modules/undici-types": {
       "version": "6.19.8",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
@@ -8501,15 +8343,6 @@
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/valid-data-url": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/valid-data-url/-/valid-data-url-3.0.1.tgz",
-      "integrity": "sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -8534,131 +8367,6 @@
         "node": ">=6.0"
       }
     },
-    "node_modules/web-resource-inliner": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/web-resource-inliner/-/web-resource-inliner-7.0.0.tgz",
-      "integrity": "sha512-NlfnGF8MY9ZUwFjyq3vOUBx7KwF8bmE+ywR781SB0nWB6MoMxN4BA8gtgP1KGTZo/O/AyWJz7HZpR704eaj4mg==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-colors": "^4.1.1",
-        "escape-goat": "^3.0.0",
-        "htmlparser2": "^5.0.0",
-        "mime": "^2.4.6",
-        "valid-data-url": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/web-resource-inliner/node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "license": "MIT",
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/web-resource-inliner/node_modules/dom-serializer/node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/web-resource-inliner/node_modules/domhandler": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz",
-      "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "domelementtype": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/web-resource-inliner/node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/web-resource-inliner/node_modules/domutils/node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/web-resource-inliner/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "license": "BSD-2-Clause",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/web-resource-inliner/node_modules/htmlparser2": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-5.0.1.tgz",
-      "integrity": "sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==",
-      "license": "MIT",
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^3.3.0",
-        "domutils": "^2.4.2",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/htmlparser2?sponsor=1"
-      }
-    },
-    "node_modules/web-resource-inliner/node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "license": "MIT",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
@@ -8687,30 +8395,6 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/whatwg-encoding": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
-      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
-      "license": "MIT",
-      "dependencies": {
-        "iconv-lite": "0.6.3"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/whatwg-mimetype": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
@@ -8997,8 +8681,8 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "devOptional": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=10"
       },

package.json

@@ -39,7 +39,6 @@
     "compression": "^1.7.5",
     "cookie-parser": "^1.4.7",
     "cors": "2.8.5",
-    "crisp-status-reporter": "^1.2.2",
     "csrf": "^3.1.0",
     "dinero.js": "^1.9.1",
     "dotenv": "^16.4.5",
@@ -51,7 +50,6 @@
     "intuit-oauth": "^4.1.3",
     "ioredis": "^5.4.1",
     "json-2-csv": "^5.5.6",
-    "juice": "^11.0.0",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "moment-timezone": "^0.5.46",
@@ -66,7 +64,7 @@
     "soap": "^1.1.6",
     "socket.io": "^4.8.1",
     "socket.io-adapter": "^2.5.5",
-    "ssh2-sftp-client": "^11.0.0",
+    "ssh2-sftp-client": "^10.0.3",
     "twilio": "^4.23.0",
     "uuid": "^10.0.0",
     "winston": "^3.17.0",
@@ -77,7 +75,6 @@
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "concurrently": "^8.2.2",
-    "p-limit": "^3.1.0",
     "prettier": "^3.3.3",
     "source-map-explorer": "^2.5.2"
   }

server.js

@@ -22,10 +22,7 @@ const { applyIOHelpers } = require("./server/utils/ioHelpers");
 const { redisSocketEvents } = require("./server/web-sockets/redisSocketEvents");
 const { ElastiCacheClient, DescribeCacheClustersCommand } = require("@aws-sdk/client-elasticache");
 const { InstanceRegion } = require("./server/utils/instanceMgr");
-const StartStatusReporter = require("./server/utils/statusReporter");
 
-const cleanupTasks = [];
-let isShuttingDown = false;
 const CLUSTER_RETRY_BASE_DELAY = 100;
 const CLUSTER_RETRY_MAX_DELAY = 5000;
 const CLUSTER_RETRY_JITTER = 100;
@@ -300,15 +297,6 @@ const main = async () => {
   applyRoutes({ app });
   redisSocketEvents({ io: ioRedis, redisHelpers, ioHelpers, logger });
 
-  const StatusReporter = StartStatusReporter();
-  registerCleanupTask(async () => {
-    StatusReporter.end();
-  });
-
-  // Add SIGTERM signal handler
-  process.on("SIGTERM", handleSigterm);
-  process.on("SIGINT", handleSigterm); // Optional: Handle Ctrl+C
-
   try {
     await server.listen(port);
     logger.log(`Server started on port ${port}`, "INFO", "api");
@@ -326,33 +314,3 @@ main().catch((error) => {
   // Note: If we want the app to crash on all uncaught async operations, we would
   // need to put a `process.exit(1);` here
 });
-
-// Register a cleanup task
-function registerCleanupTask(task) {
-  cleanupTasks.push(task);
-}
-
-// SIGTERM handler
-async function handleSigterm() {
-  if (isShuttingDown) {
-    logger.log("sigterm-api", "WARN", null, null, { message: "Shutdown already in progress, ignoring signal." });
-    return;
-  }
-
-  isShuttingDown = true;
-
-  logger.log("sigterm-api", "WARN", null, null, { message: "SIGTERM Received. Starting graceful shutdown." });
-
-  try {
-    for (const task of cleanupTasks) {
-      logger.log("sigterm-api", "WARN", null, null, { message: `Running cleanup task: ${task.name}` });
-
-      await task();
-    }
-    logger.log("sigterm-api", "WARN", null, null, { message: `All cleanup tasks completed.` });
-  } catch (error) {
-    logger.log("sigterm-api-error", "ERROR", null, null, { message: error.message, stack: error.stack });
-  }
-
-  process.exit(0);
-}

server/accounting/qb-receivables-lines.js

@@ -548,61 +548,6 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
     }
   }
 
-  if (jobs_by_pk.job_totals.totals?.ttl_adjustment) {
-    // Do not need to check for ImEX or Rome because ImEX uses a different totals calculation that will never set this field.
-    if (qbo) {
-      const taxAccountCode = findTaxCode(
-        {
-          local: false,
-          federal: InstanceManager({ imex: true, rome: false }),
-          state: jobs_by_pk.tax_lbr_rt === 0 ? false : true
-        },
-        bodyshop.md_responsibility_centers.sales_tax_codes
-      );
-
-      const QboTaxId = InstanceManager({
-        imex: taxCodes[taxAccountCode],
-        rome: CheckQBOUSATaxID({
-          // jobline: jobline,
-          type: "adjustment",
-          job: jobs_by_pk
-        })
-      });
-
-      InvoiceLineAdd.push({
-        DetailType: "SalesItemLineDetail",
-        Amount: Dinero(jobs_by_pk.job_totals.totals?.ttl_adjustment).toFormat(DineroQbFormat),
-        SalesItemLineDetail: {
-          ...(jobs_by_pk.class ? { ClassRef: { value: classes[jobs_by_pk.class] } } : {}),
-          ItemRef: {
-            value: items[responsibilityCenters.ttl_adjustment?.accountitem]
-          },
-          TaxCodeRef: {
-            value: QboTaxId
-          },
-          Qty: 1
-        }
-      });
-    } else {
-      InvoiceLineAdd.push({
-        ItemRef: {
-          FullName: responsibilityCenters.ttl_adjustment?.accountitem
-        },
-        Desc: "Adjustment",
-        Quantity: 1,
-        Amount: Dinero(jobs_by_pk.job_totals.totals?.ttl_adjustment).toFormat(DineroQbFormat),
-        SalesTaxCodeRef: InstanceManager({
-          imex: {
-            FullName: "E"
-          },
-          rome: {
-            FullName: bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON"
-          }
-        })
-      });
-    }
-  }
-
   //Add tax lines
   const job_totals = jobs_by_pk.job_totals;
   const federal_tax = Dinero(job_totals.totals.federal_tax);
@@ -879,60 +824,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
       }
     }
   }
-  if (jobs_by_pk.job_totals.totals.ttl_tax_adjustment) {
-    // Do not need to check for ImEX or Rome because ImEX uses a different totals calculation that will never set this field.
-    if (qbo) {
-      const taxAccountCode = findTaxCode(
-        {
-          local: false,
-          federal: InstanceManager({ imex: true, rome: false }),
-          state: jobs_by_pk.tax_lbr_rt === 0 ? false : true
-        },
-        bodyshop.md_responsibility_centers.sales_tax_codes
-      );
 
-      const QboTaxId = InstanceManager({
-        imex: taxCodes[taxAccountCode],
-        rome: CheckQBOUSATaxID({
-          // jobline: jobline,
-          type: "adjustment",
-          job: jobs_by_pk
-        })
-      });
-
-      InvoiceLineAdd.push({
-        DetailType: "SalesItemLineDetail",
-        Amount: Dinero(jobs_by_pk.job_totals.totals?.ttl_tax_adjustment).toFormat(DineroQbFormat),
-        SalesItemLineDetail: {
-          ...(jobs_by_pk.class ? { ClassRef: { value: classes[jobs_by_pk.class] } } : {}),
-          ItemRef: {
-            value: items[responsibilityCenters.ttl_tax_adjustment?.accountitem]
-          },
-          TaxCodeRef: {
-            value: QboTaxId
-          },
-          Qty: 1
-        }
-      });
-    } else {
-      InvoiceLineAdd.push({
-        ItemRef: {
-          FullName: responsibilityCenters.ttl_tax_adjustment?.accountitem
-        },
-        Desc: "Tax Adjustment",
-        Quantity: 1,
-        Amount: Dinero(jobs_by_pk.job_totals.totals?.ttl_tax_adjustment).toFormat(DineroQbFormat),
-        SalesTaxCodeRef: InstanceManager({
-          imex: {
-            FullName: "E"
-          },
-          rome: {
-            FullName: bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON"
-          }
-        })
-      });
-    }
-  }
   if (!qbo && InvoiceLineAdd.length === 0) {
     //Handle the scenario where there is a $0 sale invoice.
     InvoiceLineAdd.push({

server/cdk/cdk-calculate-allocations.js

@@ -352,7 +352,6 @@ function calculateAllocations(connectionData, job) {
       //  console.log("NO MASH ACCOUNT FOUND!!");
     }
   }
-
   if (InstanceManager({ rome: true })) {
     //profile level adjustments for parts
     Object.keys(job.job_totals.parts.adjustments).forEach((key) => {
@@ -428,41 +427,6 @@ function calculateAllocations(connectionData, job) {
         } else {
           return { ...taxAllocations[key], tax: key };
         }
-      }),
-
-    ...(job.job_totals.totals.ttl_adjustment
-      ? [
-          {
-            center: "SUB ADJ",
-            sale: Dinero(job.job_totals.totals.ttl_adjustment),
-            cost: Dinero(),
-            profitCenter: {
-              name: "SUB ADJ",
-              accountdesc: "SUB ADJ",
-              accountitem: "SUB ADJ",
-              accountname: "SUB ADJ",
-              dms_acctnumber: bodyshop.md_responsibility_centers.ttl_adjustment.dms_acctnumber
-            },
-            costCenter: {}
-          }
-        ]
-      : []),
-    ...(job.job_totals.totals.ttl_tax_adjustment
-      ? [
-          {
-            center: "TAX ADJ",
-            sale: Dinero(job.job_totals.totals.ttl_tax_adjustment),
-            cost: Dinero(),
-            profitCenter: {
-              name: "TAX ADJ",
-              accountdesc: "TAX ADJ",
-              accountitem: "TAX ADJ",
-              accountname: "TAX ADJ",
-              dms_acctnumber: bodyshop.md_responsibility_centers.ttl_tax_adjustment.dms_acctnumber
-            },
-            costCenter: {}
-          }
-        ]
-      : [])
+      })
   ];
 }

server/data/autohouse.js

@@ -25,15 +25,15 @@ const ftpSetup = {
   port: process.env.AUTOHOUSE_PORT,
   username: process.env.AUTOHOUSE_USER,
   password: process.env.AUTOHOUSE_PASSWORD,
-  debug:
-    process.env.NODE_ENV !== "production"
-      ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
-      : () => {},
+  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
   algorithms: {
     serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
   }
 };
 
+const allxmlsToUpload = [];
+const allErrors = [];
+
 exports.default = async (req, res) => {
   // Only process if in production environment.
   if (process.env.NODE_ENV !== "production") {
@@ -55,13 +55,12 @@ exports.default = async (req, res) => {
 
   try {
     logger.log("autohouse-start", "DEBUG", "api", null, null);
-    const allXMLResults = [];
-    const allErrors = [];
-
     const { bodyshops } = await client.request(queries.GET_AUTOHOUSE_SHOPS); //Query for the List of Bodyshop Clients.
     const specificShopIds = req.body.bodyshopIds; // ['uuid];
     const { start, end, skipUpload } = req.body; //YYYY-MM-DD
 
+    const batchSize = 10;
+
     const shopsToProcess =
       specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
     logger.log("autohouse-shopsToProcess-generated", "DEBUG", "api", null, null);
@@ -70,18 +69,27 @@ exports.default = async (req, res) => {
       logger.log("autohouse-shopsToProcess-empty", "DEBUG", "api", null, null);
       return;
     }
+    const batchPromises = [];
+    for (let i = 0; i < shopsToProcess.length; i += batchSize) {
+      const batch = shopsToProcess.slice(i, i + batchSize);
+      const batchPromise = (async () => {
+        await processBatch(batch, start, end);
 
-    await processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors);
-
+        if (skipUpload) {
+          for (const xmlObj of allxmlsToUpload) {
+            fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
+          }
+        } else {
+          await uploadViaSFTP(allxmlsToUpload);
+        }
+      })();
+      batchPromises.push(batchPromise);
+    }
+    await Promise.all(batchPromises);
     await sendServerEmail({
       subject: `Autohouse Report ${moment().format("MM-DD-YY")}`,
       text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
-        allXMLResults.map((x) => ({
-          imexshopid: x.imexshopid,
-          filename: x.filename,
-          count: x.count,
-          result: x.result
-        })),
+        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count, result: x.result })),
         null,
         2
       )}`
@@ -93,8 +101,8 @@ exports.default = async (req, res) => {
   }
 };
 
-async function processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors) {
-  for (const bodyshop of shopsToProcess) {
+async function processBatch(batch, start, end) {
+  for (const bodyshop of batch) {
     const erroredJobs = [];
     try {
       logger.log("autohouse-start-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -124,27 +132,12 @@ async function processShopData(shopsToProcess, start, end, skipUpload, allXMLRes
         });
       }
 
-      const xmlObj = {
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        xml: builder.create({}, autoHouseObject).end({ allowEmptyTags: true }),
-        filename: `IM_${bodyshop.autohouseid}_${moment().format("DDMMYYYY_HHMMss")}.xml`,
-        count: autoHouseObject.AutoHouseExport.RepairOrder.length
-      };
+      const ret = builder.create({}, autoHouseObject).end({ allowEmptyTags: true });
 
-      if (skipUpload) {
-        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
-      } else {
-        await uploadViaSFTP(xmlObj);
-      }
-
-      allXMLResults.push({
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        autohouseid: bodyshop.autohouseid,
-        count: xmlObj.count,
-        filename: xmlObj.filename,
-        result: xmlObj.result
+      allxmlsToUpload.push({
+        count: autoHouseObject.AutoHouseExport.RepairOrder.length,
+        xml: ret,
+        filename: `IM_${bodyshop.autohouseid}_${moment().format("DDMMYYYY_HHMMss")}.xml`
       });
 
       logger.log("autohouse-end-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -176,35 +169,33 @@ async function processShopData(shopsToProcess, start, end, skipUpload, allXMLRes
   }
 }
 
-async function uploadViaSFTP(xmlObj) {
+async function uploadViaSFTP(allxmlsToUpload) {
   const sftp = new Client();
   sftp.on("error", (errors) =>
-    logger.log("autohouse-sftp-connection-error", "ERROR", "api", xmlObj.bodyshopid, {
-      error: errors.message,
-      stack: errors.stack
-    })
+    logger.log("autohouse-sftp-connection-error", "ERROR", "api", null, { error: errors.message, stack: errors.stack })
   );
   try {
     //Connect to the FTP and upload all.
     await sftp.connect(ftpSetup);
 
-    try {
-      xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
-      logger.log("autohouse-sftp-upload", "DEBUG", "api", xmlObj.bodyshopid, {
-        imexshopid: xmlObj.imexshopid,
-        filename: xmlObj.filename,
-        result: xmlObj.result
-      });
-    } catch (error) {
-      logger.log("autohouse-sftp-upload-error", "ERROR", "api", xmlObj.bodyshopid, {
-        filename: xmlObj.filename,
-        error: error.message,
-        stack: error.stack
-      });
-      throw error;
+    for (const xmlObj of allxmlsToUpload) {
+      try {
+        xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
+        logger.log("autohouse-sftp-upload", "DEBUG", "api", null, {
+          filename: xmlObj.filename,
+          result: xmlObj.result
+        });
+      } catch (error) {
+        logger.log("autohouse-sftp-upload-error", "ERROR", "api", null, {
+          filename: xmlObj.filename,
+          error: error.message,
+          stack: error.stack
+        });
+        throw error;
+      }
     }
   } catch (error) {
-    logger.log("autohouse-sftp-error", "ERROR", "api", xmlObj.bodyshopid, { error: error.message, stack: error.stack });
+    logger.log("autohouse-sftp-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
     throw error;
   } finally {
     sftp.end();

server/data/chatter.js

@@ -17,15 +17,15 @@ const ftpSetup = {
   port: process.env.CHATTER_PORT,
   username: process.env.CHATTER_USER,
   privateKey: null,
-  debug:
-    process.env.NODE_ENV !== "production"
-      ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
-      : () => {},
+  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
   algorithms: {
     serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
   }
 };
 
+const allcsvsToUpload = [];
+const allErrors = [];
+
 exports.default = async (req, res) => {
   // Only process if in production environment.
   if (process.env.NODE_ENV !== "production") {
@@ -47,13 +47,12 @@ exports.default = async (req, res) => {
 
   try {
     logger.log("chatter-start", "DEBUG", "api", null, null);
-    const allChatterObjects = [];
-    const allErrors = [];
-
     const { bodyshops } = await client.request(queries.GET_CHATTER_SHOPS); //Query for the List of Bodyshop Clients.
     const specificShopIds = req.body.bodyshopIds; // ['uuid];
     const { start, end, skipUpload } = req.body; //YYYY-MM-DD
 
+    const batchSize = 10;
+
     const shopsToProcess =
       specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
     logger.log("chatter-shopsToProcess-generated", "DEBUG", "api", null, null);
@@ -63,24 +62,29 @@ exports.default = async (req, res) => {
       return;
     }
 
-    await processBatch(shopsToProcess, start, end, allChatterObjects, allErrors);
-
-    const csvToUpload = {
-      count: allChatterObjects.length,
-      csv: converter.json2csv(allChatterObjects, { emptyFieldValue: "" }),
-      filename: `IMEX_ONLINE_solicitation_${moment().format("YYYYMMDD")}.csv`
-    };
-
-    if (skipUpload) {
-      await fs.promises.writeFile(`./logs/${csvToUpload.filename}`, csvToUpload.csv);
-    } else {
-      await uploadViaSFTP(csvToUpload);
+    const batchPromises = [];
+    for (let i = 0; i < shopsToProcess.length; i += batchSize) {
+      const batch = shopsToProcess.slice(i, i + batchSize);
+      const batchPromise = (async () => {
+        await processBatch(batch, start, end);
+        if (skipUpload) {
+          for (const csvObj of allcsvsToUpload) {
+            await fs.promises.writeFile(`./logs/${csvObj.filename}`, csvObj.csv);
+          }
+        } else {
+          await uploadViaSFTP(allcsvsToUpload);
+        }
+      })();
+      batchPromises.push(batchPromise);
     }
-
+    await Promise.all(batchPromises);
     await sendServerEmail({
       subject: `Chatter Report ${moment().format("MM-DD-YY")}`,
-      text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\n
-      Uploaded:\n${JSON.stringify({ filename: csvToUpload.filename, count: csvToUpload.count, result: csvToUpload.result }, null, 2)}`
+      text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
+        allcsvsToUpload.map((x) => ({ filename: x.filename, count: x.count, result: x.result })),
+        null,
+        2
+      )}`
     });
 
     logger.log("chatter-end", "DEBUG", "api", null, null);
@@ -89,8 +93,8 @@ exports.default = async (req, res) => {
   }
 };
 
-async function processBatch(shopsToProcess, start, end, allChatterObjects, allErrors) {
-  for (const bodyshop of shopsToProcess) {
+async function processBatch(batch, start, end) {
+  for (const bodyshop of batch) {
     try {
       logger.log("chatter-start-shop-extract", "DEBUG", "api", bodyshop.id, {
         shopname: bodyshop.shopname
@@ -109,11 +113,18 @@ async function processBatch(shopsToProcess, start, end, allChatterObjects, allEr
           lastname: j.ownr_co_nm ? j.ownr_co_nm : j.ownr_ln,
           transaction_id: j.ro_number,
           email: j.ownr_ea,
-          phone_number: j.ownr_ph1,
-          transaction_time: (j.actual_delivery && moment(j.actual_delivery).tz(bodyshop.timezone).format("YYYYMMDD-HHmm")) || ""
+          phone_number: j.ownr_ph1
         };
       });
-      allChatterObjects.push(...chatterObject);
+
+      const ret = converter.json2csv(chatterObject, { emptyFieldValue: "" });
+
+      allcsvsToUpload.push({
+        count: chatterObject.length,
+        csv: ret,
+        filename: `${bodyshop.shopname}_solicitation_${moment().format("YYYYMMDD")}.csv`
+      });
+
       logger.log("chatter-end-shop-extract", "DEBUG", "api", bodyshop.id, {
         shopname: bodyshop.shopname
       });
@@ -155,7 +166,7 @@ async function getPrivateKey() {
   }
 }
 
-async function uploadViaSFTP(csvToUpload) {
+async function uploadViaSFTP(allcsvsToUpload) {
   const sftp = new Client();
   sftp.on("error", (errors) =>
     logger.log("chatter-sftp-connection-error", "ERROR", "api", null, { error: errors.message, stack: errors.stack })
@@ -167,19 +178,21 @@ async function uploadViaSFTP(csvToUpload) {
     //Connect to the FTP and upload all.
     await sftp.connect({ ...ftpSetup, privateKey });
 
-    try {
-      csvToUpload.result = await sftp.put(Buffer.from(csvToUpload.csv), `${csvToUpload.filename}`);
-      logger.log("chatter-sftp-upload", "DEBUG", "api", null, {
-        filename: csvToUpload.filename,
-        result: csvToUpload.result
-      });
-    } catch (error) {
-      logger.log("chatter-sftp-upload-error", "ERROR", "api", null, {
-        filename: csvToUpload.filename,
-        error: csvToUpload.message,
-        stack: csvToUpload.stack
-      });
-      throw error;
+    for (const csvObj of allcsvsToUpload) {
+      try {
+        csvObj.result = await sftp.put(Buffer.from(csvObj.csv), `${csvObj.filename}`);
+        logger.log("chatter-sftp-upload", "DEBUG", "api", null, {
+          filename: csvObj.filename,
+          result: csvObj.result
+        });
+      } catch (error) {
+        logger.log("chatter-sftp-upload-error", "ERROR", "api", null, {
+          filename: csvObj.filename,
+          error: error.message,
+          stack: error.stack
+        });
+        throw error;
+      }
     }
   } catch (error) {
     logger.log("chatter-sftp-error", "ERROR", "api", null, { error: error.message, stack: error.stack });

server/data/claimscorp.js

@@ -24,15 +24,15 @@ const ftpSetup = {
   port: process.env.CLAIMSCORP_PORT,
   username: process.env.CLAIMSCORP_USER,
   password: process.env.CLAIMSCORP_PASSWORD,
-  debug:
-    process.env.NODE_ENV !== "production"
-      ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
-      : () => {},
+  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
   algorithms: {
     serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
   }
 };
 
+const allxmlsToUpload = [];
+const allErrors = [];
+
 exports.default = async (req, res) => {
   // Only process if in production environment.
   if (process.env.NODE_ENV !== "production") {
@@ -54,13 +54,12 @@ exports.default = async (req, res) => {
 
   try {
     logger.log("claimscorp-start", "DEBUG", "api", null, null);
-    const allXMLResults = [];
-    const allErrors = [];
-
     const { bodyshops } = await client.request(queries.GET_CLAIMSCORP_SHOPS); //Query for the List of Bodyshop Clients.
     const specificShopIds = req.body.bodyshopIds; // ['uuid];
     const { start, end, skipUpload } = req.body; //YYYY-MM-DD
 
+    const batchSize = 10;
+
     const shopsToProcess =
       specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
     logger.log("claimscorp-shopsToProcess-generated", "DEBUG", "api", null, null);
@@ -69,18 +68,27 @@ exports.default = async (req, res) => {
       logger.log("claimscorp-shopsToProcess-empty", "DEBUG", "api", null, null);
       return;
     }
+    const batchPromises = [];
+    for (let i = 0; i < shopsToProcess.length; i += batchSize) {
+      const batch = shopsToProcess.slice(i, i + batchSize);
+      const batchPromise = (async () => {
+        await processBatch(batch, start, end);
 
-    await processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors);
-
+        if (skipUpload) {
+          for (const xmlObj of allxmlsToUpload) {
+            fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
+          }
+        } else {
+          await uploadViaSFTP(allxmlsToUpload);
+        }
+      })();
+      batchPromises.push(batchPromise);
+    }
+    await Promise.all(batchPromises);
     await sendServerEmail({
       subject: `ClaimsCorp Report ${moment().format("MM-DD-YY")}`,
       text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
-        allXMLResults.map((x) => ({
-          imexshopid: x.imexshopid,
-          filename: x.filename,
-          count: x.count,
-          result: x.result
-        })),
+        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count, result: x.result })),
         null,
         2
       )}`
@@ -92,8 +100,8 @@ exports.default = async (req, res) => {
   }
 };
 
-async function processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors) {
-  for (const bodyshop of shopsToProcess) {
+async function processBatch(batch, start, end) {
+  for (const bodyshop of batch) {
     const erroredJobs = [];
     try {
       logger.log("claimscorp-start-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -127,27 +135,12 @@ async function processShopData(shopsToProcess, start, end, skipUpload, allXMLRes
         });
       }
 
-      const xmlObj = {
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        xml: builder.create({}, claimsCorpObject).end({ allowEmptyTags: true }),
-        filename: `${bodyshop.claimscorpid}-${moment().format("YYYYMMDDTHHMMss")}.xml`,
-        count: claimsCorpObject.DataFeed.ShopInfo.RO.length
-      };
+      const ret = builder.create({}, claimsCorpObject).end({ allowEmptyTags: true });
 
-      if (skipUpload) {
-        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
-      } else {
-        await uploadViaSFTP(xmlObj);
-      }
-
-      allXMLResults.push({
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        claimscorpid: bodyshop.claimscorpid,
-        count: xmlObj.count,
-        filename: xmlObj.filename,
-        result: xmlObj.result
+      allxmlsToUpload.push({
+        count: claimsCorpObject.DataFeed.ShopInfo.RO.length,
+        xml: ret,
+        filename: `${bodyshop.claimscorpid}-${moment().format("YYYYMMDDTHHMMss")}.xml`
       });
 
       logger.log("claimscorp-end-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -179,38 +172,33 @@ async function processShopData(shopsToProcess, start, end, skipUpload, allXMLRes
   }
 }
 
-async function uploadViaSFTP(xmlObj) {
+async function uploadViaSFTP(allxmlsToUpload) {
   const sftp = new Client();
   sftp.on("error", (errors) =>
-    logger.log("claimscorp-sftp-connection-error", "ERROR", "api", xmlObj.bodyshopid, {
-      error: errors.message,
-      stack: errors.stack
-    })
+    logger.log("claimscorp-sftp-connection-error", "ERROR", "api", null, { error: errors.message, stack: errors.stack })
   );
   try {
     //Connect to the FTP and upload all.
     await sftp.connect(ftpSetup);
 
-    try {
-      xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
-      logger.log("claimscorp-sftp-upload", "DEBUG", "api", xmlObj.bodyshopid, {
-        imexshopid: xmlObj.imexshopid,
-        filename: xmlObj.filename,
-        result: xmlObj.result
-      });
-    } catch (error) {
-      logger.log("claimscorp-sftp-upload-error", "ERROR", "api", xmlObj.bodyshopid, {
-        filename: xmlObj.filename,
-        error: error.message,
-        stack: error.stack
-      });
-      throw error;
+    for (const xmlObj of allxmlsToUpload) {
+      try {
+        xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
+        logger.log("claimscorp-sftp-upload", "DEBUG", "api", null, {
+          filename: xmlObj.filename,
+          result: xmlObj.result
+        });
+      } catch (error) {
+        logger.log("claimscorp-sftp-upload-error", "ERROR", "api", null, {
+          filename: xmlObj.filename,
+          error: error.message,
+          stack: error.stack
+        });
+        throw error;
+      }
     }
   } catch (error) {
-    logger.log("claimscorp-sftp-error", "ERROR", "api", xmlObj.bodyshopid, {
-      error: error.message,
-      stack: error.stack
-    });
+    logger.log("claimscorp-sftp-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
     throw error;
   } finally {
     sftp.end();

server/data/kaizen.js

@@ -23,15 +23,15 @@ const ftpSetup = {
   port: process.env.KAIZEN_PORT,
   username: process.env.KAIZEN_USER,
   password: process.env.KAIZEN_PASSWORD,
-  debug:
-    process.env.NODE_ENV !== "production"
-      ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
-      : () => {},
+  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
   algorithms: {
     serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
   }
 };
 
+const allxmlsToUpload = [];
+const allErrors = [];
+
 exports.default = async (req, res) => {
   // Only process if in production environment.
   if (process.env.NODE_ENV !== "production") {
@@ -53,13 +53,12 @@ exports.default = async (req, res) => {
 
   try {
     logger.log("kaizen-start", "DEBUG", "api", null, null);
-    const allXMLResults = [];
-    const allErrors = [];
-
     const { bodyshops } = await client.request(queries.GET_KAIZEN_SHOPS, { imexshopid: kaizenShopsIDs }); //Query for the List of Bodyshop Clients.
     const specificShopIds = req.body.bodyshopIds; // ['uuid];
     const { start, end, skipUpload } = req.body; //YYYY-MM-DD
 
+    const batchSize = 10;
+
     const shopsToProcess =
       specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
     logger.log("kaizen-shopsToProcess-generated", "DEBUG", "api", null, null);
@@ -68,18 +67,27 @@ exports.default = async (req, res) => {
       logger.log("kaizen-shopsToProcess-empty", "DEBUG", "api", null, null);
       return;
     }
+    const batchPromises = [];
+    for (let i = 0; i < shopsToProcess.length; i += batchSize) {
+      const batch = shopsToProcess.slice(i, i + batchSize);
+      const batchPromise = (async () => {
+        await processBatch(batch, start, end);
 
-    await processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors);
-
+        if (skipUpload) {
+          for (const xmlObj of allxmlsToUpload) {
+            fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
+          }
+        } else {
+          await uploadViaSFTP(allxmlsToUpload);
+        }
+      })();
+      batchPromises.push(batchPromise);
+    }
+    await Promise.all(batchPromises);
     await sendServerEmail({
       subject: `Kaizen Report ${moment().format("MM-DD-YY")}`,
       text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
-        allXMLResults.map((x) => ({
-          imexshopid: x.imexshopid,
-          filename: x.filename,
-          count: x.count,
-          result: x.result
-        })),
+        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count, result: x.result })),
         null,
         2
       )}`
@@ -91,8 +99,8 @@ exports.default = async (req, res) => {
   }
 };
 
-async function processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors) {
-  for (const bodyshop of shopsToProcess) {
+async function processBatch(batch, start, end) {
+  for (const bodyshop of batch) {
     const erroredJobs = [];
     try {
       logger.log("kaizen-start-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -125,26 +133,12 @@ async function processShopData(shopsToProcess, start, end, skipUpload, allXMLRes
         });
       }
 
-      const xmlObj = {
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        xml: builder.create({}, kaizenObject).end({ allowEmptyTags: true }),
-        filename: `${bodyshop.shopname}-${moment().format("YYYYMMDDTHHMMss")}.xml`,
-        count: kaizenObject.DataFeed.ShopInfo.Jobs.length
-      };
+      const ret = builder.create({}, kaizenObject).end({ allowEmptyTags: true });
 
-      if (skipUpload) {
-        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
-      } else {
-        await uploadViaSFTP(xmlObj);
-      }
-
-      allXMLResults.push({
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        count: xmlObj.count,
-        filename: xmlObj.filename,
-        result: xmlObj.result
+      allxmlsToUpload.push({
+        count: kaizenObject.DataFeed.ShopInfo.Jobs.length,
+        xml: ret,
+        filename: `${bodyshop.shopname}-${moment().format("YYYYMMDDTHHMMss")}.xml`
       });
 
       logger.log("kaizen-end-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -176,35 +170,33 @@ async function processShopData(shopsToProcess, start, end, skipUpload, allXMLRes
   }
 }
 
-async function uploadViaSFTP(xmlObj) {
+async function uploadViaSFTP(allxmlsToUpload) {
   const sftp = new Client();
   sftp.on("error", (errors) =>
-    logger.log("kaizen-sftp-connection-error", "ERROR", "api", xmlObj.bodyshopid, {
-      error: errors.message,
-      stack: errors.stack
-    })
+    logger.log("kaizen-sftp-connection-error", "ERROR", "api", null, { error: errors.message, stack: errors.stack })
   );
   try {
     //Connect to the FTP and upload all.
     await sftp.connect(ftpSetup);
 
-    try {
-      xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
-      logger.log("kaizen-sftp-upload", "DEBUG", "api", xmlObj.bodyshopid, {
-        imexshopid: xmlObj.imexshopid,
-        filename: xmlObj.filename,
-        result: xmlObj.result
-      });
-    } catch (error) {
-      logger.log("kaizen-sftp-upload-error", "ERROR", "api", xmlObj.bodyshopid, {
-        filename: xmlObj.filename,
-        error: error.message,
-        stack: error.stack
-      });
-      throw error;
+    for (const xmlObj of allxmlsToUpload) {
+      try {
+        xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
+        logger.log("kaizen-sftp-upload", "DEBUG", "api", null, {
+          filename: xmlObj.filename,
+          result: xmlObj.result
+        });
+      } catch (error) {
+        logger.log("kaizen-sftp-upload-error", "ERROR", "api", null, {
+          filename: xmlObj.filename,
+          error: error.message,
+          stack: error.stack
+        });
+        throw error;
+      }
     }
   } catch (error) {
-    logger.log("kaizen-sftp-error", "ERROR", "api", xmlObj.bodyshopid, { error: error.message, stack: error.stack });
+    logger.log("kaizen-sftp-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
     throw error;
   } finally {
     sftp.end();

server/firebase/firebase-handler.js

@@ -253,7 +253,7 @@ const sendNotification = async (req, res) => {
     admin
       .messaging()
       .send({
-        topic: req.body.topic,
+        topic: "PRD_PATRICK-messaging",
         notification: {
           title: `ImEX Online Message - `,
           body: "Test Noti."

server/graphql-client/queries.js

@@ -4,7 +4,6 @@ query FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID($mssid: String!, $phone: String!) {
       id
       conversations(where: { phone_num: { _eq: $phone } }) {
         id
-        created_at
       }
     }
   }`;
@@ -98,7 +97,7 @@ mutation RECEIVE_MESSAGE($msg: [messages_insert_input!]!) {
             ownr_co_nm
           }
         }
-        messages_aggregate (where: { read: { _eq: false }, isoutbound: { _eq: false } }){
+        messages_aggregate {
           aggregate {
             count
           }
@@ -132,7 +131,6 @@ mutation INSERT_MESSAGE($msg: [messages_insert_input!]!, $conversationid: uuid!)
         id
         archived
         bodyshop {
-          id
           imexshopid
         }
         created_at
@@ -161,11 +159,6 @@ mutation UPDATE_MESSAGE($msid: String!, $fields: messages_set_input!) {
     update_messages(where: { msid: { _eq: $msid } }, _set: $fields) {
       returning {
         id
-        status
-        conversationid
-        conversation{
-        bodyshopid
-        }
       }
     }
   }`;
@@ -862,7 +855,6 @@ exports.CHATTER_QUERY = `query CHATTER_EXPORT($start: timestamptz, $bodyshopid:
     timezone
   }
   jobs(where: {_and: [{converted: {_eq: true}}, {actual_delivery: {_gt: $start}}, {actual_delivery: {_lte: $end}}, {shopid: {_eq: $bodyshopid}}, {_or: [{ownr_ph1: {_is_null: false}}, {ownr_ea: {_is_null: false}}]}]}) {
-    actual_delivery
     id
     created_at
     ro_number
@@ -1388,7 +1380,6 @@ exports.GET_JOB_BY_PK = `query GET_JOB_BY_PK($id: uuid!) {
       cieca_pfl
       cieca_pft
       cieca_pfo
-      cieca_ttl
       vehicle {
         id
         notes
@@ -1518,8 +1509,7 @@ exports.GET_JOB_BY_PK = `query GET_JOB_BY_PK($id: uuid!) {
   }`;
 //TODO:AIO The above query used to have parts order lines in it. Validate that this doesn't need it.
 
-exports.QUERY_JOB_COSTING_DETAILS = `
-query QUERY_JOB_COSTING_DETAILS($id: uuid!) {
+exports.QUERY_JOB_COSTING_DETAILS = ` query QUERY_JOB_COSTING_DETAILS($id: uuid!) {
     jobs_by_pk(id: $id) {
       ro_number
       clm_total
@@ -2570,27 +2560,51 @@ exports.GET_JOBS_BY_PKS = `query GET_JOBS_BY_PKS($ids: [uuid!]!) {
 }
 `;
 
+exports.GET_CONVERSATIONS = `query GET_CONVERSATIONS($bodyshopId: uuid!) {
+  conversations(
+    where: { bodyshopid: { _eq: $bodyshopId }, archived: { _eq: false } },
+    order_by: { updated_at: desc },
+    limit: 50
+  ) {
+    phone_num
+    id
+    updated_at
+    unreadcnt
+    archived
+    label
+    messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
+      aggregate {
+        count
+      }
+    }
+    job_conversations {
+      job {
+        id
+        ro_number
+        ownr_fn
+        ownr_ln
+        ownr_co_nm
+      }
+    }
+  }
+}
+`;
+
 exports.MARK_MESSAGES_AS_READ = `mutation MARK_MESSAGES_AS_READ($conversationId: uuid!) {
   update_messages(where: { conversationid: { _eq: $conversationId } }, _set: { read: true }) {
-      returning {
-      id
-    }
     affected_rows
   }
 }
 `;
 
-exports.CREATE_CONVERSATION = `mutation CREATE_CONVERSATION($conversation: [conversations_insert_input!]!) {
-  insert_conversations(objects: $conversation) {
-    returning {
+exports.GET_CONVERSATION_DETAILS = `
+  query GET_CONVERSATION_DETAILS($conversationId: uuid!) {
+    conversation: conversations_by_pk(id: $conversationId) {
       id
       phone_num
-      archived
+      updated_at
       label
-      unreadcnt
       job_conversations {
-        jobid
-        conversationid
         job {
           id
           ro_number
@@ -2599,14 +2613,15 @@ exports.CREATE_CONVERSATION = `mutation CREATE_CONVERSATION($conversation: [conv
           ownr_co_nm
         }
       }
-      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
-        aggregate {
-          count
-        }
-      }
+    }
+    messages: messages(where: { conversationid: { _eq: $conversationId } }, order_by: { created_at: asc }) {
+      id
+      text
       created_at
-      updated_at
+      read
+      isoutbound
+      userid
+      image_path
     }
   }
-}
 `;

server/intellipay/intellipay.js

@@ -149,58 +149,6 @@ exports.generate_payment_url = async (req, res) => {
   }
 };
 
-//Reference: https://intellipay.com/dist/webapi26.html#operation/fee
-exports.checkfee = async (req, res) => {
-  // Requires amount, bodyshop.imexshopid, and state? to get data.
-  logger.log("intellipay-fee-check", "DEBUG", req.user?.email, null, null);
-
-  //If there's no amount, there can't be a fee. Skip the call.
-  if (!req.body.amount || req.body.amount <= 0) {
-    res.json({ fee: 0 });
-    return;
-  }
-
-  const shopCredentials = await getShopCredentials(req.body.bodyshop);
-
-  try {
-    const options = {
-      method: "POST",
-      headers: { "content-type": "application/x-www-form-urlencoded" },
-      //TODO: Move these to environment variables/database.
-      data: qs.stringify(
-        {
-          method: "fee",
-          ...shopCredentials,
-          amount: req.body.amount,
-          paymenttype: `CC`,
-          cardnum: "4111111111111111", //Not needed per documentation, but incorrect values come back without it.
-          state:
-            req.body.bodyshop?.state && req.body.bodyshop.state?.length === 2
-              ? req.body.bodyshop.state.toUpperCase()
-              : "ZZ" //Same as above
-        },
-        { sort: false } //ColdFusion Query Strings depend on order. This preserves it.
-      ),
-      url: `https://${domain}.cpteller.com/api/26/webapi.cfc`
-    };
-
-    const response = await axios(options);
-    if (response.data?.error) {
-      res.status(400).json({ error: response.data.error });
-    } else if (response.data < 0) {
-      res.json({ error: "Fee amount negative. Check API credentials & account configuration." });
-    } else {
-      res.json({ fee: response.data });
-    }
-  } catch (error) {
-    //console.log(error);
-    logger.log("intellipay-fee-check-error", "ERROR", req.user?.email, null, {
-      error: error.message
-    });
-    res.status(400).json({ error });
-  }
-};
-
 exports.postback = async (req, res) => {
   try {
     logger.log("intellipay-postback", "DEBUG", req.user?.email, null, req.body);

server/job/job-costing.js

@@ -849,41 +849,6 @@ function GenerateCostingData(job) {
       gppercent: formatGpPercent(0)
     });
   }
-  //Push adjustments to bottom line.
-  if (job.job_totals?.totals?.ttl_adjustment) {
-    //Add to totals.
-    const Adjustment = Dinero(job.job_totals.totals.ttl_adjustment); //Need to invert, since this is being assigned as a cost.
-    summaryData.totalAdditionalSales = summaryData.totalAdditionalSales.add(Adjustment);
-    summaryData.totalSales = summaryData.totalSales.add(Adjustment);
-    //Add to lines.
-    costCenterData.push({
-      id: "AdjEst",
-      cost_center: "Adjustment (Est. Match)",
-      sale_labor: Dinero().toFormat(),
-      sale_labor_dinero: Dinero(),
-      sale_parts: Dinero().toFormat(),
-      sale_parts_dinero: Dinero(),
-      sale_additional: Adjustment.toFormat(),
-      sale_additional_dinero: Adjustment,
-      sale_sublet: Dinero(),
-      sale_sublet_dinero: Dinero(),
-      sales: Adjustment.toFormat(),
-      sales_dinero: Adjustment,
-      cost_parts: Dinero().toFormat(),
-      cost_parts_dinero: Dinero(),
-      cost_labor: Dinero().toFormat(), //Adjustment.toFormat(),
-      cost_labor_dinero: Dinero(), // Adjustment,
-      cost_additional: Dinero(),
-      cost_additional_dinero: Dinero(),
-      cost_sublet: Dinero(),
-      cost_sublet_dinero: Dinero(),
-      costs: Dinero().toFormat(),
-      costs_dinero: Dinero(),
-      gpdollars_dinero: Dinero(),
-      gpdollars: Dinero().toFormat(),
-      gppercent: formatGpPercent(0)
-    });
-  }
 
   //Final summary data massaging.
 

server/job/job-totals-USA.js

@@ -49,7 +49,7 @@ exports.totalsSsu = async function (req, res) {
   } catch (error) {
     logger.log("job-totals-ssu-USA-error", "ERROR", req?.user?.email, id, {
       jobid: id,
-      error: error.message
+      error
     });
     res.status(503).send();
   }
@@ -68,54 +68,6 @@ async function TotalsServerSide(req, res) {
     ret.additional = CalculateAdditional(job);
     ret.totals = CalculateTaxesTotals(job, ret);
 
-    // Sub total scrubbbing.
-    const emsTotal =
-      job.cieca_ttl.data.n_ttl_amt === job.cieca_ttl.data.g_ttl_amt //It looks like sometimes, gross and net are the same, but they shouldn't be.
-        ? job.cieca_ttl.data.n_ttl_amt - job.cieca_ttl.data.g_tax
-        : job.cieca_ttl.data.g_ttl_amt - job.cieca_ttl.data.g_tax; //If they are, adjust the gross total down by the tax amount.
-    const ttlDifference =
-      emsTotal -
-      ret.totals.subtotal
-        .add(
-          Dinero({
-            amount: Math.round((job.adjustment_bottom_line || 0) * 100)
-          }).multiply(-1) //Add back in the adjustment to the subtotal. We don't want to scrub it twice.
-        )
-        .getAmount() /
-        100;
-
-    if (Math.abs(ttlDifference) > 0.0) {
-      //If difference is greater than a pennny, we need to adjust it.
-      ret.totals.ttl_adjustment = Dinero({ amount: Math.round(ttlDifference * 100) });
-      ret.totals.subtotal = ret.totals.subtotal.add(ret.totals.ttl_adjustment);
-      ret.totals.total_repairs = ret.totals.total_repairs.add(ret.totals.ttl_adjustment);
-      ret.totals.net_repairs = ret.totals.net_repairs.add(ret.totals.ttl_adjustment);
-      logger.log("job-totals-USA-ttl-adj", "DEBUG", null, job.id, {
-        adjAmount: ttlDifference
-      });
-    }
-
-    //Taxes Scrubbing
-    const emsTaxTotal = job.cieca_ttl.data.g_tax;
-    const totalUsTaxes =
-      (ret.totals.us_sales_tax_breakdown.ty1Tax.getAmount() +
-        ret.totals.us_sales_tax_breakdown.ty2Tax.getAmount() +
-        ret.totals.us_sales_tax_breakdown.ty3Tax.getAmount() +
-        ret.totals.us_sales_tax_breakdown.ty4Tax.getAmount() +
-        ret.totals.us_sales_tax_breakdown.ty5Tax.getAmount()) /
-      100;
-    const ttlTaxDifference = emsTaxTotal - totalUsTaxes;
-
-    if (Math.abs(ttlTaxDifference) > 0.0) {
-      //If difference is greater than a pennny, we need to adjust it.
-      ret.totals.ttl_tax_adjustment = Dinero({ amount: Math.round(ttlTaxDifference * 100) });
-      ret.totals.total_repairs = ret.totals.total_repairs.add(ret.totals.ttl_tax_adjustment);
-      ret.totals.net_repairs = ret.totals.net_repairs.add(ret.totals.ttl_tax_adjustment);
-      logger.log("job-totals-USA-ttl-tax-adj", "DEBUG", null, job.id, {
-        adjAmount: ttlTaxDifference
-      });
-    }
-
     return ret;
   } catch (error) {
     logger.log("job-totals-ssu-USA-error", "ERROR", req.user?.email, job.id, {
@@ -890,21 +842,17 @@ function CalculateTaxesTotals(job, otherTotals) {
       }
     });
   //Add towing and storage taxable amounts
-  const stlTowing = job.cieca_stl?.data.find((c) => c.ttl_typecd === "OTTW" || c.ttl_type === "OTTW");
-  const stlStorage = job.cieca_stl?.data.find((c) => c.ttl_typecd === "OTST" || c.ttl_type === "OTST");
+  const stlTowing = job.cieca_stl?.data.find((c) => c.ttl_typecd === "OTTW");
+  const stlStorage = job.cieca_stl?.data.find((c) => c.ttl_typecd === "OTST");
 
   if (stlTowing)
-    taxableAmounts.TOW = taxableAmounts.TOW.add(
-      Dinero({
-        amount: Math.round(stlTowing.t_amt * 100)
-      })
-    );
+    taxableAmounts.TOW = Dinero({
+      amount: Math.round(stlTowing.t_amt * 100)
+    });
   if (stlStorage)
-    taxableAmounts.TOW = taxableAmounts.TOW.add(
-      (taxableAmounts.TOW = Dinero({
-        amount: Math.round(stlStorage.t_amt * 100)
-      }))
-    );
+    taxableAmounts.TOW = Dinero({
+      amount: Math.round(stlStorage.t_amt * 100)
+    });
 
   const pfp = job.parts_tax_rates;
 
@@ -1011,7 +959,7 @@ function CalculateTaxesTotals(job, otherTotals) {
         }
       }
     } catch (error) {
-      logger.log("job-totals-USA Key with issue", "error", null, job.id, {
+      logger.log("job-totals-USA Key with issue", "error", null, null, {
         key
       });
     }
@@ -1041,7 +989,7 @@ function CalculateTaxesTotals(job, otherTotals) {
       for (let threshCounter = 1; threshCounter <= 5; threshCounter++) {
         const thresholdAmount = parseFloat(job.cieca_pft[`ty${tyCounter}_thres${threshCounter}`]) || 0;
         const thresholdTaxRate = parseFloat(job.cieca_pft[`ty${tyCounter}_rate${threshCounter}`]) || 0;
-        // console.log(taxTierKey, tyCounter, threshCounter, thresholdAmount, thresholdTaxRate);
+
         let taxableAmountInThisThreshold;
         if (
           thresholdAmount === 9999.99 ||
@@ -1065,8 +1013,11 @@ function CalculateTaxesTotals(job, otherTotals) {
             taxableAmountInThisThreshold = Dinero({
               amount: Math.round(thresholdAmount * 100)
             });
-            remainingTaxableAmounts[taxTierKey] =
-              remainingTaxableAmounts[taxTierKey].subtract(taxableAmountInThisThreshold);
+            remainingTaxableAmounts[taxTierKey] = remainingTaxableAmounts[taxTierKey].subtract(
+              Dinero({
+                amount: Math.round(taxableAmountInThisThreshold * 100)
+              })
+            );
           }
         }
 
@@ -1075,8 +1026,8 @@ function CalculateTaxesTotals(job, otherTotals) {
         totalTaxByTier[taxTierKey] = totalTaxByTier[taxTierKey].add(taxAmountToAdd);
       }
     } catch (error) {
-      logger.log("job-totals-USA - PFP Calculation Error", "error", null, job.id, {
-        error: error.message
+      logger.log("job-totals-USA - PFP Calculation Error", "error", null, null, {
+        error
       });
     }
   });

server/middleware/validateCanvasRequestMiddleware.js

@@ -1,20 +0,0 @@
-const { isObject } = require("lodash");
-
-const validateCanvasRequestMiddleware = (req, res, next) => {
-  const { w, h, values, keys, override } = req.body;
-  if (!values || !keys) {
-    return res.status(400).send("Missing required data");
-  }
-  if (override && !isObject(override)) {
-    return res.status(400).send("Override must be an object");
-  }
-  if (w && (!Number.isFinite(w) || w <= 0)) {
-    return res.status(400).send("Width must be a positive number");
-  }
-  if (h && (!Number.isFinite(h) || h <= 0)) {
-    return res.status(400).send("Height must be a positive number");
-  }
-  next();
-};
-
-module.exports = validateCanvasRequestMiddleware;

server/render/canvas-handler.js

@@ -5,120 +5,89 @@ const logger = require("../utils/logger");
 const { backgroundColors, borderColors } = require("./canvas-colors");
 const { isObject, defaultsDeep, isNumber } = require("lodash");
 
-let isProcessing = false;
-const requestQueue = [];
-
-const processCanvasRequest = async (req, res) => {
-  try {
-    const { w, h, values, keys, override } = req.body;
-    logger.log("inbound-canvas-creation", "debug", "jsr", null, { w, h, values, keys, override });
-
-    // Set dimensions with defaults
-    const width = isNumber(w) ? w : 500;
-    const height = isNumber(h) ? h : 275;
-
-    const configuration = {
-      type: "doughnut",
-      data: {
-        labels: keys,
-        datasets: [
-          {
-            data: values,
-            backgroundColor: backgroundColors,
-            borderColor: borderColors,
-            borderWidth: 1
-          }
-        ]
-      },
-      options: {
-        animation: false,
-        devicePixelRatio: 4,
-        responsive: false,
-        maintainAspectRatio: true,
-        circumference: 180,
-        rotation: -90,
-        plugins: {
-          legend: {
-            labels: {
-              boxWidth: 20,
-              font: {
-                family: "'Montserrat'",
-                size: 10,
-                style: "normal",
-                weight: "normal"
-              }
-            },
-            position: "left"
-          }
-        }
-      }
-    };
-
-    // If we have a valid override object, merge it with the default configuration object.
-    // This allows for you to override the default configuration with a custom one.
-    const defaults = () => {
-      if (!override || !isObject(override)) {
-        return configuration;
-      }
-      return defaultsDeep(override, configuration);
-    };
-
-    // Generate chart
-    let canvas = createCanvas(width, height);
-    let ctx = canvas.getContext("2d");
-    let chart = new Chart(ctx, defaults());
-    const result = canvas.toDataURL();
-
-    chart.destroy();
-    canvas.width = 0;
-    canvas.height = 0;
-    ctx = null;
-    canvas = null;
-    chart = null;
-
-    res.status(200).send(result);
-  } catch (error) {
-    if (chart) chart.destroy();
-    if (canvas) {
-      canvas.width = 0;
-      canvas.height = 0;
-    }
-    ctx = null;
-    canvas = null;
-    chart = null;
-
-    logger.log("inbound-canvas-creation", "error", "jsr", null, { error: error.message, stack: error.stack });
-    res.status(500).send("Error generating canvas");
-  }
-};
-
-const processNextInQueue = async () => {
-  if (requestQueue.length === 0) {
-    isProcessing = false;
-    return;
-  }
-
-  const { req, res } = requestQueue.shift();
-  await processCanvasRequest(req, res);
-  processNextInQueue();
-};
-
 exports.canvastest = function (req, res) {
+  //console.log("Incoming test request.", req);
   res.status(200).send("OK");
 };
 
-exports.canvas = async function (req, res) {
-  if (isProcessing) {
-    if (requestQueue.length >= 100) {
-      // Set a maximum queue size
-      return res.status(503).send("Server is busy. Please try again later.");
-    }
-    requestQueue.push({ req, res });
-    logger.log("inbound-canvas-creation-queue", "debug", "jsr", null, { queue: requestQueue.length });
+exports.canvas = function (req, res) {
+  const { w, h, values, keys, override } = req.body;
+  //console.log("Incoming Canvas Request:", w, h, values, keys, override);
+  logger.log("inbound-canvas-creation", "debug", "jsr", null, { w, h, values, keys, override });
+  // Gate required values
+  if (!values || !keys) {
+    res.status(400).send("Missing required data");
     return;
   }
 
-  isProcessing = true;
-  await processCanvasRequest(req, res);
-  processNextInQueue();
+  // Override must be an object if it exists
+  if (override && !isObject(override)) {
+    res.status(400).send("Override must be an object");
+    return;
+  }
+
+  // Set the default Width and Height
+  let [width, height] = [500, 275];
+
+  // Allow for custom width and height
+  if (isNumber(w)) {
+    width = w;
+  }
+  if (isNumber(h)) {
+    height = h;
+  }
+
+  const configuration = {
+    type: "doughnut",
+    data: {
+      labels: keys,
+      datasets: [
+        {
+          data: values,
+          backgroundColor: backgroundColors,
+          borderColor: borderColors,
+          borderWidth: 1
+        }
+      ]
+    },
+    options: {
+      devicePixelRatio: 4,
+      responsive: false,
+      maintainAspectRatio: true,
+      circumference: 180,
+      rotation: -90,
+      plugins: {
+        legend: {
+          labels: {
+            boxWidth: 20,
+            font: {
+              family: "'Montserrat'",
+              size: 10,
+              style: "normal",
+              weight: "normal"
+            }
+          },
+          position: "left"
+        }
+      }
+    }
+  };
+
+  // If we have a valid override object, merge it with the default configuration object.
+  // This allows for you to override the default configuration with a custom one.
+  const defaults = () => {
+    if (!override || !isObject(override)) {
+      return configuration;
+    }
+    return defaultsDeep(override, configuration);
+  };
+
+  res.status(200).send(
+    (() => {
+      const canvas = createCanvas(width, height);
+      const ctx = canvas.getContext("2d");
+      new Chart(ctx, defaults());
+      return canvas.toDataURL();
+    })()
+  );
 };

server/render/inlinecss.js

@@ -3,36 +3,24 @@ require("dotenv").config({
   path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });
 const logger = require("../utils/logger");
-//const inlineCssTool = require("inline-css");
-const juice = require("juice");
+const inlineCssTool = require("inline-css");
 
-exports.inlinecss = async (req, res) => {
+exports.inlinecss = (req, res) => {
   //Perform request validation
+
   logger.log("email-inline-css", "DEBUG", req.user.email, null, null);
 
   const { html, url } = req.body;
-  try {
-    const inlinedHtml = juice(html, {
-      applyAttributesTableElements: false,
-      preserveMediaQueries: false,
-      applyWidthAttributes: false
-    });
-    res.send(inlinedHtml);
-  } catch (error) {
-    logger.log("email-inline-css-error", "ERROR", req.user.email, null, {
-      error
-    });
-    res.send(error.message);
-  }
 
-  // inlineCssTool(html, { url: url })
-  //   .then((inlinedHtml) => {
-  //     res.send(inlinedHtml);
-  //   })
-  //   .catch((error) => {
-  //     logger.log("email-inline-css-error", "ERROR", req.user.email, null, {
-  //       error
-  //     });
+  inlineCssTool(html, { url: url })
+    .then((inlinedHtml) => {
+      res.send(inlinedHtml);
+    })
+    .catch((error) => {
+      logger.log("email-inline-css-error", "ERROR", req.user.email, null, {
+        error
+      });
 
-  //   });
+      res.send(error);
+    });
 };

server/routes/intellipayRoutes.js

@@ -1,12 +1,11 @@
 const express = require("express");
 const router = express.Router();
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
-const { lightbox_credentials, payment_refund, generate_payment_url, postback, checkfee } = require("../intellipay/intellipay");
+const { lightbox_credentials, payment_refund, generate_payment_url, postback } = require("../intellipay/intellipay");
 
 router.post("/lightbox_credentials", validateFirebaseIdTokenMiddleware, lightbox_credentials);
 router.post("/payment_refund", validateFirebaseIdTokenMiddleware, payment_refund);
 router.post("/generate_payment_url", validateFirebaseIdTokenMiddleware, generate_payment_url);
-router.post("/checkfee", validateFirebaseIdTokenMiddleware, checkfee);
 router.post("/postback", postback);
 
 module.exports = router;

server/routes/miscellaneousRoutes.js

@@ -13,7 +13,6 @@ const withUserGraphQLClientMiddleware = require("../middleware/withUserGraphQLCl
 const { taskAssignedEmail, tasksRemindEmail } = require("../email/tasksEmails");
 const { canvastest } = require("../render/canvas-handler");
 const { alertCheck } = require("../alerts/alertcheck");
-const uuid = require("uuid").v4;
 
 //Test route to ensure Express is responding.
 router.get("/test", eventAuthorizationMiddleware, async function (req, res) {
@@ -58,59 +57,6 @@ router.get("/test-logs", eventAuthorizationMiddleware, (req, res) => {
 
   return res.status(500).send("Logs tested.");
 });
-router.get("/wstest", eventAuthorizationMiddleware, (req, res) => {
-  const { ioRedis } = req;
-  ioRedis.to(`bodyshop-broadcast-room:bfec8c8c-b7f1-49e0-be4c-524455f4e582`).emit("new-message-summary", {
-    isoutbound: true,
-    conversationId: "2b44d692-a9e4-4ed4-9c6b-7d8b0c44a0f6",
-    msid: "SM5d053957bc0da29399b768c23bffcc0f",
-    summary: true
-  });
-
-  // TODO: Do we need to add more content here?
-  ioRedis
-    .to(`bodyshop-conversation-room:bfec8c8c-b7f1-49e0-be4c-524455f4e582:2b44d692-a9e4-4ed4-9c6b-7d8b0c44a0f6`)
-    .emit("new-message-detailed", {
-      //
-      // msid: "SMbbd7703a898fef7f2c07c148ade8a6cd",
-      // text: "test2",
-      // conversationid: "2b44d692-a9e4-4ed4-9c6b-7d8b0c44a0f6",
-      // isoutbound: true,
-      // userid: "patrick@imex.dev",
-      // image: false,
-      // image_path: [],
-      newMessage: {
-        conversation: {
-          id: uuid(),
-          archived: false,
-          bodyshop: {
-            id: "bfec8c8c-b7f1-49e0-be4c-524455f4e582",
-            imexshopid: "APPLE"
-          },
-          created_at: "2024-11-19T19:46:38.984633+00:00",
-          updated_at: "2024-11-19T22:40:48.346875+00:00",
-          unreadcnt: 0,
-          phone_num: "+16138676684"
-        },
-        conversationid: "2b44d692-a9e4-4ed4-9c6b-7d8b0c44a0f6",
-        created_at: "2024-11-19T22:40:48.346875+00:00",
-        id: "68604ea9-c411-43ec-ab83-899868e58819",
-        image_path: [],
-        image: false,
-        isoutbound: true,
-        msid: "SMbbd7703a898fef7f2c07c148ade8a6cd",
-        read: false,
-        text: `This is a test ${Math.round(Math.random() * 100)}`,
-        updated_at: "2024-11-19T22:40:48.346875+00:00",
-        status: "posted",
-        userid: "patrick@imex.dev"
-      },
-      conversationId: "2b44d692-a9e4-4ed4-9c6b-7d8b0c44a0f6",
-      summary: false
-    }); // TODO: Do we need to add more content here?
-
-  return res.status(500).send("Logs tested.");
-});
 
 // Search
 router.post("/search", validateFirebaseIdTokenMiddleware, withUserGraphQLClientMiddleware, os.search);

server/routes/notificationsRoutes.js

@@ -1,12 +1,11 @@
 const express = require("express");
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
-const { subscribe, unsubscribe, sendNotification } = require("../firebase/firebase-handler");
+const { subscribe, unsubscribe } = require("../firebase/firebase-handler");
 const router = express.Router();
 
 router.use(validateFirebaseIdTokenMiddleware);
 
 router.post("/subscribe", subscribe);
 router.post("/unsubscribe", unsubscribe);
-router.post("/sendtestnotification", sendNotification);
 
 module.exports = router;

server/routes/renderRoutes.js

@@ -2,11 +2,10 @@ const express = require("express");
 const router = express.Router();
 const { inlinecss } = require("../render/inlinecss");
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
-const validateCanvasRequestMiddleware = require("../middleware/validateCanvasRequestMiddleware");
 const { canvas } = require("../render/canvas-handler");
 
 // Define the route for inline CSS rendering
 router.post("/inlinecss", validateFirebaseIdTokenMiddleware, inlinecss);
-router.post("/canvas", [validateFirebaseIdTokenMiddleware, validateCanvasRequestMiddleware], canvas);
+router.post("/canvas", validateFirebaseIdTokenMiddleware, canvas);
 
 module.exports = router;

server/sms/receive.js

@@ -11,154 +11,182 @@ const logger = require("../utils/logger");
 const InstanceManager = require("../utils/instanceMgr").default;
 
 exports.receive = async (req, res) => {
+  // Perform request validation
   const {
     ioRedis,
-    ioHelpers: { getBodyshopRoom, getBodyshopConversationRoom }
+    ioHelpers: { getBodyshopRoom }
   } = req;
 
-  const loggerData = {
+  logger.log("sms-inbound", "DEBUG", "api", null, {
     msid: req.body.SmsMessageSid,
     text: req.body.Body,
     image: !!req.body.MediaUrl0,
     image_path: generateMediaArray(req.body)
-  };
-
-  logger.log("sms-inbound", "DEBUG", "api", null, loggerData);
+  });
 
   if (!req.body || !req.body.MessagingServiceSid || !req.body.SmsMessageSid) {
     logger.log("sms-inbound-error", "ERROR", "api", null, {
-      ...loggerData,
+      msid: req.body.SmsMessageSid,
+      text: req.body.Body,
+      image: !!req.body.MediaUrl0,
+      image_path: generateMediaArray(req.body),
       type: "malformed-request"
     });
-    return res.status(400).json({ success: false, error: "Malformed Request" });
+    res.status(400).json({ success: false, error: "Malformed Request" });
+    return;
   }
 
   try {
-    // Step 1: Find the bodyshop and existing conversation
     const response = await client.request(queries.FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID, {
       mssid: req.body.MessagingServiceSid,
       phone: phone(req.body.From).phoneNumber
     });
 
-    if (!response.bodyshops[0]) {
-      return res.status(400).json({ success: false, error: "No matching bodyshop" });
-    }
-
-    const bodyshop = response.bodyshops[0];
-
-    // Sort conversations by `updated_at` (or `created_at`) and pick the last one
-    const sortedConversations = bodyshop.conversations.sort((a, b) => new Date(a.created_at) - new Date(b.created_at));
-    const existingConversation = sortedConversations.length
-      ? sortedConversations[sortedConversations.length - 1]
-      : null;
-
-    let conversationid;
     let newMessage = {
       msid: req.body.SmsMessageSid,
       text: req.body.Body,
       image: !!req.body.MediaUrl0,
-      image_path: generateMediaArray(req.body),
-      isoutbound: false,
-      userid: null // Add additional fields as necessary
+      image_path: generateMediaArray(req.body)
     };
 
-    if (existingConversation) {
-      // Use the existing conversation
-      conversationid = existingConversation.id;
+    if (response.bodyshops[0]) {
+      if (response.bodyshops[0].conversations.length === 0) {
+        // No conversation found, create one
+        newMessage.conversation = {
+          data: {
+            bodyshopid: response.bodyshops[0].id,
+            phone_num: phone(req.body.From).phoneNumber
+          }
+        };
 
-      // Unarchive the conversation if necessary
-      if (existingConversation.archived) {
-        await client.request(queries.UNARCHIVE_CONVERSATION, {
-          id: conversationid,
-          archived: false
-        });
-      }
-    } else {
-      // Create a new conversation
-      const newConversationResponse = await client.request(queries.CREATE_CONVERSATION, {
-        conversation: {
-          bodyshopid: bodyshop.id,
-          phone_num: phone(req.body.From).phoneNumber,
-          archived: false
+        try {
+          // Insert new conversation and message
+          const insertresp = await client.request(queries.RECEIVE_MESSAGE, { msg: newMessage });
+
+          // Safely access conversation and message
+          const createdConversation = insertresp?.insert_messages?.returning?.[0]?.conversation || null;
+          const message = insertresp?.insert_messages?.returning?.[0] || {
+            text: "",
+            image: false,
+            image_path: []
+          };
+
+          if (!createdConversation) {
+            throw new Error("Conversation data is missing from the response.");
+          }
+
+          ioRedis.to(getBodyshopRoom(response.bodyshops[0].id)).emit("new-conversation", {
+            conversation: {
+              ...createdConversation,
+              messages_aggregate: {
+                aggregate: {
+                  count: 1 // Adjust dynamically based on your logic or default to 0
+                }
+              }
+            },
+            message
+          });
+
+          logger.log("sms-inbound-success", "DEBUG", "api", null, {
+            newMessage,
+            createdConversation
+          });
+
+          res.status(200).send("");
+          return;
+        } catch (e) {
+          logger.log("sms-inbound-error", "ERROR", "api", null, {
+            msid: req.body.SmsMessageSid,
+            text: req.body.Body,
+            image: !!req.body.MediaUrl0,
+            image_path: generateMediaArray(req.body),
+            messagingServiceSid: req.body.MessagingServiceSid,
+            error: e
+          });
+
+          res.status(500).json(e);
+          return;
         }
-      });
-      const createdConversation = newConversationResponse.insert_conversations.returning[0];
-      conversationid = createdConversation.id;
-    }
-
-    // Ensure `conversationid` is added to the message
-    newMessage.conversationid = conversationid;
-
-    // Step 3: Insert the message into the conversation
-    const insertresp = await client.request(queries.INSERT_MESSAGE, {
-      msg: newMessage,
-      conversationid: conversationid
-    });
-
-    const message = insertresp?.insert_messages?.returning?.[0];
-    const conversation = message?.conversation || null;
-
-    if (!conversation) {
-      throw new Error("Conversation data is missing from the response.");
-    }
-
-    // Step 4: Notify clients through Redis
-    const broadcastRoom = getBodyshopRoom(conversation.bodyshop.id);
-    const conversationRoom = getBodyshopConversationRoom({
-      bodyshopId: conversation.bodyshop.id,
-      conversationId: conversation.id
-    });
-
-    const commonPayload = {
-      isoutbound: false,
-      conversationId: conversation.id,
-      updated_at: message.updated_at,
-      msid: message.sid
-    };
-
-    ioRedis.to(broadcastRoom).emit("new-message-summary", {
-      ...commonPayload,
-      existingConversation: !!existingConversation,
-      newConversation: !existingConversation ? conversation : null,
-      summary: true
-    });
-
-    ioRedis.to(conversationRoom).emit("new-message-detailed", {
-      newMessage: message,
-      ...commonPayload,
-      newConversation: !existingConversation ? conversation : null,
-      existingConversation: !!existingConversation,
-      summary: false
-    });
-
-    // Step 5: Send FCM notification
-    const fcmresp = await admin.messaging().send({
-      topic: `${message.conversation.bodyshop.imexshopid}-messaging`,
-      notification: {
-        title: InstanceManager({
-          imex: `ImEX Online Message - ${message.conversation.phone_num}`,
-          rome: `Rome Online Message - ${message.conversation.phone_num}`,
-          promanager: `ProManager Message - ${message.conversation.phone_num}`
-        }),
-        body: message.image_path ? `Image ${message.text}` : message.text
-      },
-      data: {
-        type: "messaging-inbound",
-        conversationid: message.conversationid || "",
-        text: message.text || "",
-        messageid: message.id || "",
-        phone_num: message.conversation.phone_num || ""
+      } else if (response.bodyshops[0].conversations.length === 1) {
+        // Add to the existing conversation
+        // conversation UPDATED
+        newMessage.conversationid = response.bodyshops[0].conversations[0].id;
+      } else {
+        // Duplicate phone error
+        logger.log("sms-inbound-error", "ERROR", "api", null, {
+          msid: req.body.SmsMessageSid,
+          text: req.body.Body,
+          image: !!req.body.MediaUrl0,
+          image_path: generateMediaArray(req.body),
+          messagingServiceSid: req.body.MessagingServiceSid,
+          type: "duplicate-phone"
+        });
+        res.status(400).json({ success: false, error: "Duplicate phone number" });
+        return;
       }
-    });
 
-    logger.log("sms-inbound-success", "DEBUG", "api", null, {
-      newMessage,
-      fcmresp
-    });
+      try {
+        // Insert message into an existing conversation
+        const insertresp = await client.request(queries.INSERT_MESSAGE, {
+          msg: newMessage,
+          conversationid: newMessage.conversationid
+        });
 
-    res.status(200).send("");
+        const message = insertresp.insert_messages.returning[0];
+        const data = {
+          type: "messaging-inbound",
+          conversationid: message.conversationid || "",
+          text: message.text || "",
+          messageid: message.id || "",
+          phone_num: message.conversation.phone_num || ""
+        };
+
+        const fcmresp = await admin.messaging().send({
+          topic: `${message.conversation.bodyshop.imexshopid}-messaging`,
+          notification: {
+            title: InstanceManager({
+              imex: `ImEX Online Message - ${data.phone_num}`,
+              rome: `Rome Online Message - ${data.phone_num}`,
+              promanager: `ProManager Message - ${data.phone_num}`
+            }),
+            body: message.image_path ? `Image ${message.text}` : message.text
+          },
+          data
+        });
+
+        logger.log("sms-inbound-success", "DEBUG", "api", null, {
+          newMessage,
+          fcmresp
+        });
+
+        // Broadcast new message to the conversation room
+        const room = `conversation-${newMessage.conversationid}`;
+        ioRedis.to(room).emit("new-message", newMessage);
+
+        res.status(200).send("");
+      } catch (e) {
+        logger.log("sms-inbound-error", "ERROR", "api", null, {
+          msid: req.body.SmsMessageSid,
+          text: req.body.Body,
+          image: !!req.body.MediaUrl0,
+          image_path: generateMediaArray(req.body),
+          messagingServiceSid: req.body.MessagingServiceSid,
+          error: e
+        });
+
+        res.status(500).json(e);
+      }
+    }
   } catch (e) {
-    handleError(req, e, res, "RECEIVE_MESSAGE");
+    logger.log("sms-inbound-error", "ERROR", "api", null, {
+      msid: req.body.SmsMessageSid,
+      text: req.body.Body,
+      image: !!req.body.MediaUrl0,
+      image_path: generateMediaArray(req.body),
+      messagingServiceSid: req.body.MessagingServiceSid,
+      error: e
+    });
+    res.status(500).json(e);
   }
 };
 
@@ -174,17 +202,3 @@ const generateMediaArray = (body) => {
     return null;
   }
 };
-
-const handleError = (req, error, res, context) => {
-  logger.log("sms-inbound-error", "ERROR", "api", null, {
-    msid: req.body.SmsMessageSid,
-    text: req.body.Body,
-    image: !!req.body.MediaUrl0,
-    image_path: generateMediaArray(req.body),
-    messagingServiceSid: req.body.MessagingServiceSid,
-    context,
-    error
-  });
-
-  res.status(500).json({ error: error.message || "Internal Server Error" });
-};

server/sms/send.js

@@ -8,17 +8,16 @@ const { phone } = require("phone");
 const queries = require("../graphql-client/queries");
 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 = async (req, res) => {
+exports.send = (req, res) => {
   const { to, messagingServiceSid, body, conversationid, selectedMedia, imexshopid } = req.body;
-  const {
-    ioRedis,
-    ioHelpers: { getBodyshopRoom, getBodyshopConversationRoom }
-  } = req;
+  const { ioRedis } = req;
 
   logger.log("sms-outbound", "DEBUG", req.user.email, null, {
-    messagingServiceSid,
+    messagingServiceSid: messagingServiceSid,
     to: phone(to).phoneNumber,
     mediaUrl: selectedMedia.map((i) => i.src),
     text: body,
@@ -29,10 +28,73 @@ exports.send = async (req, res) => {
     image_path: req.body.selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : []
   });
 
-  if (!to || !messagingServiceSid || (!body && selectedMedia.length === 0) || !conversationid) {
+  if (!!to && !!messagingServiceSid && (!!body || !!selectedMedia.length > 0) && !!conversationid) {
+    client.messages
+      .create({
+        body: body,
+        messagingServiceSid: messagingServiceSid,
+        to: phone(to).phoneNumber,
+        mediaUrl: selectedMedia.map((i) => i.src)
+      })
+      .then((message) => {
+        let newMessage = {
+          msid: message.sid,
+          text: body,
+          conversationid,
+          isoutbound: true,
+          userid: req.user.email,
+          image: req.body.selectedMedia.length > 0,
+          image_path: req.body.selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : []
+        };
+        gqlClient
+          .request(queries.INSERT_MESSAGE, { msg: newMessage, conversationid })
+          .then((r2) => {
+            //console.log("Responding GQL Message ID", JSON.stringify(r2));
+            logger.log("sms-outbound-success", "DEBUG", req.user.email, null, {
+              msid: message.sid,
+              conversationid
+            });
+
+            const data = {
+              type: "messaging-outbound",
+              conversationid: newMessage.conversationid || ""
+            };
+
+            // TODO Verify
+            // const messageData = response.insert_messages.returning[0];
+
+            // Broadcast new message to conversation room
+            const room = `conversation-${conversationid}`;
+            ioRedis.to(room).emit("new-message", newMessage);
+
+            admin.messaging().send({
+              topic: `${imexshopid}-messaging`,
+              data
+            });
+
+            res.sendStatus(200);
+          })
+          .catch((e2) => {
+            logger.log("sms-outbound-error", "ERROR", req.user.email, null, {
+              msid: message.sid,
+              conversationid,
+              error: e2
+            });
+
+            //res.json({ success: false, message: e2 });
+          });
+      })
+      .catch((e1) => {
+        //res.json({ success: false, message: error });
+        logger.log("sms-outbound-error", "ERROR", req.user.email, null, {
+          conversationid,
+          error: e1
+        });
+      });
+  } else {
     logger.log("sms-outbound-error", "ERROR", req.user.email, null, {
       type: "missing-parameters",
-      messagingServiceSid,
+      messagingServiceSid: messagingServiceSid,
       to: phone(to).phoneNumber,
       text: body,
       conversationid,
@@ -42,72 +104,5 @@ exports.send = async (req, res) => {
       image_path: req.body.selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : []
     });
     res.status(400).json({ success: false, message: "Missing required parameter(s)." });
-    return;
-  }
-
-  try {
-    const message = await client.messages.create({
-      body,
-      messagingServiceSid,
-      to: phone(to).phoneNumber,
-      mediaUrl: selectedMedia.map((i) => i.src)
-    });
-
-    const newMessage = {
-      msid: message.sid,
-      text: body,
-      conversationid,
-      isoutbound: true,
-      userid: req.user.email,
-      image: req.body.selectedMedia.length > 0,
-      image_path: req.body.selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : []
-    };
-
-    try {
-      const gqlResponse = await gqlClient.request(queries.INSERT_MESSAGE, { msg: newMessage, conversationid });
-
-      logger.log("sms-outbound-success", "DEBUG", req.user.email, null, {
-        msid: message.sid,
-        conversationid
-      });
-
-      const insertedMessage = gqlResponse.insert_messages.returning[0];
-      const broadcastRoom = getBodyshopRoom(insertedMessage.conversation.bodyshop.id);
-      const conversationRoom = getBodyshopConversationRoom({
-        bodyshopId: insertedMessage.conversation.bodyshop.id,
-        conversationId: insertedMessage.conversation.id
-      });
-
-      ioRedis.to(broadcastRoom).emit("new-message-summary", {
-        isoutbound: true,
-        conversationId: conversationid,
-        updated_at: insertedMessage.updated_at,
-        msid: message.sid,
-        summary: true
-      });
-
-      ioRedis.to(conversationRoom).emit("new-message-detailed", {
-        newMessage: insertedMessage,
-        conversationId: conversationid,
-        summary: false
-      });
-
-      res.sendStatus(200);
-    } catch (gqlError) {
-      logger.log("sms-outbound-error", "ERROR", req.user.email, null, {
-        msid: message.sid,
-        conversationid,
-        error: gqlError.message,
-        stack: gqlError.stack
-      });
-      res.status(500).json({ success: false, message: "Failed to insert message into database." });
-    }
-  } catch (twilioError) {
-    logger.log("sms-outbound-error", "ERROR", req.user.email, null, {
-      conversationid,
-      error: twilioError.message,
-      stack: twilioError.stack
-    });
-    res.status(500).json({ success: false, message: "Failed to send message through Twilio." });
   }
 };

server/sms/status.js

@@ -5,102 +5,66 @@ require("dotenv").config({
 
 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 = async (req, res) => {
+exports.status = (req, res) => {
   const { SmsSid, SmsStatus } = req.body;
-  const {
-    ioRedis,
-    ioHelpers: { getBodyshopRoom, getBodyshopConversationRoom }
-  } = req;
-
-  try {
-    // Ignore status 'queued'
-    if (SmsStatus === "queued") {
-      return res.status(200).json({ message: "Status 'queued' disregarded." });
-    }
-
-    // Update message status in the database
-    const response = await client.request(queries.UPDATE_MESSAGE_STATUS, {
+  const { ioRedis } = req;
+  client
+    .request(queries.UPDATE_MESSAGE_STATUS, {
       msid: SmsSid,
       fields: { status: SmsStatus }
-    });
-
-    const message = response.update_messages.returning[0];
-
-    if (message) {
+    })
+    .then((response) => {
       logger.log("sms-status-update", "DEBUG", "api", null, {
         msid: SmsSid,
         fields: { status: SmsStatus }
       });
-
-      // Emit WebSocket event to notify the change in message status
-      const conversationRoom = getBodyshopConversationRoom({
-        bodyshopId: message.conversation.bodyshopid,
-        conversationId: message.conversationid
+      // TODO Verify
+      const conversationId = response.update_messages.returning[0].conversationid;
+      ioRedis.to(`conversation-${conversationId}`).emit("message-status-updated", {
+        messageId: SmsSid,
+        status: SmsStatus
       });
-
-      ioRedis.to(conversationRoom).emit("message-changed", {
-        ...message,
-        status: SmsStatus,
-        type: "status-changed"
-      });
-    } else {
-      logger.log("sms-status-update-warning", "WARN", "api", null, {
+    })
+    .catch((error) => {
+      logger.log("sms-status-update-error", "ERROR", "api", null, {
         msid: SmsSid,
         fields: { status: SmsStatus },
-        warning: "No message returned from the database update."
+        error
       });
-    }
-
-    res.sendStatus(200);
-  } catch (error) {
-    logger.log("sms-status-update-error", "ERROR", "api", null, {
-      msid: SmsSid,
-      fields: { status: SmsStatus },
-      stack: error.stack,
-      message: error.message
     });
-    res.status(500).json({ error: "Failed to update message status." });
-  }
+  res.sendStatus(200);
 };
 
 exports.markConversationRead = async (req, res) => {
-  const {
-    ioRedis,
-    ioHelpers: { getBodyshopRoom, getBodyshopConversationRoom }
-  } = req;
-  const { conversation, imexshopid, bodyshopid } = req.body;
-
-  // Alternatively, support both payload formats
-  const conversationId = conversation?.id || req.body.conversationId;
-
-  if (!conversationId || !imexshopid || !bodyshopid) {
-    return res.status(400).json({ error: "Invalid conversation data provided." });
-  }
-
-  try {
-    const response = await client.request(queries.MARK_MESSAGES_AS_READ, {
-      conversationId
-    });
-
-    const updatedMessageIds = response.update_messages.returning.map((message) => message.id);
-
-    const broadcastRoom = getBodyshopRoom(bodyshopid);
-
-    ioRedis.to(broadcastRoom).emit("conversation-changed", {
-      type: "conversation-marked-read",
-      conversationId,
-      affectedMessages: response.update_messages.affected_rows,
-      messageIds: updatedMessageIds
-    });
-
-    res.status(200).json({
-      success: true,
-      message: "Conversation marked as read."
-    });
-  } catch (error) {
-    console.error("Error marking conversation as read:", error);
-    res.status(500).json({ error: "Failed to mark conversation as read." });
-  }
+  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",
+//     "SmsStatus": "queued",
+//     "MessageStatus": "queued",
+//     "To": "+16049992002",
+//     "MessagingServiceSid": "MG6e259e2add04ffa0d0aa355038670ee1",
+//     "MessageSid": "SM5205ea340e06437799d9345e7283457c",
+//     "AccountSid": "AC6c09d337d6b9c68ab6488c2052bd457c",
+//     "From": "+16043301606",
+//     "ApiVersion": "2010-04-01"
+//   }

server/utils/getHostNameOrIP.js

@@ -1,26 +0,0 @@
-// Load environment variables THIS MUST BE AT THE TOP
-const path = require("path");
-require("dotenv").config({
-  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
-});
-
-const { networkInterfaces, hostname } = require("node:os");
-
-const getHostNameOrIP = () => {
-  // Try to get the hostname first
-  const hostName = hostname();
-  if (hostName) return hostName;
-
-  const interfaces = networkInterfaces();
-  for (const name of Object.keys(interfaces)) {
-    for (const iface of interfaces[name]) {
-      if (iface.family === "IPv4" && !iface.internal) {
-        return iface.address;
-      }
-    }
-  }
-
-  return "127.0.0.1";
-};
-
-module.exports = getHostNameOrIP;

server/utils/ioHelpers.js

@@ -1,12 +1,8 @@
 const applyIOHelpers = ({ app, api, io, logger }) => {
   const getBodyshopRoom = (bodyshopID) => `bodyshop-broadcast-room:${bodyshopID}`;
-  // Messaging - conversation specific room to handle detailed messages when the user has a conversation open.
-  const getBodyshopConversationRoom = ({bodyshopId, conversationId}) =>
-    `bodyshop-conversation-room:${bodyshopId}:${conversationId}`;
 
   const ioHelpersAPI = {
-    getBodyshopRoom,
-    getBodyshopConversationRoom
+    getBodyshopRoom
   };
 
   // Helper middleware

server/utils/logger.js

@@ -8,10 +8,10 @@ const InstanceManager = require("../utils/instanceMgr").default;
 const winston = require("winston");
 const WinstonCloudWatch = require("winston-cloudwatch");
 const { isString, isEmpty } = require("lodash");
+const { networkInterfaces, hostname } = require("node:os");
 const { uploadFileToS3 } = require("./s3");
 const { v4 } = require("uuid");
 const { InstanceRegion } = require("./instanceMgr");
-const getHostNameOrIP = require("./getHostNameOrIP");
 
 const LOG_LEVELS = {
   error: { level: 0, name: "error" },
@@ -76,6 +76,22 @@ const createLogger = () => {
       })();
     };
 
+    const getHostNameOrIP = () => {
+      // Try to get the hostname first
+      const hostName = hostname();
+      if (hostName) return hostName;
+
+      const interfaces = networkInterfaces();
+      for (const name of Object.keys(interfaces)) {
+        for (const iface of interfaces[name]) {
+          if (iface.family === "IPv4" && !iface.internal) {
+            return iface.address;
+          }
+        }
+      }
+
+      return "127.0.0.1";
+    };
     const createProductionTransport = (level, logStreamName, filters) => {
       return new WinstonCloudWatch({
         level,

server/utils/statusReporter.js

@@ -1,52 +0,0 @@
-// Load environment variables THIS MUST BE AT THE TOP
-const path = require("path");
-const getHostNameOrIP = require("./getHostNameOrIP");
-const logger = require("./logger");
-require("dotenv").config({
-  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
-});
-const CrispStatusReporter = require("crisp-status-reporter").CrispStatusReporter;
-const InstanceManager = require("../utils/instanceMgr").default;
-
-function StartStatusReporter() {
-  //For ImEX Online.
-
-  return InstanceManager({
-    executeFunction: true,
-    args: [],
-    imex: () => {
-      if (
-        process.env.NODE_ENV === undefined ||
-        !process.env.CRISP_SECRET_TOKEN ||
-        !process.env.CRISP_SERVICE_IDENTIFIER ||
-        !process.env.CRISP_NODE_IDENTIFIER
-      ) {
-        logger.log("crisp-status-update-error", "DEBUG", null, null, { message: "Environment Variables not set." });
-        return;
-      }
-
-      try {
-        const crispStatusReporter = new CrispStatusReporter({
-          token: process.env.CRISP_SECRET_TOKEN, // Your reporter token (given by Crisp)
-          service_id: process.env.CRISP_SERVICE_IDENTIFIER, // Service ID containing the parent Node for Replica (given by Crisp)
-          node_id: process.env.CRISP_NODE_IDENTIFIER, // Node ID containing Replica (given by Crisp)
-          replica_id: getHostNameOrIP(), // Unique Replica ID for instance (ie. your IP on the LAN)
-          interval: 30 // Reporting interval (in seconds; defaults to 30 seconds if not set)
-
-          // console: {
-          //   debug: (log_message, data) => logger.log("crisp-status-update", "DEBUG", null, null, { log_message, data }),
-          //   log: (log_message, data) => logger.log("crisp-status-update", "DEBUG", null, null, { log_message, data }),
-          //   warn: (log_message, data) => logger.log("crisp-status-update", "WARN", null, null, { log_message, data }),
-          //   error: (log_message, data) => logger.log("crisp-status-update", "ERROR", null, null, { log_message, data })
-          // } // Console instance if you need to debug issues,
-        });
-
-        return crispStatusReporter;
-      } catch (error) {
-        logger.log("crisp-status-update-error", "DEBUG", null, null, { error: error.message });
-      }
-    }
-  });
-}
-
-module.exports = StartStatusReporter;

server/web-sockets/redisSocketEvents.js

@@ -1,9 +1,17 @@
 const { admin } = require("../firebase/firebase-handler");
+const { MARK_MESSAGES_AS_READ, GET_CONVERSATIONS, GET_CONVERSATION_DETAILS } = require("../graphql-client/queries");
+const { phone } = require("phone");
+const { client: gqlClient } = require("../graphql-client/graphql-client");
+const queries = require("../graphql-client/queries");
+const twilio = require("twilio");
+const client = require("../graphql-client/graphql-client").client;
+
+const twilioClient = twilio(process.env.TWILIO_AUTH_TOKEN, process.env.TWILIO_AUTH_KEY);
 
 const redisSocketEvents = ({
   io,
   redisHelpers: { setSessionData, clearSessionData }, // Note: Used if we persist user to Redis
-  ioHelpers: { getBodyshopRoom, getBodyshopConversationRoom },
+  ioHelpers: { getBodyshopRoom },
   logger
 }) => {
   // Logging helper functions
@@ -46,25 +54,18 @@ const redisSocketEvents = ({
 
     // Token Update Events
     const registerUpdateEvents = (socket) => {
-      let latestTokenTimestamp = 0;
-
       const updateToken = async (newToken) => {
-        const currentTimestamp = Date.now();
-        latestTokenTimestamp = currentTimestamp;
-
         try {
-          // Verify token with Firebase Admin SDK
+          // noinspection UnnecessaryLocalVariableJS
           const user = await admin.auth().verifyIdToken(newToken, true);
-
-          // Skip outdated token validations
-          if (currentTimestamp < latestTokenTimestamp) {
-            createLogEvent(socket, "warn", "Outdated token validation skipped.");
-            return;
-          }
-
           socket.user = user;
 
-          createLogEvent(socket, "debug", `Token updated successfully for socket ID: ${socket.id}`);
+          // If We ever want to persist user Data across workers
+          // await setSessionData(socket.id, "user", user);
+
+          // Uncomment for further testing
+          // createLogEvent(socket, "debug", "Token updated successfully");
+
           socket.emit("token-updated", { success: true });
         } catch (error) {
           if (error.code === "auth/id-token-expired") {
@@ -73,20 +74,16 @@ const redisSocketEvents = ({
               success: false,
               error: "Stale token."
             });
-            return; // Avoid disconnecting for expired tokens
+          } else {
+            createLogEvent(socket, "error", `Token update failed: ${error.message}`);
+            socket.emit("token-updated", { success: false, error: error.message });
+            // For any other errors, optionally disconnect the socket
+            socket.disconnect();
           }
-
-          createLogEvent(socket, "error", `Token update failed for socket ID: ${socket.id}, Error: ${error.message}`);
-          socket.emit("token-updated", { success: false, error: error.message });
-
-          // Optionally disconnect for invalid tokens or other errors
-          socket.disconnect();
         }
       };
-
       socket.on("update-token", updateToken);
     };
-
     // Room Broadcast Events
     const registerRoomAndBroadcastEvents = (socket) => {
       const joinBodyshopRoom = (bodyshopUUID) => {
@@ -141,59 +138,162 @@ const redisSocketEvents = ({
 
       socket.on("disconnect", disconnect);
     };
-
     // Messaging Events
     const registerMessagingEvents = (socket) => {
-      const joinConversationRoom = async ({ bodyshopId, conversationId }) => {
+      const openMessaging = async (bodyshopUUID) => {
         try {
-          const room = getBodyshopConversationRoom({ bodyshopId, conversationId });
+          const conversations = await client.request(GET_CONVERSATIONS, { bodyshopId: bodyshopUUID });
+          socket.emit("messaging-list", { conversations });
+        } catch (error) {
+          logger.log("error", "Failed to fetch conversations", error);
+          socket.emit("error", { message: "Failed to fetch conversations" });
+        }
+      };
+
+      const joinConversation = async (conversationId) => {
+        try {
+          const room = `conversation-${conversationId}`;
           socket.join(room);
+
+          // Fetch conversation details and messages
+          const data = await client.request(GET_CONVERSATION_DETAILS, { conversationId });
+          socket.emit("conversation-details", data); // Send data to the client
         } catch (error) {
-          logger.log("Failed to Join Conversation Room", "error", "io-redis", null, {
-            bodyshopId,
-            conversationId,
-            error: error.message,
+          logger.log("error", "Failed to join conversation", error);
+          socket.emit("error", { message: "Failed to join conversation" });
+        }
+      };
+
+      const markAsRead = async ({ conversationId, userId, imexshopid, bodyshopId }) => {
+        try {
+          await client.request(MARK_MESSAGES_AS_READ, { conversationId, userId });
+
+          // Fetch the updated unread count for this conversation
+          const conversations = await client.request(GET_CONVERSATIONS, { bodyshopId });
+
+          // Emit the updated unread count to all clients
+          const room = `conversation-${conversationId}`;
+          io.to(room).emit("messaging-list", { conversations });
+
+          admin.messaging().send({
+            topic: `${imexshopid}-messaging`,
+            data: {
+              type: "messaging-mark-conversation-read",
+              conversationid: conversationId || ""
+            }
+          });
+        } catch (error) {
+          logger.log("Failed to mark messages as read", "error", null, null, {
+            message: error.message,
             stack: error.stack
           });
+          socket.emit("error", { message: "Failed to mark messages as read" });
+        }
+      };
+
+      const sendMessage = (data) => {
+        const { to, messagingServiceSid, body, conversationid, selectedMedia, imexshopid, user } = data;
+        logger.log("sms-outbound", "DEBUG", user.email, null, {
+          messagingServiceSid: messagingServiceSid,
+          to: phone(to).phoneNumber,
+          mediaUrl: selectedMedia.map((i) => i.src),
+          text: body,
+          conversationid,
+          isoutbound: true,
+          userid: user.email,
+          image: selectedMedia?.length > 0,
+          image_path: selectedMedia?.length > 0 ? selectedMedia.map((i) => i.src) : []
+        });
+
+        if (!!to && !!messagingServiceSid && (!!body || !!selectedMedia?.length > 0) && !!conversationid) {
+          twilioClient.messages
+            .create({
+              body: body,
+              messagingServiceSid: messagingServiceSid,
+              to: phone(to).phoneNumber,
+              mediaUrl: selectedMedia.map((i) => i.src)
+            })
+            .then((message) => {
+              let newMessage = {
+                msid: message.sid,
+                text: body,
+                conversationid,
+                isoutbound: true,
+                userid: user.email,
+                image: selectedMedia?.length > 0,
+                image_path: selectedMedia?.length > 0 ? selectedMedia.map((i) => i.src) : []
+              };
+              gqlClient
+                .request(queries.INSERT_MESSAGE, { msg: newMessage, conversationid })
+                .then((r2) => {
+                  logger.log("sms-outbound-success", "DEBUG", user.email, null, {
+                    msid: message.sid,
+                    conversationid
+                  });
+
+                  const data = {
+                    type: "messaging-outbound",
+                    conversationid: newMessage.conversationid || ""
+                  };
+
+                  // TODO Verify
+                  // const messageData = response.insert_messages.returning[0];
+
+                  // Broadcast new message to conversation room
+                  const room = `conversation-${conversationid}`;
+                  io.to(room).emit("new-message", newMessage);
+
+                  admin.messaging().send({
+                    topic: `${imexshopid}-messaging`,
+                    data
+                  });
+                })
+                .catch((e2) => {
+                  logger.log("sms-outbound-error", "ERROR", user.email, null, {
+                    msid: message.sid,
+                    conversationid,
+                    error: e2
+                  });
+                });
+            })
+            .catch((e1) => {
+              logger.log("sms-outbound-error", "ERROR", user.email, null, {
+                conversationid,
+                error: e1
+              });
+            });
+        } else {
+          logger.log("sms-outbound-error", "ERROR", user.email, null, {
+            type: "missing-parameters",
+            messagingServiceSid: messagingServiceSid,
+            to: phone(to).phoneNumber,
+            text: body,
+            conversationid,
+            isoutbound: true,
+            userid: user.email,
+            image: selectedMedia?.length > 0,
+            image_path: selectedMedia?.length > 0 ? selectedMedia.map((i) => i.src) : []
+          });
         }
       };
-      const leaveConversationRoom = ({ bodyshopId, conversationId }) => {
+
+      const leaveConversation = (conversationId) => {
         try {
-          const room = getBodyshopConversationRoom({ bodyshopId, conversationId });
+          const room = `conversation-${conversationId}`;
           socket.leave(room);
+
+          // Optionally notify the client
+          socket.emit("conversation-left", { conversationId });
         } catch (error) {
-          logger.log("Failed to Leave Conversation Room", "error", "io-redis", null, {
-            bodyshopId,
-            conversationId,
-            error: error.message,
-            stack: error.stack
-          });
+          socket.emit("error", { message: "Failed to leave conversation" });
         }
       };
 
-      const conversationModified = ({ bodyshopId, conversationId, ...fields }) => {
-        try {
-          // Retrieve the room name for the conversation
-          const room = getBodyshopRoom(bodyshopId);
-          // Emit the updated data to all clients in the room
-          io.to(room).emit("conversation-changed", {
-            conversationId,
-            ...fields
-          });
-        } catch (error) {
-          logger.log("Failed to handle conversation modification", "error", "io-redis", null, {
-            bodyshopId,
-            conversationId,
-            fields,
-            error: error.message,
-            stack: error.stack
-          });
-        }
-      };
-
-      socket.on("conversation-modified", conversationModified);
-      socket.on("join-bodyshop-conversation", joinConversationRoom);
-      socket.on("leave-bodyshop-conversation", leaveConversationRoom);
+      socket.on("leave-conversation", leaveConversation);
+      socket.on("send-message", sendMessage);
+      socket.on("mark-as-read", markAsRead);
+      socket.on("join-conversation", joinConversation);
+      socket.on("open-messaging", openMessaging);
     };
 
     // Call Handlers