IO-3464 Document Edit

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/document-editor/document-editor-local.component.jsx

@@ -0,0 +1,166 @@
+import axios from "axios";
+import { Result } from "antd";
+import * as markerjs2 from "markerjs2";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { handleUpload } from "../documents-local-upload/documents-local-upload.utility";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser,
+  bodyshop: selectBodyshop
+});
+const mapDispatchToProps = () => ({});
+
+export function DocumentEditorLocalComponent({ imageUrl, filename, jobid }) {
+  const imgRef = useRef(null);
+  const [loading, setLoading] = useState(false);
+  const [uploaded, setuploaded] = useState(false);
+  const [loadedImageUrl, setLoadedImageUrl] = useState(null);
+  const [imageLoaded, setImageLoaded] = useState(false);
+  const [imageLoading, setImageLoading] = useState(true);
+  const markerArea = useRef(null);
+  const { t } = useTranslation();
+  const notification = useNotification();
+  const [uploading, setUploading] = useState(false);
+
+  const triggerUpload = useCallback(
+    async (dataUrl) => {
+      if (uploading) return;
+      setUploading(true);
+      const blob = await b64toBlob(dataUrl);
+      const nameWithoutExt = filename.split(".").slice(0, -1).join(".").trim();
+      const parts = nameWithoutExt.split("-");
+      const baseParts = [];
+      for (let i = 0; i < parts.length; i++) {
+        if (/^\d+$/.test(parts[i])) {
+          break;
+        }
+        baseParts.push(parts[i]);
+      }
+      const adjustedBase = baseParts.length > 0 ? baseParts.join("-") : "edited";
+      const adjustedFilename = `${adjustedBase}.jpg`;
+      const file = new File([blob], adjustedFilename, { type: "image/jpeg" });
+
+      handleUpload({
+        ev: {
+          file: file,
+          filename: adjustedFilename,
+          onSuccess: () => {
+            setUploading(false);
+            setLoading(false);
+            setuploaded(true);
+          },
+          onError: () => {
+            setUploading(false);
+            setLoading(false);
+          }
+        },
+        context: {
+          jobid: jobid,
+          callback: () => {} // Optional callback
+        },
+        notification
+      });
+    },
+    [filename, jobid, notification, uploading]
+  );
+
+  useEffect(() => {
+    if (imgRef.current !== null && imageLoaded && !markerArea.current) {
+      // create a marker.js MarkerArea
+      markerArea.current = new markerjs2.MarkerArea(imgRef.current);
+
+      // attach an event handler to assign annotated image back to our image element
+      markerArea.current.addEventListener("close", () => {
+        // NO OP
+      });
+
+      markerArea.current.addEventListener("render", (event) => {
+        const dataUrl = event.dataUrl;
+        imgRef.current.src = dataUrl;
+        markerArea.current.close();
+        triggerUpload(dataUrl);
+      });
+      // launch marker.js
+
+      markerArea.current.renderAtNaturalSize = true;
+      markerArea.current.renderImageType = "image/jpeg";
+      markerArea.current.renderImageQuality = 1;
+      //markerArea.current.settings.displayMode = "inline";
+      markerArea.current.show();
+    }
+  }, [triggerUpload, imageLoaded]);
+
+  useEffect(() => {
+    if (!imageUrl) return;
+    const controller = new AbortController();
+
+    const loadImage = async () => {
+      setImageLoaded(false);
+      setImageLoading(true);
+      try {
+        const response = await axios.get(imageUrl, { responseType: "blob", signal: controller.signal });
+        const blobUrl = URL.createObjectURL(response.data);
+        setLoadedImageUrl((prevUrl) => {
+          if (prevUrl) URL.revokeObjectURL(prevUrl);
+          return blobUrl;
+        });
+      } catch (error) {
+        if (axios.isCancel?.(error) || error.name === "CanceledError") {
+          // request was aborted — safe to ignore
+          return;
+        }
+        console.error("Failed to fetch image blob", error);
+      } finally {
+        if (!controller.signal.aborted) {
+          setImageLoading(false);
+        }
+      }
+    };
+    loadImage();
+    return () => {
+      controller.abort();
+    };
+  }, [imageUrl]);
+
+  useEffect(() => {
+    return () => {
+      if (loadedImageUrl) {
+        URL.revokeObjectURL(loadedImageUrl);
+      }
+    };
+  }, [loadedImageUrl]);
+
+  async function b64toBlob(url) {
+    const res = await fetch(url);
+    return await res.blob();
+  }
+
+  return (
+    <div>
+      {!loading && !uploaded && loadedImageUrl && (
+        <img
+          ref={imgRef}
+          src={loadedImageUrl}
+          alt="sample"
+          onLoad={() => setImageLoaded(true)}
+          onError={(error) => {
+            console.error("Failed to load image", error);
+          }}
+          style={{ maxWidth: "90vw", maxHeight: "90vh" }}
+        />
+      )}
+      {(loading || imageLoading || !imageLoaded) && !uploaded && (
+        <LoadingSpinner message={t("documents.labels.uploading")} />
+      )}
+      {uploaded && <Result status="success" title={t("documents.successes.edituploaded")} />}
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(DocumentEditorLocalComponent);

client/src/components/document-editor/document-editor.component.jsx

@@ -1,4 +1,5 @@
 //import "tui-image-editor/dist/tui-image-editor.css";
+import axios from "axios";
 import { Result } from "antd";
 import * as markerjs2 from "markerjs2";
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -6,8 +7,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import { handleUpload } from "../documents-upload/documents-upload.utility";
-import { GenerateSrcUrl } from "../jobs-documents-gallery/job-documents.utility";
+import { handleUpload } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility.js";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
@@ -23,6 +23,9 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
   const imgRef = useRef(null);
   const [loading, setLoading] = useState(false);
   const [uploaded, setuploaded] = useState(false);
+  const [imageUrl, setImageUrl] = useState(null);
+  const [imageLoaded, setImageLoaded] = useState(false);
+  const [imageLoading, setImageLoading] = useState(true);
   const markerArea = useRef(null);
   const { t } = useTranslation();
   const notification = useNotification();
@@ -55,7 +58,7 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
   );
 
   useEffect(() => {
-    if (imgRef.current !== null) {
+    if (imgRef.current !== null && imageLoaded && !markerArea.current) {
       // create a marker.js MarkerArea
       markerArea.current = new markerjs2.MarkerArea(imgRef.current);
 
@@ -78,7 +81,52 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
       //markerArea.current.settings.displayMode = "inline";
       markerArea.current.show();
     }
-  }, [triggerUpload]);
+  }, [triggerUpload, imageLoaded]);
+
+  useEffect(() => {
+    if (!document?.id) return;
+    const controller = new AbortController();
+
+    const loadImage = async () => {
+      setImageLoaded(false);
+      setImageLoading(true);
+      try {
+        const response = await axios.post(
+          "/media/imgproxy/original",
+          { documentId: document.id },
+          {
+            responseType: "blob",
+            signal: controller.signal
+          }
+        );
+        const blobUrl = URL.createObjectURL(response.data);
+        setImageUrl((prevUrl) => {
+          if (prevUrl) URL.revokeObjectURL(prevUrl);
+          return blobUrl;
+        });
+      } catch (error) {
+        if (axios.isCancel?.(error) || error.name === "CanceledError") {
+          // request was aborted — safe to ignore
+          return;
+        }
+        console.error("Failed to fetch original image blob", error);
+      } finally {
+        setImageLoading(false);
+      }
+    };
+    loadImage();
+    return () => {
+      controller.abort();
+    };
+  }, [document]);
+
+  useEffect(() => {
+    return () => {
+      if (imageUrl) {
+        URL.revokeObjectURL(imageUrl);
+      }
+    };
+  }, [imageUrl]);
 
   async function b64toBlob(url) {
     const res = await fetch(url);
@@ -87,16 +135,21 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
 
   return (
     <div>
-      {!loading && !uploaded && (
+      {!loading && !uploaded && imageUrl && (
         <img
           ref={imgRef}
-          src={GenerateSrcUrl(document)}
+          src={imageUrl}
           alt="sample"
-          crossOrigin="anonymous"
+          onLoad={() => setImageLoaded(true)}
+          onError={(error) => {
+            console.error("Failed to load original image", error);
+          }}
           style={{ maxWidth: "90vw", maxHeight: "90vh" }}
         />
       )}
-      {loading && <LoadingSpinner message={t("documents.labels.uploading")} />}
+      {(loading || imageLoading || !imageLoaded) && !uploaded && (
+        <LoadingSpinner message={t("documents.labels.uploading")} />
+      )}
       {uploaded && <Result status="success" title={t("documents.successes.edituploaded")} />}
     </div>
   );

client/src/components/document-editor/document-editor.container.jsx

@@ -11,6 +11,7 @@ import { setBodyshop } from "../../redux/user/user.actions";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import DocumentEditor from "./document-editor.component";
+import { DocumentEditorLocalComponent } from "./document-editor-local.component";
 
 const mapDispatchToProps = (dispatch) => ({
   setBodyshop: (bs) => dispatch(setBodyshop(bs))
@@ -21,7 +22,7 @@ export default connect(null, mapDispatchToProps)(DocumentEditorContainer);
 export function DocumentEditorContainer({ setBodyshop }) {
   //Get the image details for the image to be saved.
   //Get the document id from the search string.
-  const { documentId } = queryString.parse(useLocation().search);
+  const { documentId, imageUrl, filename, jobid } = queryString.parse(useLocation().search);
   const { t } = useTranslation();
   const {
     loading: loadingShop,
@@ -32,24 +33,45 @@ export function DocumentEditorContainer({ setBodyshop }) {
     nextFetchPolicy: "network-only"
   });
 
-  useEffect(() => {
-    if (dataShop) setBodyshop(dataShop.bodyshops[0]);
-  }, [dataShop, setBodyshop]);
+  const isLocalMedia = !!dataShop?.bodyshops?.[0]?.uselocalmediaserver;
 
-  const { loading, error, data } = useQuery(GET_DOCUMENT_BY_PK, {
+  const {
+    loading: loadingDoc,
+    error: errorDoc,
+    data: dataDoc
+  } = useQuery(GET_DOCUMENT_BY_PK, {
     variables: { documentId },
-    skip: !documentId,
+    skip: !documentId || isLocalMedia,
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
 
-  if (loading || loadingShop) return <LoadingSpinner />;
-  if (error || errorShop) return <AlertComponent message={error.message || errorShop.message} type="error" />;
+  useEffect(() => {
+    if (dataShop) setBodyshop(dataShop.bodyshops[0]);
+  }, [dataShop, setBodyshop]);
 
-  if (!data || !data.documents_by_pk) return <Result status="404" title={t("general.errors.notfound")} />;
+  if (loadingShop) return <LoadingSpinner />;
+  if (errorShop) return <AlertComponent message={errorShop.message} type="error" />;
+
+  if (isLocalMedia) {
+    if (imageUrl && filename && jobid) {
+      return (
+        <div>
+          <DocumentEditorLocalComponent imageUrl={imageUrl} filename={filename} jobid={jobid} />
+        </div>
+      );
+    } else {
+      return <Result status="404" title={t("general.errors.notfound")} />;
+    }
+  }
+
+  if (loadingDoc) return <LoadingSpinner />;
+  if (errorDoc) return <AlertComponent message={errorDoc.message} type="error" />;
+
+  if (!dataDoc || !dataDoc.documents_by_pk) return <Result status="404" title={t("general.errors.notfound")} />;
   return (
     <div>
-      <DocumentEditor document={data ? data.documents_by_pk : null} />
+      <DocumentEditor document={dataDoc ? dataDoc.documents_by_pk : null} />
     </div>
   );
 }

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

@@ -609,7 +609,7 @@ export function JobsDetailHeaderActions({
             <FormDateTimePickerComponent
               onBlur={() => {
                 const start = form.getFieldValue("start");
-                form.setFieldsValue({ end: start?.add(30, "minutes") });
+                form.setFieldsValue({ end: start.add(30, "minutes") });
               }}
             />
           </Form.Item>

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx

@@ -1,4 +1,4 @@
-import { FileExcelFilled, SyncOutlined } from "@ant-design/icons";
+import { EditFilled, FileExcelFilled, SyncOutlined } from "@ant-design/icons";
 import { Alert, Button, Card, Col, Row, Space } from "antd";
 import { useEffect, useState } from "react";
 import { Gallery } from "react-grid-gallery";
@@ -185,6 +185,21 @@ export function JobsDocumentsLocalGallery({
         </Col>
         {modalState.open && (
           <Lightbox
+            toolbarButtons={[
+              <EditFilled
+                key="edit"
+                onClick={() => {
+                  const newWindow = window.open(
+                    `${window.location.protocol}//${window.location.host}/edit?imageUrl=${
+                      jobMedia.images[modalState.index].fullsize
+                    }&filename=${jobMedia.images[modalState.index].filename}&jobid=${job.id}`,
+                    "_blank",
+                    "noopener,noreferrer"
+                  );
+                  if (newWindow) newWindow.opener = null;
+                }}
+              />
+            ]}
             mainSrc={jobMedia.images[modalState.index].fullsize}
             nextSrc={jobMedia.images[(modalState.index + 1) % jobMedia.images.length].fullsize}
             prevSrc={jobMedia.images[(modalState.index + jobMedia.images.length - 1) % jobMedia.images.length].fullsize}

client/src/components/notification-settings/notification-settings-form.component.jsx

@@ -132,7 +132,7 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
       dataIndex: "scenarioLabel",
       key: "scenario",
       render: (_, record) => t(`notifications.scenarios.${record.key}`),
-      width: "80%"
+      width: "90%"
     },
     {
       title: <ColumnHeaderCheckbox channel="app" form={form} onHeaderChange={() => setIsDirty(true)} />,
@@ -156,23 +156,20 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
         </Form.Item>
       )
     }
+    // TODO: Disabled for now until FCM is implemented.
+    // {
+    //   title: <ColumnHeaderCheckbox channel="fcm" form={form} disabled onHeaderChange={() => setIsDirty(true)} />,
+    //   dataIndex: "fcm",
+    //   key: "fcm",
+    //   align: "center",
+    //   render: (_, record) => (
+    //     <Form.Item name={[record.key, "fcm"]} valuePropName="checked" noStyle>
+    //       <Checkbox disabled />
+    //     </Form.Item>
+    //   )
+    // }
   ];
 
-  // Currently disabled for prod
-  if (!import.meta.env.PROD) {
-    columns.push({
-      title: <ColumnHeaderCheckbox channel="fcm" form={form} onHeaderChange={() => setIsDirty(true)} />,
-      dataIndex: "fcm",
-      key: "fcm",
-      align: "center",
-      render: (_, record) => (
-        <Form.Item name={[record.key, "fcm"]} valuePropName="checked" noStyle>
-          <Checkbox />
-        </Form.Item>
-      )
-    });
-  }
-
   const dataSource = notificationScenarios.map((scenario) => ({ key: scenario }));
 
   return (
@@ -189,7 +186,13 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
         extra={
           <Space>
             <Typography.Text type="secondary">{t("notifications.labels.auto-add")}</Typography.Text>
-            <Switch checked={autoAddEnabled} onChange={handleAutoAddToggle} loading={savingAutoAdd} />
+            <Switch
+              checked={autoAddEnabled}
+              onChange={handleAutoAddToggle}
+              loading={savingAutoAdd}
+              // checkedChildren={t("notifications.labels.auto-add-on")}
+              // unCheckedChildren={t("notifications.labels.auto-add-off")}
+            />
             <Button type="default" onClick={handleReset} disabled={!isDirty && !isAutoAddDirty}>
               {t("general.actions.clear")}
             </Button>

client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx

@@ -144,7 +144,7 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
       <Spin spinning={loading}>
         {record[type] ? (
           <div>
-            <span>{`${theEmployee?.first_name || ""} ${theEmployee?.last_name || ""}`}</span>
+            <span>{`${theEmployee.first_name || ""} ${theEmployee.last_name || ""}`}</span>
             <DeleteFilled style={iconStyle} onClick={() => handleRemove(type)} />
           </div>
         ) : (

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

@@ -143,7 +143,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
 
   //TODO: Find a way to filter out / blur on demand.
   return (
-    <div className="report-center-modal">
+    <div>
       <Form onFinish={handleFinish} autoComplete={"off"} layout="vertical" form={form}>
         <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} />
         <Form.Item name="defaultSorters" hidden />
@@ -163,14 +163,13 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
               {Object.keys(grouped)
                 //.filter((key) => !groupExcludeKeyFilter.includes(key))
                 .map((key) => (
-                  <Col xs={24} sm={12} md={Object.keys(grouped).length === 1 ? 24 : 8} key={key}>
+                  <Col md={8} sm={12} key={key}>
                     <Card.Grid
                       style={{
                         width: "100%",
                         height: "100%",
                         maxHeight: "33vh",
-                        overflowY: "scroll",
-                        minWidth: "200px"
+                        overflowY: "scroll"
                       }}
                     >
                       <Typography.Title level={4}>{t(`reportcenter.labels.groups.${key}`)}</Typography.Title>
@@ -178,7 +177,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                         <BlurWrapperComponent
                           featureName={groupExcludeKeyFilter.find((g) => g.key === key).featureName}
                         >
-                          <ul style={{ listStyleType: "none", columns: grouped[key].length > 4 ? "2 auto" : "1", padding: 0, margin: 0 }}>
+                          <ul style={{ listStyleType: "none", columns: "2 auto" }}>
                             {grouped[key].map((item) => (
                               <li key={item.key}>
                                 <Radio key={item.key} value={item.key}>
@@ -189,7 +188,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                           </ul>
                         </BlurWrapperComponent>
                       ) : (
-                        <ul style={{ listStyleType: "none", columns: grouped[key].length > 4 ? "2 auto" : "1", padding: 0, margin: 0 }}>
+                        <ul style={{ listStyleType: "none", columns: "2 auto" }}>
                           {grouped[key].map((item) =>
                             item.featureNameRestricted ? (
                               <li key={item.key}>

client/src/components/report-center-modal/report-center-modal.styles.scss

@@ -11,38 +11,3 @@
     }
   }
 }
-
-// Report center modal fixes for column layout
-.report-center-modal {
-  .ant-form-item .ant-radio-group {
-    width: 100%;
-    
-    .ant-card-grid {
-      padding: 16px;
-      box-sizing: border-box;
-      
-      ul {
-        width: 100%;
-        
-        li {
-          margin-bottom: 8px;
-          break-inside: avoid;
-          page-break-inside: avoid;
-          
-          .ant-radio-wrapper {
-            display: flex;
-            align-items: flex-start;
-            width: 100%;
-            
-            span:not(.ant-radio) {
-              word-break: break-word;
-              overflow-wrap: break-word;
-              hyphens: auto;
-              flex: 1;
-            }
-          }
-        }
-      }
-    }
-  }
-}

client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx

@@ -16,7 +16,6 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
       <Text type="secondary">{t("bodyshop.labels.notifications.followers")}</Text>
       {employeeOptions.length > 0 ? (
         <Form.Item
-          normalize={(value) => (value || []).filter((id) => typeof id === "string" && id.trim() !== "")}
           name="notification_followers"
           rules={[
             {
@@ -43,6 +42,11 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
             options={employeeOptions}
             placeholder={t("bodyshop.fields.notifications.placeholder")}
             showEmail={true}
+            onChange={(value) => {
+              // Filter out null or invalid values before passing to Form
+              const cleanedValue = value?.filter((id) => id != null && typeof id === "string" && id.trim() !== "");
+              return cleanedValue;
+            }}
           />
         </Form.Item>
       ) : (

client/src/firebase/firebase.utils.js

@@ -5,7 +5,7 @@ import { getFirestore } from "@firebase/firestore";
 import { getMessaging, getToken, onMessage } from "@firebase/messaging";
 import { store } from "../redux/store";
 //import * as amplitude from '@amplitude/analytics-browser';
-// import posthog from 'posthog-js'
+import posthog from 'posthog-js'
 
 const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);
 initializeApp(config);
@@ -74,6 +74,7 @@ onMessage(messaging, (payload) => {
 
 export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
   try {
+
     const state = stateProp || store.getState();
 
     const eventParams = {
@@ -98,7 +99,8 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
     // );
     logEvent(analytics, eventName, eventParams);
     //amplitude.track(eventName, eventParams);
-    //posthog.capture(eventName, eventParams);
+    posthog.capture(eventName, eventParams);
+
   } finally {
     //If it fails, just keep going.
   }

client/src/utils/sentry.js

@@ -31,8 +31,7 @@ if (!import.meta.env.DEV) {
       "Module specifier, 'fs' does not start",
       "Module specifier, 'zlib' does not start with",
       "Messaging: This browser doesn't support the API's required to use the Firebase SDK.",
-      "Failed to update a ServiceWorker for scope",
-      "Network Error"
+      "Failed to update a ServiceWorker for scope"
     ],
     integrations: [
       // See docs for support of different versions of variation of react router

client/vite.config.js

@@ -24,13 +24,11 @@ const lightningCssTargets = browserslistToTargets(
   })
 );
 
-const pstFormatter = new Intl.DateTimeFormat("en-CA", {
-  timeZone: "America/Los_Angeles",
-  year: "numeric",
-  month: "2-digit",
-  day: "2-digit"
-});
-const currentDatePST = pstFormatter.format(new Date());
+const currentDatePST = new Date()
+  .toLocaleDateString("en-US", { timeZone: "America/Los_Angeles", year: "numeric", month: "2-digit", day: "2-digit" })
+  .split("/")
+  .reverse()
+  .join("-");
 
 const getFormattedTimestamp = () =>
   new Date().toLocaleTimeString("en-US", { hour12: true }).replace("AM", "a.m.").replace("PM", "p.m.");

hasura/metadata/tables.yaml

@@ -1156,11 +1156,7 @@
         enable_manual: false
         update:
           columns:
-            - imexshopid
-            - timezone
             - shopname
-            - notification_followers
-            - state
             - md_order_statuses
       retry_conf:
         interval_sec: 10
@@ -3702,7 +3698,6 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
-          - dms_id
           - driveable
           - employee_body
           - employee_csr
@@ -3980,7 +3975,6 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
-          - dms_id
           - driveable
           - employee_body
           - employee_csr
@@ -4270,7 +4264,6 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
-          - dms_id
           - driveable
           - employee_body
           - employee_csr

hasura/migrations/1764704225560_alter_table_public_jobs_add_column_dms_id/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."jobs" add column "dms_id" text
---  null;

hasura/migrations/1764704225560_alter_table_public_jobs_add_column_dms_id/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."jobs" add column "dms_id" text
- null;

server.js

@@ -38,7 +38,6 @@ const { registerCleanupTask, initializeCleanupManager } = require("./server/util
 
 const { loadEmailQueue } = require("./server/notifications/queues/emailQueue");
 const { loadAppQueue } = require("./server/notifications/queues/appQueue");
-const { loadFcmQueue } = require("./server/notifications/queues/fcmQueue");
 
 const CLUSTER_RETRY_BASE_DELAY = 100;
 const CLUSTER_RETRY_MAX_DELAY = 5000;
@@ -356,10 +355,9 @@ const loadQueues = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
   const queueSettings = { pubClient, logger, redisHelpers, ioRedis };
 
   // Assuming loadEmailQueue and loadAppQueue return Promises
-  const [notificationsEmailsQueue, notificationsAppQueue, notificationsFcmQueue] = await Promise.all([
+  const [notificationsEmailsQueue, notificationsAppQueue] = await Promise.all([
     loadEmailQueue(queueSettings),
-    loadAppQueue(queueSettings),
-    loadFcmQueue(queueSettings)
+    loadAppQueue(queueSettings)
   ]);
 
   // Add error listeners or other setup for queues if needed
@@ -370,10 +368,6 @@ const loadQueues = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
   notificationsAppQueue.on("error", (error) => {
     logger.log(`Error in notificationsAppQueue: ${error}`, "ERROR", "queue", "api", null, { error: error?.message });
   });
-
-  notificationsFcmQueue.on("error", (error) => {
-    logger.log(`Error in notificationsFCMQueue: ${error}`, "ERROR", "queue", "api", null, { error: error?.message });
-  });
 };
 
 /**

server/graphql-client/queries.js

@@ -2926,15 +2926,6 @@ exports.GET_BODYSHOP_BY_ID = `
   }
 `;
 
-exports.GET_BODYSHOP_WATCHERS_BY_ID = `
-  query GET_BODYSHOP_BY_ID($id: uuid!) {
-    bodyshops_by_pk(id: $id) {
-      id
-      notification_followers
-    }
-  }
-`;
-
 exports.GET_DOCUMENTS_BY_JOB = `
   query GET_DOCUMENTS_BY_JOB($jobId: uuid!) {
     jobs_by_pk(id: $jobId) {
@@ -3187,20 +3178,3 @@ mutation INSERT_MEDIA_ANALYTICS($mediaObject: media_analytics_insert_input!) {
   }
 }
 `;
-
-exports.GET_USERS_FCM_TOKENS_BY_EMAILS = /* GraphQL */ `
-  query GET_USERS_FCM_TOKENS_BY_EMAILS($emails: [String!]!) {
-    users(where: { email: { _in: $emails } }) {
-      email
-      fcmtokens
-    }
-  }
-`;
-
-exports.UPDATE_USER_FCM_TOKENS_BY_EMAIL = /* GraphQL */ `
-  mutation UPDATE_USER_FCM_TOKENS_BY_EMAIL($email: String!, $fcmtokens: jsonb) {
-    update_users(where: { email: { _eq: $email } }, _set: { fcmtokens: $fcmtokens }) {
-      affected_rows
-    }
-  }
-`;

server/integrations/partsManagement/endpoints/partsManagementProvisioning.js

@@ -77,8 +77,9 @@ const generateResetLink = async (email) => {
  */
 const ensureExternalIdUnique = async (externalId) => {
   const resp = await client.request(CHECK_EXTERNAL_SHOP_ID, { key: externalId });
-
-  return !!resp.bodyshops.length;
+  if (resp.bodyshops.length) {
+    throw { status: 400, message: `external_shop_id '${externalId}' is already in use.` };
+  }
 };
 
 /**
@@ -224,25 +225,10 @@ const patchPartsManagementProvisioning = async (req, res) => {
  */
 const partsManagementProvisioning = async (req, res) => {
   const { logger } = req;
-
-  // Trim and normalize email early
-  const body = {
-    ...req.body,
-    userEmail: req.body.userEmail?.trim().toLowerCase()
-  };
-
-  const trim = (value) => (typeof value === "string" ? value.trim() : value);
-  const trimIfString = (value) =>
-    value !== null && value !== undefined && typeof value === "string" ? value.trim() : value;
+  const body = { ...req.body, userEmail: req.body.userEmail?.toLowerCase() };
 
   try {
-    // Ensure email is present and trimmed before checking registration
-    if (!body.userEmail) {
-      throw { status: 400, message: "userEmail is required" };
-    }
-
     await ensureEmailNotRegistered(body.userEmail);
-
     requireFields(body, [
       "external_shop_id",
       "shopname",
@@ -255,69 +241,27 @@ const partsManagementProvisioning = async (req, res) => {
       "phone",
       "userEmail"
     ]);
+    await ensureExternalIdUnique(body.external_shop_id);
 
-    // Trim all top-level string fields
-    const trimmedBody = {
-      ...body,
-      external_shop_id: trim(body.external_shop_id),
-      shopname: trim(body.shopname),
-      address1: trim(body.address1),
-      address2: trimIfString(body.address2),
-      city: trim(body.city),
-      state: trim(body.state),
-      zip_post: trim(body.zip_post),
-      country: trim(body.country),
-      email: trim(body.email),
-      phone: trim(body.phone),
-      timezone: trimIfString(body.timezone),
-      logoUrl: trimIfString(body.logoUrl),
-      userPassword: body.userPassword, // passwords should NOT be trimmed (preserves intentional spaces if any, though rare)
-      vendors: Array.isArray(body.vendors)
-        ? body.vendors.map((v) => ({
-            name: trim(v.name),
-            street1: trimIfString(v.street1),
-            street2: trimIfString(v.street2),
-            city: trimIfString(v.city),
-            state: trimIfString(v.state),
-            zip: trimIfString(v.zip),
-            country: trimIfString(v.country),
-            email: trimIfString(v.email),
-            cost_center: trimIfString(v.cost_center),
-            phone: trimIfString(v.phone),
-            dmsid: trimIfString(v.dmsid),
-            discount: v.discount ?? 0,
-            due_date: v.due_date ?? null,
-            favorite: v.favorite ?? [],
-            active: v.active ?? true
-          }))
-        : []
-    };
-
-    const duplicateCheck = await ensureExternalIdUnique(trimmedBody.external_shop_id);
-
-    if (duplicateCheck) {
-      throw { status: 400, message: `external_shop_id '${trimmedBody.external_shop_id}' is already in use.` };
-    }
-
-    logger.log("admin-create-shop-user", "debug", trimmedBody.userEmail, null, {
+    logger.log("admin-create-shop-user", "debug", body.userEmail, null, {
       request: req.body,
       ioadmin: true
     });
 
     const shopInput = {
-      shopname: trimmedBody.shopname,
-      address1: trimmedBody.address1,
-      address2: trimmedBody.address2,
-      city: trimmedBody.city,
-      state: trimmedBody.state,
-      zip_post: trimmedBody.zip_post,
-      country: trimmedBody.country,
-      email: trimmedBody.email,
-      external_shop_id: trimmedBody.external_shop_id,
-      timezone: trimmedBody.timezone || DefaultNewShop.timezone,
-      phone: trimmedBody.phone,
+      shopname: body.shopname,
+      address1: body.address1,
+      address2: body.address2 || null,
+      city: body.city,
+      state: body.state,
+      zip_post: body.zip_post,
+      country: body.country,
+      email: body.email,
+      external_shop_id: body.external_shop_id,
+      timezone: body.timezone || DefaultNewShop.timezone,
+      phone: body.phone,
       logo_img_path: {
-        src: trimmedBody.logoUrl || null, // allow empty logo
+        src: body.logoUrl,
         width: "",
         height: "",
         headerMargin: DefaultNewShop.logo_img_path.headerMargin
@@ -342,37 +286,35 @@ const partsManagementProvisioning = async (req, res) => {
       appt_alt_transport: DefaultNewShop.appt_alt_transport,
       md_jobline_presets: DefaultNewShop.md_jobline_presets,
       vendors: {
-        data: trimmedBody.vendors.map((v) => ({
+        data: body.vendors.map((v) => ({
           name: v.name,
-          street1: v.street1,
-          street2: v.street2,
-          city: v.city,
-          state: v.state,
-          zip: v.zip,
-          country: v.country,
-          email: v.email,
-          discount: v.discount,
-          due_date: v.due_date,
-          cost_center: v.cost_center,
-          favorite: v.favorite,
-          phone: v.phone,
-          active: v.active,
-          dmsid: v.dmsid
+          street1: v.street1 || null,
+          street2: v.street2 || null,
+          city: v.city || null,
+          state: v.state || null,
+          zip: v.zip || null,
+          country: v.country || null,
+          email: v.email || null,
+          discount: v.discount ?? 0,
+          due_date: v.due_date ?? null,
+          cost_center: v.cost_center || null,
+          favorite: v.favorite ?? [],
+          phone: v.phone || null,
+          active: v.active ?? true,
+          dmsid: v.dmsid || null
         }))
       }
     };
 
     const newShopId = await insertBodyshop(shopInput);
-    const userRecord = await createFirebaseUser(trimmedBody.userEmail, trimmedBody.userPassword);
+    const userRecord = await createFirebaseUser(body.userEmail, body.userPassword);
     let resetLink = null;
-    if (!trimmedBody.userPassword) {
-      resetLink = await generateResetLink(trimmedBody.userEmail);
-    }
+    if (!body.userPassword) resetLink = await generateResetLink(body.userEmail);
 
-    const createdUser = await insertUserAssociation(userRecord.uid, trimmedBody.userEmail, newShopId);
+    const createdUser = await insertUserAssociation(userRecord.uid, body.userEmail, newShopId);
 
     return res.status(200).json({
-      shop: { id: newShopId, shopname: trimmedBody.shopname },
+      shop: { id: newShopId, shopname: body.shopname },
       user: {
         id: createdUser.id,
         email: createdUser.email,
@@ -380,7 +322,7 @@ const partsManagementProvisioning = async (req, res) => {
       }
     });
   } catch (err) {
-    logger.log("admin-create-shop-user-error", "error", body.userEmail || "unknown", null, {
+    logger.log("admin-create-shop-user-error", "error", body.userEmail, null, {
       message: err.message,
       detail: err.detail || err
     });

server/media/imgproxy-media.js

@@ -44,25 +44,25 @@ const generateSignedUploadUrls = async (req, res) => {
     for (const filename of filenames) {
       const key = filename;
       const client = new S3Client({ region: InstanceRegion() });
-      
+
       // Check if filename indicates PDF and set content type accordingly
-      const isPdf = filename.toLowerCase().endsWith('.pdf');
+      const isPdf = filename.toLowerCase().endsWith(".pdf");
       const commandParams = {
         Bucket: imgproxyDestinationBucket,
         Key: key,
         StorageClass: "INTELLIGENT_TIERING"
       };
-      
+
       if (isPdf) {
         commandParams.ContentType = "application/pdf";
       }
-      
+
       const command = new PutObjectCommand(commandParams);
 
       // For PDFs, we need to add conditions to the presigned URL to enforce content type
       const presignedUrlOptions = { expiresIn: 360 };
       if (isPdf) {
-        presignedUrlOptions.signableHeaders = new Set(['content-type']);
+        presignedUrlOptions.signableHeaders = new Set(["content-type"]);
       }
 
       const presignedUrl = await getSignedUrl(client, command, presignedUrlOptions);
@@ -265,6 +265,82 @@ const downloadFiles = async (req, res) => {
   }
 };
 
+/**
+ * Stream original image content by document ID
+ * @param req
+ * @param res
+ * @returns {Promise<*>}
+ */
+const getOriginalImageByDocumentId = async (req, res) => {
+  const {
+    body: { documentId },
+    user,
+    userGraphQLClient
+  } = req;
+
+  if (!documentId) {
+    return res.status(400).json({ message: "documentId is required" });
+  }
+
+  try {
+    logger.log("imgproxy-original-image", "DEBUG", user?.email, null, { documentId });
+
+    const { documents } = await userGraphQLClient.request(GET_DOCUMENTS_BY_IDS, { documentIds: [documentId] });
+
+    if (!documents || documents.length === 0) {
+      return res.status(404).json({ message: "Document not found" });
+    }
+
+    const [document] = documents;
+    const { type } = document;
+
+    if (!type || !type.startsWith("image")) {
+      return res.status(400).json({ message: "Document is not an image" });
+    }
+
+    const s3client = new S3Client({ region: InstanceRegion() });
+    const key = keyStandardize(document);
+
+    let s3Response;
+    try {
+      s3Response = await s3client.send(
+        new GetObjectCommand({
+          Bucket: imgproxyDestinationBucket,
+          Key: key
+        })
+      );
+    } catch (err) {
+      logger.log("imgproxy-original-image-s3-error", "ERROR", user?.email, null, {
+        key,
+        message: err.message,
+        stack: err.stack
+      });
+      return res.status(400).json({ message: "Unable to retrieve image" });
+    }
+
+    res.setHeader("Content-Type", type || "image/jpeg");
+
+    s3Response.Body.on("error", (err) => {
+      logger.log("imgproxy-original-image-s3stream-error", "ERROR", user?.email, null, {
+        key,
+        message: err.message,
+        stack: err.stack
+      });
+      res.destroy(err);
+    });
+
+    s3Response.Body.pipe(res);
+  } catch (error) {
+    logger.log("imgproxy-original-image-error", "ERROR", req.user?.email, null, {
+      documentId,
+      message: error.message,
+      stack: error.stack
+    });
+
+    return res.status(400).json({ message: error.message, stack: error.stack });
+  }
+};
+
 /**
  * Delete Files
  * @param req
@@ -425,6 +501,7 @@ const keyStandardize = (doc) => {
 module.exports = {
   generateSignedUploadUrls,
   getThumbnailUrls,
+  getOriginalImageByDocumentId,
   downloadFiles,
   deleteFiles,
   moveFiles

server/notifications/autoAddWatchers.js

@@ -4,14 +4,11 @@
  * This module handles automatically adding watchers to new jobs based on the notifications_autoadd
  * boolean field in the associations table and the notification_followers JSON field in the bodyshops table.
  * It ensures users are not added twice and logs the process.
- *
- * NOTE: Bodyshop notification_followers is fetched directly from the DB (Hasura) to avoid stale Redis cache.
  */
 
 const { client: gqlClient } = require("../graphql-client/graphql-client");
 const { isEmpty } = require("lodash");
 const {
-  GET_BODYSHOP_WATCHERS_BY_ID,
   GET_JOB_WATCHERS_MINIMAL,
   GET_NOTIFICATION_WATCHERS,
   INSERT_JOB_WATCHERS
@@ -29,7 +26,10 @@ const FILTER_SELF_FROM_WATCHERS = process.env?.FILTER_SELF_FROM_WATCHERS !== "fa
  */
 const autoAddWatchers = async (req) => {
   const { event, trigger } = req.body;
-  const { logger } = req;
+  const {
+    logger,
+    sessionUtils: { getBodyshopFromRedis }
+  } = req;
 
   // Validate that this is an INSERT event, bail
   if (trigger?.name !== "notifications_jobs_autoadd" || event.op !== "INSERT" || event.data.old) {
@@ -48,20 +48,20 @@ const autoAddWatchers = async (req) => {
   const hasuraUserId = event?.session_variables?.["x-hasura-user-id"];
 
   try {
-    // Fetch bodyshop data directly from DB (avoid Redis staleness)
-    const bodyshopResponse = await gqlClient.request(GET_BODYSHOP_WATCHERS_BY_ID, { id: shopId });
-    const bodyshopData = bodyshopResponse?.bodyshops_by_pk;
+    // Fetch bodyshop data from Redis
+    const bodyshopData = await getBodyshopFromRedis(shopId);
+    let notificationFollowers = bodyshopData?.notification_followers;
 
-    const notificationFollowersRaw = bodyshopData?.notification_followers;
-    const notificationFollowers = Array.isArray(notificationFollowersRaw)
-      ? [...new Set(notificationFollowersRaw.filter((id) => id))] // de-dupe + remove falsy
-      : [];
+    // Bail if notification_followers is missing or not an array
+    if (!notificationFollowers || !Array.isArray(notificationFollowers)) {
+      return;
+    }
 
     // Execute queries in parallel
     const [notificationData, existingWatchersData] = await Promise.all([
       gqlClient.request(GET_NOTIFICATION_WATCHERS, {
         shopId,
-        employeeIds: notificationFollowers
+        employeeIds: notificationFollowers.filter((id) => id)
       }),
       gqlClient.request(GET_JOB_WATCHERS_MINIMAL, { jobid: jobId })
     ]);
@@ -73,7 +73,7 @@ const autoAddWatchers = async (req) => {
         associationId: assoc.id
       })) || [];
 
-    // Get users from notification_followers (employee IDs -> employee emails)
+    // Get users from notification_followers
     const followerEmails =
       notificationData?.employees
         ?.filter((e) => e.user_email)
@@ -84,7 +84,7 @@ const autoAddWatchers = async (req) => {
 
     // Combine and deduplicate emails (use email as the unique key)
     const usersToAdd = [...autoAddUsers, ...followerEmails].reduce((acc, user) => {
-      if (user?.email && !acc.some((u) => u.email === user.email)) {
+      if (!acc.some((u) => u.email === user.email)) {
         acc.push(user);
       }
       return acc;
@@ -123,7 +123,6 @@ const autoAddWatchers = async (req) => {
       message: error?.message,
       stack: error?.stack,
       jobId,
-      shopId,
       roNumber
     });
     throw error; // Re-throw to ensure the error is logged in the handler

server/notifications/eventHandlers.js

@@ -205,8 +205,9 @@ const handleTaskSocketEmit = (req) => {
  * @returns {Promise<Object>} JSON response with a success message.
  */
 const handleTasksChange = async (req, res) => {
+  // Handle Notification Event
+  processNotificationEvent(req, res, "req.body.event.new.jobid", "Tasks Notifications Event Handled.");
   handleTaskSocketEmit(req);
-  return processNotificationEvent(req, res, "req.body.event.new.jobid", "Tasks Notifications Event Handled.");
 };
 
 /**

server/notifications/queues/appQueue.js

@@ -42,13 +42,6 @@ const buildNotificationContent = (notifications) => {
   };
 };
 
-/**
- * Convert MS to S
- * @param ms
- * @returns {number}
- */
-const seconds = (ms) => Math.max(1, Math.ceil(ms / 1000));
-
 /**
  * Initializes the notification queues and workers for adding and consolidating notifications.
  */
@@ -59,13 +52,6 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
 
     devDebugLogger(`Initializing Notifications Queues with prefix: ${prefix}`);
 
-    // Redis key helpers (per jobId)
-    const recipientsSetKey = (jobId) => `app:${devKey}:recipients:${jobId}`; // set of `${user}:${bodyShopId}`
-    const recipientAssocHashKey = (jobId) => `app:${devKey}:recipientAssoc:${jobId}`; // hash `${user}:${bodyShopId}` => associationId
-    const consolidateFlagKey = (jobId) => `app:${devKey}:consolidate:${jobId}`;
-    const lockKeyForJob = (jobId) => `lock:${devKey}:consolidate:${jobId}`;
-    const listKey = ({ jobId, user, bodyShopId }) => `app:${devKey}:notifications:${jobId}:${user}:${bodyShopId}`;
-
     addQueue = new Queue("notificationsAdd", {
       prefix,
       connection: pubClient,
@@ -84,39 +70,27 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
         const { jobId, key, variables, recipients, body, jobRoNumber } = job.data;
         devDebugLogger(`Adding notifications for jobId ${jobId}`);
 
+        const redisKeyPrefix = `app:${devKey}:notifications:${jobId}`;
         const notification = { key, variables, body, jobRoNumber, timestamp: Date.now() };
 
-        // Store notifications atomically (RPUSH) and store recipients in a Redis set
-        for (const recipient of recipients || []) {
-          const { user, bodyShopId, associationId } = recipient;
-          if (!user || !bodyShopId) continue;
-
-          const rk = `${user}:${bodyShopId}`;
-
-          // (1) Store notification payload in a list (atomic append)
-          const lk = listKey({ jobId, user, bodyShopId });
-          await pubClient.rpush(lk, JSON.stringify(notification));
-          await pubClient.expire(lk, seconds(NOTIFICATION_STORAGE_EXPIRATION));
-
-          // (2) Track recipients in a set, and associationId in a hash
-          await pubClient.sadd(recipientsSetKey(jobId), rk);
-          await pubClient.expire(recipientsSetKey(jobId), seconds(NOTIFICATION_STORAGE_EXPIRATION));
-
-          if (associationId) {
-            await pubClient.hset(recipientAssocHashKey(jobId), rk, String(associationId));
-          }
-          await pubClient.expire(recipientAssocHashKey(jobId), seconds(NOTIFICATION_STORAGE_EXPIRATION));
+        for (const recipient of recipients) {
+          const { user } = recipient;
+          const userKey = `${redisKeyPrefix}:${user}`;
+          const existingNotifications = await pubClient.get(userKey);
+          const notifications = existingNotifications ? JSON.parse(existingNotifications) : [];
+          notifications.push(notification);
+          await pubClient.set(userKey, JSON.stringify(notifications), "EX", NOTIFICATION_STORAGE_EXPIRATION / 1000);
+          devDebugLogger(`Stored notification for ${user} under ${userKey}: ${JSON.stringify(notifications)}`);
         }
 
-        // Schedule consolidation once per jobId
-        const flagKey = consolidateFlagKey(jobId);
-        const flagSet = await pubClient.setnx(flagKey, "pending");
+        const consolidateKey = `app:${devKey}:consolidate:${jobId}`;
+        const flagSet = await pubClient.setnx(consolidateKey, "pending");
         devDebugLogger(`Consolidation flag set for jobId ${jobId}: ${flagSet}`);
 
         if (flagSet) {
           await consolidateQueue.add(
             "consolidate-notifications",
-            { jobId },
+            { jobId, recipients },
             {
               jobId: `consolidate-${jobId}`,
               delay: APP_CONSOLIDATION_DELAY,
@@ -124,9 +98,8 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
               backoff: LOCK_EXPIRATION
             }
           );
-
-          await pubClient.expire(flagKey, seconds(CONSOLIDATION_FLAG_EXPIRATION));
           devDebugLogger(`Scheduled consolidation for jobId ${jobId}`);
+          await pubClient.expire(consolidateKey, CONSOLIDATION_FLAG_EXPIRATION / 1000);
         } else {
           devDebugLogger(`Consolidation already scheduled for jobId ${jobId}`);
         }
@@ -141,167 +114,122 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
     const consolidateWorker = new Worker(
       "notificationsConsolidate",
       async (job) => {
-        const { jobId } = job.data;
+        const { jobId, recipients } = job.data;
         devDebugLogger(`Consolidating notifications for jobId ${jobId}`);
 
-        const lockKey = lockKeyForJob(jobId);
-        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", seconds(LOCK_EXPIRATION));
+        const redisKeyPrefix = `app:${devKey}:notifications:${jobId}`;
+        const lockKey = `lock:${devKey}:consolidate:${jobId}`;
+
+        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", LOCK_EXPIRATION / 1000);
         devDebugLogger(`Lock acquisition for jobId ${jobId}: ${lockAcquired}`);
 
-        if (!lockAcquired) {
-          devDebugLogger(`Skipped consolidation for jobId ${jobId} - lock held by another worker`);
-          return;
-        }
+        if (lockAcquired) {
+          try {
+            const allNotifications = {};
+            const uniqueUsers = [...new Set(recipients.map((r) => r.user))];
+            devDebugLogger(`Unique users for jobId ${jobId}: ${uniqueUsers}`);
 
-        try {
-          const rkSet = recipientsSetKey(jobId);
-          const assocHash = recipientAssocHashKey(jobId);
+            for (const user of uniqueUsers) {
+              const userKey = `${redisKeyPrefix}:${user}`;
+              const notifications = await pubClient.get(userKey);
+              devDebugLogger(`Retrieved notifications for ${user}: ${notifications}`);
 
-          const recipientKeys = await pubClient.smembers(rkSet);
-          if (!recipientKeys?.length) {
-            devDebugLogger(`No recipients found for jobId ${jobId}, nothing to consolidate.`);
-            await pubClient.del(consolidateFlagKey(jobId));
-            return;
-          }
-
-          const assocMap = await pubClient.hgetall(assocHash);
-
-          // Collect notifications by recipientKey
-          const notificationsByRecipient = new Map(); // rk => parsed notifications array
-          const listKeysToDelete = []; // delete only after successful insert+emit
-
-          for (const rk of recipientKeys) {
-            const [user, bodyShopId] = rk.split(":");
-            const lk = listKey({ jobId, user, bodyShopId });
-
-            const items = await pubClient.lrange(lk, 0, -1);
-            if (!items?.length) continue;
-
-            const parsed = items
-              .map((x) => {
-                try {
-                  return JSON.parse(x);
-                } catch {
-                  return null;
+              if (notifications) {
+                const parsedNotifications = JSON.parse(notifications);
+                const userRecipients = recipients.filter((r) => r.user === user);
+                for (const { bodyShopId } of userRecipients) {
+                  allNotifications[user] = allNotifications[user] || {};
+                  allNotifications[user][bodyShopId] = parsedNotifications;
                 }
-              })
-              .filter(Boolean);
-
-            if (parsed.length) {
-              notificationsByRecipient.set(rk, parsed);
-
-              // IMPORTANT: do NOT delete list yet; only delete after successful insert+emit
-              listKeysToDelete.push(lk);
-            }
-          }
-
-          if (!notificationsByRecipient.size) {
-            devDebugLogger(`No notifications found in lists for jobId ${jobId}, nothing to insert/emit.`);
-            if (listKeysToDelete.length) {
-              await pubClient.del(...listKeysToDelete);
-            }
-            await pubClient.del(rkSet);
-            await pubClient.del(assocHash);
-            await pubClient.del(consolidateFlagKey(jobId));
-            return;
-          }
-
-          // Build DB inserts
-          const inserts = [];
-          const insertMeta = []; // keep rk + associationId to emit after insert
-
-          for (const [rk, notifications] of notificationsByRecipient.entries()) {
-            const associationId = assocMap?.[rk];
-
-            // If your DB requires associationid NOT NULL, skip if missing
-            if (!associationId) {
-              devDebugLogger(`Skipping insert for ${rk} (missing associationId).`);
-              continue;
-            }
-
-            const { scenario_text, fcm_text, scenario_meta } = buildNotificationContent(notifications);
-
-            inserts.push({
-              jobid: jobId,
-              associationid: associationId,
-              // NOTE: if these are jsonb columns, remove JSON.stringify and pass arrays directly.
-              scenario_text: JSON.stringify(scenario_text),
-              fcm_text,
-              scenario_meta: JSON.stringify(scenario_meta)
-            });
-
-            insertMeta.push({ rk, associationId });
-          }
-
-          // Map notificationId by associationId from Hasura returning rows
-          const idByAssociationId = new Map();
-
-          if (inserts.length > 0) {
-            const insertResponse = await graphQLClient.request(INSERT_NOTIFICATIONS_MUTATION, { objects: inserts });
-
-            const returning = insertResponse?.insert_notifications?.returning || [];
-            returning.forEach((row) => {
-              // Expecting your mutation to return associationid as well as id.
-              // If your mutation currently doesn’t return associationid, update it.
-              if (row?.associationid) idByAssociationId.set(String(row.associationid), row.id);
-            });
-
-            devDebugLogger(
-              `Inserted ${insertResponse.insert_notifications.affected_rows} notifications for jobId ${jobId}`
-            );
-          }
-
-          // Emit via Socket.io
-          // Group by user to reduce mapping lookups
-          const uniqueUsers = [...new Set(insertMeta.map(({ rk }) => rk.split(":")[0]))];
-
-          for (const user of uniqueUsers) {
-            const userMapping = await redisHelpers.getUserSocketMapping(user);
-            const entriesForUser = insertMeta
-              .map((m) => ({ ...m, user: m.rk.split(":")[0], bodyShopId: m.rk.split(":")[1] }))
-              .filter((m) => m.user === user);
-
-            for (const entry of entriesForUser) {
-              const { rk, bodyShopId, associationId } = entry;
-              const notifications = notificationsByRecipient.get(rk) || [];
-              if (!notifications.length) continue;
-
-              const jobRoNumber = notifications[0]?.jobRoNumber;
-              const notificationId = idByAssociationId.get(String(associationId)) || null;
-
-              if (userMapping && userMapping[bodyShopId]?.socketIds) {
-                userMapping[bodyShopId].socketIds.forEach((socketId) => {
-                  ioRedis.to(socketId).emit("notification", {
-                    jobId,
-                    jobRoNumber,
-                    bodyShopId,
-                    notifications,
-                    notificationId,
-                    associationId
-                  });
-                });
-
-                devDebugLogger(
-                  `Sent ${notifications.length} consolidated notifications to ${user} for jobId ${jobId} (notificationId ${notificationId})`
-                );
+                await pubClient.del(userKey);
+                devDebugLogger(`Deleted Redis key ${userKey}`);
               } else {
-                devDebugLogger(`No socket IDs found for ${user} in bodyShopId ${bodyShopId}`);
+                devDebugLogger(`No notifications found for ${user} under ${userKey}`);
               }
             }
-          }
 
-          // Cleanup recipient tracking keys + consolidation flag
-          await pubClient.del(rkSet);
-          await pubClient.del(assocHash);
-          await pubClient.del(consolidateFlagKey(jobId));
-        } catch (err) {
-          logger.log("app-queue-consolidation-error", "ERROR", "notifications", "api", {
-            message: err?.message,
-            stack: err?.stack
-          });
-          throw err;
-        } finally {
-          await pubClient.del(lockKey);
+            devDebugLogger(`Consolidated notifications: ${JSON.stringify(allNotifications)}`);
+
+            // Insert notifications into the database and collect IDs
+            const notificationInserts = [];
+            const notificationIdMap = new Map();
+
+            for (const [user, bodyShopData] of Object.entries(allNotifications)) {
+              const userRecipients = recipients.filter((r) => r.user === user);
+              const associationId = userRecipients[0]?.associationId;
+
+              for (const [bodyShopId, notifications] of Object.entries(bodyShopData)) {
+                const { scenario_text, fcm_text, scenario_meta } = buildNotificationContent(notifications);
+                notificationInserts.push({
+                  jobid: jobId,
+                  associationid: associationId,
+                  scenario_text: JSON.stringify(scenario_text),
+                  fcm_text: fcm_text,
+                  scenario_meta: JSON.stringify(scenario_meta)
+                });
+                notificationIdMap.set(`${user}:${bodyShopId}`, null);
+              }
+            }
+
+            if (notificationInserts.length > 0) {
+              const insertResponse = await graphQLClient.request(INSERT_NOTIFICATIONS_MUTATION, {
+                objects: notificationInserts
+              });
+              devDebugLogger(
+                `Inserted ${insertResponse.insert_notifications.affected_rows} notifications for jobId ${jobId}`
+              );
+
+              insertResponse.insert_notifications.returning.forEach((row, index) => {
+                const user = uniqueUsers[Math.floor(index / Object.keys(allNotifications[uniqueUsers[0]]).length)];
+                const bodyShopId = Object.keys(allNotifications[user])[
+                  index % Object.keys(allNotifications[user]).length
+                ];
+                notificationIdMap.set(`${user}:${bodyShopId}`, row.id);
+              });
+            }
+
+            // Emit notifications to users via Socket.io with notification ID
+            for (const [user, bodyShopData] of Object.entries(allNotifications)) {
+              const userMapping = await redisHelpers.getUserSocketMapping(user);
+              const userRecipients = recipients.filter((r) => r.user === user);
+              const associationId = userRecipients[0]?.associationId;
+
+              for (const [bodyShopId, notifications] of Object.entries(bodyShopData)) {
+                const notificationId = notificationIdMap.get(`${user}:${bodyShopId}`);
+                const jobRoNumber = notifications[0]?.jobRoNumber;
+
+                if (userMapping && userMapping[bodyShopId]?.socketIds) {
+                  userMapping[bodyShopId].socketIds.forEach((socketId) => {
+                    ioRedis.to(socketId).emit("notification", {
+                      jobId,
+                      jobRoNumber,
+                      bodyShopId,
+                      notifications,
+                      notificationId,
+                      associationId
+                    });
+                  });
+                  devDebugLogger(
+                    `Sent ${notifications.length} consolidated notifications to ${user} for jobId ${jobId} with notificationId ${notificationId}`
+                  );
+                } else {
+                  devDebugLogger(`No socket IDs found for ${user} in bodyShopId ${bodyShopId}`);
+                }
+              }
+            }
+
+            await pubClient.del(`app:${devKey}:consolidate:${jobId}`);
+          } catch (err) {
+            logger.log(`app-queue-consolidation-error`, "ERROR", "notifications", "api", {
+              message: err?.message,
+              stack: err?.stack
+            });
+            throw err;
+          } finally {
+            await pubClient.del(lockKey);
+          }
+        } else {
+          devDebugLogger(`Skipped consolidation for jobId ${jobId} - lock held by another worker`);
         }
       },
       {
@@ -316,14 +244,13 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
     consolidateWorker.on("completed", (job) => devDebugLogger(`Consolidate job ${job.id} completed`));
 
     addWorker.on("failed", (job, err) =>
-      logger.log("app-queue-notification-error", "ERROR", "notifications", "api", {
+      logger.log(`app-queue-notification-error`, "ERROR", "notifications", "api", {
         message: err?.message,
         stack: err?.stack
       })
     );
-
     consolidateWorker.on("failed", (job, err) =>
-      logger.log("app-queue-consolidation-failed", "ERROR", "notifications", "api", {
+      logger.log(`app-queue-consolidation-failed:`, "ERROR", "notifications", "api", {
         message: err?.message,
         stack: err?.stack
       })
@@ -358,13 +285,11 @@ const dispatchAppsToQueue = async ({ appsToDispatch }) => {
 
   for (const app of appsToDispatch) {
     const { jobId, bodyShopId, key, variables, recipients, body, jobRoNumber } = app;
-
     await appQueue.add(
       "add-notification",
       { jobId, bodyShopId, key, variables, recipients, body, jobRoNumber },
       { jobId: `${jobId}-${Date.now()}` }
     );
-
     devDebugLogger(`Added notification to queue for jobId ${jobId} with ${recipients.length} recipients`);
   }
 };

server/notifications/queues/emailQueue.js

@@ -27,16 +27,6 @@ let emailConsolidateQueue;
 let emailAddWorker;
 let emailConsolidateWorker;
 
-const seconds = (ms) => Math.max(1, Math.ceil(ms / 1000));
-
-const escapeHtml = (s = "") =>
-  String(s)
-    .replace(/&/g, "&")
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;")
-    .replace(/"/g, "&quot;")
-    .replace(/'/g, "&#39;");
-
 /**
  * Initializes the email notification queues and workers.
  *
@@ -75,21 +65,17 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
 
         const redisKeyPrefix = `email:${devKey}:notifications:${jobId}`;
 
-        for (const recipient of recipients || []) {
+        for (const recipient of recipients) {
           const { user, firstName, lastName } = recipient;
-          if (!user) continue;
           const userKey = `${redisKeyPrefix}:${user}`;
           await pubClient.rpush(userKey, body);
-          await pubClient.expire(userKey, seconds(NOTIFICATION_EXPIRATION));
+          await pubClient.expire(userKey, NOTIFICATION_EXPIRATION / 1000);
           const detailsKey = `email:${devKey}:recipientDetails:${jobId}:${user}`;
           await pubClient.hsetnx(detailsKey, "firstName", firstName || "");
           await pubClient.hsetnx(detailsKey, "lastName", lastName || "");
-          const tzValue = bodyShopTimezone || "UTC";
-          await pubClient.hsetnx(detailsKey, "bodyShopTimezone", tzValue);
-          await pubClient.expire(detailsKey, seconds(NOTIFICATION_EXPIRATION));
-          const recipientsSetKey = `email:${devKey}:recipients:${jobId}`;
-          await pubClient.sadd(recipientsSetKey, user);
-          await pubClient.expire(recipientsSetKey, seconds(NOTIFICATION_EXPIRATION));
+          await pubClient.hsetnx(detailsKey, "bodyShopTimezone", bodyShopTimezone);
+          await pubClient.expire(detailsKey, NOTIFICATION_EXPIRATION / 1000);
+          await pubClient.sadd(`email:${devKey}:recipients:${jobId}`, user);
           devDebugLogger(`Stored message for ${user} under ${userKey}: ${body}`);
         }
 
@@ -107,7 +93,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
             }
           );
           devDebugLogger(`Scheduled email consolidation for jobId ${jobId}`);
-          await pubClient.expire(consolidateKey, seconds(CONSOLIDATION_KEY_EXPIRATION));
+          await pubClient.expire(consolidateKey, CONSOLIDATION_KEY_EXPIRATION / 1000);
         } else {
           devDebugLogger(`Email consolidation already scheduled for jobId ${jobId}`);
         }
@@ -127,7 +113,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
         devDebugLogger(`Consolidating emails for jobId ${jobId}`);
 
         const lockKey = `lock:${devKey}:emailConsolidate:${jobId}`;
-        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", seconds(LOCK_EXPIRATION));
+        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", LOCK_EXPIRATION / 1000);
         if (lockAcquired) {
           try {
             const recipientsSet = `email:${devKey}:recipients:${jobId}`;
@@ -153,7 +139,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
                     <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
                       <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 16px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
                         <ul style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 1%; padding-left: 30px;">
-                          ${messages.map((msg) => `<li style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%;">${escapeHtml(msg)}</li>`).join("")}
+                          ${messages.map((msg) => `<li style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%;">${msg}</li>`).join("")}
                         </ul>
                       </td></tr></table></th>
                     </tr><tbody></table>
@@ -253,13 +239,7 @@ const dispatchEmailsToQueue = async ({ emailsToDispatch, logger }) => {
   const emailAddQueue = getQueue();
 
   for (const email of emailsToDispatch) {
-    const { jobId, bodyShopName, bodyShopTimezone, body, recipients } = email;
-    let { jobRoNumber } = email;
-
-    // Make sure Jobs that have not been coverted yet can still get notifications
-    if (jobRoNumber === null) {
-      jobRoNumber = "N/A";
-    }
+    const { jobId, jobRoNumber, bodyShopName, bodyShopTimezone, body, recipients } = email;
 
     if (!jobId || !jobRoNumber || !bodyShopName || !body || !recipients.length) {
       devDebugLogger(

server/notifications/queues/fcmQueue.js

@@ -1,569 +0,0 @@
-// NOTE: Despite the filename, this implementation targets Expo Push Tokens (ExponentPushToken[...]).
-// It does NOT use Firebase Admin and does NOT require credentials (no EXPO_ACCESS_TOKEN).
-
-const { Queue, Worker } = require("bullmq");
-const { registerCleanupTask } = require("../../utils/cleanupManager");
-const getBullMQPrefix = require("../../utils/getBullMQPrefix");
-const devDebugLogger = require("../../utils/devDebugLogger");
-
-const { client: gqlClient } = require("../../graphql-client/graphql-client");
-const { GET_USERS_FCM_TOKENS_BY_EMAILS, UPDATE_USER_FCM_TOKENS_BY_EMAIL } = require("../../graphql-client/queries");
-
-const FCM_CONSOLIDATION_DELAY_IN_MINS = (() => {
-  const envValue = process.env?.FCM_CONSOLIDATION_DELAY_IN_MINS;
-  const parsedValue = envValue ? parseInt(envValue, 10) : NaN;
-  return isNaN(parsedValue) ? 3 : Math.max(1, parsedValue);
-})();
-
-const FCM_CONSOLIDATION_DELAY = FCM_CONSOLIDATION_DELAY_IN_MINS * 60000;
-
-// pegged constants (pattern matches your other queues)
-const CONSOLIDATION_KEY_EXPIRATION = FCM_CONSOLIDATION_DELAY * 1.5;
-
-// IMPORTANT: lock must outlive a full consolidation run to avoid duplicate sends.
-const LOCK_EXPIRATION = FCM_CONSOLIDATION_DELAY * 1.5;
-
-// Keep Bull backoff separate from lock TTL to avoid unexpected long retries.
-const BACKOFF_DELAY = Math.max(1000, Math.floor(FCM_CONSOLIDATION_DELAY * 0.25));
-
-const RATE_LIMITER_DURATION = FCM_CONSOLIDATION_DELAY * 0.1;
-const NOTIFICATION_EXPIRATION = FCM_CONSOLIDATION_DELAY * 1.5;
-
-const EXPO_PUSH_ENDPOINT = "https://exp.host/--/api/v2/push/send";
-const EXPO_MAX_MESSAGES_PER_REQUEST = 100;
-
-let fcmAddQueue;
-let fcmConsolidateQueue;
-let fcmAddWorker;
-let fcmConsolidateWorker;
-
-/**
- * Milliseconds to seconds.
- * @param ms
- * @returns {number}
- */
-const seconds = (ms) => Math.max(1, Math.ceil(ms / 1000));
-
-/**
- * Chunk an array into smaller arrays of given size.
- * @param arr
- * @param size
- * @returns {*[]}
- */
-const chunk = (arr, size) => {
-  const out = [];
-  for (let i = 0; i < arr.length; i += size) out.push(arr.slice(i, i + size));
-  return out;
-};
-
-/**
- * Check if a string is an Expo push token.
- * @param s
- * @returns {boolean}
- */
-const isExpoPushToken = (s) => {
-  if (!s || typeof s !== "string") return false;
-  // Common formats observed in the wild:
-  // - ExponentPushToken[xxxxxxxxxxxxxxxxxxxxxx]
-  // - ExpoPushToken[xxxxxxxxxxxxxxxxxxxxxx]
-  return /^ExponentPushToken\[[^\]]+\]$/.test(s) || /^ExpoPushToken\[[^\]]+\]$/.test(s);
-};
-
-/**
- * Get unique, trimmed strings from an array.
- * @param arr
- * @returns {any[]}
- */
-const uniqStrings = (arr) => [
-  ...new Set(
-    arr
-      .filter(Boolean)
-      .map((x) => String(x).trim())
-      .filter(Boolean)
-  )
-];
-
-/**
- * Normalize users.fcmtokens (jsonb) into an array of Expo push tokens.
- *
- * New expected shape (example):
- * {
- *   "ExponentPushToken[dksJAdLUTofdEk7P59thue]": {
- *     "platform": "ios",
- *     "timestamp": 1767397802709,
- *     "pushTokenString": "ExponentPushToken[dksJAdLUTofdEk7P59thue]"
- *   }
- * }
- *
- * Also supports older/alternate shapes:
- *  - string: "ExponentPushToken[...]"
- *  - array: ["ExponentPushToken[...]", ...]
- *  - object: token keys OR values containing token-like fields
- * @param fcmtokens
- * @returns {string[]|*[]}
- */
-const normalizeTokens = (fcmtokens) => {
-  if (!fcmtokens) return [];
-
-  if (typeof fcmtokens === "string") {
-    const s = fcmtokens.trim();
-    return isExpoPushToken(s) ? [s] : [];
-  }
-
-  if (Array.isArray(fcmtokens)) {
-    return uniqStrings(fcmtokens).filter(isExpoPushToken);
-  }
-
-  if (typeof fcmtokens === "object") {
-    const keys = Object.keys(fcmtokens || {});
-    const vals = Object.values(fcmtokens || {});
-
-    const fromKeys = keys.filter(isExpoPushToken);
-
-    const fromValues = vals
-      .map((v) => {
-        if (!v) return null;
-
-        // Some shapes store token as a string value directly
-        if (typeof v === "string") return v;
-
-        if (typeof v === "object") {
-          // Your new shape uses pushTokenString
-          return v.pushTokenString || v.token || v.expoPushToken || null;
-        }
-
-        return null;
-      })
-      .filter(Boolean)
-      .map(String);
-
-    return uniqStrings([...fromKeys, ...fromValues]).filter(isExpoPushToken);
-  }
-
-  return [];
-};
-
-/**
- * Remove specified tokens from the stored fcmtokens jsonb while preserving the original shape.
- * @param fcmtokens
- * @param tokensToRemove
- * @returns {*}
- */
-const removeTokensFromFcmtokens = (fcmtokens, tokensToRemove) => {
-  const remove = new Set((tokensToRemove || []).map((t) => String(t).trim()).filter(Boolean));
-  if (!remove.size) return fcmtokens;
-  if (!fcmtokens) return fcmtokens;
-
-  if (typeof fcmtokens === "string") {
-    const s = fcmtokens.trim();
-    return remove.has(s) ? null : fcmtokens;
-  }
-
-  if (Array.isArray(fcmtokens)) {
-    const next = fcmtokens.filter((t) => !remove.has(String(t).trim()));
-    return next.length ? next : [];
-  }
-
-  if (typeof fcmtokens === "object") {
-    const next = {};
-    for (const [k, v] of Object.entries(fcmtokens)) {
-      const keyIsToken = isExpoPushToken(k) && remove.has(k);
-
-      let valueToken = null;
-      if (typeof v === "string") valueToken = v;
-      else if (v && typeof v === "object") valueToken = v.pushTokenString || v.token || v.expoPushToken || null;
-
-      const valueIsToken = valueToken && remove.has(String(valueToken).trim());
-
-      if (keyIsToken || valueIsToken) continue;
-      next[k] = v;
-    }
-    return Object.keys(next).length ? next : {};
-  }
-
-  return fcmtokens;
-};
-
-/**
- * Safely parse JSON response.
- * @param res
- * @returns {Promise<*|null>}
- */
-const safeJson = async (res) => {
-  try {
-    return await res.json();
-  } catch {
-    return null;
-  }
-};
-
-/**
- * Send Expo push notifications.
- * Returns invalid tokens that should be removed (e.g., DeviceNotRegistered).
- *
- * @param {Array<Object>} messages Expo messages array
- * @param {Object} logger
- * @returns {Promise<{invalidTokens: string[], ticketIds: string[]}>}
- */
-const sendExpoPush = async ({ messages, logger }) => {
-  if (!messages?.length) return { invalidTokens: [], ticketIds: [] };
-
-  const invalidTokens = new Set();
-  const ticketIds = [];
-
-  for (const batch of chunk(messages, EXPO_MAX_MESSAGES_PER_REQUEST)) {
-    const res = await fetch(EXPO_PUSH_ENDPOINT, {
-      method: "POST",
-      headers: {
-        accept: "application/json",
-        "content-type": "application/json"
-      },
-      body: JSON.stringify(batch)
-    });
-
-    const payload = await safeJson(res);
-
-    if (!res.ok) {
-      logger?.log?.("expo-push-http-error", "ERROR", "notifications", "api", {
-        status: res.status,
-        statusText: res.statusText,
-        payload
-      });
-      throw new Error(`Expo push HTTP error: ${res.status} ${res.statusText}`);
-    }
-
-    const tickets = Array.isArray(payload?.data) ? payload.data : payload?.data ? [payload.data] : [];
-
-    if (!tickets.length) {
-      logger?.log?.("expo-push-bad-response", "ERROR", "notifications", "api", { payload });
-      continue;
-    }
-
-    // Expo returns tickets in the same order as messages in the request batch
-    for (let i = 0; i < tickets.length; i++) {
-      const t = tickets[i];
-      const msg = batch[i];
-      const token = typeof msg?.to === "string" ? msg.to : null;
-
-      if (t?.status === "ok" && t?.id) ticketIds.push(String(t.id));
-
-      if (t?.status === "error") {
-        const errCode = t?.details?.error;
-        const msgText = String(t?.message || "");
-
-        const shouldDelete =
-          errCode === "DeviceNotRegistered" || /not a registered push notification recipient/i.test(msgText);
-
-        if (shouldDelete && token && isExpoPushToken(token)) {
-          invalidTokens.add(token);
-        }
-
-        logger?.log?.("expo-push-ticket-error", "ERROR", "notifications", "api", {
-          token,
-          ticket: t
-        });
-      }
-    }
-  }
-
-  return { invalidTokens: [...invalidTokens], ticketIds };
-};
-
-/**
- * Build a summary string for push notification body.
- * @param count
- * @param jobRoNumber
- * @param bodyShopName
- * @returns {`${string} ${string} for ${string|string}${string|string}`}
- */
-const buildPushSummary = ({ count, jobRoNumber, bodyShopName }) => {
-  const updates = count === 1 ? "update" : "updates";
-  const ro = jobRoNumber ? `RO ${jobRoNumber}` : "a job";
-  const shop = bodyShopName ? ` at ${bodyShopName}` : "";
-  return `${count} ${updates} for ${ro}${shop}`;
-};
-
-/**
- * Loads the push notification queues and workers (Expo push).
- * @param pubClient
- * @param logger
- * @returns {Promise<Queue|null>}
- */
-const loadFcmQueue = async ({ pubClient, logger }) => {
-  if (!fcmAddQueue || !fcmConsolidateQueue) {
-    const prefix = getBullMQPrefix();
-    const devKey = process.env?.NODE_ENV === "production" ? "prod" : "dev";
-
-    devDebugLogger(`Initializing Expo Push Queues with prefix: ${prefix}`);
-
-    fcmAddQueue = new Queue("fcmAdd", {
-      prefix,
-      connection: pubClient,
-      defaultJobOptions: { removeOnComplete: true, removeOnFail: true }
-    });
-
-    fcmConsolidateQueue = new Queue("fcmConsolidate", {
-      prefix,
-      connection: pubClient,
-      defaultJobOptions: { removeOnComplete: true, removeOnFail: true }
-    });
-
-    fcmAddWorker = new Worker(
-      "fcmAdd",
-      async (job) => {
-        const { jobId, jobRoNumber, bodyShopId, bodyShopName, scenarioKey, key, variables, body, recipients } =
-          job.data;
-
-        devDebugLogger(`Adding push notifications for jobId ${jobId}`);
-
-        const recipientsSetKey = `fcm:${devKey}:recipients:${jobId}`; // set of user emails
-        const metaKey = `fcm:${devKey}:meta:${jobId}`;
-        const redisKeyPrefix = `fcm:${devKey}:notifications:${jobId}`; // per-user list keys
-
-        // Store job-level metadata (always keep latest values)
-        await pubClient.hset(metaKey, "jobRoNumber", jobRoNumber || "");
-        await pubClient.hset(metaKey, "bodyShopId", bodyShopId || "");
-        await pubClient.hset(metaKey, "bodyShopName", bodyShopName || "");
-        await pubClient.expire(metaKey, seconds(NOTIFICATION_EXPIRATION));
-
-        for (const r of recipients || []) {
-          const user = r?.user;
-          const associationId = r?.associationId;
-
-          if (!user) continue;
-
-          const userKey = `${redisKeyPrefix}:${user}`;
-          const payload = JSON.stringify({
-            body: body || "",
-            scenarioKey: scenarioKey || "",
-            key: key || "",
-            variables: variables || {},
-            associationId: associationId ? String(associationId) : null,
-            ts: Date.now()
-          });
-
-          await pubClient.rpush(userKey, payload);
-          await pubClient.expire(userKey, seconds(NOTIFICATION_EXPIRATION));
-
-          await pubClient.sadd(recipientsSetKey, user);
-          await pubClient.expire(recipientsSetKey, seconds(NOTIFICATION_EXPIRATION));
-        }
-
-        const consolidateKey = `fcm:${devKey}:consolidate:${jobId}`;
-        const flagSet = await pubClient.setnx(consolidateKey, "pending");
-
-        if (flagSet) {
-          await fcmConsolidateQueue.add(
-            "consolidate-fcm",
-            { jobId },
-            {
-              jobId: `consolidate-${jobId}`,
-              delay: FCM_CONSOLIDATION_DELAY,
-              attempts: 3,
-              backoff: BACKOFF_DELAY
-            }
-          );
-
-          await pubClient.expire(consolidateKey, seconds(CONSOLIDATION_KEY_EXPIRATION));
-          devDebugLogger(`Scheduled consolidation for jobId ${jobId}`);
-        } else {
-          devDebugLogger(`Consolidation already scheduled for jobId ${jobId}`);
-        }
-      },
-      { prefix, connection: pubClient, concurrency: 5 }
-    );
-
-    fcmConsolidateWorker = new Worker(
-      "fcmConsolidate",
-      async (job) => {
-        const { jobId } = job.data;
-        const devKey = process.env?.NODE_ENV === "production" ? "prod" : "dev";
-
-        const lockKey = `lock:${devKey}:fcmConsolidate:${jobId}`;
-        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", seconds(LOCK_EXPIRATION));
-
-        if (!lockAcquired) {
-          devDebugLogger(`Skipped consolidation for jobId ${jobId} - lock held by another worker`);
-          return;
-        }
-
-        try {
-          const recipientsSet = `fcm:${devKey}:recipients:${jobId}`;
-          const userEmails = await pubClient.smembers(recipientsSet);
-
-          if (!userEmails?.length) {
-            devDebugLogger(`No recipients found for jobId ${jobId}`);
-            await pubClient.del(`fcm:${devKey}:consolidate:${jobId}`);
-            return;
-          }
-
-          // Load meta
-          const metaKey = `fcm:${devKey}:meta:${jobId}`;
-          const meta = await pubClient.hgetall(metaKey);
-          const jobRoNumber = meta?.jobRoNumber || "";
-          const bodyShopId = meta?.bodyShopId || "";
-          const bodyShopName = meta?.bodyShopName || "";
-
-          // Fetch tokens for all recipients (1 DB round-trip)
-          const usersResp = await gqlClient.request(GET_USERS_FCM_TOKENS_BY_EMAILS, { emails: userEmails });
-
-          // Map: email -> { raw, tokens }
-          const tokenMap = new Map(
-            (usersResp?.users || []).map((u) => [
-              String(u.email),
-              { raw: u.fcmtokens, tokens: normalizeTokens(u.fcmtokens) }
-            ])
-          );
-
-          for (const userEmail of userEmails) {
-            const userKey = `fcm:${devKey}:notifications:${jobId}:${userEmail}`;
-            const raw = await pubClient.lrange(userKey, 0, -1);
-
-            if (!raw?.length) {
-              await pubClient.del(userKey);
-              continue;
-            }
-
-            const parsed = raw
-              .map((x) => {
-                try {
-                  return JSON.parse(x);
-                } catch {
-                  return null;
-                }
-              })
-              .filter(Boolean);
-
-            const count = parsed.length;
-            const notificationBody = buildPushSummary({ count, jobRoNumber, bodyShopName });
-
-            // associationId should be stable for a user in a job’s bodyshop; take first non-null
-            const firstWithAssociation = parsed.find((p) => p?.associationId != null);
-            const associationId =
-              firstWithAssociation?.associationId != null ? String(firstWithAssociation.associationId) : "";
-
-            const tokenInfo = tokenMap.get(String(userEmail)) || { raw: null, tokens: [] };
-            const tokens = tokenInfo.tokens || [];
-
-            if (!tokens.length) {
-              devDebugLogger(`No Expo push tokens for ${userEmail}; skipping push for jobId ${jobId}`);
-              await pubClient.del(userKey);
-              continue;
-            }
-
-            // Build 1 message per device token
-            const messages = tokens.map((token) => ({
-              to: token,
-              title: "ImEX Online",
-              body: notificationBody,
-              priority: "high",
-              data: {
-                type: "job-notification",
-                jobId: String(jobId),
-                jobRoNumber: String(jobRoNumber || ""),
-                bodyShopId: String(bodyShopId || ""),
-                bodyShopName: String(bodyShopName || ""),
-                associationId: String(associationId || ""),
-                userEmail: String(userEmail),
-                count: String(count)
-              }
-            }));
-
-            const { invalidTokens } = await sendExpoPush({ messages, logger });
-
-            // Opportunistic cleanup: remove invalid tokens from users.fcmtokens
-            if (invalidTokens?.length) {
-              try {
-                const nextFcmtokens = removeTokensFromFcmtokens(tokenInfo.raw, invalidTokens);
-
-                await gqlClient.request(UPDATE_USER_FCM_TOKENS_BY_EMAIL, {
-                  email: String(userEmail),
-                  fcmtokens: nextFcmtokens
-                });
-
-                devDebugLogger(`Cleaned ${invalidTokens.length} invalid Expo tokens for ${userEmail}`);
-              } catch (e) {
-                logger?.log?.("expo-push-token-cleanup-failed", "ERROR", "notifications", "api", {
-                  userEmail: String(userEmail),
-                  message: e?.message,
-                  stack: e?.stack
-                });
-                // Do not throw: cleanup failure should not retry the whole consolidation and risk duplicate pushes.
-              }
-            }
-
-            devDebugLogger(`Sent Expo push to ${userEmail} for jobId ${jobId} (${count} updates)`);
-
-            await pubClient.del(userKey);
-          }
-
-          await pubClient.del(recipientsSet);
-          await pubClient.del(metaKey);
-          await pubClient.del(`fcm:${devKey}:consolidate:${jobId}`);
-        } catch (err) {
-          logger.log("fcm-queue-consolidation-error", "ERROR", "notifications", "api", {
-            message: err?.message,
-            stack: err?.stack
-          });
-          throw err;
-        } finally {
-          await pubClient.del(lockKey);
-        }
-      },
-      { prefix, connection: pubClient, concurrency: 1, limiter: { max: 1, duration: RATE_LIMITER_DURATION } }
-    );
-
-    fcmAddWorker.on("failed", (job, err) =>
-      logger.log("fcm-add-failed", "ERROR", "notifications", "api", { message: err?.message, stack: err?.stack })
-    );
-
-    fcmConsolidateWorker.on("failed", (job, err) =>
-      logger.log("fcm-consolidate-failed", "ERROR", "notifications", "api", {
-        message: err?.message,
-        stack: err?.stack
-      })
-    );
-
-    const shutdown = async () => {
-      devDebugLogger("Closing push queue workers...");
-      await Promise.all([fcmAddWorker.close(), fcmConsolidateWorker.close()]);
-      devDebugLogger("Push queue workers closed");
-    };
-
-    registerCleanupTask(shutdown);
-  }
-
-  return fcmAddQueue;
-};
-
-/**
- * Get the add queue.
- * @returns {*}
- */
-const getQueue = () => {
-  if (!fcmAddQueue) throw new Error("FCM add queue not initialized. Ensure loadFcmQueue is called during bootstrap.");
-  return fcmAddQueue;
-};
-
-/**
- * Dispatch push notifications to the add queue.
- * @param fcmsToDispatch
- * @returns {Promise<void>}
- */
-const dispatchFcmsToQueue = async ({ fcmsToDispatch }) => {
-  const queue = getQueue();
-
-  for (const fcm of fcmsToDispatch) {
-    const { jobId, jobRoNumber, bodyShopId, bodyShopName, scenarioKey, key, variables, body, recipients } = fcm;
-
-    if (!jobId || !recipients?.length) continue;
-
-    await queue.add(
-      "add-fcm-notification",
-      { jobId, jobRoNumber, bodyShopId, bodyShopName, scenarioKey, key, variables, body, recipients },
-      { jobId: `${jobId}-${Date.now()}` }
-    );
-  }
-};
-
-module.exports = { loadFcmQueue, getQueue, dispatchFcmsToQueue };

server/notifications/scenarioBuilders.js

@@ -19,8 +19,6 @@ const buildNotification = (data, key, body, variables = {}) => {
       jobId: data.jobId,
       jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
-      scenarioKey: data.scenarioKey,
-      scenarioTable: data.scenarioTable,
       key,
       body,
       variables,
@@ -34,47 +32,21 @@ const buildNotification = (data, key, body, variables = {}) => {
       body,
       recipients: []
     },
-    fcm: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      bodyShopName: data.bodyShopName,
-      bodyShopTimezone: data.bodyShopTimezone,
-      scenarioKey: data.scenarioKey,
-      scenarioTable: data.scenarioTable,
-      key,
-      body,
-      variables,
-      recipients: []
-    }
+    fcm: { recipients: [] }
   };
 
   // Populate recipients from scenarioWatchers
   data.scenarioWatchers.forEach((recipients) => {
     const { user, app, fcm, email, firstName, lastName, employeeId, associationId } = recipients;
-
-    if (app === true) {
+    if (app === true)
       result.app.recipients.push({
         user,
         bodyShopId: data.bodyShopId,
         employeeId,
         associationId
       });
-    }
-
-    if (email === true) {
-      result.email.recipients.push({ user, firstName, lastName });
-    }
-
-    if (fcm === true) {
-      // Keep structure consistent and future-proof (token lookup is done server-side)
-      result.fcm.recipients.push({
-        user,
-        bodyShopId: data.bodyShopId,
-        employeeId,
-        associationId
-      });
-    }
+    if (fcm === true) result.fcm.recipients.push(user);
+    if (email === true) result.email.recipients.push({ user, firstName, lastName });
   });
 
   return result;

server/notifications/scenarioParser.js

@@ -14,7 +14,6 @@ const { isEmpty, isFunction } = require("lodash");
 const { getMatchingScenarios } = require("./scenarioMapper");
 const { dispatchEmailsToQueue } = require("./queues/emailQueue");
 const { dispatchAppsToQueue } = require("./queues/appQueue");
-const { dispatchFcmsToQueue } = require("./queues/fcmQueue"); // NEW
 
 // If true, the user who commits the action will NOT receive notifications; if false, they will.
 const FILTER_SELF_FROM_WATCHERS = process.env?.FILTER_SELF_FROM_WATCHERS !== "false";
@@ -299,16 +298,6 @@ const scenarioParser = async (req, jobIdField) => {
       })
     );
   }
-
-  const fcmsToDispatch = scenariosToDispatch.map((scenario) => scenario?.fcm);
-  if (!isEmpty(fcmsToDispatch)) {
-    dispatchFcmsToQueue({ fcmsToDispatch, logger }).catch((e) =>
-      logger.log("Something went wrong dispatching FCMs to the FCM Notification Queue", "error", "queue", null, {
-        message: e?.message,
-        stack: e?.stack
-      })
-    );
-  }
 };
 
 module.exports = scenarioParser;

server/routes/mediaRoutes.js

@@ -4,6 +4,7 @@ const { createSignedUploadURL, downloadFiles, renameKeys, deleteFiles } = requir
 const {
   generateSignedUploadUrls: createSignedUploadURLImgproxy,
   getThumbnailUrls: getThumbnailUrlsImgproxy,
+  getOriginalImageByDocumentId: getOriginalImageByDocumentIdImgproxy,
   downloadFiles: downloadFilesImgproxy,
   moveFiles: moveFilesImgproxy,
   deleteFiles: deleteFilesImgproxy
@@ -24,5 +25,6 @@ router.post("/imgproxy/thumbnails", getThumbnailUrlsImgproxy);
 router.post("/imgproxy/download", downloadFilesImgproxy);
 router.post("/imgproxy/rename", moveFilesImgproxy);
 router.post("/imgproxy/delete", deleteFilesImgproxy);
+router.post("/imgproxy/original", getOriginalImageByDocumentIdImgproxy);
 
 module.exports = router;