feature/IO-3479-Customer-Phone-Numbers - Implementation

feature/IO-3479-Customer-Phone-Numbers - DB Modifications
2025-12-30 19:14:57 -05:00 · 2025-12-30 18:56:05 -05:00 · 2025-12-30 17:31:20 -05:00
49 changed files with 444 additions and 957 deletions
--- a/client/src/components/chat-open-button/chat-open-button.component.jsx
+++ b/client/src/components/chat-open-button/chat-open-button.component.jsx
@@ -19,30 +19,35 @@ const mapDispatchToProps = (dispatch) => ({
  openChatByPhone: (phone) => dispatch(openChatByPhone(phone))
 });

-export function ChatOpenButton({ bodyshop, searchingForConversation, phone, jobid, openChatByPhone }) {
+export function ChatOpenButton({ bodyshop, searchingForConversation, phone, type, jobid, openChatByPhone }) {
  const { t } = useTranslation();
  const { socket } = useSocket();
  const notification = useNotification();

  if (!phone) return <></>;

-  if (!bodyshop.messagingservicesid) return <PhoneNumberFormatter>{phone}</PhoneNumberFormatter>;
+  if (!bodyshop.messagingservicesid) {
+    return <PhoneNumberFormatter type={type}>{phone}</PhoneNumberFormatter>;
+  }

  return (
    <a
      href="# "
      onClick={(e) => {
+        e.preventDefault();
        e.stopPropagation();
+
+        if (searchingForConversation) return; // Prevent finding the same thing twice.
+
        const p = parsePhoneNumber(phone, "CA");
-        if (searchingForConversation) return; //This is to prevent finding the same thing twice.
        if (p && p.isValid()) {
-          openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid, socket });
+          openChatByPhone({ phone_num: p.formatInternational(), jobid, socket });
        } else {
          notification["error"]({ message: t("messaging.error.invalidphone") });
        }
      }}
    >
-      <PhoneNumberFormatter>{phone}</PhoneNumberFormatter>
+      <PhoneNumberFormatter type={type}>{phone}</PhoneNumberFormatter>
    </a>
  );
 }
--- a/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
+++ b/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
@@ -133,6 +133,9 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
      ownr_ln: contract.job.owner.ownr_ln,
      ownr_co_nm: contract.job.owner.ownr_co_nm,
      ownr_ph1: contract.job.owner.ownr_ph1,
+      ownr_ph2: contract.job.owner.ownr_ph2,
+      ownr_ph1_ty: contract.job.owner.ownr_ph1_ty,
+      ownr_ph2_ty: contract.job.owner.ownr_ph2_ty,
      ownr_ea: contract.job.owner.ownr_ea,
      v_model_desc: contract.job.vehicle && contract.job.vehicle.v_model_desc,
      v_model_yr: contract.job.vehicle && contract.job.vehicle.v_model_yr,
--- a/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx
@@ -256,9 +256,9 @@ export default function DashboardScheduledDeliveryToday({ data, ...cardProps })
      responsive: ["md"],
      render: (text, record) => (
        <Space size="small" wrap>
-          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />

-          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
        </Space>
      )
    },
@@ -397,6 +397,8 @@ export const DashboardScheduledDeliveryTodayGql = `
      ownr_ln
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      production_vars
      ro_number
      scheduled_delivery
--- a/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
@@ -48,6 +48,8 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
        ownr_ln: item.job.ownr_ln,
        ownr_ph1: item.job.ownr_ph1,
        ownr_ph2: item.job.ownr_ph2,
+        ownr_ph1_ty: item.job.ownr_ph1_ty,
+        ownr_ph2_ty: item.job.ownr_ph2_ty,
        production_vars: item.job.production_vars,
        ro_number: item.job.ro_number,
        suspended: item.job.suspended,
@@ -264,8 +266,8 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
      responsive: ["md"],
      render: (text, record) => (
        <Space size="small" wrap>
-          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
-          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
        </Space>
      )
    },
@@ -400,6 +402,8 @@ export const DashboardScheduledInTodayGql = `
      ownr_ln
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      production_vars
      ro_number
      suspended
--- a/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
@@ -256,9 +256,9 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
      responsive: ["md"],
      render: (text, record) => (
        <Space size="small" wrap>
-          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />

-          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
        </Space>
      )
    },
@@ -397,6 +397,8 @@ export const DashboardScheduledOutTodayGql = `
      ownr_ln
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      production_vars
      ro_number
      scheduled_completion
--- a/client/src/components/global-search/global-search-os.component.jsx
+++ b/client/src/components/global-search/global-search-os.component.jsx
@@ -73,8 +73,8 @@ export default function GlobalSearchOs() {
                      <span>
                        <OwnerNameDisplay ownerObject={owner} />
                      </span>
-                      <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
-                      <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
+                      <PhoneNumberFormatter type={owner?.ownr_ph1_ty}>{owner.ownr_ph1}</PhoneNumberFormatter>
+                      <PhoneNumberFormatter type={owner?.ownr_ph2_ty}>{owner.ownr_ph2}</PhoneNumberFormatter>
                    </Space>
                  </Link>
                )
--- a/client/src/components/global-search/global-search.component.jsx
+++ b/client/src/components/global-search/global-search.component.jsx
@@ -63,8 +63,8 @@ export default function GlobalSearch() {
                    <span>
                      <OwnerNameDisplay ownerObject={owner} />
                    </span>
-                    <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
-                    <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter type={owner.ownr_ph1_ty}>{owner.ownr_ph1}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter type={owner.ownr_ph2_ty}>{owner.ownr_ph2}</PhoneNumberFormatter>
                  </Space>
                </Link>
              )
--- a/client/src/components/job-at-change/schedule-event.component.jsx
+++ b/client/src/components/job-at-change/schedule-event.component.jsx
@@ -220,10 +220,10 @@ export function ScheduleEventComponent({
          </DataLabel>
          <DataLabel label={t("jobs.fields.ownr_ea")}>{(event.job && event.job.ownr_ea) || ""}</DataLabel>
          <DataLabel label={t("jobs.fields.ownr_ph1")}>
-            <ChatOpenButton phone={event.job && event.job.ownr_ph1} jobid={event.job.id} />
+            <ChatOpenButton phone={event?.job?.ownr_ph1} type={event?.job?.ownr_ph1_ty} jobid={event.job.id} />
          </DataLabel>
          <DataLabel label={t("jobs.fields.ownr_ph2")}>
-            <ChatOpenButton phone={event.job && event.job.ownr_ph2} jobid={event.job.id} />
+            <ChatOpenButton phone={event?.job?.ownr_ph2} type={event?.job?.ownr_ph2_ty} jobid={event.job.id} />
          </DataLabel>
          <DataLabel hideIfNull label={t("jobs.fields.loss_of_use")}>
            {(event.job && event.job.loss_of_use) || ""}
--- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
@@ -1,4 +1,4 @@
-import { Form, Input } from "antd";
+import { Form, Input, Select } from "antd";
 import { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
@@ -7,6 +7,11 @@ import FormItemPhone, { PhoneItemFormatterValidation } from "../form-items-forma
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";

 export default function JobsCreateOwnerInfoNewComponent() {
+  const PHONE_TYPE_OPTIONS = [
+    { label: t("owners.labels.home"), value: "Home" },
+    { label: t("owners.labels.work"), value: "Work" },
+    { label: t("owners.labels.cell"), value: "Cell" }
+  ];
  const [state] = useContext(JobCreateContext);

  const { t } = useTranslation();
@@ -105,26 +110,56 @@ export default function JobsCreateOwnerInfoNewComponent() {
          ]}
          name={["owner", "data", "ownr_ea"]}
        >
-          <FormItemEmail
-            //email={form.getFieldValue("ownr_ea")}
-            disabled={!state.owner.new}
-          />
+          <FormItemEmail disabled={!state.owner.new} />
        </Form.Item>
-        <Form.Item
-          label={t("owners.fields.ownr_ph1")}
-          name={["owner", "data", "ownr_ph1"]}
-          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph1")]}
-        >
-          <FormItemPhone disabled={!state.owner.new} />
+
+        {/* Phone 1 + Type */}
+        <Form.Item label={t("owners.fields.ownr_ph1")} style={{ marginBottom: 0 }}>
+          <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
+            <Form.Item
+              name={["owner", "data", "ownr_ph1"]}
+              noStyle
+              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph1")]}
+            >
+              <FormItemPhone disabled={!state.owner.new} style={{ flex: 1, minWidth: 150 }} />
+            </Form.Item>
+
+            <Form.Item name={["owner", "data", "ownr_ph1_ty"]} noStyle>
+              <Select
+                disabled={!state.owner.new}
+                allowClear
+                placeholder="Type"
+                options={PHONE_TYPE_OPTIONS}
+                style={{ width: 110 }}
+              />
+            </Form.Item>
+          </div>
        </Form.Item>
-        <Form.Item
-          label={t("owners.fields.ownr_ph2")}
-          name={["owner", "data", "ownr_ph2"]}
-          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph2")]}
-        >
-          <FormItemPhone disabled={!state.owner.new} />
+
+        {/* Phone 2 + Type */}
+        <Form.Item label={t("owners.fields.ownr_ph2")} style={{ marginBottom: 0 }}>
+          <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
+            <Form.Item
+              name={["owner", "data", "ownr_ph2"]}
+              noStyle
+              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph2")]}
+            >
+              <FormItemPhone disabled={!state.owner.new} style={{ flex: 1, minWidth: 150 }} />
+            </Form.Item>
+
+            <Form.Item name={["owner", "data", "ownr_ph2_ty"]} noStyle>
+              <Select
+                disabled={!state.owner.new}
+                allowClear
+                placeholder="Type"
+                options={PHONE_TYPE_OPTIONS}
+                style={{ width: 110 }}
+              />
+            </Form.Item>
+          </div>
        </Form.Item>
      </LayoutFormRow>
+
      <LayoutFormRow grow>
        <Form.Item label={t("owners.fields.preferred_contact")} name={["owner", "data", "preferred_contact"]}>
          <Input disabled={!state.owner.new} />
--- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx
@@ -61,7 +61,7 @@ export default function JobsCreateOwnerInfoSearchComponent({ loading, owners })
      title: t("owners.fields.ownr_ph1"),
      dataIndex: "ownr_ph1",
      key: "ownr_ph1",
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>,
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>,
      sorter: (a, b) => alphaSort(a.ownr_ph1, b.ownr_ph1),
      sortOrder: tableState.sortedInfo.columnKey === "ownr_ph1" && tableState.sortedInfo.order
    },
@@ -69,7 +69,7 @@ export default function JobsCreateOwnerInfoSearchComponent({ loading, owners })
      title: t("owners.fields.ownr_ph2"),
      dataIndex: "ownr_ph2",
      key: "ownr_ph2",
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>,
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>,
      sorter: (a, b) => alphaSort(a.ownr_ph2, b.ownr_ph2),
      sortOrder: tableState.sortedInfo.columnKey === "ownr_ph2" && tableState.sortedInfo.order
    }
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -251,16 +251,16 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
            <div>
              <DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
                {disabled || isPartsEntry ? (
-                  <PhoneNumberFormatter>{job.ownr_ph1}</PhoneNumberFormatter>
+                  <PhoneNumberFormatter type={job.ownr_ph1_ty}>{job.ownr_ph1}</PhoneNumberFormatter>
                ) : (
-                  <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
+                  <ChatOpenButton type={job.ownr_ph1_ty} phone={job.ownr_ph1} jobid={job.id} />
                )}
              </DataLabel>
              <DataLabel key="22" label={t("jobs.fields.ownr_ph2")}>
                {disabled || isPartsEntry ? (
-                  <PhoneNumberFormatter>{job.ownr_ph2}</PhoneNumberFormatter>
+                  <PhoneNumberFormatter type={job.ownr_ph2_ty}>{job.ownr_ph2}</PhoneNumberFormatter>
                ) : (
-                  <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
+                  <ChatOpenButton type={job.ownr_ph2_ty} phone={job.ownr_ph2} jobid={job.id} />
                )}
              </DataLabel>
              <DataLabel key="3" label={t("owners.fields.address")}>
--- a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
+++ b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
@@ -64,7 +64,11 @@ export default function JobsFindModalComponent({
      width: "12%",
      ellipsis: true,
      render: (text, record) => {
-        return record.ownr_ph1 ? <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter> : t("general.labels.unknown");
+        return record.ownr_ph1 ? (
+          <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
+        ) : (
+          t("general.labels.unknown")
+        );
      }
    },
    {
@@ -74,7 +78,11 @@ export default function JobsFindModalComponent({
      width: "12%",
      ellipsis: true,
      render: (text, record) => {
-        return record.ownr_ph2 ? <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter> : t("general.labels.unknown");
+        return record.ownr_ph2 ? (
+          <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
+        ) : (
+          t("general.labels.unknown")
+        );
      }
    },
    {
@@ -245,7 +253,11 @@ export default function JobsFindModalComponent({
        >
          {t("jobs.labels.override_header")}
        </Checkbox>
-        <Checkbox checked={partsQueueToggle} onChange={(e) => setPartsQueueToggle(e.target.checked)} id="parts_queue_toggle">
+        <Checkbox
+          checked={partsQueueToggle}
+          onChange={(e) => setPartsQueueToggle(e.target.checked)}
+          id="parts_queue_toggle"
+        >
          {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
        </Checkbox>
        <Checkbox
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -72,14 +72,14 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      dataIndex: "ownr_ph1",
      key: "ownr_ph1",
      ellipsis: true,
-      render: (text, record) => <StartChatButton phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <StartChatButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
    },
    {
      title: t("jobs.fields.ownr_ph2"),
      dataIndex: "ownr_ph2",
      key: "ownr_ph2",
      ellipsis: true,
-      render: (text, record) => <StartChatButton phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <StartChatButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
    },
    {
      title: t("jobs.fields.status"),
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -139,7 +139,7 @@ export function JobsList({ bodyshop }) {
      key: "ownr_ph1",
      ellipsis: true,
      responsive: ["md"],
-      render: (text, record) => <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
    },
    {
      title: t("jobs.fields.ownr_ph2"),
@@ -147,7 +147,7 @@ export function JobsList({ bodyshop }) {
      key: "ownr_ph2",
      ellipsis: true,
      responsive: ["md"],
-      render: (text, record) => <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
    },

    {
--- a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
+++ b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
@@ -140,7 +140,7 @@ export function JobsReadyList({ bodyshop }) {
      key: "ownr_ph1",
      ellipsis: true,
      responsive: ["md"],
-      render: (text, record) => <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
    },
    {
      title: t("jobs.fields.ownr_ph2"),
@@ -148,7 +148,7 @@ export function JobsReadyList({ bodyshop }) {
      key: "ownr_ph2",
      ellipsis: true,
      responsive: ["md"],
-      render: (text, record) => <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
    },
    {
      title: t("jobs.fields.status"),
--- a/client/src/components/notification-settings/notification-settings-form.component.jsx
+++ b/client/src/components/notification-settings/notification-settings-form.component.jsx
@@ -132,7 +132,7 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
      dataIndex: "scenarioLabel",
      key: "scenario",
      render: (_, record) => t(`notifications.scenarios.${record.key}`),
-      width: "80%"
+      width: "90%"
    },
    {
      title: <ColumnHeaderCheckbox channel="app" form={form} onHeaderChange={() => setIsDirty(true)} />,
@@ -156,23 +156,20 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
        </Form.Item>
      )
    }
+    // TODO: Disabled for now until FCM is implemented.
+    // {
+    //   title: <ColumnHeaderCheckbox channel="fcm" form={form} disabled onHeaderChange={() => setIsDirty(true)} />,
+    //   dataIndex: "fcm",
+    //   key: "fcm",
+    //   align: "center",
+    //   render: (_, record) => (
+    //     <Form.Item name={[record.key, "fcm"]} valuePropName="checked" noStyle>
+    //       <Checkbox disabled />
+    //     </Form.Item>
+    //   )
+    // }
  ];

-  // Currently disabled for prod
-  if (!import.meta.env.PROD) {
-    columns.push({
-      title: <ColumnHeaderCheckbox channel="fcm" form={form} onHeaderChange={() => setIsDirty(true)} />,
-      dataIndex: "fcm",
-      key: "fcm",
-      align: "center",
-      render: (_, record) => (
-        <Form.Item name={[record.key, "fcm"]} valuePropName="checked" noStyle>
-          <Checkbox />
-        </Form.Item>
-      )
-    });
-  }
-
  const dataSource = notificationScenarios.map((scenario) => ({ key: scenario }));

  return (
@@ -189,7 +186,13 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
        extra={
          <Space>
            <Typography.Text type="secondary">{t("notifications.labels.auto-add")}</Typography.Text>
-            <Switch checked={autoAddEnabled} onChange={handleAutoAddToggle} loading={savingAutoAdd} />
+            <Switch
+              checked={autoAddEnabled}
+              onChange={handleAutoAddToggle}
+              loading={savingAutoAdd}
+              // checkedChildren={t("notifications.labels.auto-add-on")}
+              // unCheckedChildren={t("notifications.labels.auto-add-off")}
+            />
            <Button type="default" onClick={handleReset} disabled={!isDirty && !isAutoAddDirty}>
              {t("general.actions.clear")}
            </Button>
--- a/client/src/components/owner-detail-form/owner-detail-form.component.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.component.jsx
@@ -1,4 +1,4 @@
-import { Form, Input, Tooltip } from "antd";
+import { Form, Input, Select, Tooltip } from "antd";
 import { CloseCircleFilled } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
@@ -10,6 +10,12 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
  const { t } = useTranslation();
  const { getFieldValue } = form;

+  const PHONE_TYPE_OPTIONS = [
+    { label: t("owners.labels.home"), value: "Home" },
+    { label: t("owners.labels.work"), value: "Work" },
+    { label: t("owners.labels.cell"), value: "Cell" }
+  ];
+
  return (
    <div>
      <FormFieldsChanged form={form} />
@@ -30,6 +36,7 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
          <Input disabled />
        </Form.Item>
      </LayoutFormRow>
+
      <LayoutFormRow header={t("owners.forms.address")}>
        <Form.Item label={t("owners.fields.ownr_addr1")} name="ownr_addr1">
          <Input />
@@ -50,6 +57,7 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
          <Input />
        </Form.Item>
      </LayoutFormRow>
+
      <LayoutFormRow header={t("owners.forms.contact")}>
        <Form.Item
          label={t("owners.fields.ownr_ea")}
@@ -63,6 +71,8 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
        >
          <FormItemEmail email={getFieldValue("ownr_ea")} />
        </Form.Item>
+
+        {/* Phone 1 + Type + Opt-out icon */}
        <Form.Item label={t("owners.fields.ownr_ph1")} style={{ marginBottom: 0 }}>
          <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
            <Form.Item
@@ -72,6 +82,11 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
            >
              <Input style={{ flex: 1, minWidth: "150px" }} />
            </Form.Item>
+
+            <Form.Item name="ownr_ph1_ty" noStyle>
+              <Select allowClear placeholder="Type" options={PHONE_TYPE_OPTIONS} style={{ width: 110 }} />
+            </Form.Item>
+
            {isPhone1OptedOut && (
              <Tooltip title={t("consent.text_body")}>
                <CloseCircleFilled
@@ -88,6 +103,8 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
            )}
          </div>
        </Form.Item>
+
+        {/* Phone 2 + Type + Opt-out icon */}
        <Form.Item label={t("owners.fields.ownr_ph2")} style={{ marginBottom: 0 }}>
          <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
            <Form.Item
@@ -97,6 +114,11 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
            >
              <Input style={{ flex: 1, minWidth: "150px" }} />
            </Form.Item>
+
+            <Form.Item name="ownr_ph2_ty" noStyle>
+              <Select allowClear placeholder="Type" options={PHONE_TYPE_OPTIONS} style={{ width: 110 }} />
+            </Form.Item>
+
            {isPhone2OptedOut && (
              <Tooltip title={t("consent.text_body")}>
                <CloseCircleFilled
@@ -113,6 +135,7 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
            )}
          </div>
        </Form.Item>
+
        <Form.Item label={t("owners.fields.preferred_contact")} name="preferred_contact">
          <Input />
        </Form.Item>
@@ -120,6 +143,7 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
          <Input />
        </Form.Item>
      </LayoutFormRow>
+
      <Form.Item label={t("owners.fields.note")} name="note">
        <Input.TextArea rows={4} />
      </Form.Item>
--- a/client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx
+++ b/client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx
@@ -25,8 +25,10 @@ export default function OwnerDetailUpdateJobsComponent({ owner, selectedJobs, di
          ownr_ea: owner["ownr_ea"],
          ownr_fn: owner["ownr_fn"],
          ownr_ph1: owner["ownr_ph1"],
+          ownr_ph1_ty: owner["ownr_ph1_ty"],
          ownr_ln: owner["ownr_ln"],
          ownr_ph2: owner["ownr_ph2"],
+          ownr_ph2_ty: owner["ownr_ph2_ty"],
          ownr_st: owner["ownr_st"],
          ownr_title: owner["ownr_title"],
          ownr_zip: owner["ownr_zip"]
--- a/client/src/components/owner-find-modal/owner-find-modal.component.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.component.jsx
@@ -47,13 +47,13 @@ export default function OwnerFindModalComponent({
      title: t("owners.fields.ownr_ph1"),
      dataIndex: "ownr_ph1",
      key: "ownr_ph1",
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
    },
    {
      title: t("owners.fields.ownr_ph2"),
      dataIndex: "ownr_ph2",
      key: "ownr_ph2",
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
    },
    {
      title: t("owners.fields.note"),
--- a/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx
+++ b/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx
@@ -15,10 +15,10 @@ export default function OwnerTagPopoverComponent({ job }) {
              <OwnerNameDisplay ownerObject={job} />
            </Descriptions.Item>
            <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
-              <PhoneFormatter>{job.ownr_ph1 || ""}</PhoneFormatter>
+              <PhoneFormatter type={job.ownr_ph1_ty}>{job.ownr_ph1 || ""}</PhoneFormatter>
            </Descriptions.Item>
            <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
-              <PhoneFormatter>{job.ownr_ph2 || ""}</PhoneFormatter>
+              <PhoneFormatter type={job.ownr_ph2_ty}>{job.ownr_ph2 || ""}</PhoneFormatter>
            </Descriptions.Item>
            <Descriptions.Item key="3" label={t("owners.fields.address")}>
              {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
@@ -36,13 +36,10 @@ export default function OwnerTagPopoverComponent({ job }) {
              <OwnerNameDisplay ownerObject={job.owner} />
            </Descriptions.Item>
            <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
-              <PhoneFormatter>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
-            </Descriptions.Item>
-            <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
-              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
+              <PhoneFormatter type={job.owner.ownr_ph1_ty}>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
            </Descriptions.Item>
            <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph2")}>
-              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
+              <PhoneFormatter type={job.owner.ownr_ph2_ty}>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
            </Descriptions.Item>
            <Descriptions.Item key="3" label={t("owners.fields.address")}>
              {`${job.owner.ownr_addr1 || ""} ${job.owner.ownr_addr2 || ""} ${
--- a/client/src/components/owners-list/owners-list.component.jsx
+++ b/client/src/components/owners-list/owners-list.component.jsx
@@ -39,7 +39,7 @@ export default function OwnersListComponent({ loading, owners, total, refetch })
      dataIndex: "ownr_ph1",
      key: "ownr_ph1",
      render: (text, record) => {
-        return <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>;
+        return <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>;
      }
    },
    {
@@ -47,7 +47,7 @@ export default function OwnersListComponent({ loading, owners, total, refetch })
      dataIndex: "ownr_ph2",
      key: "ownr_ph2",
      render: (text, record) => {
-        return <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>;
+        return <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>;
      }
    },
    {
--- a/client/src/components/production-list-columns/production-list-columns.data.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.data.jsx
@@ -255,14 +255,14 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
      dataIndex: "ownr_ph1",
      key: "ownr_ph1",
      ellipsis: true,
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
    },
    {
      title: i18n.t("jobs.fields.ownr_ph2"),
      dataIndex: "ownr_ph2",
      key: "ownr_ph2",
      ellipsis: true,
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
    },
    {
      title: i18n.t("jobs.fields.specialcoveragepolicy"),
--- a/client/src/components/production-list-detail/production-list-detail.component.jsx
+++ b/client/src/components/production-list-detail/production-list-detail.component.jsx
@@ -154,13 +154,25 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
                <OwnerNameDisplay ownerObject={theJob} />
                {!technician ? (
                  <>
-                    <StartChatButton phone={data.jobs_by_pk.ownr_ph1} jobid={data.jobs_by_pk.id} />
-                    <StartChatButton phone={data.jobs_by_pk.ownr_ph2} jobid={data.jobs_by_pk.id} />
+                    <StartChatButton
+                      type={data.jobs_by_pk.ownr_ph1_ty}
+                      phone={data.jobs_by_pk.ownr_ph1}
+                      jobid={data.jobs_by_pk.id}
+                    />
+                    <StartChatButton
+                      type={data.jobs_by_pk.ownr_ph2_ty}
+                      phone={data.jobs_by_pk.ownr_ph2}
+                      jobid={data.jobs_by_pk.id}
+                    />
                  </>
                ) : (
                  <>
-                    <PhoneNumberFormatter>{data.jobs_by_pk.ownr_ph1}</PhoneNumberFormatter>
-                    <PhoneNumberFormatter>{data.jobs_by_pk.ownr_ph2}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter type={data.jobs_by_pk.ownr_ph1_ty}>
+                      {data.jobs_by_pk.ownr_ph1}
+                    </PhoneNumberFormatter>
+                    <PhoneNumberFormatter type={data.jobs_by_pk.ownr_ph2_ty}>
+                      {data.jobs_by_pk.ownr_ph2}
+                    </PhoneNumberFormatter>
                  </>
                )}
              </Space>
--- a/client/src/graphql/appointments.queries.js
+++ b/client/src/graphql/appointments.queries.js
@@ -40,6 +40,8 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
        ownr_fn
        ownr_ph1
        ownr_ph2
+        ownr_ph1_ty
+        ownr_ph2_ty
        ownr_ea
        clm_total
        id
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -19,7 +19,9 @@ export const QUERY_ALL_ACTIVE_JOBS_PAGINATED = gql`
      ownr_ln
      ownr_co_nm
      ownr_ph1
+      ownr_ph1_ty
      ownr_ph2
+      ownr_ph2_ty
      ownr_ea
      ownerid
      comment
@@ -69,6 +71,8 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      ownr_ea
      ownerid
      comment
@@ -122,6 +126,8 @@ export const QUERY_PARTS_QUEUE = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      ownr_ea
      plate_no
      plate_st
@@ -179,6 +185,8 @@ export const QUERY_EXACT_JOB_IN_PRODUCTION = gql`
      clm_total
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      special_coverage_policy
      owner_owing
      production_vars
@@ -249,6 +257,8 @@ export const QUERY_EXACT_JOBS_IN_PRODUCTION = gql`
      clm_total
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      special_coverage_policy
      owner_owing
      production_vars
@@ -615,6 +625,8 @@ export const GET_JOB_BY_PK = gql`
        ownr_ln
        ownr_ph1
        ownr_ph2
+        ownr_ph1_ty
+        ownr_ph2_ty
        ownr_st
        ownr_zip
        tax_number
@@ -631,6 +643,8 @@ export const GET_JOB_BY_PK = gql`
      ownr_ln
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      ownr_st
      ownr_zip
      parts_tax_rates
@@ -714,7 +728,7 @@ export const GET_JOB_BY_PK = gql`
      v_model_yr
      v_model_desc
      v_vin
-      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
+      notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
        created_at
        created_by
        critical
@@ -830,6 +844,8 @@ export const QUERY_JOB_CARD_DETAILS = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      comment
      ownr_ea
      ca_gst_registrant
@@ -1000,7 +1016,6 @@ export const QUERY_JOB_CARD_DETAILS = gql`
        key
        type
      }
-
    }
  }
 `;
@@ -1230,6 +1245,8 @@ export const GET_JOB_INFO_FOR_STRIPE = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      ownr_ea
    }
  }
@@ -1443,8 +1460,10 @@ export const QUERY_JOB_FOR_DUPE = gql`
      ownr_ln
      ownr_ph1
      ownr_ph1x
+      ownr_ph1_ty
      ownr_ph2
      ownr_ph2x
+      ownr_ph2_ty
      ownr_st
      ownr_title
      ownr_zip
@@ -1690,8 +1709,10 @@ export const QUERY_ALL_JOB_FIELDS = gql`
      ownr_ln
      ownr_ph1
      ownr_ph1x
+      ownr_ph1_ty
      ownr_ph2
      ownr_ph2x
+      ownr_ph2_ty
      ownr_st
      ownr_title
      ownr_zip
@@ -1829,6 +1850,8 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      plate_no
      plate_st
      v_vin
@@ -1869,6 +1892,8 @@ export const QUERY_SIMPLIFIED_PARTS_PAGINATED_STATUS_FILTERED = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      plate_no
      plate_st
      v_vin
@@ -2117,6 +2142,8 @@ export const GET_JOB_FOR_CC_CONTRACT = gql`
      ownr_zip
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
    }
  }
 `;
@@ -2415,7 +2442,7 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
        start
        status
      }
-      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
+      notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
        created_at
        created_by
        critical
@@ -2503,6 +2530,8 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
      ownr_ln
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      owner {
        id
        preferred_contact
@@ -2600,6 +2629,8 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
      clm_total
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      special_coverage_policy
      owner_owing
      production_vars
--- a/client/src/graphql/owners.queries.js
+++ b/client/src/graphql/owners.queries.js
@@ -8,6 +8,8 @@ export const QUERY_SEARCH_OWNER_BY_IDX = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
      ownr_addr1
      ownr_addr2
      ownr_city
@@ -57,8 +59,10 @@ export const QUERY_OWNER_BY_ID = gql`
      ownr_ea
      ownr_fn
      ownr_ph1
+      ownr_ph1_ty
      ownr_ln
      ownr_ph2
+      ownr_ph2_ty
      ownr_st
      ownr_title
      ownr_zip
@@ -112,8 +116,10 @@ export const QUERY_ALL_OWNERS = gql`
      ownr_ea
      ownr_fn
      ownr_ph1
+      ownr_ph1_ty
      ownr_ln
      ownr_ph2
+      ownr_ph2_ty
      ownr_st
      ownr_title
      ownr_zip
@@ -136,8 +142,10 @@ export const QUERY_ALL_OWNERS_PAGINATED = gql`
      ownr_ea
      ownr_fn
      ownr_ph1
+      ownr_ph1_ty
      ownr_ln
      ownr_ph2
+      ownr_ph2_ty
      ownr_st
      ownr_title
      ownr_zip
@@ -164,8 +172,10 @@ export const QUERY_OWNER_FOR_JOB_CREATION = gql`
      ownr_ea
      ownr_fn
      ownr_ph1
+      ownr_ph1_ty
      ownr_ln
      ownr_ph2
+      ownr_ph2_ty
      ownr_st
      ownr_title
      ownr_zip
--- a/client/src/graphql/parts-orders.queries.js
+++ b/client/src/graphql/parts-orders.queries.js
@@ -177,10 +177,12 @@ export const QUERY_PARTS_ORDER_OEC = gql`
        ownr_fax
        ownr_faxx
        ownr_ph1
+        ownr_ph1_ty
        ownr_fn
        ownr_ln
        ownr_ph1x
        ownr_ph2
+        ownr_ph2_ty
        ownr_ph2x
        ownr_st
        ownr_title
--- a/client/src/graphql/search.queries.js
+++ b/client/src/graphql/search.queries.js
@@ -22,6 +22,8 @@ export const GLOBAL_SEARCH_QUERY = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
    }
    search_vehicles(args: { search: $search }, limit: 25) {
      id
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2590,7 +2590,10 @@
        "fromclaim": "Current Claim",
        "fromowner": "Historical Owner Record",
        "relatedjobs": "Related Jobs",
-        "updateowner": "Update Owner"
+        "updateowner": "Update Owner",
+        "work": "Work",
+        "home": "Home",
+        "cell": "Cell"
      },
      "successes": {
        "delete": "Owner deleted successfully.",
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2590,7 +2590,10 @@
        "fromclaim": "",
        "fromowner": "",
        "relatedjobs": "",
-        "updateowner": ""
+        "updateowner": "",
+        "work": "",
+        "home": "",
+        "cell": ""
      },
      "successes": {
        "delete": "",
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2590,7 +2590,10 @@
        "fromclaim": "",
        "fromowner": "",
        "relatedjobs": "",
-        "updateowner": ""
+        "updateowner": "",
+        "work": "",
+        "home": "",
+        "cell": ""
      },
      "successes": {
        "delete": "",
--- a/client/src/utils/PhoneFormatter.jsx
+++ b/client/src/utils/PhoneFormatter.jsx
@@ -1,7 +1,23 @@
-//import NumberFormat from "react-number-format";
+import { Typography } from "antd";
 import parsePhoneNumber from "libphonenumber-js";

-export default function PhoneNumberFormatter(props) {
-  const p = parsePhoneNumber(props.children || "", "CA");
-  return p ? <span>{p.formatNational()}</span> : null;
+const { Text } = Typography;
+
+export default function PhoneNumberFormatter({ children, type }) {
+  const p = parsePhoneNumber(children || "", "CA");
+  if (!p) return null;
+
+  const phone = p.formatNational();
+
+  return (
+    <span>
+      <Text>{phone}</Text>
+      {type ? (
+        <>
+          {" "}
+          <Text type="secondary">({type})</Text>
+        </>
+      ) : null}
+    </span>
+  );
 }
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -3684,6 +3684,7 @@
          - completed_tasks
          - converted
          - created_at
+          - created_user_email
          - cust_pr
          - date_estimated
          - date_exported
@@ -3798,8 +3799,10 @@
          - ownr_fn
          - ownr_ln
          - ownr_ph1
+          - ownr_ph1_ty
          - ownr_ph1x
          - ownr_ph2
+          - ownr_ph2_ty
          - ownr_ph2x
          - ownr_st
          - ownr_title
@@ -3961,6 +3964,7 @@
          - completed_tasks
          - converted
          - created_at
+          - created_user_email
          - cust_pr
          - date_estimated
          - date_exported
@@ -4077,8 +4081,10 @@
          - ownr_fn
          - ownr_ln
          - ownr_ph1
+          - ownr_ph1_ty
          - ownr_ph1x
          - ownr_ph2
+          - ownr_ph2_ty
          - ownr_ph2x
          - ownr_st
          - ownr_title
@@ -4251,6 +4257,7 @@
          - completed_tasks
          - converted
          - created_at
+          - created_user_email
          - cust_pr
          - date_estimated
          - date_exported
@@ -4367,8 +4374,10 @@
          - ownr_fn
          - ownr_ln
          - ownr_ph1
+          - ownr_ph1_ty
          - ownr_ph1x
          - ownr_ph2
+          - ownr_ph2_ty
          - ownr_ph2x
          - ownr_st
          - ownr_title
@@ -4641,7 +4650,7 @@
      request_transform:
        body:
          action: transform
-          template: "{\r\n  \"event\": {\r\n  \"session_variables\": {\r\n    \"x-hasura-user-id\": {{$body?.event?.session_variables?.x-hasura-user-id ?? \"Internal\"}},\r\n    \"x-hasura-role\": {{$body?.event?.session_variables?.x-hasura-role ?? \"Internal\"}}\r\n    }, \r\n    \"op\": {{$body.event.op}},\r\n    \"data\": {\r\n      \"new\": {\r\n        \"id\": {{$body.event.data.new.id}},\r\n        \"shopid\": {{$body.event.data.new?.shopid}},\r\n        \"ro_number\": {{$body.event.data.new?.ro_number}}\r\n      }\r\n    }\r\n  },\r\n  \"trigger\": {\r\n    \"name\": \"notifications_jobs_autoadd\"\r\n  },\r\n  \"table\": {\r\n    \"schema\": \"public\",\r\n    \"name\": \"jobs\"\r\n  }\r\n}\r\n"
+          template: "{\r\n  \"event\": {\r\n  \"session_variables\": {\r\n    \"x-hasura-user-id\": {{$body?.event?.session_variables?.x-hasura-user-id ?? \"Internal\"}},\r\n    \"x-hasura-role\": {{$body?.event?.session_variables?.x-hasura-role ?? \"Internal\"}}\r\n    }, \r\n    \"op\": {{$body.event.op}},\r\n    \"data\": {\r\n      \"new\": {\r\n        \"id\": {{$body.event.data.new.id}},\r\n        \"shopid\": {{$body.event.data.new?.shopid}},\r\n        \"ro_number\": {{$body.event.data.new?.ro_number}},\r\n        \"created_user_email\": {{$body.event.data.new?.created_user_email}}\r\n      }\r\n    }\r\n  },\r\n  \"trigger\": {\r\n    \"name\": \"notifications_jobs_autoadd\"\r\n  },\r\n  \"table\": {\r\n    \"schema\": \"public\",\r\n    \"name\": \"jobs\"\r\n  }\r\n}\r\n"
        method: POST
        query_params: {}
        template_engine: Kriti
@@ -5168,7 +5177,9 @@
          - ownr_fn
          - ownr_ln
          - ownr_ph1
+          - ownr_ph1_ty
          - ownr_ph2
+          - ownr_ph2_ty
          - ownr_st
          - ownr_title
          - ownr_zip
@@ -5193,7 +5204,9 @@
          - ownr_fn
          - ownr_ln
          - ownr_ph1
+          - ownr_ph1_ty
          - ownr_ph2
+          - ownr_ph2_ty
          - ownr_st
          - ownr_title
          - ownr_zip
@@ -5229,7 +5242,9 @@
          - ownr_fn
          - ownr_ln
          - ownr_ph1
+          - ownr_ph1_ty
          - ownr_ph2
+          - ownr_ph2_ty
          - ownr_st
          - ownr_title
          - ownr_zip
--- a/hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/down.sql
+++ b/hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/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"."owners" add column "ownr_ph1_ty" text
+--  null;
--- a/hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/up.sql
+++ b/hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."owners" add column "ownr_ph1_ty" text
+ null;
--- a/hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/down.sql
+++ b/hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/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"."owners" add column "ownr_ph2_ty" text
+--  null;
--- a/hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/up.sql
+++ b/hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."owners" add column "ownr_ph2_ty" text
+ null;
--- a/hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/down.sql
+++ b/hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/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 "ownr_ph1_ty" text
+--  null;
--- a/hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/up.sql
+++ b/hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "ownr_ph1_ty" text
+ null;
--- a/hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/down.sql
+++ b/hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/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 "ownr_ph2_ty" text
+--  null;
--- a/hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/up.sql
+++ b/hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "ownr_ph2_ty" text
+ null;
--- a/server.js
+++ b/server.js
@@ -38,7 +38,6 @@ const { registerCleanupTask, initializeCleanupManager } = require("./server/util

 const { loadEmailQueue } = require("./server/notifications/queues/emailQueue");
 const { loadAppQueue } = require("./server/notifications/queues/appQueue");
-const { loadFcmQueue } = require("./server/notifications/queues/fcmQueue");

 const CLUSTER_RETRY_BASE_DELAY = 100;
 const CLUSTER_RETRY_MAX_DELAY = 5000;
@@ -356,10 +355,9 @@ const loadQueues = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
  const queueSettings = { pubClient, logger, redisHelpers, ioRedis };

  // Assuming loadEmailQueue and loadAppQueue return Promises
-  const [notificationsEmailsQueue, notificationsAppQueue, notificationsFcmQueue] = await Promise.all([
+  const [notificationsEmailsQueue, notificationsAppQueue] = await Promise.all([
    loadEmailQueue(queueSettings),
-    loadAppQueue(queueSettings),
-    loadFcmQueue(queueSettings)
+    loadAppQueue(queueSettings)
  ]);

  // Add error listeners or other setup for queues if needed
@@ -370,10 +368,6 @@ const loadQueues = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
  notificationsAppQueue.on("error", (error) => {
    logger.log(`Error in notificationsAppQueue: ${error}`, "ERROR", "queue", "api", null, { error: error?.message });
  });
-
-  notificationsFcmQueue.on("error", (error) => {
-    logger.log(`Error in notificationsFCMQueue: ${error}`, "ERROR", "queue", "api", null, { error: error?.message });
-  });
 };

 /**
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -3187,20 +3187,3 @@ mutation INSERT_MEDIA_ANALYTICS($mediaObject: media_analytics_insert_input!) {
  }
 }
 `;
-
-exports.GET_USERS_FCM_TOKENS_BY_EMAILS = /* GraphQL */ `
-  query GET_USERS_FCM_TOKENS_BY_EMAILS($emails: [String!]!) {
-    users(where: { email: { _in: $emails } }) {
-      email
-      fcmtokens
-    }
-  }
-`;
-
-exports.UPDATE_USER_FCM_TOKENS_BY_EMAIL = /* GraphQL */ `
-  mutation UPDATE_USER_FCM_TOKENS_BY_EMAIL($email: String!, $fcmtokens: jsonb) {
-    update_users(where: { email: { _eq: $email } }, _set: { fcmtokens: $fcmtokens }) {
-      affected_rows
-    }
-  }
-`;
--- a/server/notifications/eventHandlers.js
+++ b/server/notifications/eventHandlers.js
@@ -205,8 +205,9 @@ const handleTaskSocketEmit = (req) => {
 * @returns {Promise<Object>} JSON response with a success message.
 */
 const handleTasksChange = async (req, res) => {
+  // Handle Notification Event
+  processNotificationEvent(req, res, "req.body.event.new.jobid", "Tasks Notifications Event Handled.");
  handleTaskSocketEmit(req);
-  return processNotificationEvent(req, res, "req.body.event.new.jobid", "Tasks Notifications Event Handled.");
 };

 /**
--- a/server/notifications/queues/appQueue.js
+++ b/server/notifications/queues/appQueue.js
@@ -42,13 +42,6 @@ const buildNotificationContent = (notifications) => {
  };
 };

-/**
- * Convert MS to S
- * @param ms
- * @returns {number}
- */
-const seconds = (ms) => Math.max(1, Math.ceil(ms / 1000));
-
 /**
 * Initializes the notification queues and workers for adding and consolidating notifications.
 */
@@ -59,13 +52,6 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {

    devDebugLogger(`Initializing Notifications Queues with prefix: ${prefix}`);

-    // Redis key helpers (per jobId)
-    const recipientsSetKey = (jobId) => `app:${devKey}:recipients:${jobId}`; // set of `${user}:${bodyShopId}`
-    const recipientAssocHashKey = (jobId) => `app:${devKey}:recipientAssoc:${jobId}`; // hash `${user}:${bodyShopId}` => associationId
-    const consolidateFlagKey = (jobId) => `app:${devKey}:consolidate:${jobId}`;
-    const lockKeyForJob = (jobId) => `lock:${devKey}:consolidate:${jobId}`;
-    const listKey = ({ jobId, user, bodyShopId }) => `app:${devKey}:notifications:${jobId}:${user}:${bodyShopId}`;
-
    addQueue = new Queue("notificationsAdd", {
      prefix,
      connection: pubClient,
@@ -84,39 +70,27 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
        const { jobId, key, variables, recipients, body, jobRoNumber } = job.data;
        devDebugLogger(`Adding notifications for jobId ${jobId}`);

+        const redisKeyPrefix = `app:${devKey}:notifications:${jobId}`;
        const notification = { key, variables, body, jobRoNumber, timestamp: Date.now() };

-        // Store notifications atomically (RPUSH) and store recipients in a Redis set
-        for (const recipient of recipients || []) {
-          const { user, bodyShopId, associationId } = recipient;
-          if (!user || !bodyShopId) continue;
-
-          const rk = `${user}:${bodyShopId}`;
-
-          // (1) Store notification payload in a list (atomic append)
-          const lk = listKey({ jobId, user, bodyShopId });
-          await pubClient.rpush(lk, JSON.stringify(notification));
-          await pubClient.expire(lk, seconds(NOTIFICATION_STORAGE_EXPIRATION));
-
-          // (2) Track recipients in a set, and associationId in a hash
-          await pubClient.sadd(recipientsSetKey(jobId), rk);
-          await pubClient.expire(recipientsSetKey(jobId), seconds(NOTIFICATION_STORAGE_EXPIRATION));
-
-          if (associationId) {
-            await pubClient.hset(recipientAssocHashKey(jobId), rk, String(associationId));
-          }
-          await pubClient.expire(recipientAssocHashKey(jobId), seconds(NOTIFICATION_STORAGE_EXPIRATION));
+        for (const recipient of recipients) {
+          const { user } = recipient;
+          const userKey = `${redisKeyPrefix}:${user}`;
+          const existingNotifications = await pubClient.get(userKey);
+          const notifications = existingNotifications ? JSON.parse(existingNotifications) : [];
+          notifications.push(notification);
+          await pubClient.set(userKey, JSON.stringify(notifications), "EX", NOTIFICATION_STORAGE_EXPIRATION / 1000);
+          devDebugLogger(`Stored notification for ${user} under ${userKey}: ${JSON.stringify(notifications)}`);
        }

-        // Schedule consolidation once per jobId
-        const flagKey = consolidateFlagKey(jobId);
-        const flagSet = await pubClient.setnx(flagKey, "pending");
+        const consolidateKey = `app:${devKey}:consolidate:${jobId}`;
+        const flagSet = await pubClient.setnx(consolidateKey, "pending");
        devDebugLogger(`Consolidation flag set for jobId ${jobId}: ${flagSet}`);

        if (flagSet) {
          await consolidateQueue.add(
            "consolidate-notifications",
-            { jobId },
+            { jobId, recipients },
            {
              jobId: `consolidate-${jobId}`,
              delay: APP_CONSOLIDATION_DELAY,
@@ -124,9 +98,8 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
              backoff: LOCK_EXPIRATION
            }
          );
-
-          await pubClient.expire(flagKey, seconds(CONSOLIDATION_FLAG_EXPIRATION));
          devDebugLogger(`Scheduled consolidation for jobId ${jobId}`);
+          await pubClient.expire(consolidateKey, CONSOLIDATION_FLAG_EXPIRATION / 1000);
        } else {
          devDebugLogger(`Consolidation already scheduled for jobId ${jobId}`);
        }
@@ -141,167 +114,122 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
    const consolidateWorker = new Worker(
      "notificationsConsolidate",
      async (job) => {
-        const { jobId } = job.data;
+        const { jobId, recipients } = job.data;
        devDebugLogger(`Consolidating notifications for jobId ${jobId}`);

-        const lockKey = lockKeyForJob(jobId);
-        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", seconds(LOCK_EXPIRATION));
+        const redisKeyPrefix = `app:${devKey}:notifications:${jobId}`;
+        const lockKey = `lock:${devKey}:consolidate:${jobId}`;
+
+        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", LOCK_EXPIRATION / 1000);
        devDebugLogger(`Lock acquisition for jobId ${jobId}: ${lockAcquired}`);

-        if (!lockAcquired) {
-          devDebugLogger(`Skipped consolidation for jobId ${jobId} - lock held by another worker`);
-          return;
-        }
+        if (lockAcquired) {
+          try {
+            const allNotifications = {};
+            const uniqueUsers = [...new Set(recipients.map((r) => r.user))];
+            devDebugLogger(`Unique users for jobId ${jobId}: ${uniqueUsers}`);

-        try {
-          const rkSet = recipientsSetKey(jobId);
-          const assocHash = recipientAssocHashKey(jobId);
+            for (const user of uniqueUsers) {
+              const userKey = `${redisKeyPrefix}:${user}`;
+              const notifications = await pubClient.get(userKey);
+              devDebugLogger(`Retrieved notifications for ${user}: ${notifications}`);

-          const recipientKeys = await pubClient.smembers(rkSet);
-          if (!recipientKeys?.length) {
-            devDebugLogger(`No recipients found for jobId ${jobId}, nothing to consolidate.`);
-            await pubClient.del(consolidateFlagKey(jobId));
-            return;
-          }
-
-          const assocMap = await pubClient.hgetall(assocHash);
-
-          // Collect notifications by recipientKey
-          const notificationsByRecipient = new Map(); // rk => parsed notifications array
-          const listKeysToDelete = []; // delete only after successful insert+emit
-
-          for (const rk of recipientKeys) {
-            const [user, bodyShopId] = rk.split(":");
-            const lk = listKey({ jobId, user, bodyShopId });
-
-            const items = await pubClient.lrange(lk, 0, -1);
-            if (!items?.length) continue;
-
-            const parsed = items
-              .map((x) => {
-                try {
-                  return JSON.parse(x);
-                } catch {
-                  return null;
+              if (notifications) {
+                const parsedNotifications = JSON.parse(notifications);
+                const userRecipients = recipients.filter((r) => r.user === user);
+                for (const { bodyShopId } of userRecipients) {
+                  allNotifications[user] = allNotifications[user] || {};
+                  allNotifications[user][bodyShopId] = parsedNotifications;
                }
-              })
-              .filter(Boolean);
-
-            if (parsed.length) {
-              notificationsByRecipient.set(rk, parsed);
-
-              // IMPORTANT: do NOT delete list yet; only delete after successful insert+emit
-              listKeysToDelete.push(lk);
-            }
-          }
-
-          if (!notificationsByRecipient.size) {
-            devDebugLogger(`No notifications found in lists for jobId ${jobId}, nothing to insert/emit.`);
-            if (listKeysToDelete.length) {
-              await pubClient.del(...listKeysToDelete);
-            }
-            await pubClient.del(rkSet);
-            await pubClient.del(assocHash);
-            await pubClient.del(consolidateFlagKey(jobId));
-            return;
-          }
-
-          // Build DB inserts
-          const inserts = [];
-          const insertMeta = []; // keep rk + associationId to emit after insert
-
-          for (const [rk, notifications] of notificationsByRecipient.entries()) {
-            const associationId = assocMap?.[rk];
-
-            // If your DB requires associationid NOT NULL, skip if missing
-            if (!associationId) {
-              devDebugLogger(`Skipping insert for ${rk} (missing associationId).`);
-              continue;
-            }
-
-            const { scenario_text, fcm_text, scenario_meta } = buildNotificationContent(notifications);
-
-            inserts.push({
-              jobid: jobId,
-              associationid: associationId,
-              // NOTE: if these are jsonb columns, remove JSON.stringify and pass arrays directly.
-              scenario_text: JSON.stringify(scenario_text),
-              fcm_text,
-              scenario_meta: JSON.stringify(scenario_meta)
-            });
-
-            insertMeta.push({ rk, associationId });
-          }
-
-          // Map notificationId by associationId from Hasura returning rows
-          const idByAssociationId = new Map();
-
-          if (inserts.length > 0) {
-            const insertResponse = await graphQLClient.request(INSERT_NOTIFICATIONS_MUTATION, { objects: inserts });
-
-            const returning = insertResponse?.insert_notifications?.returning || [];
-            returning.forEach((row) => {
-              // Expecting your mutation to return associationid as well as id.
-              // If your mutation currently doesn’t return associationid, update it.
-              if (row?.associationid) idByAssociationId.set(String(row.associationid), row.id);
-            });
-
-            devDebugLogger(
-              `Inserted ${insertResponse.insert_notifications.affected_rows} notifications for jobId ${jobId}`
-            );
-          }
-
-          // Emit via Socket.io
-          // Group by user to reduce mapping lookups
-          const uniqueUsers = [...new Set(insertMeta.map(({ rk }) => rk.split(":")[0]))];
-
-          for (const user of uniqueUsers) {
-            const userMapping = await redisHelpers.getUserSocketMapping(user);
-            const entriesForUser = insertMeta
-              .map((m) => ({ ...m, user: m.rk.split(":")[0], bodyShopId: m.rk.split(":")[1] }))
-              .filter((m) => m.user === user);
-
-            for (const entry of entriesForUser) {
-              const { rk, bodyShopId, associationId } = entry;
-              const notifications = notificationsByRecipient.get(rk) || [];
-              if (!notifications.length) continue;
-
-              const jobRoNumber = notifications[0]?.jobRoNumber;
-              const notificationId = idByAssociationId.get(String(associationId)) || null;
-
-              if (userMapping && userMapping[bodyShopId]?.socketIds) {
-                userMapping[bodyShopId].socketIds.forEach((socketId) => {
-                  ioRedis.to(socketId).emit("notification", {
-                    jobId,
-                    jobRoNumber,
-                    bodyShopId,
-                    notifications,
-                    notificationId,
-                    associationId
-                  });
-                });
-
-                devDebugLogger(
-                  `Sent ${notifications.length} consolidated notifications to ${user} for jobId ${jobId} (notificationId ${notificationId})`
-                );
+                await pubClient.del(userKey);
+                devDebugLogger(`Deleted Redis key ${userKey}`);
              } else {
-                devDebugLogger(`No socket IDs found for ${user} in bodyShopId ${bodyShopId}`);
+                devDebugLogger(`No notifications found for ${user} under ${userKey}`);
              }
            }
-          }

-          // Cleanup recipient tracking keys + consolidation flag
-          await pubClient.del(rkSet);
-          await pubClient.del(assocHash);
-          await pubClient.del(consolidateFlagKey(jobId));
-        } catch (err) {
-          logger.log("app-queue-consolidation-error", "ERROR", "notifications", "api", {
-            message: err?.message,
-            stack: err?.stack
-          });
-          throw err;
-        } finally {
-          await pubClient.del(lockKey);
+            devDebugLogger(`Consolidated notifications: ${JSON.stringify(allNotifications)}`);
+
+            // Insert notifications into the database and collect IDs
+            const notificationInserts = [];
+            const notificationIdMap = new Map();
+
+            for (const [user, bodyShopData] of Object.entries(allNotifications)) {
+              const userRecipients = recipients.filter((r) => r.user === user);
+              const associationId = userRecipients[0]?.associationId;
+
+              for (const [bodyShopId, notifications] of Object.entries(bodyShopData)) {
+                const { scenario_text, fcm_text, scenario_meta } = buildNotificationContent(notifications);
+                notificationInserts.push({
+                  jobid: jobId,
+                  associationid: associationId,
+                  scenario_text: JSON.stringify(scenario_text),
+                  fcm_text: fcm_text,
+                  scenario_meta: JSON.stringify(scenario_meta)
+                });
+                notificationIdMap.set(`${user}:${bodyShopId}`, null);
+              }
+            }
+
+            if (notificationInserts.length > 0) {
+              const insertResponse = await graphQLClient.request(INSERT_NOTIFICATIONS_MUTATION, {
+                objects: notificationInserts
+              });
+              devDebugLogger(
+                `Inserted ${insertResponse.insert_notifications.affected_rows} notifications for jobId ${jobId}`
+              );
+
+              insertResponse.insert_notifications.returning.forEach((row, index) => {
+                const user = uniqueUsers[Math.floor(index / Object.keys(allNotifications[uniqueUsers[0]]).length)];
+                const bodyShopId = Object.keys(allNotifications[user])[
+                  index % Object.keys(allNotifications[user]).length
+                ];
+                notificationIdMap.set(`${user}:${bodyShopId}`, row.id);
+              });
+            }
+
+            // Emit notifications to users via Socket.io with notification ID
+            for (const [user, bodyShopData] of Object.entries(allNotifications)) {
+              const userMapping = await redisHelpers.getUserSocketMapping(user);
+              const userRecipients = recipients.filter((r) => r.user === user);
+              const associationId = userRecipients[0]?.associationId;
+
+              for (const [bodyShopId, notifications] of Object.entries(bodyShopData)) {
+                const notificationId = notificationIdMap.get(`${user}:${bodyShopId}`);
+                const jobRoNumber = notifications[0]?.jobRoNumber;
+
+                if (userMapping && userMapping[bodyShopId]?.socketIds) {
+                  userMapping[bodyShopId].socketIds.forEach((socketId) => {
+                    ioRedis.to(socketId).emit("notification", {
+                      jobId,
+                      jobRoNumber,
+                      bodyShopId,
+                      notifications,
+                      notificationId,
+                      associationId
+                    });
+                  });
+                  devDebugLogger(
+                    `Sent ${notifications.length} consolidated notifications to ${user} for jobId ${jobId} with notificationId ${notificationId}`
+                  );
+                } else {
+                  devDebugLogger(`No socket IDs found for ${user} in bodyShopId ${bodyShopId}`);
+                }
+              }
+            }
+
+            await pubClient.del(`app:${devKey}:consolidate:${jobId}`);
+          } catch (err) {
+            logger.log(`app-queue-consolidation-error`, "ERROR", "notifications", "api", {
+              message: err?.message,
+              stack: err?.stack
+            });
+            throw err;
+          } finally {
+            await pubClient.del(lockKey);
+          }
+        } else {
+          devDebugLogger(`Skipped consolidation for jobId ${jobId} - lock held by another worker`);
        }
      },
      {
@@ -316,14 +244,13 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
    consolidateWorker.on("completed", (job) => devDebugLogger(`Consolidate job ${job.id} completed`));

    addWorker.on("failed", (job, err) =>
-      logger.log("app-queue-notification-error", "ERROR", "notifications", "api", {
+      logger.log(`app-queue-notification-error`, "ERROR", "notifications", "api", {
        message: err?.message,
        stack: err?.stack
      })
    );
-
    consolidateWorker.on("failed", (job, err) =>
-      logger.log("app-queue-consolidation-failed", "ERROR", "notifications", "api", {
+      logger.log(`app-queue-consolidation-failed:`, "ERROR", "notifications", "api", {
        message: err?.message,
        stack: err?.stack
      })
@@ -358,13 +285,11 @@ const dispatchAppsToQueue = async ({ appsToDispatch }) => {

  for (const app of appsToDispatch) {
    const { jobId, bodyShopId, key, variables, recipients, body, jobRoNumber } = app;
-
    await appQueue.add(
      "add-notification",
      { jobId, bodyShopId, key, variables, recipients, body, jobRoNumber },
      { jobId: `${jobId}-${Date.now()}` }
    );
-
    devDebugLogger(`Added notification to queue for jobId ${jobId} with ${recipients.length} recipients`);
  }
 };
--- a/server/notifications/queues/emailQueue.js
+++ b/server/notifications/queues/emailQueue.js
@@ -27,16 +27,6 @@ let emailConsolidateQueue;
 let emailAddWorker;
 let emailConsolidateWorker;

-const seconds = (ms) => Math.max(1, Math.ceil(ms / 1000));
-
-const escapeHtml = (s = "") =>
-  String(s)
-    .replace(/&/g, "&amp;")
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;")
-    .replace(/"/g, "&quot;")
-    .replace(/'/g, "&#39;");
-
 /**
 * Initializes the email notification queues and workers.
 *
@@ -75,21 +65,17 @@ const loadEmailQueue = async ({ pubClient, logger }) => {

        const redisKeyPrefix = `email:${devKey}:notifications:${jobId}`;

-        for (const recipient of recipients || []) {
+        for (const recipient of recipients) {
          const { user, firstName, lastName } = recipient;
-          if (!user) continue;
          const userKey = `${redisKeyPrefix}:${user}`;
          await pubClient.rpush(userKey, body);
-          await pubClient.expire(userKey, seconds(NOTIFICATION_EXPIRATION));
+          await pubClient.expire(userKey, NOTIFICATION_EXPIRATION / 1000);
          const detailsKey = `email:${devKey}:recipientDetails:${jobId}:${user}`;
          await pubClient.hsetnx(detailsKey, "firstName", firstName || "");
          await pubClient.hsetnx(detailsKey, "lastName", lastName || "");
-          const tzValue = bodyShopTimezone || "UTC";
-          await pubClient.hsetnx(detailsKey, "bodyShopTimezone", tzValue);
-          await pubClient.expire(detailsKey, seconds(NOTIFICATION_EXPIRATION));
-          const recipientsSetKey = `email:${devKey}:recipients:${jobId}`;
-          await pubClient.sadd(recipientsSetKey, user);
-          await pubClient.expire(recipientsSetKey, seconds(NOTIFICATION_EXPIRATION));
+          await pubClient.hsetnx(detailsKey, "bodyShopTimezone", bodyShopTimezone);
+          await pubClient.expire(detailsKey, NOTIFICATION_EXPIRATION / 1000);
+          await pubClient.sadd(`email:${devKey}:recipients:${jobId}`, user);
          devDebugLogger(`Stored message for ${user} under ${userKey}: ${body}`);
        }

@@ -107,7 +93,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
            }
          );
          devDebugLogger(`Scheduled email consolidation for jobId ${jobId}`);
-          await pubClient.expire(consolidateKey, seconds(CONSOLIDATION_KEY_EXPIRATION));
+          await pubClient.expire(consolidateKey, CONSOLIDATION_KEY_EXPIRATION / 1000);
        } else {
          devDebugLogger(`Email consolidation already scheduled for jobId ${jobId}`);
        }
@@ -127,7 +113,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
        devDebugLogger(`Consolidating emails for jobId ${jobId}`);

        const lockKey = `lock:${devKey}:emailConsolidate:${jobId}`;
-        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", seconds(LOCK_EXPIRATION));
+        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", LOCK_EXPIRATION / 1000);
        if (lockAcquired) {
          try {
            const recipientsSet = `email:${devKey}:recipients:${jobId}`;
@@ -153,7 +139,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
                    <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
                      <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 16px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
                        <ul style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 1%; padding-left: 30px;">
-                          ${messages.map((msg) => `<li style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%;">${escapeHtml(msg)}</li>`).join("")}
+                          ${messages.map((msg) => `<li style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%;">${msg}</li>`).join("")}
                        </ul>
                      </td></tr></table></th>
                    </tr><tbody></table>
@@ -253,13 +239,7 @@ const dispatchEmailsToQueue = async ({ emailsToDispatch, logger }) => {
  const emailAddQueue = getQueue();

  for (const email of emailsToDispatch) {
-    const { jobId, bodyShopName, bodyShopTimezone, body, recipients } = email;
-    let { jobRoNumber } = email;
-
-    // Make sure Jobs that have not been coverted yet can still get notifications
-    if (jobRoNumber === null) {
-      jobRoNumber = "N/A";
-    }
+    const { jobId, jobRoNumber, bodyShopName, bodyShopTimezone, body, recipients } = email;

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

  // Populate recipients from scenarioWatchers
  data.scenarioWatchers.forEach((recipients) => {
    const { user, app, fcm, email, firstName, lastName, employeeId, associationId } = recipients;
-
-    if (app === true) {
+    if (app === true)
      result.app.recipients.push({
        user,
        bodyShopId: data.bodyShopId,
        employeeId,
        associationId
      });
-    }
-
-    if (email === true) {
-      result.email.recipients.push({ user, firstName, lastName });
-    }
-
-    if (fcm === true) {
-      // Keep structure consistent and future-proof (token lookup is done server-side)
-      result.fcm.recipients.push({
-        user,
-        bodyShopId: data.bodyShopId,
-        employeeId,
-        associationId
-      });
-    }
+    if (fcm === true) result.fcm.recipients.push(user);
+    if (email === true) result.email.recipients.push({ user, firstName, lastName });
  });

  return result;
--- a/server/notifications/scenarioParser.js
+++ b/server/notifications/scenarioParser.js
@@ -14,7 +14,6 @@ const { isEmpty, isFunction } = require("lodash");
 const { getMatchingScenarios } = require("./scenarioMapper");
 const { dispatchEmailsToQueue } = require("./queues/emailQueue");
 const { dispatchAppsToQueue } = require("./queues/appQueue");
-const { dispatchFcmsToQueue } = require("./queues/fcmQueue"); // NEW

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

 module.exports = scenarioParser;
Author	SHA1	Message	Date
Dave	63ce7b5c79	feature/IO-3479-Customer-Phone-Numbers - Implementation	2025-12-30 19:14:57 -05:00
Dave	79a3b58a86	feature/IO-3479-Customer-Phone-Numbers - DB Modifications	2025-12-30 18:56:05 -05:00
Dave	45dd3d8cd6	feature/IO-3479-Customer-Phone-Numbers - DB Modifications	2025-12-30 17:31:20 -05:00