feature/IO-3492-FCM-Queue-For-Notifications: Finalize

hotfix/missing-dms-migration - Add Back DMS_ID

client/src/App/App.jsx

@@ -138,7 +138,7 @@ export function App({
     );
   }
 
-  if (currentEula && !currentUser.eulaIsAccepted) {
+  if (!isPartsEntry && currentEula && !currentUser.eulaIsAccepted) {
     return <Eula />;
   }
 

client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx

@@ -142,17 +142,37 @@ export default function JobLifecycleDashboardComponent({ data, bodyshop, ...card
             title={t("job_lifecycle.content.legend_title")}
             style={{ marginTop: "10px" }}
           >
-            <div>
+            <div
+              style={{
+                display: "flex",
+                flexWrap: "wrap",
+                gap: 8
+              }}
+            >
               {lifecycleData.summations.map((key) => (
-                <Tag key={key.status} color={key.color} style={{ width: "13vh", padding: "4px", margin: "4px" }}>
+                <Tag
+                  key={key.status}
+                  color={key.color}
+                  style={{
+                    // IMPORTANT: let the tag grow with its content
+                    width: "auto",
+                    padding: 0,
+                    margin: 0,
+                    display: "inline-flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    boxSizing: "border-box"
+                  }}
+                >
                   <div
                     aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                     title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                     style={{
                       backgroundColor: "var(--tag-wrapper-bg)",
                       color: "var(--tag-wrapper-text)",
-                      padding: "4px",
+                      padding: "4px 8px",
-                      textAlign: "center"
+                      textAlign: "center",
+                      whiteSpace: "nowrap" // keep it on one line while letting the pill expand
                     }}
                   >
                     {key.status} [{lifecycleData.statusCounts[key.status]}] ({key.roundedPercentage})

client/src/components/eula/eula.component.jsx

@@ -55,7 +55,8 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
     const useremail = currentUser.email;
 
     try {
-      const { ...otherFormValues } = formValues;
+      // eslint-disable-next-line no-unused-vars
+      const { accepted_terms, ...otherFormValues } = formValues;
 
       // Trim the values of the fields before submitting
       const trimmedFormValues = Object.entries(otherFormValues).reduce((acc, [key, value]) => {

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

@@ -222,17 +222,37 @@ export function JobLifecycleComponent({ bodyshop, job, statuses }) {
                 </div>
               </BlurWrapperComponent>
               <Card type="inner" title={t("job_lifecycle.content.legend_title")} style={{ marginTop: "10px" }}>
-                <div>
+                <div
+                  style={{
+                    display: "flex",
+                    flexWrap: "wrap",
+                    gap: 8
+                  }}
+                >
                   {lifecycleData.durations.summations.map((key) => (
-                    <Tag key={key.status} color={key.color} style={{ width: "13vh", padding: "4px", margin: "4px" }}>
+                    <Tag
+                      key={key.status}
+                      color={key.color}
+                      style={{
+                        // let the tag grow with its content
+                        width: "auto",
+                        padding: 0,
+                        margin: 0,
+                        display: "inline-flex",
+                        alignItems: "center",
+                        justifyContent: "center",
+                        boxSizing: "border-box"
+                      }}
+                    >
                       <div
                         aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                         title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                         style={{
                           backgroundColor: "var(--tag-wrapper-bg)",
                           color: "var(--tag-wrapper-text)",
-                          padding: "4px",
+                          padding: "4px 8px",
-                          textAlign: "center"
+                          textAlign: "center",
+                          whiteSpace: "nowrap" // single line; tag gets wider instead of text escaping
                         }}
                       >
                         {key.status} (

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-imgproxy-gallery/jobs-document-imgproxy-gallery.download.component.jsx

@@ -35,16 +35,14 @@ export function JobsDocumentsImgproxyDownloadButton({ galleryImages, identifier,
     ...galleryImages.other.filter((image) => image.isSelected)
   ];
 
-  function downloadProgress(progressEvent) {
+  const downloadProgress = ({ loaded }) => {
-    setDownload((currentDownloadState) => {
+    setDownload((currentDownloadState) => ({
-      return {
+      downloaded: loaded ?? 0,
-        downloaded: progressEvent.loaded || 0,
+      speed: (loaded ?? 0) - (currentDownloadState?.downloaded ?? 0)
-        speed: (progressEvent.loaded || 0) - ((currentDownloadState && currentDownloadState.downloaded) || 0)
+    }));
-      };
+  };
-    });
-  }
 
-  function standardMediaDownload(bufferData) {
+  const standardMediaDownload = (bufferData) => {
     try {
       const a = document.createElement("a");
       const url = window.URL.createObjectURL(new Blob([bufferData]));
@@ -55,29 +53,26 @@ export function JobsDocumentsImgproxyDownloadButton({ galleryImages, identifier,
       setLoading(false);
       setDownload(null);
     }
-  }
+  };
 
   const handleDownload = async () => {
     logImEXEvent("jobs_documents_download");
     setLoading(true);
     try {
-      const response = await axios({
+      const { data } = await axios({
         url: "/media/imgproxy/download",
         method: "POST",
         responseType: "blob",
         data: { jobId, documentids: imagesToDownload.map((_) => _.id) },
         onDownloadProgress: downloadProgress
       });
-
-      setLoading(false);
-      setDownload(null);
-
       // Use the response data (Blob) to trigger download
-      standardMediaDownload(response.data);
+      standardMediaDownload(data);
     } catch {
+      // handle error (optional)
+    } finally {
       setLoading(false);
       setDownload(null);
-      // handle error (optional)
     }
   };
 

client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component.jsx

@@ -76,14 +76,14 @@ function JobsDocumentsImgproxyComponent({
               <SyncOutlined />
             </Button>
             <JobsDocumentsGallerySelectAllComponent galleryImages={galleryImages} setGalleryImages={setGalleryImages} />
+            {!billId && (
+              <JobsDocumentsGalleryReassign galleryImages={galleryImages} callback={fetchThumbnails || refetch} />
+            )}
             <JobsDocumentsDownloadButton galleryImages={galleryImages} identifier={downloadIdentifier} jobId={jobId} />
             <JobsDocumentsDeleteButton
               galleryImages={galleryImages}
               deletionCallback={billsCallback || fetchThumbnails || refetch}
             />
-            {!billId && (
-              <JobsDocumentsGalleryReassign galleryImages={galleryImages} callback={fetchThumbnails || refetch} />
-            )}
           </Space>
         </Col>
         {!hasMediaAccess && (

client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.delete.component.jsx

@@ -67,7 +67,7 @@ export default function JobsDocumentsImgproxyDeleteButton({ galleryImages, delet
       okButtonProps={{ danger: true }}
       cancelText={t("general.actions.cancel")}
     >
-      <Button disabled={imagesToDelete.length < 1} loading={loading}>
+      <Button danger disabled={imagesToDelete.length < 1} loading={loading}>
         {t("documents.actions.delete")}
       </Button>
     </Popconfirm>

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

@@ -107,8 +107,8 @@ export function JobsDocumentsLocalGallery({
             <a href={CreateExplorerLinkForJob({ jobid: job.id })}>
               <Button>{t("documents.labels.openinexplorer")}</Button>
             </a>
-            <JobsDocumentsLocalGalleryReassign jobid={job.id} />
             <JobsDocumentsLocalGallerySelectAllComponent jobid={job.id} />
+            <JobsDocumentsLocalGalleryReassign jobid={job.id} />
             <JobsLocalGalleryDownloadButton job={job} />
             <JobsDocumentsLocalDeleteButton jobid={job.id} />
           </Space>

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.delete.component.jsx

@@ -28,6 +28,8 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
 
   const [loading, setLoading] = useState(false);
 
+  const imagesToDelete = (allMedia?.[jobid] || []).filter((i) => i.isSelected);
+
   const handleDelete = async () => {
     logImEXEvent("job_documents_delete");
     setLoading(true);
@@ -36,7 +38,7 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
       `${bodyshop.localmediaserverhttp}/jobs/delete`,
       {
         jobid: jobid,
-        files: (allMedia?.[jobid] || []).filter((i) => i.isSelected).map((i) => i.filename)
+        files: imagesToDelete.map((i) => i.filename)
       },
       { headers: { ims_token: bodyshop.localmediatoken } }
     );
@@ -60,14 +62,17 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
 
   return (
     <Popconfirm
+      disabled={imagesToDelete.length < 1}
       icon={<QuestionCircleOutlined style={{ color: "red" }} />}
       onConfirm={handleDelete}
       title={t("documents.labels.confirmdelete")}
       okText={t("general.actions.delete")}
-      okButtonProps={{ type: "danger" }}
+      okButtonProps={{ danger: true }}
       cancelText={t("general.actions.cancel")}
     >
-      <Button loading={loading}>{t("documents.actions.delete")}</Button>
+      <Button danger disabled={imagesToDelete.length < 1} loading={loading}>
+        {t("documents.actions.delete")}
+      </Button>
     </Popconfirm>
   );
 }

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

@@ -1,8 +1,8 @@
-import { Button } from "antd";
+import { Button, Space } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import cleanAxios from "../../utils/CleanAxios";
-
+import formatBytes from "../../utils/formatbytes";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectAllMedia } from "../../redux/media/media.selectors";
@@ -19,45 +19,63 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobsLocalGalleryDown
 
 export function JobsLocalGalleryDownloadButton({ bodyshop, allMedia, job }) {
   const { t } = useTranslation();
-  const [download, setDownload] = useState(null);
+  const [loading, setLoading] = useState(false);
+  const [download, setDownload] = useState(false);
 
-  function downloadProgress(progressEvent) {
+  const imagesToDownload = (allMedia?.[job.id] || []).filter((i) => i.isSelected);
-    setDownload((currentDownloadState) => {
+
-      return {
+  const downloadProgress = ({ loaded }) => {
-        downloaded: progressEvent.loaded || 0,
+    setDownload((currentDownloadState) => ({
-        speed: (progressEvent.loaded || 0) - (currentDownloadState?.downloaded || 0)
+      downloaded: loaded || 0,
-      };
+      speed: (loaded || 0) - (currentDownloadState?.downloaded || 0)
-    });
+    }));
-  }
+  };
+
+  const standardMediaDownload = (bufferData, filename) => {
+    try {
+      const a = document.createElement("a");
+      const url = window.URL.createObjectURL(new Blob([bufferData]));
+      a.href = url;
+      a.download = `${filename}.zip`;
+      a.click();
+    } catch {
+      setLoading(false);
+      setDownload(null);
+    }
+  };
 
   const handleDownload = async () => {
-    const theDownloadedZip = await cleanAxios.post(
+    const { localmediaserverhttp, localmediatoken } = bodyshop;
-      `${bodyshop.localmediaserverhttp}/jobs/download`,
+    const { id, ro_number } = job;
-      {
+    setLoading(true);
-        jobid: job.id,
+    try {
-        files: (allMedia?.[job.id] || []).filter((i) => i.isSelected).map((i) => i.filename)
+      const response = await cleanAxios.post(
-      },
+        `${localmediaserverhttp}/jobs/download`,
-      {
+        {
-        headers: { ims_token: bodyshop.localmediatoken },
+          jobid: id,
-        responseType: "arraybuffer",
+          files: imagesToDownload.map((i) => i.filename)
-        onDownloadProgress: downloadProgress
+        },
-      }
+        {
-    );
+          headers: { ims_token: localmediatoken },
-    setDownload(null);
+          responseType: "arraybuffer",
-    standardMediaDownload(theDownloadedZip.data, job.ro_number);
+          onDownloadProgress: downloadProgress
+        }
+      );
+      standardMediaDownload(response.data, ro_number);
+    } catch {
+      // handle error (optional)
+    } finally {
+      setLoading(false);
+      setDownload(null);
+    }
   };
 
   return (
-    <Button loading={!!download} onClick={handleDownload}>
+    <Button disabled={imagesToDownload < 1} loading={download || loading} onClick={handleDownload}>
-      {t("documents.actions.download")}
+      <Space>
+        <span>{t("documents.actions.download")}</span>
+        {download && <span>{`(${formatBytes(download.downloaded)} @ ${formatBytes(download.speed)} / second)`}</span>}
+      </Space>
     </Button>
   );
 }
-
-function standardMediaDownload(bufferData, filename) {
-  const a = document.createElement("a");
-  const url = window.URL.createObjectURL(new Blob([bufferData]));
-  a.href = url;
-  a.download = `${filename}.zip`;
-  a.click();
-}

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: "90%"
+      width: "80%"
     },
     {
       title: <ColumnHeaderCheckbox channel="app" form={form} onHeaderChange={() => setIsDirty(true)} />,
@@ -156,20 +156,23 @@ 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 (
@@ -186,13 +189,7 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
         extra={
           <Space>
             <Typography.Text type="secondary">{t("notifications.labels.auto-add")}</Typography.Text>
-            <Switch
+            <Switch checked={autoAddEnabled} onChange={handleAutoAddToggle} loading={savingAutoAdd} />
-              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>
+    <div className="report-center-modal">
       <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,13 +163,14 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
               {Object.keys(grouped)
                 //.filter((key) => !groupExcludeKeyFilter.includes(key))
                 .map((key) => (
-                  <Col md={8} sm={12} key={key}>
+                  <Col xs={24} sm={12} md={Object.keys(grouped).length === 1 ? 24 : 8} key={key}>
                     <Card.Grid
                       style={{
                         width: "100%",
                         height: "100%",
                         maxHeight: "33vh",
-                        overflowY: "scroll"
+                        overflowY: "scroll",
+                        minWidth: "200px"
                       }}
                     >
                       <Typography.Title level={4}>{t(`reportcenter.labels.groups.${key}`)}</Typography.Title>
@@ -177,7 +178,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                         <BlurWrapperComponent
                           featureName={groupExcludeKeyFilter.find((g) => g.key === key).featureName}
                         >
-                          <ul style={{ listStyleType: "none", columns: "2 auto" }}>
+                          <ul style={{ listStyleType: "none", columns: grouped[key].length > 4 ? "2 auto" : "1", padding: 0, margin: 0 }}>
                             {grouped[key].map((item) => (
                               <li key={item.key}>
                                 <Radio key={item.key} value={item.key}>
@@ -188,7 +189,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                           </ul>
                         </BlurWrapperComponent>
                       ) : (
-                        <ul style={{ listStyleType: "none", columns: "2 auto" }}>
+                        <ul style={{ listStyleType: "none", columns: grouped[key].length > 4 ? "2 auto" : "1", padding: 0, margin: 0 }}>
                           {grouped[key].map((item) =>
                             item.featureNameRestricted ? (
                               <li key={item.key}>

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

@@ -11,3 +11,38 @@
     }
   }
 }
+
+// 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,6 +16,7 @@ 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={[
             {
@@ -42,11 +43,6 @@ 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/components/tech-header/tech-header.component.jsx

@@ -16,7 +16,7 @@ const mapDispatchToProps = () => ({
 export function TechHeader({ technician }) {
   const { t } = useTranslation();
   return (
-    <Header style={{ textAlign: "center" }}>
+    <Header style={{ textAlign: "center", height: "auto", overflow: "visible" }}>
       <Typography.Title style={{ color: "#fff" }}>
         {technician
           ? t("tech.labels.loggedin", {

client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx

@@ -1,5 +1,5 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Card, Col, Form, InputNumber, Popover, Row, Select } from "antd";
+import { Button, Card, Form, InputNumber, Popover, Select, Space } from "antd";
 import axios from "axios";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -124,103 +124,12 @@ export function TechClockOffButton({
             cost_center: isShiftTicket ? "timetickets.labels.shift" : technician ? technician.cost_center : null
           }}
         >
-          <Row gutter={[16, 16]}>
+          <Space direction="vertical">
-            <Col span={!isShiftTicket ? 8 : 24}>
+            {!isShiftTicket ? (
-              {!isShiftTicket ? (
+              <div>
-                <div>
-                  <Form.Item
-                    label={t("timetickets.fields.actualhrs")}
-                    name="actualhrs"
-                    rules={[
-                      {
-                        required: true
-                        //message: t("general.validation.required"),
-                      }
-                    ]}
-                  >
-                    <InputNumber min={0} precision={1} />
-                  </Form.Item>
-                  <Form.Item
-                    label={t("timetickets.fields.productivehrs")}
-                    name="productivehrs"
-                    rules={[
-                      {
-                        required: true
-                        //message: t("general.validation.required"),
-                      },
-                      ({ getFieldValue }) => ({
-                        validator(rule, value) {
-                          if (!bodyshop.tt_enforce_hours_for_tech_console) {
-                            return Promise.resolve();
-                          }
-                          if (!value || getFieldValue("cost_center") === null || !lineTicketData)
-                            return Promise.resolve();
-
-                          //Check the cost center,
-                          const totals = CalculateAllocationsTotals(
-                            bodyshop,
-                            lineTicketData.joblines,
-                            lineTicketData.timetickets,
-                            lineTicketData.jobs_by_pk.lbr_adjustments
-                          );
-
-                          const fieldTypeToCheck =
-                            bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? "mod_lbr_ty" : "cost_center";
-
-                          const costCenterDiff =
-                            Math.round(
-                              totals.find((total) => total[fieldTypeToCheck] === getFieldValue("cost_center"))
-                                ?.difference * 10
-                            ) / 10;
-
-                          if (value > costCenterDiff)
-                            return Promise.reject(t("timetickets.validation.hoursenteredmorethanavailable"));
-                          else {
-                            return Promise.resolve();
-                          }
-                        }
-                      })
-                    ]}
-                  >
-                    <InputNumber min={0} precision={1} />
-                  </Form.Item>
-                </div>
-              ) : null}
-              <Form.Item
-                name="cost_center"
-                label={t("timetickets.fields.cost_center")}
-                rules={[
-                  {
-                    required: true
-                    //message: t("general.validation.required"),
-                  }
-                ]}
-              >
-                <Select disabled={isShiftTicket}>
-                  {isShiftTicket ? (
-                    <Select.Option value="timetickets.labels.shift">{t("timetickets.labels.shift")}</Select.Option>
-                  ) : (
-                    emps &&
-                    emps.rates.map((item) => (
-                      <Select.Option key={item.cost_center}>
-                        {item.cost_center === "timetickets.labels.shift"
-                          ? t(item.cost_center)
-                          : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
-                            ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
-                            : item.cost_center}
-                      </Select.Option>
-                    ))
-                  )}
-                </Select>
-              </Form.Item>
-
-              {isShiftTicket ? (
-                <div></div>
-              ) : (
                 <Form.Item
-                  name="status"
+                  label={t("timetickets.fields.actualhrs")}
-                  label={t("jobs.fields.status")}
+                  name="actualhrs"
-                  initialValue={lineTicketData && lineTicketData.jobs_by_pk.status}
                   rules={[
                     {
                       required: true
@@ -228,35 +137,117 @@ export function TechClockOffButton({
                     }
                   ]}
                 >
-                  <Select>
+                  <InputNumber min={0} precision={1} />
-                    {bodyshop.md_ro_statuses.production_statuses.map((item) => (
-                      <Select.Option key={item}></Select.Option>
-                    ))}
-                  </Select>
                 </Form.Item>
-              )}
+                <Form.Item
-              <Button type="primary" htmlType="submit" loading={loading}>
+                  label={t("timetickets.fields.productivehrs")}
-                {t("general.actions.save")}
+                  name="productivehrs"
-              </Button>
+                  rules={[
-              <TechJobClockoutDelete completedCallback={completedCallback} timeTicketId={timeTicketId} />
+                    {
-            </Col>
+                      required: true
-            {!isShiftTicket && (
+                      //message: t("general.validation.required"),
-              <Col span={16}>
+                    },
-                <LaborAllocationContainer
+                    ({ getFieldValue }) => ({
-                  jobid={jobId || null}
+                      validator(rule, value) {
-                  loading={queryLoading}
+                        if (!bodyshop.tt_enforce_hours_for_tech_console) {
-                  lineTicketData={lineTicketData}
+                          return Promise.resolve();
-                />
+                        }
-              </Col>
+                        if (!value || getFieldValue("cost_center") === null || !lineTicketData)
+                          return Promise.resolve();
+                        //Check the cost center,
+                        const totals = CalculateAllocationsTotals(
+                          bodyshop,
+                          lineTicketData.joblines,
+                          lineTicketData.timetickets,
+                          lineTicketData.jobs_by_pk.lbr_adjustments
+                        );
+                        const fieldTypeToCheck =
+                          bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? "mod_lbr_ty" : "cost_center";
+                        const costCenterDiff =
+                          Math.round(
+                            totals.find((total) => total[fieldTypeToCheck] === getFieldValue("cost_center"))
+                              ?.difference * 10
+                          ) / 10;
+                        if (value > costCenterDiff)
+                          return Promise.reject(t("timetickets.validation.hoursenteredmorethanavailable"));
+                        else {
+                          return Promise.resolve();
+                        }
+                      }
+                    })
+                  ]}
+                >
+                  <InputNumber min={0} precision={1} />
+                </Form.Item>
+              </div>
+            ) : null}
+            <Form.Item
+              name="cost_center"
+              label={t("timetickets.fields.cost_center")}
+              rules={[
+                {
+                  required: true
+                  //message: t("general.validation.required"),
+                }
+              ]}
+            >
+              <Select disabled={isShiftTicket}>
+                {isShiftTicket ? (
+                  <Select.Option value="timetickets.labels.shift">{t("timetickets.labels.shift")}</Select.Option>
+                ) : (
+                  emps &&
+                  emps.rates.map((item) => (
+                    <Select.Option key={item.cost_center}>
+                      {item.cost_center === "timetickets.labels.shift"
+                        ? t(item.cost_center)
+                        : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                          ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
+                          : item.cost_center}
+                    </Select.Option>
+                  ))
+                )}
+              </Select>
+            </Form.Item>
+            {isShiftTicket ? (
+              <div></div>
+            ) : (
+              <Form.Item
+                name="status"
+                label={t("jobs.fields.status")}
+                initialValue={lineTicketData && lineTicketData.jobs_by_pk.status}
+                rules={[
+                  {
+                    required: true
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+              >
+                <Select>
+                  {bodyshop.md_ro_statuses.production_statuses.map((item) => (
+                    <Select.Option key={item}></Select.Option>
+                  ))}
+                </Select>
+              </Form.Item>
             )}
-          </Row>
+            <Button type="primary" htmlType="submit" loading={loading}>
+              {t("general.actions.save")}
+            </Button>
+            <TechJobClockoutDelete completedCallback={completedCallback} timeTicketId={timeTicketId} />
+            {!isShiftTicket && (
+              <LaborAllocationContainer jobid={jobId || null} loading={queryLoading} lineTicketData={lineTicketData} />
+            )}
+          </Space>
         </Form>
       </div>
     </Card>
   );
 
   return (
-    <Popover content={overlay} trigger="click">
+    <Popover 
+      content={<div style={{ maxHeight: "75vh", overflowY: "auto" }}>{overlay}</div>} 
+      trigger="click"
+      getPopupContainer={() => document.querySelector('#time-ticket-modal')}
+    >
       <Button loading={loading} {...otherBtnProps}>
         {t("timetickets.actions.clockout")}
       </Button>

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,7 +74,6 @@ onMessage(messaging, (payload) => {
 
 export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
   try {
-
     const state = stateProp || store.getState();
 
     const eventParams = {
@@ -99,8 +98,7 @@ 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/redux/user/user.sagas.js

@@ -50,7 +50,7 @@ import {
 } from "./user.actions";
 import UserActionTypes from "./user.types";
 //import * as amplitude from '@amplitude/analytics-browser';
-import posthog from 'posthog-js';
+import posthog from "posthog-js";
 
 const fpPromise = FingerprintJS.load();
 
@@ -269,11 +269,11 @@ export function* signInSuccessSaga({ payload }) {
         instanceSeg,
         ...(isParts
           ? [
-            InstanceRenderManager({
+              InstanceRenderManager({
-              imex: "ImexPartsManagement",
+                imex: "ImexPartsManagement",
-              rome: "RomePartsManagement"
+                rome: "RomePartsManagement"
-            })
+              })
-          ]
+            ]
           : [])
       ];
       window.$crisp.push(["set", "session:segments", [segs]]);
@@ -375,17 +375,31 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
       const isParts = yield select((state) => state.application.isPartsEntry === true);
       const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
 
-      let featureSegments;
+      const featureSegments =
-      if (payload.features?.allAccess === true) {
+        payload.features?.allAccess === true
-        featureSegments = ["allAccess"];
+          ? ["allAccess"]
-      } else {
+          : [
-        const featureKeys = Object.keys(payload.features).filter(
+              "basic",
-          (key) =>
+              ...Object.keys(payload.features).filter(
-            payload.features[key] === true ||
+                (key) =>
-            (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
+                  payload.features[key] === true ||
-        );
+                  (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
-        featureSegments = ["basic", ...featureKeys];
+              )
-      }
+            ];
+
+      const additionalSegments = [
+        payload.cdk_dealerid && "CDK",
+        payload.pbs_serialnumber && "PBS",
+        // payload.rr_dealerid && "Reynolds",
+        payload.accountingconfig.qbo === true && "QBO",
+        payload.accountingconfig.qbo === false &&
+          !payload.cdk_dealerid &&
+          !payload.pbs_serialnumber &&
+          // !payload.rr_dealerid &&
+          "QBD"
+      ].filter(Boolean);
+
+      featureSegments.push(...additionalSegments);
 
       const regionSeg = payload.region_config ? `region:${payload.region_config}` : null;
       const segments = [instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];

client/src/utils/TemplateConstants.js

@@ -1221,7 +1221,7 @@ export const TemplateList = (type, context) => {
           payments_by_date_excel: {
             title: i18n.t("reportcenter.templates.payments_by_date_excel"),
             subject: i18n.t("reportcenter.templates.payments_by_date_excel"),
-            key: "payments_by_date",
+            key: "payments_by_date_excel",
             reporttype: "excel",
             disabled: false,
             rangeFilter: {

client/src/utils/sentry.js

@@ -31,7 +31,8 @@ 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"
+      "Failed to update a ServiceWorker for scope",
+      "Network Error"
     ],
     integrations: [
       // See docs for support of different versions of variation of react router

client/vite.config.js

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

hasura/metadata/tables.yaml

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

@@ -0,0 +1,4 @@
+-- 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

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

server.js

@@ -38,6 +38,7 @@ 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;
@@ -355,9 +356,10 @@ const loadQueues = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
   const queueSettings = { pubClient, logger, redisHelpers, ioRedis };
 
   // Assuming loadEmailQueue and loadAppQueue return Promises
-  const [notificationsEmailsQueue, notificationsAppQueue] = await Promise.all([
+  const [notificationsEmailsQueue, notificationsAppQueue, notificationsFcmQueue] = await Promise.all([
     loadEmailQueue(queueSettings),
-    loadAppQueue(queueSettings)
+    loadAppQueue(queueSettings),
+    loadFcmQueue(queueSettings)
   ]);
 
   // Add error listeners or other setup for queues if needed
@@ -368,6 +370,10 @@ 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/data/carfax-rps.js

@@ -117,44 +117,46 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
         imexshopid: shopid,
         json: JSON.stringify(carfaxObject, null, 2),
         filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
-        count: carfaxObject.job.length
+        count: carfaxObject?.job?.length || 0
       };
 
       if (skipUpload) {
         fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
         uploadToS3(jsonObj, S3_BUCKET_NAME);
       } else {
-        await uploadViaSFTP(jsonObj);
+        if (jsonObj.count > 0) {
+          await uploadViaSFTP(jsonObj);
 
-        await sendMexicoBillingEmail({
+          await sendMexicoBillingEmail({
-          subject: `${shopid.replace(/_/g, "").toUpperCase()}_MexicoRPS_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
+            subject: `${shopid.replace(/_/g, "").toUpperCase()}_MexicoRPS_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
-          text: `Errors:\n${JSON.stringify(
+            text: `Errors:\n${JSON.stringify(
-            erroredJobs.map((ej) => ({
+              erroredJobs.map((ej) => ({
-              jobid: ej.job?.id,
+                jobid: ej.job?.id,
-              error: ej.error
+                error: ej.error
-            })),
+              })),
-            null,
+              null,
-            2
+              2
-          )}\n\nUploaded:\n${JSON.stringify(
+            )}\n\nUploaded:\n${JSON.stringify(
-            {
+              {
-              bodyshopid: bodyshop.id,
+                bodyshopid: bodyshop.id,
-              imexshopid: shopid,
+                imexshopid: shopid,
-              count: jsonObj.count,
+                count: jsonObj.count,
-              filename: jsonObj.filename,
+                filename: jsonObj.filename,
-              result: jsonObj.result
+                result: jsonObj.result
-            },
+              },
-            null,
+              null,
-            2
+              2
-          )}`
+            )}`
-        });
+          });
+        }
       }
 
-      allJSONResults.push({
+      jsonObj.count > 0 && allJSONResults.push({
         bodyshopid: bodyshop.id,
         imexshopid: shopid,
         count: jsonObj.count,
         filename: jsonObj.filename,
-        result: jsonObj.result
+        result: jsonObj.result || "No Upload Result Available"
       });
 
       logger.log("CARFAX-RPS-end-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -234,11 +236,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
     const ret = {
       ro_number: crypto.createHash("md5").update(job.id, "utf8").digest("hex"),
       v_vin: job.v_vin || "",
-      v_year: job.v_model_yr
+      v_year: (() => {
-        ? parseInt(job.v_model_yr.match(/\d/g))
+        const y = parseInt(job.v_model_yr);
-          ? parseInt(job.v_model_yr.match(/\d/g).join(""), 10)
+        return isNaN(y) ? null : y < 100 ? y + (y >= (new Date().getFullYear() + 1) % 100 ? 1900 : 2000) : y;
-          : ""
+      })(),
-        : "",
       v_make: job.v_makedesc || "",
       v_model: job.v_model || "",
 

server/data/carfax.js

@@ -160,40 +160,42 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
         imexshopid: shopid,
         json: JSON.stringify(carfaxObject, null, 2),
         filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
-        count: carfaxObject.job.length
+        count: carfaxObject?.job?.length || 0
       };
 
       if (skipUpload) {
         fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
         uploadToS3(jsonObj);
       } else {
-        await uploadViaSFTP(jsonObj);
+        if (jsonObj.count > 0) {
+          await uploadViaSFTP(jsonObj);
 
-        await sendMexicoBillingEmail({
+          await sendMexicoBillingEmail({
-          subject: `${shopid.replace(/_/g, "").toUpperCase()}_Mexico${InstanceManager({
+            subject: `${shopid.replace(/_/g, "").toUpperCase()}_Mexico${InstanceManager({
-            imex: "IO",
+              imex: "IO",
-            rome: "RO"
+              rome: "RO"
-          })}_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
+            })}_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
-          text: `Errors:\n${JSON.stringify(
+            text: `Errors:\n${JSON.stringify(
-            erroredJobs.map((ej) => ({
+              erroredJobs.map((ej) => ({
-              ro_number: ej.job?.ro_number,
+                ro_number: ej.job?.ro_number,
-              jobid: ej.job?.id,
+                jobid: ej.job?.id,
-              error: ej.error
+                error: ej.error
-            })),
+              })),
-            null,
+              null,
-            2
+              2
-          )}\n\nUploaded:\n${JSON.stringify(
+            )}\n\nUploaded:\n${JSON.stringify(
-            {
+              {
-              bodyshopid: bodyshop.id,
+                bodyshopid: bodyshop.id,
-              imexshopid: shopid,
+                imexshopid: shopid,
-              count: jsonObj.count,
+                count: jsonObj.count,
-              filename: jsonObj.filename,
+                filename: jsonObj.filename,
-              result: jsonObj.result
+                result: jsonObj.result
-            },
+              },
-            null,
+              null,
-            2
+              2
-          )}`
+            )}`
-        });
+          });
+        }
       }
 
       allJSONResults.push({
@@ -201,7 +203,7 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
         imexshopid: shopid,
         count: jsonObj.count,
         filename: jsonObj.filename,
-        result: jsonObj.result
+        result: jsonObj.result || "No Upload Result Available"
       });
 
       logger.log("CARFAX-end-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -286,11 +288,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
     const ret = {
       ro_number: crypto.createHash("md5").update(job.ro_number, "utf8").digest("hex"),
       v_vin: job.v_vin || "",
-      v_year: job.v_model_yr
+      v_year: (() => {
-        ? parseInt(job.v_model_yr.match(/\d/g))
+        const y = parseInt(job.v_model_yr);
-          ? parseInt(job.v_model_yr.match(/\d/g).join(""), 10)
+        return isNaN(y) ? null : y < 100 ? y + (y >= (new Date().getFullYear() + 1) % 100 ? 1900 : 2000) : y;
-          : ""
+      })(),
-        : "",
       v_make: job.v_make_desc || "",
       v_model: job.v_model_desc || "",
 

server/data/usageReport.js

@@ -55,7 +55,9 @@ exports.default = async (req, res) => {
           "patrick.fic@convenient-brands.com",
           "bradley.rhoades@convenient-brands.com",
           "jrome@rometech.com",
-          "ivana@imexsystems.ca"
+          "ivana@imexsystems.ca",
+          "support@imexsystems.ca",
+          "sarah@rometech.com"
         ],
         subject: `RO Usage Report - ${moment().format("MM/DD/YYYY")}`,
         text: `

server/graphql-client/queries.js

@@ -2926,6 +2926,15 @@ 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) {
@@ -3178,3 +3187,20 @@ 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,9 +77,8 @@ const generateResetLink = async (email) => {
  */
 const ensureExternalIdUnique = async (externalId) => {
   const resp = await client.request(CHECK_EXTERNAL_SHOP_ID, { key: externalId });
-  if (resp.bodyshops.length) {
+
-    throw { status: 400, message: `external_shop_id '${externalId}' is already in use.` };
+  return !!resp.bodyshops.length;
-  }
 };
 
 /**
@@ -134,13 +133,16 @@ const insertUserAssociation = async (uid, email, shopId) => {
 
 /**
  * PATCH handler for updating bodyshop fields.
- * Allows patching: shopname, address1, address2, city, state, zip_post, country, email, timezone, phone, logo_img_path
+ * Allows patching: shopname, address1, address2, city, state, zip_post, country, email, timezone, phone
+ * Also allows updating logo_img_path via a simple logoUrl string, which is expanded to the full object.
  * @param req
  * @param res
  * @returns {Promise<void>}
  */
 const patchPartsManagementProvisioning = async (req, res) => {
   const { id } = req.params;
+
+  // Fields that can be directly patched 1:1
   const allowedFields = [
     "shopname",
     "address1",
@@ -151,31 +153,58 @@ const patchPartsManagementProvisioning = async (req, res) => {
     "country",
     "email",
     "timezone",
-    "phone",
+    "phone"
-    "logo_img_path"
+    // NOTE: logo_img_path is handled separately via logoUrl
   ];
+
   const updateFields = {};
+
+  // Copy over simple scalar fields if present
   for (const field of allowedFields) {
     if (req.body[field] !== undefined) {
       updateFields[field] = req.body[field];
     }
   }
+
+  // Handle logo update via a simple href string, same behavior as provision route
+  if (typeof req.body.logo_img_path === "string") {
+    const trimmed = req.body.logo_img_path.trim();
+    if (trimmed) {
+      updateFields.logo_img_path = {
+        src: trimmed,
+        width: "",
+        height: "",
+        headerMargin: DefaultNewShop.logo_img_path.headerMargin
+      };
+    }
+  }
+
   if (Object.keys(updateFields).length === 0) {
     return res.status(400).json({ error: "No valid fields provided for update." });
   }
+
   // Check that the bodyshop has an external_shop_id before allowing patch
   try {
-    // Fetch the bodyshop by id
     const shopResp = await client.request(
-      `query GetBodyshop($id: uuid!) { bodyshops_by_pk(id: $id) { id external_shop_id } }`,
+      `query GetBodyshop($id: uuid!) {
+        bodyshops_by_pk(id: $id) {
+          id
+          external_shop_id
+        }
+      }`,
       { id }
     );
+
     if (!shopResp.bodyshops_by_pk?.external_shop_id) {
       return res.status(400).json({ error: "Cannot patch: bodyshop does not have an external_shop_id." });
     }
   } catch (err) {
-    return res.status(500).json({ error: "Failed to validate bodyshop external_shop_id.", detail: err });
+    return res.status(500).json({
+      error: "Failed to validate bodyshop external_shop_id.",
+      detail: err
+    });
   }
+
   try {
     const resp = await client.request(UPDATE_BODYSHOP_BY_ID, { id, fields: updateFields });
     if (!resp.update_bodyshops_by_pk) {
@@ -195,10 +224,25 @@ const patchPartsManagementProvisioning = async (req, res) => {
  */
 const partsManagementProvisioning = async (req, res) => {
   const { logger } = req;
-  const body = { ...req.body, userEmail: req.body.userEmail?.toLowerCase() };
+
+  // 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;
 
   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",
@@ -211,27 +255,69 @@ const partsManagementProvisioning = async (req, res) => {
       "phone",
       "userEmail"
     ]);
-    await ensureExternalIdUnique(body.external_shop_id);
 
-    logger.log("admin-create-shop-user", "debug", body.userEmail, null, {
+    // 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, {
       request: req.body,
       ioadmin: true
     });
 
     const shopInput = {
-      shopname: body.shopname,
+      shopname: trimmedBody.shopname,
-      address1: body.address1,
+      address1: trimmedBody.address1,
-      address2: body.address2 || null,
+      address2: trimmedBody.address2,
-      city: body.city,
+      city: trimmedBody.city,
-      state: body.state,
+      state: trimmedBody.state,
-      zip_post: body.zip_post,
+      zip_post: trimmedBody.zip_post,
-      country: body.country,
+      country: trimmedBody.country,
-      email: body.email,
+      email: trimmedBody.email,
-      external_shop_id: body.external_shop_id,
+      external_shop_id: trimmedBody.external_shop_id,
-      timezone: body.timezone || DefaultNewShop.timezone,
+      timezone: trimmedBody.timezone || DefaultNewShop.timezone,
-      phone: body.phone,
+      phone: trimmedBody.phone,
       logo_img_path: {
-        src: body.logoUrl,
+        src: trimmedBody.logoUrl || null, // allow empty logo
         width: "",
         height: "",
         headerMargin: DefaultNewShop.logo_img_path.headerMargin
@@ -256,35 +342,37 @@ const partsManagementProvisioning = async (req, res) => {
       appt_alt_transport: DefaultNewShop.appt_alt_transport,
       md_jobline_presets: DefaultNewShop.md_jobline_presets,
       vendors: {
-        data: body.vendors.map((v) => ({
+        data: trimmedBody.vendors.map((v) => ({
           name: v.name,
-          street1: v.street1 || null,
+          street1: v.street1,
-          street2: v.street2 || null,
+          street2: v.street2,
-          city: v.city || null,
+          city: v.city,
-          state: v.state || null,
+          state: v.state,
-          zip: v.zip || null,
+          zip: v.zip,
-          country: v.country || null,
+          country: v.country,
-          email: v.email || null,
+          email: v.email,
-          discount: v.discount ?? 0,
+          discount: v.discount,
-          due_date: v.due_date ?? null,
+          due_date: v.due_date,
-          cost_center: v.cost_center || null,
+          cost_center: v.cost_center,
-          favorite: v.favorite ?? [],
+          favorite: v.favorite,
-          phone: v.phone || null,
+          phone: v.phone,
-          active: v.active ?? true,
+          active: v.active,
-          dmsid: v.dmsid || null
+          dmsid: v.dmsid
         }))
       }
     };
 
     const newShopId = await insertBodyshop(shopInput);
-    const userRecord = await createFirebaseUser(body.userEmail, body.userPassword);
+    const userRecord = await createFirebaseUser(trimmedBody.userEmail, trimmedBody.userPassword);
     let resetLink = null;
-    if (!body.userPassword) resetLink = await generateResetLink(body.userEmail);
+    if (!trimmedBody.userPassword) {
+      resetLink = await generateResetLink(trimmedBody.userEmail);
+    }
 
-    const createdUser = await insertUserAssociation(userRecord.uid, body.userEmail, newShopId);
+    const createdUser = await insertUserAssociation(userRecord.uid, trimmedBody.userEmail, newShopId);
 
     return res.status(200).json({
-      shop: { id: newShopId, shopname: body.shopname },
+      shop: { id: newShopId, shopname: trimmedBody.shopname },
       user: {
         id: createdUser.id,
         email: createdUser.email,
@@ -292,7 +380,7 @@ const partsManagementProvisioning = async (req, res) => {
       }
     });
   } catch (err) {
-    logger.log("admin-create-shop-user-error", "error", body.userEmail, null, {
+    logger.log("admin-create-shop-user-error", "error", body.userEmail || "unknown", null, {
       message: err.message,
       detail: err.detail || err
     });

server/notifications/autoAddWatchers.js

@@ -4,11 +4,14 @@
  * 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
@@ -26,10 +29,7 @@ const FILTER_SELF_FROM_WATCHERS = process.env?.FILTER_SELF_FROM_WATCHERS !== "fa
  */
 const autoAddWatchers = async (req) => {
   const { event, trigger } = req.body;
-  const {
+  const { logger } = req;
-    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 from Redis
+    // Fetch bodyshop data directly from DB (avoid Redis staleness)
-    const bodyshopData = await getBodyshopFromRedis(shopId);
+    const bodyshopResponse = await gqlClient.request(GET_BODYSHOP_WATCHERS_BY_ID, { id: shopId });
-    let notificationFollowers = bodyshopData?.notification_followers;
+    const bodyshopData = bodyshopResponse?.bodyshops_by_pk;
 
-    // Bail if notification_followers is missing or not an array
+    const notificationFollowersRaw = bodyshopData?.notification_followers;
-    if (!notificationFollowers || !Array.isArray(notificationFollowers)) {
+    const notificationFollowers = Array.isArray(notificationFollowersRaw)
-      return;
+      ? [...new Set(notificationFollowersRaw.filter((id) => id))] // de-dupe + remove falsy
-    }
+      : [];
 
     // Execute queries in parallel
     const [notificationData, existingWatchersData] = await Promise.all([
       gqlClient.request(GET_NOTIFICATION_WATCHERS, {
         shopId,
-        employeeIds: notificationFollowers.filter((id) => id)
+        employeeIds: notificationFollowers
       }),
       gqlClient.request(GET_JOB_WATCHERS_MINIMAL, { jobid: jobId })
     ]);
@@ -73,7 +73,7 @@ const autoAddWatchers = async (req) => {
         associationId: assoc.id
       })) || [];
 
-    // Get users from notification_followers
+    // Get users from notification_followers (employee IDs -> employee emails)
     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 (!acc.some((u) => u.email === user.email)) {
+      if (user?.email && !acc.some((u) => u.email === user.email)) {
         acc.push(user);
       }
       return acc;
@@ -123,6 +123,7 @@ 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,9 +205,8 @@ 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,6 +42,13 @@ 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.
  */
@@ -52,6 +59,13 @@ 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,
@@ -70,27 +84,39 @@ 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() };
 
-        for (const recipient of recipients) {
+        // Store notifications atomically (RPUSH) and store recipients in a Redis set
-          const { user } = recipient;
+        for (const recipient of recipients || []) {
-          const userKey = `${redisKeyPrefix}:${user}`;
+          const { user, bodyShopId, associationId } = recipient;
-          const existingNotifications = await pubClient.get(userKey);
+          if (!user || !bodyShopId) continue;
-          const notifications = existingNotifications ? JSON.parse(existingNotifications) : [];
+
-          notifications.push(notification);
+          const rk = `${user}:${bodyShopId}`;
-          await pubClient.set(userKey, JSON.stringify(notifications), "EX", NOTIFICATION_STORAGE_EXPIRATION / 1000);
+
-          devDebugLogger(`Stored notification for ${user} under ${userKey}: ${JSON.stringify(notifications)}`);
+          // (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));
         }
 
-        const consolidateKey = `app:${devKey}:consolidate:${jobId}`;
+        // Schedule consolidation once per jobId
-        const flagSet = await pubClient.setnx(consolidateKey, "pending");
+        const flagKey = consolidateFlagKey(jobId);
+        const flagSet = await pubClient.setnx(flagKey, "pending");
         devDebugLogger(`Consolidation flag set for jobId ${jobId}: ${flagSet}`);
 
         if (flagSet) {
           await consolidateQueue.add(
             "consolidate-notifications",
-            { jobId, recipients },
+            { jobId },
             {
               jobId: `consolidate-${jobId}`,
               delay: APP_CONSOLIDATION_DELAY,
@@ -98,8 +124,9 @@ 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}`);
         }
@@ -114,122 +141,167 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
     const consolidateWorker = new Worker(
       "notificationsConsolidate",
       async (job) => {
-        const { jobId, recipients } = job.data;
+        const { jobId } = job.data;
         devDebugLogger(`Consolidating notifications for jobId ${jobId}`);
 
-        const redisKeyPrefix = `app:${devKey}:notifications:${jobId}`;
+        const lockKey = lockKeyForJob(jobId);
-        const lockKey = `lock:${devKey}:consolidate:${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);
         devDebugLogger(`Lock acquisition for jobId ${jobId}: ${lockAcquired}`);
 
-        if (lockAcquired) {
+        if (!lockAcquired) {
-          try {
-            const allNotifications = {};
-            const uniqueUsers = [...new Set(recipients.map((r) => r.user))];
-            devDebugLogger(`Unique users for jobId ${jobId}: ${uniqueUsers}`);
-
-            for (const user of uniqueUsers) {
-              const userKey = `${redisKeyPrefix}:${user}`;
-              const notifications = await pubClient.get(userKey);
-              devDebugLogger(`Retrieved notifications for ${user}: ${notifications}`);
-
-              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;
-                }
-                await pubClient.del(userKey);
-                devDebugLogger(`Deleted Redis key ${userKey}`);
-              } else {
-                devDebugLogger(`No notifications found for ${user} under ${userKey}`);
-              }
-            }
-
-            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`);
+          return;
+        }
+
+        try {
+          const rkSet = recipientsSetKey(jobId);
+          const assocHash = recipientAssocHashKey(jobId);
+
+          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;
+                }
+              })
+              .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})`
+                );
+              } else {
+                devDebugLogger(`No socket IDs found for ${user} in bodyShopId ${bodyShopId}`);
+              }
+            }
+          }
+
+          // 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);
         }
       },
       {
@@ -244,13 +316,14 @@ 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
       })
@@ -285,11 +358,13 @@ 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,6 +27,16 @@ 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.
  *
@@ -65,17 +75,21 @@ 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, NOTIFICATION_EXPIRATION / 1000);
+          await pubClient.expire(userKey, seconds(NOTIFICATION_EXPIRATION));
           const detailsKey = `email:${devKey}:recipientDetails:${jobId}:${user}`;
           await pubClient.hsetnx(detailsKey, "firstName", firstName || "");
           await pubClient.hsetnx(detailsKey, "lastName", lastName || "");
-          await pubClient.hsetnx(detailsKey, "bodyShopTimezone", bodyShopTimezone);
+          const tzValue = bodyShopTimezone || "UTC";
-          await pubClient.expire(detailsKey, NOTIFICATION_EXPIRATION / 1000);
+          await pubClient.hsetnx(detailsKey, "bodyShopTimezone", tzValue);
-          await pubClient.sadd(`email:${devKey}:recipients:${jobId}`, user);
+          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));
           devDebugLogger(`Stored message for ${user} under ${userKey}: ${body}`);
         }
 
@@ -93,7 +107,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
             }
           );
           devDebugLogger(`Scheduled email consolidation for jobId ${jobId}`);
-          await pubClient.expire(consolidateKey, CONSOLIDATION_KEY_EXPIRATION / 1000);
+          await pubClient.expire(consolidateKey, seconds(CONSOLIDATION_KEY_EXPIRATION));
         } else {
           devDebugLogger(`Email consolidation already scheduled for jobId ${jobId}`);
         }
@@ -113,7 +127,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", LOCK_EXPIRATION / 1000);
+        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", seconds(LOCK_EXPIRATION));
         if (lockAcquired) {
           try {
             const recipientsSet = `email:${devKey}:recipients:${jobId}`;
@@ -139,7 +153,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%;">${msg}</li>`).join("")}
+                          ${messages.map((msg) => `<li style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%;">${escapeHtml(msg)}</li>`).join("")}
                         </ul>
                       </td></tr></table></th>
                     </tr><tbody></table>
@@ -239,7 +253,13 @@ const dispatchEmailsToQueue = async ({ emailsToDispatch, logger }) => {
   const emailAddQueue = getQueue();
 
   for (const email of emailsToDispatch) {
-    const { jobId, jobRoNumber, bodyShopName, bodyShopTimezone, body, recipients } = email;
+    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";
+    }
 
     if (!jobId || !jobRoNumber || !bodyShopName || !body || !recipients.length) {
       devDebugLogger(

server/notifications/queues/fcmQueue.js

@@ -0,0 +1,569 @@
+// 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,6 +19,8 @@ const buildNotification = (data, key, body, variables = {}) => {
       jobId: data.jobId,
       jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
+      scenarioKey: data.scenarioKey,
+      scenarioTable: data.scenarioTable,
       key,
       body,
       variables,
@@ -32,21 +34,47 @@ const buildNotification = (data, key, body, variables = {}) => {
       body,
       recipients: []
     },
-    fcm: { 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: []
+    }
   };
 
   // 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 (fcm === true) result.fcm.recipients.push(user);
+    }
-    if (email === true) result.email.recipients.push({ user, firstName, lastName });
+
+    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
+      });
+    }
   });
 
   return result;
@@ -81,8 +109,8 @@ const alternateTransportChangedBuilder = (data) => {
  * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
 const billPostedBuilder = (data) => {
-  const facing = data?.data?.isinhouse ? "in-house" : "vendor";
+  const facing = data?.data?.isinhouse ? "An In House" : "A Vendor";
-  const body = `An ${facing} ${data?.data?.is_credit_memo ? "credit memo" : "bill"} has been posted.`.trim();
+  const body = `${facing} ${data?.data?.is_credit_memo ? "credit memo" : "bill"} has been posted.`.trim();
 
   return buildNotification(data, "notifications.job.billPosted", body, {
     isInHouse: data?.data?.isinhouse,

server/notifications/scenarioParser.js

@@ -14,6 +14,7 @@ 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";
@@ -298,6 +299,16 @@ 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;