IO-3053 Add datadog watcher for Production and Test instances.

Merged in feature/IO-3048-Fix-Job-Bug-Messaging (pull request #1986 )
feature/IO-3048-Fix-Job-Bug-Messaging - Job Tag weirdness, Messaging Name Display, Unread Messages
2024-12-05 12:07:16 -08:00 · 2024-12-03 23:51:54 +00:00 · 2024-12-03 13:58:16 -08:00 · 2024-12-03 12:17:11 -08:00 · 2024-12-03 10:39:14 -08:00 · 2024-12-03 09:48:52 -08:00
28 changed files with 1002 additions and 443 deletions
--- a/.platform/hooks/predeploy/01-install-dd.sh
+++ b/.platform/hooks/predeploy/01-install-dd.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+DD_API_KEY=58d91898a70c6fd659f6eea768a57976 DD_SITE="us3.datadoghq.com" bash -c "$(curl -L https://install.datadoghq.com/scripts/install_script_agent7.sh)"
+
+echo "Datadog agent installed."
--- a/client/public/firebase-messaging-sw.js
+++ b/client/public/firebase-messaging-sw.js
@@ -1,6 +1,6 @@
 // Scripts for firebase and firebase messaging
-importScripts("https://www.gstatic.com/firebasejs/8.2.0/firebase-app.js");
-importScripts("https://www.gstatic.com/firebasejs/8.2.0/firebase-messaging.js");
+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");

 // 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,8 +49,6 @@ const messaging = firebase.messaging();

 messaging.onBackgroundMessage(function (payload) {
  // Customize notification here
-  const channel = new BroadcastChannel("imex-sw-messages");
-  channel.postMessage(payload);
-
-  //self.registration.showNotification(notificationTitle, notificationOptions);
+  console.log("[firebase-messaging-sw.js] Received background message ", payload);
+  self.registration.showNotification(notificationTitle, notificationOptions);
 });
--- a/client/src/components/chat-affix/chat-affix.container.jsx
+++ b/client/src/components/chat-affix/chat-affix.container.jsx
@@ -1,9 +1,12 @@
 import { useApolloClient } from "@apollo/client";
+import { getToken } from "@firebase/messaging";
+import axios from "axios";
 import React, { useContext, useEffect } from "react";
 import { useTranslation } from "react-i18next";
+import SocketContext from "../../contexts/SocketIO/socketContext";
+import { messaging, requestForToken } from "../../firebase/firebase.utils";
 import ChatPopupComponent from "../chat-popup/chat-popup.component";
 import "./chat-affix.styles.scss";
-import SocketContext from "../../contexts/SocketIO/socketContext";
 import { registerMessagingHandlers, unregisterMessagingHandlers } from "./registerMessagingSocketHandlers";

 export function ChatAffixContainer({ bodyshop, chatVisible }) {
@@ -14,6 +17,23 @@ export function ChatAffixContainer({ bodyshop, chatVisible }) {
  useEffect(() => {
    if (!bodyshop || !bodyshop.messagingservicesid) return;

+    async function SubscribeToTopicForFCMNotification() {
+      try {
+        await requestForToken();
+        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
+        });
+      } catch (error) {
+        console.log("Error attempting to subscribe to messaging topic: ", error);
+      }
+    }
+
+    SubscribeToTopicForFCMNotification();
+
    //Register WS handlers
    if (socket && socket.connected) {
      registerMessagingHandlers({ socket, client });
--- a/client/src/components/chat-affix/registerMessagingSocketHandlers.js
+++ b/client/src/components/chat-affix/registerMessagingSocketHandlers.js
@@ -2,39 +2,65 @@ import { CONVERSATION_LIST_QUERY, GET_CONVERSATION_DETAILS } from "../../graphql
 import { gql } from "@apollo/client";

 const logLocal = (message, ...args) => {
-  if (import.meta.env.PROD) {
-    return;
+  if (import.meta.env.VITE_APP_IS_TEST || !import.meta.env.PROD) {
+    console.log(`==================== ${message} ====================`);
+    console.dir({ ...args });
  }
-  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 };

-    // 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
+    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
+          });
        }
-      },
-      __typename: "conversations"
-    });
+      } catch (error) {
+        logLocal("handleNewMessageSummary - Cache miss", { conversationId });
+      }
+    }

    // Handle new conversation
    if (!existingConversation && newConversation?.phone_num) {
@@ -49,7 +75,6 @@ export const registerMessagingHandlers = ({ socket, client }) => {
        const existingConversations = queryResults?.conversations || [];
        const enrichedConversation = enrichConversation(newConversation, isoutbound);

-        // Avoid adding duplicate conversations
        if (!existingConversations.some((conv) => conv.id === enrichedConversation.id)) {
          client.cache.modify({
            id: "ROOT_QUERY",
@@ -68,81 +93,7 @@ export const registerMessagingHandlers = ({ socket, client }) => {

    // Handle existing conversation
    if (existingConversation) {
-      let conversationDetails;
-
-      // Attempt to read existing conversation details from cache
      try {
-        conversationDetails = client.cache.readFragment({
-          id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-          fragment: gql`
-            fragment ExistingConversation on conversations {
-              id
-              phone_num
-              updated_at
-              archived
-              label
-              unreadcnt
-              job_conversations {
-                jobid
-                conversationid
-              }
-              messages_aggregate {
-                aggregate {
-                  count
-                }
-              }
-              __typename
-            }
-          `
-        });
-      } catch (error) {
-        logLocal("handleNewMessageSummary - Cache miss for conversation, fetching from server", { conversationId });
-      }
-
-      // Fetch conversation details from server if not in cache
-      if (!conversationDetails) {
-        try {
-          const { data } = await client.query({
-            query: GET_CONVERSATION_DETAILS,
-            variables: { conversationId },
-            fetchPolicy: "network-only"
-          });
-          conversationDetails = data?.conversations_by_pk;
-        } catch (error) {
-          console.error("Failed to fetch conversation details from server:", error);
-          return;
-        }
-      }
-
-      // Validate that conversation details were retrieved
-      if (!conversationDetails) {
-        console.error("Unable to retrieve conversation details. Skipping cache update.");
-        return;
-      }
-
-      try {
-        // Check if the conversation is already in the cache
-        const queryResults = client.cache.readQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: queryVariables
-        });
-
-        const isAlreadyInCache = queryResults?.conversations.some((conv) => conv.id === conversationId);
-
-        if (!isAlreadyInCache) {
-          const enrichedConversation = enrichConversation(conversationDetails, isoutbound);
-
-          client.cache.modify({
-            id: "ROOT_QUERY",
-            fields: {
-              conversations(existingConversations = []) {
-                return [enrichedConversation, ...existingConversations];
-              }
-            }
-          });
-        }
-
-        // Update fields for the existing conversation in the cache
        client.cache.modify({
          id: client.cache.identify({ __typename: "conversations", id: conversationId }),
          fields: {
@@ -166,7 +117,11 @@ export const registerMessagingHandlers = ({ socket, client }) => {
      } catch (error) {
        console.error("Error updating cache for existing conversation:", error);
      }
+
+      return;
    }
+
+    logLocal("New Conversation Summary finished without work", { message });
  };

  const handleNewMessageDetailed = (message) => {
@@ -379,24 +334,75 @@ export const registerMessagingHandlers = ({ socket, client }) => {
          break;

        case "tag-added":
+          // Ensure `job_conversations` is properly formatted
+          const formattedJobConversations = job_conversations.map((jc) => ({
+            __typename: "job_conversations",
+            jobid: jc.jobid || jc.job?.id,
+            conversationid: conversationId,
+            job: jc.job || {
+              __typename: "jobs",
+              id: data.selectedJob.id,
+              ro_number: data.selectedJob.ro_number,
+              ownr_co_nm: data.selectedJob.ownr_co_nm,
+              ownr_fn: data.selectedJob.ownr_fn,
+              ownr_ln: data.selectedJob.ownr_ln
+            }
+          }));
+
          client.cache.modify({
            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
            fields: {
-              job_conversations: (existing = []) => [...existing, ...job_conversations]
+              job_conversations: (existing = []) => {
+                // Ensure no duplicates based on both `conversationid` and `jobid`
+                const existingLinks = new Set(
+                  existing.map((jc) => {
+                    const jobId = client.cache.readFragment({
+                      id: client.cache.identify(jc),
+                      fragment: gql`
+                        fragment JobConversationLinkAdded on job_conversations {
+                          jobid
+                          conversationid
+                        }
+                      `
+                    })?.jobid;
+                    return `${jobId}:${conversationId}`; // Unique identifier for a job-conversation link
+                  })
+                );
+
+                const newItems = formattedJobConversations.filter((jc) => {
+                  const uniqueLink = `${jc.jobid}:${jc.conversationid}`;
+                  return !existingLinks.has(uniqueLink);
+                });
+
+                return [...existing, ...newItems];
+              }
            }
          });
+
          break;

        case "tag-removed":
-          client.cache.modify({
-            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: {
-              job_conversations: (existing = [], { readField }) =>
-                existing.filter((jobRef) => readField("jobid", jobRef) !== fields.jobId)
-            }
-          });
-          break;
+          try {
+            const conversationCacheId = client.cache.identify({ __typename: "conversations", id: conversationId });

+            // Evict the specific cache entry for job_conversations
+            client.cache.evict({
+              id: conversationCacheId,
+              fieldName: "job_conversations"
+            });
+
+            // Garbage collect evicted entries
+            client.cache.gc();
+
+            logLocal("handleConversationChanged - tag removed - Refetched conversation list after state change", {
+              conversationId,
+              type
+            });
+          } catch (error) {
+            console.error("Error refetching queries after conversation state change: (Tag Removed)", error);
+          }
+
+          break;
        default:
          logLocal("handleConversationChanged - Unhandled type", { type });
          client.cache.modify({
@@ -421,7 +427,6 @@ export const registerMessagingHandlers = ({ socket, client }) => {

 export const unregisterMessagingHandlers = ({ socket }) => {
  if (!socket) return;
-  socket.off("new-message");
  socket.off("new-message-summary");
  socket.off("new-message-detailed");
  socket.off("message-changed");
--- a/client/src/components/chat-archive-button/chat-archive-button.component.jsx
+++ b/client/src/components/chat-archive-button/chat-archive-button.component.jsx
@@ -40,7 +40,7 @@ export function ChatArchiveButton({ conversation, bodyshop }) {
  };

  return (
-    <Button onClick={handleToggleArchive} loading={loading} type="primary">
+    <Button onClick={handleToggleArchive} loading={loading} className="archive-button" type="primary">
      {conversation.archived ? t("messaging.labels.unarchive") : t("messaging.labels.archive")}
    </Button>
  );
--- a/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx
+++ b/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 from "react";
+import React, { useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { Virtuoso } from "react-virtuoso";
 import { createStructuredSelector } from "reselect";
@@ -20,8 +20,25 @@ const mapDispatchToProps = (dispatch) => ({
 });

 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]);
+
  const renderConversation = (index) => {
-    const item = conversationList[index];
+    const item = sortedConversationList[index];
    const cardContentRight = <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>;
    const cardContentLeft =
      item.job_conversations.length > 0
@@ -64,13 +81,10 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
    );
  };

-  // CAN DO: Can go back into virtuoso for additional fetch
-  // endReached={loadMoreConversations} // Calls loadMoreConversations when scrolled to the bottom
-
  return (
    <div className="chat-list-container">
      <Virtuoso
-        data={conversationList}
+        data={sortedConversationList}
        itemContent={(index) => renderConversation(index)}
        style={{ height: "100%", width: "100%" }}
      />
--- a/client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx
+++ b/client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx
@@ -20,10 +20,10 @@ export function ChatConversationTitleTags({ jobConversations, bodyshop }) {
  const [removeJobConversation] = useMutation(REMOVE_CONVERSATION_TAG);
  const { socket } = useContext(SocketContext);

-  const handleRemoveTag = (jobId) => {
+  const handleRemoveTag = async (jobId) => {
    const convId = jobConversations[0].conversationid;
    if (!!convId) {
-      removeJobConversation({
+      await removeJobConversation({
        variables: {
          conversationId: convId,
          jobId: jobId
@@ -38,17 +38,18 @@ export function ChatConversationTitleTags({ jobConversations, bodyshop }) {
            }
          });
        }
-      }).then(() => {
-        if (socket) {
-          // Emit the `conversation-modified` event
-          socket.emit("conversation-modified", {
-            bodyshopId: bodyshop.id,
-            conversationId: convId,
-            type: "tag-removed",
-            jobId: jobId
-          });
-        }
      });
+
+      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
--- a/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx
+++ b/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx
@@ -15,7 +15,7 @@ const mapDispatchToProps = () => ({});

 export function ChatConversationTitle({ conversation }) {
  return (
-    <Space wrap>
+    <Space className="chat-title" wrap>
      <PhoneNumberFormatter>{conversation && conversation.phone_num}</PhoneNumberFormatter>
      <ChatLabelComponent conversation={conversation} />
      <ChatPrintButton conversation={conversation} />
--- a/client/src/components/chat-conversation/chat-conversation.container.jsx
+++ b/client/src/components/chat-conversation/chat-conversation.container.jsx
@@ -1,10 +1,10 @@
-import { useApolloClient, useQuery } from "@apollo/client";
+import { gql, useApolloClient, useQuery, useSubscription } from "@apollo/client";
 import axios from "axios";
 import React, { useCallback, useContext, useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import SocketContext from "../../contexts/SocketIO/socketContext";
-import { GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
+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";
@@ -14,11 +14,12 @@ const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
 });

-export function ChatConversationContainer({ bodyshop, selectedConversation }) {
+function ChatConversationContainer({ bodyshop, selectedConversation }) {
  const client = useApolloClient();
  const { socket } = useContext(SocketContext);
  const [markingAsReadInProgress, setMarkingAsReadInProgress] = useState(false);

+  // Fetch conversation details
  const {
    loading: convoLoading,
    error: convoError,
@@ -29,49 +30,80 @@ export function ChatConversationContainer({ bodyshop, selectedConversation }) {
    nextFetchPolicy: "network-only"
  });

-  const updateCacheWithReadMessages = useCallback(
-    (conversationId, messageIds) => {
-      if (!conversationId || !messageIds || messageIds.length === 0) return;
+  // 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;
+      }

-      // Mark individual messages as read
-      messageIds.forEach((messageId) => {
+      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: "messages", id: messageId }),
+          id: client.cache.identify({ __typename: "conversations", id: selectedConversation }),
          fields: {
-            read() {
-              return true; // Mark message as read
+            messages(existingMessages = []) {
+              const alreadyExists = existingMessages.some((msg) => msg.__ref === messageRef);
+              if (alreadyExists) return existingMessages;
+              return [...existingMessages, { __ref: messageRef }];
+            },
+            updated_at() {
+              return message.created_at;
            }
          }
        });
      });
+    }
+  });

-      // Update aggregate unread count for the conversation
-      client.cache.modify({
-        id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-        fields: {
-          messages_aggregate(existingAggregate) {
-            return {
-              ...existingAggregate,
-              aggregate: {
-                ...existingAggregate.aggregate,
-                count: 0 // No unread messages remaining
-              }
-            };
+  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]
  );

-  // Handle WebSocket events
+  // WebSocket event handlers
  useEffect(() => {
-    if (!socket || !socket.connected) return;
+    if (!socket?.connected) return;

    const handleConversationChange = (data) => {
      if (data.type === "conversation-marked-read") {
        const { conversationId, messageIds } = data;
-        console.log("Conversation change received:", data);
        updateCacheWithReadMessages(conversationId, messageIds);
      }
    };
@@ -81,11 +113,11 @@ export function ChatConversationContainer({ bodyshop, selectedConversation }) {
    return () => {
      socket.off("conversation-changed", handleConversationChange);
    };
-  }, [socket, client, updateCacheWithReadMessages]);
+  }, [socket, updateCacheWithReadMessages]);

-  // Handle joining/leaving conversation
+  // Join and leave conversation via WebSocket
  useEffect(() => {
-    if (!socket || !socket.connected) return;
+    if (!socket?.connected || !selectedConversation || !bodyshop?.id) return;

    socket.emit("join-bodyshop-conversation", {
      bodyshopId: bodyshop.id,
@@ -98,17 +130,14 @@ export function ChatConversationContainer({ bodyshop, selectedConversation }) {
        conversationId: selectedConversation
      });
    };
-  }, [selectedConversation, bodyshop, socket]);
+  }, [socket, bodyshop, selectedConversation]);

-  // Handle marking conversation as read
+  // Mark conversation as read
  const handleMarkConversationAsRead = async () => {
-    if (!convoData || !selectedConversation || markingAsReadInProgress) return;
+    if (!convoData || markingAsReadInProgress) return;

    const conversation = convoData.conversations_by_pk;
-    if (!conversation) {
-      console.warn(`No data found for conversation ID: ${selectedConversation}`);
-      return;
-    }
+    if (!conversation) return;

    const unreadMessageIds = conversation.messages
      ?.filter((message) => !message.read && !message.isoutbound)
@@ -116,22 +145,16 @@ export function ChatConversationContainer({ bodyshop, selectedConversation }) {

    if (unreadMessageIds?.length > 0) {
      setMarkingAsReadInProgress(true);
-
      try {
-        const payload = {
+        await axios.post("/sms/markConversationRead", {
          conversation,
          imexshopid: bodyshop?.imexshopid,
          bodyshopid: bodyshop?.id
-        };
+        });

-        console.log("Marking conversation as read:", payload);
-
-        await axios.post("/sms/markConversationRead", payload);
-
-        // Update local cache
        updateCacheWithReadMessages(selectedConversation, unreadMessageIds);
      } catch (error) {
-        console.error("Error marking conversation as read:", error.response?.data || error.message);
+        console.error("Error marking conversation as read:", error.message);
      } finally {
        setMarkingAsReadInProgress(false);
      }
@@ -141,11 +164,11 @@ export function ChatConversationContainer({ bodyshop, selectedConversation }) {
  return (
    <ChatConversationComponent
      subState={[convoLoading, convoError]}
-      conversation={convoData ? convoData.conversations_by_pk : {}}
-      messages={convoData ? convoData.conversations_by_pk.messages : []}
+      conversation={convoData?.conversations_by_pk || {}}
+      messages={convoData?.conversations_by_pk?.messages || []}
      handleMarkConversationAsRead={handleMarkConversationAsRead}
    />
  );
 }

-export default connect(mapStateToProps, null)(ChatConversationContainer);
+export default connect(mapStateToProps)(ChatConversationContainer);
--- a/client/src/components/chat-messages-list/chat-message-list.component.jsx
+++ b/client/src/components/chat-messages-list/chat-message-list.component.jsx
@@ -1,53 +1,85 @@
-import React, { useEffect, useRef } from "react";
+import React, { useCallback, useEffect, useRef, useState } from "react";
 import { Virtuoso } from "react-virtuoso";
 import { renderMessage } from "./renderMessage";
 import "./chat-message-list.styles.scss";

-const SCROLL_DELAY_MS = 50;
-const INITIAL_SCROLL_DELAY_MS = 100;
-
 export default function ChatMessageListComponent({ messages }) {
  const virtuosoRef = useRef(null);
+  const [atBottom, setAtBottom] = useState(true);
+  const loadedImagesRef = useRef(0);

-  // Scroll to the bottom after a short delay when the component mounts
+  const handleScrollStateChange = (isAtBottom) => {
+    setAtBottom(isAtBottom);
+  };
+
+  const resetImageLoadState = () => {
+    loadedImagesRef.current = 0;
+  };
+
+  const preloadImages = useCallback((imagePaths, onComplete) => {
+    resetImageLoadState();
+
+    if (imagePaths.length === 0) {
+      onComplete();
+      return;
+    }
+
+    imagePaths.forEach((url) => {
+      const img = new Image();
+      img.src = url;
+      img.onload = img.onerror = () => {
+        loadedImagesRef.current += 1;
+        if (loadedImagesRef.current === imagePaths.length) {
+          onComplete();
+        }
+      };
+    });
+  }, []);
+
+  // Ensure all images are loaded on initial render
  useEffect(() => {
-    const timer = setTimeout(() => {
-      if (virtuosoRef?.current?.scrollToIndex && messages?.length) {
+    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,
-          behavior: "auto" // Instantly scroll to the bottom
+          align: "end",
+          behavior: "auto"
        });
      }
-    }, INITIAL_SCROLL_DELAY_MS);
+    });
+  }, [messages, preloadImages]);

-    // Cleanup the timeout on unmount
-    return () => clearTimeout(timer);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []); // ESLint is disabled for this line because we only want this to load once (valid exception)
-
-  // Scroll to the bottom after the new messages are rendered
+  // Handle scrolling when new messages are added
  useEffect(() => {
-    if (virtuosoRef?.current?.scrollToIndex && messages?.length) {
-      const timeout = setTimeout(() => {
+    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", // Ensure the last message is fully visible
-          behavior: "smooth" // Smooth scrolling
+          align: "end",
+          behavior: "smooth"
        });
-      }, SCROLL_DELAY_MS); // Slight delay to ensure layout recalculates
-
-      // Cleanup timeout on dependency changes
-      return () => clearTimeout(timeout);
-    }
-  }, [messages]); // Triggered when new messages are added
+      }
+    });
+  }, [messages, atBottom, preloadImages]);

  return (
    <div className="chat">
      <Virtuoso
        ref={virtuosoRef}
        data={messages}
-        itemContent={(index) => renderMessage(messages, index)} // Pass `messages` to renderMessage
-        followOutput="smooth" // Ensure smooth scrolling when new data is appended
+        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}
        style={{ height: "100%", width: "100%" }}
      />
    </div>
--- a/client/src/components/chat-messages-list/chat-message-list.styles.scss
+++ b/client/src/components/chat-messages-list/chat-message-list.styles.scss
@@ -1,110 +1,131 @@
-.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;
-  margin: 0.8rem 0rem;
-  overflow: hidden; // Ensure the content scrolls correctly
+  height: 100%;
+  width: 100%;
+}
+.archive-button {
+  height: 20px;
+  border-radius: 4px;
+}
+.chat-title {
+  margin-bottom: 5px;
 }
-
 .messages {
  display: flex;
  flex-direction: column;
-  padding: 0.5rem; // Add padding to avoid edge clipping
+  padding: 0.5rem; // Prevent edge clipping
 }

 .message {
+  position: relative;
  border-radius: 20px;
  padding: 0.25rem 0.8rem;
+  word-wrap: break-word;

-  .message-img {
+  &-img {
    max-width: 10rem;
    max-height: 10rem;
    object-fit: contain;
    margin: 0.2rem;
+    border-radius: 4px;
+  }
+
+  &-images {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
  }
 }
-
-.yours {
-  align-items: flex-start;
+.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;
 }

 .msgmargin {
-  margin-top: 0.1rem;
-  margin-bottom: 0.1rem;
+  margin: 0.1rem 0;
 }

-.yours .message {
-  margin-right: 20%;
-  background-color: #eee;
-  position: relative;
+.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: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;
+/* "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;
+    }
+  }
 }

+/* "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;
+    }
+  }
 }

-.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;
+.virtuoso-container {
+  flex: 1;
+  overflow: auto;
 }
--- a/client/src/components/chat-messages-list/renderMessage.jsx
+++ b/client/src/components/chat-messages-list/renderMessage.jsx
@@ -7,28 +7,38 @@ 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>
-            {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>
+            {/* 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", {
--- a/client/src/components/chat-popup/chat-popup.component.jsx
+++ b/client/src/components/chat-popup/chat-popup.component.jsx
@@ -1,11 +1,11 @@
 import { InfoCircleOutlined, MessageOutlined, ShrinkOutlined, SyncOutlined } from "@ant-design/icons";
-import { useApolloClient, useLazyQuery } from "@apollo/client";
+import { useApolloClient, useLazyQuery, useQuery } from "@apollo/client";
 import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
 import React, { useContext, useEffect, useState } 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 { CONVERSATION_LIST_QUERY, UNREAD_CONVERSATION_COUNT } from "../../graphql/conversations.queries";
 import { toggleChatVisible } from "../../redux/messaging/messaging.actions";
 import { selectChatVisible, selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import ChatConversationListComponent from "../chat-conversation-list/chat-conversation-list.component";
@@ -38,6 +38,14 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
    ...(pollInterval > 0 ? { pollInterval } : {})
  });

+  // Query for unread count when chat is not visible
+  const { data: unreadData } = useQuery(UNREAD_CONVERSATION_COUNT, {
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+    skip: chatVisible, // Skip when chat is visible
+    ...(pollInterval > 0 ? { pollInterval } : {})
+  });
+
  // Socket connection status
  useEffect(() => {
    const handleSocketStatus = () => {
@@ -77,23 +85,29 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh

  // Get unread count from the cache
  const unreadCount = (() => {
-    try {
-      const cachedData = client.readQuery({
-        query: CONVERSATION_LIST_QUERY,
-        variables: { offset: 0 }
-      });
+    if (chatVisible) {
+      try {
+        const cachedData = client.readQuery({
+          query: CONVERSATION_LIST_QUERY,
+          variables: { offset: 0 }
+        });

-      if (!cachedData?.conversations) return 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
+        // 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
+      }
+    } else if (unreadData?.messages_aggregate?.aggregate?.count) {
+      // Use the unread count from the query result
+      return unreadData.messages_aggregate.aggregate.count;
    }
+    return 0;
  })();

  return (
@@ -108,7 +122,7 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
                <InfoCircleOutlined />
              </Tooltip>
              <SyncOutlined style={{ cursor: "pointer" }} onClick={() => refetch()} />
-              {pollInterval > 0 && <Tag color="yellow">{t("messaging.labels.nopush")}</Tag>}
+              {!socket?.connected && <Tag color="yellow">{t("messaging.labels.nopush")}</Tag>}
            </Space>
            <ShrinkOutlined
              onClick={() => toggleChatVisible()}
--- a/client/src/components/chat-send-message/chat-send-message.component.jsx
+++ b/client/src/components/chat-send-message/chat-send-message.component.jsx
@@ -81,7 +81,7 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
        />
      </span>
      <SendOutlined
-        className="imex-flex-row__margin"
+        className="chat-send-message-button"
        //  disabled={message === "" || !message}
        onClick={handleEnter}
      />
--- a/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx
+++ b/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx
@@ -28,7 +28,7 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {

  const executeSearch = (v) => {
    logImEXEvent("messaging_search_job_tag", { searchTerm: v });
-    loadRo(v);
+    loadRo(v).catch((e) => console.error("Error in ChatTagRoContainer executeSearch:", e));
  };

  const debouncedExecuteSearch = _.debounce(executeSearch, 500);
@@ -41,33 +41,40 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {
    variables: { conversationId: conversation.id }
  });

-  const handleInsertTag = (value, option) => {
+  const handleInsertTag = async (value, option) => {
    logImEXEvent("messaging_add_job_tag");

-    insertTag({
+    await insertTag({
      variables: { jobId: option.key }
-    }).then(() => {
-      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]
-        });
-      }
    });
+
+    if (socket) {
+      // Find the job details from the search data
+      const selectedJob = data?.search_jobs.find((job) => job.id === option.key);
+      if (!selectedJob) return;
+      socket.emit("conversation-modified", {
+        conversationId: conversation.id,
+        bodyshopId: bodyshop.id,
+        type: "tag-added",
+        selectedJob,
+        job_conversations: [
+          {
+            __typename: "job_conversations",
+            jobid: selectedJob.id,
+            conversationid: conversation.id,
+            job: {
+              __typename: "jobs",
+              id: selectedJob.id,
+              ro_number: selectedJob.ro_number,
+              ownr_co_nm: selectedJob.ownr_co_nm,
+              ownr_fn: selectedJob.ownr_fn,
+              ownr_ln: selectedJob.ownr_ln
+            }
+          }
+        ]
+      });
+    }
+
    setOpen(false);
  };

@@ -85,9 +92,10 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {
          handleSearch={handleSearch}
          handleInsertTag={handleInsertTag}
          setOpen={setOpen}
+          style={{ cursor: "pointer" }}
        />
      ) : (
-        <Tag onClick={() => setOpen(true)}>
+        <Tag style={{ cursor: "pointer" }} onClick={() => setOpen(true)}>
          <PlusOutlined />
          {t("messaging.actions.link")}
        </Tag>
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/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 { Button, Col, Row, notification } from "antd";
+import { Col, Row, notification } from "antd"; //import { Button, Col, Row, notification } from "antd";
 import Axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
@@ -408,8 +408,8 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
        updateSchComp={updateSchComp}
        setSchComp={setSchComp}
      />
-      {
-        {/* currentUser.email.includes("@rome.") || currentUser.email.includes("@imex.") ? (
+      {/* {
+        currentUser.email.includes("@rome.") || currentUser.email.includes("@imex.") ? (
        <Button
          onClick={async () => {
            for (const record of data.available_jobs) {
@@ -425,8 +425,8 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
        >
          Add all jobs as new.
        </Button>
-      ) : null */}
-      }
+      ) : null
+      } */}
      <Row gutter={[16, 16]}>
        <Col span={24}>
          <JobsAvailableTableComponent
--- a/client/src/firebase/firebase.utils.js
+++ b/client/src/firebase/firebase.utils.js
@@ -65,13 +65,10 @@ export const requestForToken = () => {
    });
 };

-export const onMessageListener = () =>
-  new Promise((resolve) => {
-    onMessage(messaging, (payload) => {
-      console.log("Inbound FCM Message", payload);
-      resolve(payload);
-    });
-  });
+onMessage(messaging, (payload) => {
+  console.log("FCM Message received. ", payload);
+  // ...
+});

 export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
  const state = stateProp || store.getState();
--- a/client/src/graphql/jobs-lines.queries.js
+++ b/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 } }, order_by: { line_no: asc }) {
+    joblines(where: { jobid: { _eq: $id }, removed: { _eq: false } }, order_by: { line_no: asc }) {
      id
      line_no
      unq_seq
--- a/client/src/utils/GraphQLClient.js
+++ b/client/src/utils/GraphQLClient.js
@@ -3,7 +3,7 @@ import { setContext } from "@apollo/client/link/context";
 import { HttpLink } from "@apollo/client/link/http"; //"apollo-link-http";
 import { RetryLink } from "@apollo/client/link/retry";
 import { WebSocketLink } from "@apollo/client/link/ws";
-import { getMainDefinition, offsetLimitPagination } from "@apollo/client/utilities";
+import { getMainDefinition } from "@apollo/client/utilities";
 //import { split } from "apollo-link";
 import apolloLogger from "apollo-link-logger";
 //import axios from "axios";
@@ -143,49 +143,7 @@ middlewares.push(
  new SentryLink().concat(roundTripLink.concat(retryLink.concat(errorLink.concat(authLink.concat(link)))))
 );

-const cache = new InMemoryCache({
-  typePolicies: {
-    Query: {
-      fields: {
-        conversations: offsetLimitPagination()
-      }
-    },
-    conversations: {
-      fields: {
-        job_conversations: {
-          keyArgs: false, // Indicates that all job_conversations share the same key
-          merge(existing = [], incoming) {
-            // Merge existing and incoming job_conversations
-            const merged = [
-              ...existing,
-              ...incoming.filter(
-                (incomingItem) => !existing.some((existingItem) => existingItem.__ref === incomingItem.__ref)
-              )
-            ];
-            return merged;
-          }
-        },
-        messages: {
-          keyArgs: false, // Ignore arguments when determining uniqueness (like `order_by`).
-          merge(existing = [], incoming = [], { readField }) {
-            const existingIds = new Set(existing.map((message) => readField("id", message)));
-
-            // Merge incoming messages, avoiding duplicates
-            const merged = [...existing];
-            incoming.forEach((message) => {
-              if (!existingIds.has(readField("id", message))) {
-                merged.push(message);
-              }
-            });
-
-            return merged;
-          }
-        }
-      }
-    }
-  }
-});
-
+const cache = new InMemoryCache({});
 const client = new ApolloClient({
  link: ApolloLink.from(middlewares),
  cache,
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,6 +31,7 @@
        "cors": "2.8.5",
        "crisp-status-reporter": "^1.2.2",
        "csrf": "^3.1.0",
+        "dd-trace": "^5.28.0",
        "dinero.js": "^1.9.1",
        "dotenv": "^16.4.5",
        "express": "^4.21.1",
@@ -55,7 +56,7 @@
        "soap": "^1.1.6",
        "socket.io": "^4.8.1",
        "socket.io-adapter": "^2.5.5",
-        "ssh2-sftp-client": "^10.0.3",
+        "ssh2-sftp-client": "^11.0.0",
        "twilio": "^4.23.0",
        "uuid": "^10.0.0",
        "winston": "^3.17.0",
@@ -66,6 +67,7 @@
      "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"
      },
@@ -1632,6 +1634,114 @@
        "kuler": "^2.0.0"
      }
    },
+    "node_modules/@datadog/libdatadog": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@datadog/libdatadog/-/libdatadog-0.2.2.tgz",
+      "integrity": "sha512-rTWo96mEPTY5UbtGoFj8/wY0uKSViJhsPg/Z6aoFWBFXQ8b45Ix2e/yvf92AAwrhG+gPLTxEqTXh3kef2dP8Ow==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/@datadog/native-appsec": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/@datadog/native-appsec/-/native-appsec-8.3.0.tgz",
+      "integrity": "sha512-RYHbSJ/MwJcJaLzaCaZvUyNLUKFbMshayIiv4ckpFpQJDiq1T8t9iM2k7008s75g1vRuXfsRNX7MaLn4aoFuWA==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "node-gyp-build": "^3.9.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@datadog/native-iast-rewriter": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@datadog/native-iast-rewriter/-/native-iast-rewriter-2.5.0.tgz",
+      "integrity": "sha512-WRu34A3Wwp6oafX8KWNAbedtDaaJO+nzfYQht7pcJKjyC2ggfPeF7SoP+eDo9wTn4/nQwEOscSR4hkJqTRlpXQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "lru-cache": "^7.14.0",
+        "node-gyp-build": "^4.5.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@datadog/native-iast-rewriter/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@datadog/native-iast-rewriter/node_modules/node-gyp-build": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+      "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
+      "license": "MIT",
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/@datadog/native-iast-taint-tracking": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@datadog/native-iast-taint-tracking/-/native-iast-taint-tracking-3.2.0.tgz",
+      "integrity": "sha512-Mc6FzCoyvU5yXLMsMS9yKnEqJMWoImAukJXolNWCTm+JQYCMf2yMsJ8pBAm7KyZKliamM9rCn7h7Tr2H3lXwjA==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "node-gyp-build": "^3.9.0"
+      }
+    },
+    "node_modules/@datadog/native-metrics": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@datadog/native-metrics/-/native-metrics-3.0.1.tgz",
+      "integrity": "sha512-0GuMyYyXf+Qpb/F+Fcekz58f2mO37lit9U3jMbWY/m8kac44gCPABzL5q3gWbdH+hWgqYfQoEYsdNDGSrKfwoQ==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "node-addon-api": "^6.1.0",
+        "node-gyp-build": "^3.9.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@datadog/pprof": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/@datadog/pprof/-/pprof-5.4.1.tgz",
+      "integrity": "sha512-IvpL96e/cuh8ugP5O8Czdup7XQOLHeIDgM5pac5W7Lc1YzGe5zTtebKFpitvb1CPw1YY+1qFx0pWGgKP2kOfHg==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "delay": "^5.0.0",
+        "node-gyp-build": "<4.0",
+        "p-limit": "^3.1.0",
+        "pprof-format": "^2.1.0",
+        "source-map": "^0.7.4"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@datadog/pprof/node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@datadog/sketches-js": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@datadog/sketches-js/-/sketches-js-2.1.1.tgz",
+      "integrity": "sha512-d5RjycE+MObE/hU+8OM5Zp4VjTwiPLRa8299fj7muOmR16fb942z8byoMbCErnGh0lBevvgkGrLclQDvINbIyg==",
+      "license": "Apache-2.0"
+    },
    "node_modules/@fastify/busboy": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-3.0.0.tgz",
@@ -1962,6 +2072,15 @@
        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
      }
    },
+    "node_modules/@isaacs/ttlcache": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/ttlcache/-/ttlcache-1.4.1.tgz",
+      "integrity": "sha512-RQgQ4uQ+pLbqXfOmieB91ejmLwvSgv9nLx6sT6sD83s7umBypgg+OIBOBbEUiJXrfpnp9j0mRhYYdzp9uqq3lA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/@jonkemp/package-utils": {
      "version": "1.0.8",
      "resolved": "https://registry.npmjs.org/@jonkemp/package-utils/-/package-utils-1.0.8.tgz",
@@ -2177,6 +2296,30 @@
        "node": ">=8.0.0"
      }
    },
+    "node_modules/@opentelemetry/core": {
+      "version": "1.29.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.29.0.tgz",
+      "integrity": "sha512-gmT7vAreXl0DTHD2rVZcw3+l2g84+5XiHIqdBUxXbExymPCvSsGOpiwMmn8nkiJur28STV31wnhIDrzWDPzjfA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/semantic-conventions": "1.28.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/semantic-conventions": {
+      "version": "1.28.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.28.0.tgz",
+      "integrity": "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=14"
+      }
+    },
    "node_modules/@pkgjs/parseargs": {
      "version": "0.11.0",
      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -2190,36 +2333,31 @@
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/base64": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/codegen": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/eventemitter": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/fetch": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
      "license": "BSD-3-Clause",
-      "optional": true,
      "dependencies": {
        "@protobufjs/aspromise": "^1.1.1",
        "@protobufjs/inquire": "^1.1.0"
@@ -2229,36 +2367,31 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/inquire": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/path": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/pool": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/utf8": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@redis/bloom": {
      "version": "1.2.0",
@@ -3339,6 +3472,15 @@
        "node": ">=0.4.0"
      }
    },
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
    "node_modules/acorn-walk": {
      "version": "8.3.0",
      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz",
@@ -3815,6 +3957,12 @@
        "node": ">=10"
      }
    },
+    "node_modules/cjs-module-lexer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz",
+      "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==",
+      "license": "MIT"
+    },
    "node_modules/cliui": {
      "version": "8.0.1",
      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@@ -4223,6 +4371,12 @@
        "node": ">= 8"
      }
    },
+    "node_modules/crypto-randomuuid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-randomuuid/-/crypto-randomuuid-1.0.0.tgz",
+      "integrity": "sha512-/RC5F4l1SCqD/jazwUF6+t34Cd8zTSAGZ7rvvZu1whZUhD2a5MOGKjSGowoGcpj/cbVZk1ZODIooJEQQq3nNAA==",
+      "license": "MIT"
+    },
    "node_modules/csrf": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.1.0.tgz",
@@ -4304,6 +4458,77 @@
      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
    },
+    "node_modules/dc-polyfill": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/dc-polyfill/-/dc-polyfill-0.1.6.tgz",
+      "integrity": "sha512-UV33cugmCC49a5uWAApM+6Ev9ZdvIUMTrtCO9fj96TPGOQiea54oeO3tiEVdVeo3J9N2UdJEmbS4zOkkEA35uQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.17"
+      }
+    },
+    "node_modules/dd-trace": {
+      "version": "5.28.0",
+      "resolved": "https://registry.npmjs.org/dd-trace/-/dd-trace-5.28.0.tgz",
+      "integrity": "sha512-jyF7JLx2Yw16MHcD97sYKXbVd7ZT1hKJ5/NkRRGeG9cgen5+d/ilIvfzgh2qRjeow+9a5ligoZoUOYJ3nYn9hw==",
+      "hasInstallScript": true,
+      "license": "(Apache-2.0 OR BSD-3-Clause)",
+      "dependencies": {
+        "@datadog/libdatadog": "^0.2.2",
+        "@datadog/native-appsec": "8.3.0",
+        "@datadog/native-iast-rewriter": "2.5.0",
+        "@datadog/native-iast-taint-tracking": "3.2.0",
+        "@datadog/native-metrics": "^3.0.1",
+        "@datadog/pprof": "5.4.1",
+        "@datadog/sketches-js": "^2.1.0",
+        "@isaacs/ttlcache": "^1.4.1",
+        "@opentelemetry/api": ">=1.0.0 <1.9.0",
+        "@opentelemetry/core": "^1.14.0",
+        "crypto-randomuuid": "^1.0.0",
+        "dc-polyfill": "^0.1.4",
+        "ignore": "^5.2.4",
+        "import-in-the-middle": "1.11.2",
+        "int64-buffer": "^0.1.9",
+        "istanbul-lib-coverage": "3.2.0",
+        "jest-docblock": "^29.7.0",
+        "koalas": "^1.0.2",
+        "limiter": "1.1.5",
+        "lodash.sortby": "^4.7.0",
+        "lru-cache": "^7.14.0",
+        "module-details-from-path": "^1.0.3",
+        "msgpack-lite": "^0.1.26",
+        "opentracing": ">=0.12.1",
+        "path-to-regexp": "^0.1.10",
+        "pprof-format": "^2.1.0",
+        "protobufjs": "^7.2.5",
+        "retry": "^0.13.1",
+        "rfdc": "^1.3.1",
+        "semver": "^7.5.4",
+        "shell-quote": "^1.8.1",
+        "tlhunter-sorted-set": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/dd-trace/node_modules/@opentelemetry/api": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.8.0.tgz",
+      "integrity": "sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/dd-trace/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/debug": {
      "version": "4.3.7",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
@@ -4384,6 +4609,18 @@
        "node": ">= 6"
      }
    },
+    "node_modules/delay": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz",
+      "integrity": "sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/delayed-stream": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -4440,6 +4677,15 @@
        "node": ">=8"
      }
    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/dev-null": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/dev-null/-/dev-null-0.1.1.tgz",
@@ -4761,6 +5007,12 @@
        "node": ">= 0.6"
      }
    },
+    "node_modules/event-lite": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/event-lite/-/event-lite-0.1.3.tgz",
+      "integrity": "sha512-8qz9nOz5VeD2z96elrEKD2U433+L3DWdUdDkOINLGOJvx1GsMBbMn0aCeu28y8/e85A6mCigBiFlYMnTBEGlSw==",
+      "license": "MIT"
+    },
    "node_modules/event-target-shim": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
@@ -5706,6 +5958,47 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-in-the-middle": {
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.11.2.tgz",
+      "integrity": "sha512-gK6Rr6EykBcc6cVWRSBR5TWf8nn6hZMYSRYqCcHa0l0d1fPK7JSYo6+Mlmck76jIX9aL/IZ71c06U2VpFwl1zA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "acorn": "^8.8.2",
+        "acorn-import-attributes": "^1.9.5",
+        "cjs-module-lexer": "^1.2.2",
+        "module-details-from-path": "^1.0.3"
+      }
+    },
    "node_modules/inflight": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -5737,6 +6030,12 @@
        "node": ">=8"
      }
    },
+    "node_modules/int64-buffer": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.10.tgz",
+      "integrity": "sha512-v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA==",
+      "license": "MIT"
+    },
    "node_modules/intuit-oauth": {
      "version": "4.1.3",
      "resolved": "https://registry.npmjs.org/intuit-oauth/-/intuit-oauth-4.1.3.tgz",
@@ -5853,6 +6152,15 @@
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/jackspeak": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz",
@@ -5916,6 +6224,18 @@
      "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
      "dev": true
    },
+    "node_modules/jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+      "license": "MIT",
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
    "node_modules/jose": {
      "version": "4.15.4",
      "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.4.tgz",
@@ -6082,6 +6402,15 @@
        "safe-buffer": "^5.0.1"
      }
    },
+    "node_modules/koalas": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/koalas/-/koalas-1.0.2.tgz",
+      "integrity": "sha512-RYhBbYaTTTHId3l6fnMZc3eGQNW6FVCqMG6AMwA5I1Mafr6AflaXeoi6x3xQuATRotGYRLk6+1ELZH4dstFNOA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/kuler": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
@@ -6201,6 +6530,12 @@
      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
    },
+    "node_modules/lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",
+      "license": "MIT"
+    },
    "node_modules/logform": {
      "version": "2.7.0",
      "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz",
@@ -6222,8 +6557,7 @@
      "version": "5.2.3",
      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==",
-      "license": "Apache-2.0",
-      "optional": true
+      "license": "Apache-2.0"
    },
    "node_modules/lru-cache": {
      "version": "6.0.0",
@@ -6424,6 +6758,12 @@
        "mkdirp": "bin/cmd.js"
      }
    },
+    "node_modules/module-details-from-path": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz",
+      "integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==",
+      "license": "MIT"
+    },
    "node_modules/moment": {
      "version": "2.30.1",
      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
@@ -6449,6 +6789,21 @@
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
    },
+    "node_modules/msgpack-lite": {
+      "version": "0.1.26",
+      "resolved": "https://registry.npmjs.org/msgpack-lite/-/msgpack-lite-0.1.26.tgz",
+      "integrity": "sha512-SZ2IxeqZ1oRFGo0xFGbvBJWMp3yLIY9rlIJyxy8CGrwZn1f0ZK4r6jV/AM1r0FZMDUkWkglOk/eeKIL9g77Nxw==",
+      "license": "MIT",
+      "dependencies": {
+        "event-lite": "^0.1.1",
+        "ieee754": "^1.1.8",
+        "int64-buffer": "^0.1.9",
+        "isarray": "^1.0.0"
+      },
+      "bin": {
+        "msgpack": "bin/msgpack"
+      }
+    },
    "node_modules/multer": {
      "version": "1.4.5-lts.1",
      "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz",
@@ -6487,6 +6842,12 @@
        "node": ">= 0.4.0"
      }
    },
+    "node_modules/node-addon-api": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
+      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
+      "license": "MIT"
+    },
    "node_modules/node-eta": {
      "version": "0.9.0",
      "resolved": "https://registry.npmjs.org/node-eta/-/node-eta-0.9.0.tgz",
@@ -6519,6 +6880,17 @@
        "node": ">= 6.13.0"
      }
    },
+    "node_modules/node-gyp-build": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.9.0.tgz",
+      "integrity": "sha512-zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A==",
+      "license": "MIT",
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
    "node_modules/node-mailjet": {
      "version": "6.0.6",
      "resolved": "https://registry.npmjs.org/node-mailjet/-/node-mailjet-6.0.6.tgz",
@@ -6687,6 +7059,15 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/opentracing": {
+      "version": "0.14.7",
+      "resolved": "https://registry.npmjs.org/opentracing/-/opentracing-0.14.7.tgz",
+      "integrity": "sha512-vz9iS7MJ5+Bp1URw8Khvdyw1H/hGvzHWlKQ7eRrQojSCDL1/SrWfrY9QebLw97n2deyRtzHRC3MkQfVNUCo91Q==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
    "node_modules/optionator": {
      "version": "0.8.3",
      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -6708,7 +7089,6 @@
      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
      "license": "MIT",
-      "optional": true,
      "dependencies": {
        "yocto-queue": "^0.1.0"
      },
@@ -6850,6 +7230,12 @@
        "@jonkemp/package-utils": "^1.0.8"
      }
    },
+    "node_modules/pprof-format": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pprof-format/-/pprof-format-2.1.0.tgz",
+      "integrity": "sha512-0+G5bHH0RNr8E5hoZo/zJYsL92MhkZjwrHp3O2IxmY8RJL9ooKeuZ8Tm0ZNBw5sGZ9TiM71sthTjWoR2Vf5/xw==",
+      "license": "MIT"
+    },
    "node_modules/prelude-ls": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -6917,7 +7303,6 @@
      "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
      "hasInstallScript": true,
      "license": "BSD-3-Clause",
-      "optional": true,
      "dependencies": {
        "@protobufjs/aspromise": "^1.1.2",
        "@protobufjs/base64": "^1.1.2",
@@ -7157,7 +7542,6 @@
      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
      "license": "MIT",
-      "optional": true,
      "engines": {
        "node": ">= 4"
      }
@@ -7177,6 +7561,12 @@
        "node": ">=14"
      }
    },
+    "node_modules/rfdc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+      "license": "MIT"
+    },
    "node_modules/rimraf": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz",
@@ -7387,7 +7777,6 @@
      "version": "1.8.1",
      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
-      "dev": true,
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
@@ -7737,16 +8126,17 @@
      }
    },
    "node_modules/ssh2-sftp-client": {
-      "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==",
+      "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",
      "dependencies": {
        "concat-stream": "^2.0.0",
        "promise-retry": "^2.0.1",
        "ssh2": "^1.15.0"
      },
      "engines": {
-        "node": ">=16.20.2"
+        "node": ">=18.20.4"
      },
      "funding": {
        "type": "individual",
@@ -8168,6 +8558,12 @@
      "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
    },
+    "node_modules/tlhunter-sorted-set": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/tlhunter-sorted-set/-/tlhunter-sorted-set-0.1.0.tgz",
+      "integrity": "sha512-eGYW4bjf1DtrHzUYxYfAcSytpOkA44zsr7G2n3PV7yOUR23vmkGe3LL4R+1jL9OsXtbsFOwe8XtbCrabeaEFnw==",
+      "license": "MIT"
+    },
    "node_modules/to-fast-properties": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -8692,7 +9088,6 @@
      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
      "license": "MIT",
-      "optional": true,
      "engines": {
        "node": ">=10"
      },
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
    "cors": "2.8.5",
    "crisp-status-reporter": "^1.2.2",
    "csrf": "^3.1.0",
+    "dd-trace": "^5.28.0",
    "dinero.js": "^1.9.1",
    "dotenv": "^16.4.5",
    "express": "^4.21.1",
--- a/server.js
+++ b/server.js
@@ -4,6 +4,14 @@ require("dotenv").config({
  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });

+if (process.env.NODE_ENV) {
+  const tracer = require("dd-trace").init({
+    profiling: true,
+    env: process.env.NODE_ENV,
+    service: "bodyshop-api"
+  });
+}
+
 const cors = require("cors");
 const http = require("http");
 const Redis = require("ioredis");
@@ -24,6 +32,8 @@ const { ElastiCacheClient, DescribeCacheClustersCommand } = require("@aws-sdk/cl
 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;
@@ -298,7 +308,14 @@ const main = async () => {
  applyRoutes({ app });
  redisSocketEvents({ io: ioRedis, redisHelpers, ioHelpers, logger });

-  StartStatusReporter();
+  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);
@@ -317,3 +334,33 @@ 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);
+}
--- a/server/firebase/firebase-handler.js
+++ b/server/firebase/firebase-handler.js
@@ -253,7 +253,7 @@ const sendNotification = async (req, res) => {
    admin
      .messaging()
      .send({
-        topic: "PRD_PATRICK-messaging",
+        topic: req.body.topic,
        notification: {
          title: `ImEX Online Message - `,
          body: "Test Noti."
--- a/server/intellipay/intellipay.js
+++ b/server/intellipay/intellipay.js
@@ -14,7 +14,7 @@ require("dotenv").config({
  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });

-const domain = process.env.NODE_ENV ? "secure" : "secure";
+const domain = process.env.NODE_ENV ? "secure" : "test";

 const { SecretsManagerClient, GetSecretValueCommand } = require("@aws-sdk/client-secrets-manager");
 const { InstanceRegion } = require("../utils/instanceMgr");
--- a/server/job/job-costing.js
+++ b/server/job/job-costing.js
@@ -857,8 +857,8 @@ function GenerateCostingData(job) {
    summaryData.totalSales = summaryData.totalSales.add(Adjustment);
    //Add to lines.
    costCenterData.push({
-      id: "Adj",
-      cost_center: "Adjustment",
+      id: "AdjEst",
+      cost_center: "Adjustment (Est. Match)",
      sale_labor: Dinero().toFormat(),
      sale_labor_dinero: Dinero(),
      sale_parts: Dinero().toFormat(),
--- a/server/job/job-totals-USA.js
+++ b/server/job/job-totals-USA.js
@@ -73,7 +73,16 @@ async function TotalsServerSide(req, res) {
      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.getAmount() / 100;
+    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.
--- a/server/routes/notificationsRoutes.js
+++ b/server/routes/notificationsRoutes.js
@@ -1,11 +1,12 @@
 const express = require("express");
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
-const { subscribe, unsubscribe } = require("../firebase/firebase-handler");
+const { subscribe, unsubscribe, sendNotification } = 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;
--- a/server/utils/statusReporter.js
+++ b/server/utils/statusReporter.js
@@ -11,7 +11,7 @@ const InstanceManager = require("../utils/instanceMgr").default;
 function StartStatusReporter() {
  //For ImEX Online.

-  InstanceManager({
+  return InstanceManager({
    executeFunction: true,
    args: [],
    imex: () => {
@@ -31,14 +31,14 @@ function StartStatusReporter() {
          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)
+          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,
+          // 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;
Author	SHA1	Message	Date
Patrick Fic	5cb93b1a2c	IO-3053 Add datadog watcher for Production and Test instances.	2024-12-05 12:07:16 -08:00
Dave Richer	8d2bdb171b	Merged in feature/IO-3048-Fix-Job-Bug-Messaging (pull request #1986 ) feature/IO-3048-Fix-Job-Bug-Messaging - Job Tag weirdness, Messaging Name Display, Unread Messages	2024-12-03 23:51:54 +00:00
Dave Richer	a2ada7d88e	feature/IO-3048-Fix-Job-Bug-Messaging - Unread count Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-03 13:58:16 -08:00
Dave Richer	b490ab96be	feature/IO-3048-Fix-Job-Bug-Messaging - Do not allow more than 1 of the same job to be associated with a conversation Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-03 12:17:11 -08:00
Dave Richer	44721019fa	feature/IO-3048-Fix-Job-Bug-Messaging - Do not allow more than 1 of the same job to be associated with a conversation Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-03 10:39:14 -08:00
Dave Richer	15ba2a1caf	feature/IO-3048-Fix-Job-Bug-Messaging - Fix tag weirdness and a vite error Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-03 09:48:52 -08:00
Dave Richer	11b906103a	Merged in release/2024-11-22 (pull request #1977 ) Release/2024-11-22 / 2024-11-29 - into master-AIO - IO-2920, IO-2921, IO-2959, IO-3000, IO-3001, IO-3037, IO-3040	2024-11-30 05:02:46 +00:00
Patrick Fic	3f006f431e	Merged in feature/IO-3001-us-est-scrubbing (pull request #1980 ) IO-3001 Update job costing label for ttl_adjustment	2024-11-29 19:56:47 +00:00
Patrick Fic	6f2b5e4c55	IO-3001 Update job costing label for ttl_adjustment	2024-11-29 11:56:18 -08:00
Patrick Fic	50d7c5dace	Merged in feature/IO-3001-us-est-scrubbing (pull request #1978 ) IO-3001 Add in adjustments to subtotal scrubbing.	2024-11-29 19:34:01 +00:00
Patrick Fic	9ac27b6090	IO-3001 Add in adjustments to subtotal scrubbing.	2024-11-29 11:33:19 -08:00
Dave Richer	51a1b48da9	Merge remote-tracking branch 'origin/feature/IO-3000-messaging-sockets-migrationv2' into release/2024-11-22	2024-11-28 12:27:39 -08:00
Dave Richer	648a9b8f64	feature/IO-3000-messaging-sockets-migration2 - - Small change Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-11-28 12:27:06 -08:00
Dave Richer	7402679091	Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1974 ) Feature/IO-3000 messaging sockets migrationv2	2024-11-28 20:16:43 +00:00
Dave Richer	627174b7d3	feature/IO-3000-messaging-sockets-migration2 - - Bring back subscription for fallback Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-11-28 12:14:35 -08:00
Patrick Fic	9fcc01aa9f	IO-3000 FInal updates to firebase SW.	2024-11-28 12:11:30 -08:00
Patrick Fic	cb46ee5700	Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1973 ) IO-3000 update firebase js version, and add back testing route.	2024-11-28 19:41:05 +00:00
Patrick Fic	43bf1fc8cf	IO-3000 update firebase js version, and add back testing route.	2024-11-28 11:39:17 -08:00
Patrick Fic	73af18f287	Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1970 ) IO-3000 Add back FCM notification subscribe	2024-11-28 19:06:17 +00:00
Patrick Fic	90f4977924	IO-3000 Add back FCM notification subscribe	2024-11-28 11:05:50 -08:00
Dave Richer	c3b184d17b	Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1968 ) Feature/IO-3000 messaging sockets migrationv2	2024-11-28 18:02:13 +00:00
Dave Richer	db5740d487	feature/IO-3000-messaging-sockets-migration2 - - Various work Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-11-28 09:57:35 -08:00
Dave Richer	08c0da1bed	feature/IO-3000-messaging-sockets-migration2 - - Various work Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-11-28 09:10:23 -08:00
Allan Carr	4d35976241	Merged in feature/IO-3040-Report-Selector-Date-Range-Restriction (pull request #1965 ) IO-3040 Report Selector Date Range Restriction for Prod Approved-by: Patrick Fic	2024-11-28 15:56:25 +00:00
Allan Carr	5edbed3f0b	Merged in feature/IO-3001-us-est-scrubbing (pull request #1966 ) IO-3001 Correct Commenting of Button	2024-11-28 15:55:59 +00:00
Allan Carr	3d79be06de	IO-3001 Correct Commenting of Button Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-27 18:02:28 -08:00
Dave Richer	2937a07379	Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1963 ) feature/IO-3000-messaging-sockets-migration2 -	2024-11-27 22:09:27 +00:00
Dave Richer	ad1761096a	feature/IO-3000-messaging-sockets-migration2 - - found small thing Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-11-27 14:08:52 -08:00
Patrick Fic	6a7548d11b	Merged in feature/IO-2920-cash-discounting (pull request #1962 ) IO-2920 Rever test URL to correct value for intellipay.	2024-11-27 21:17:56 +00:00
Patrick Fic	affbb3f168	IO-2920 Rever test URL to correct value for intellipay.	2024-11-27 13:15:03 -08:00
Dave Richer	0522747b49	Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1960 ) Feature/IO-3000 messaging sockets migrationv2	2024-11-27 19:36:29 +00:00
Dave Richer	aec7b40ae2	feature/IO-3000-messaging-sockets-migration2 - -misc Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-11-27 11:35:28 -08:00
Dave Richer	54d319f1e8	Merge remote-tracking branch 'origin/release/2024-11-22' into feature/IO-3000-messaging-sockets-migrationv2	2024-11-27 11:30:39 -08:00
Dave Richer	8d6fba2b61	feature/IO-3000-messaging-sockets-migration2 - -misc Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-11-27 11:27:34 -08:00
Dave Richer	70c31eae9e	feature/IO-3000-messaging-sockets-migration2 - - [EXISTING BUG?] The updated at timeframes do not automatically update as time passes. If you receive a message, and it is changed to a few seconds ago, if you wait a few minutes, it does not change unless you interact with it forcing a re-render. This can be solved by adding a tick state and periodically refreshing - unsure of the performance impact for many elements however. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-11-27 10:21:53 -08:00
Dave Richer	5e871b024d	feature/IO-3000-messaging-sockets-migration2 - - Polling Mode indicator now pegged to socket.connected Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-11-27 10:13:38 -08:00
Dave Richer	eb1786d634	Merged in feature/IO-2959-crisp-status-page (pull request #1958 ) IO-2959 Remove debug for crisp status and add sig term handler.	2024-11-27 18:03:02 +00:00
Patrick Fic	5e8d0fddbd	IO-2959 Remove debug for crisp status and add sig term handler.	2024-11-27 09:44:42 -08:00
Allan Carr	5d690fd71f	Merged in feature/IO-3040-Report-Selector-Date-Range-Restriction (pull request #1956 ) Feature/IO-3040 Report Selector Date Range Restriction Approved-by: Dave Richer	2024-11-27 16:48:07 +00:00
Allan Carr	79a2d902cd	Merged in feature/IO-3037-Supplement-Existing-Lines (pull request #1957 ) IO-3037 Supplement Existing Lines Approved-by: Dave Richer	2024-11-27 16:47:52 +00:00
Allan Carr	77f340d08c	IO-3037 Supplement Existing Lines Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-27 08:40:55 -08:00