IO-3015 add additional indexs.

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

@@ -1,10 +1,10 @@
 import { Card, Table, Tag } from "antd";
-import axios from "axios";
-import React, { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import dayjs from "../../../utils/day";
 import LoadingSkeleton from "../../loading-skeleton/loading-skeleton.component";
+import { useTranslation } from "react-i18next";
+import React, { useEffect, useState } from "react";
+import dayjs from "../../../utils/day";
 import DashboardRefreshRequired from "../refresh-required.component";
+import axios from "axios";
 
 const fortyFiveDaysAgo = () => dayjs().subtract(45, "day").toLocaleString();
 
@@ -46,11 +46,6 @@ export default function JobLifecycleDashboardComponent({ data, bodyshop, ...card
       dataIndex: "humanReadable",
       key: "humanReadable"
     },
-    {
-      title: t("job_lifecycle.columns.average_human_readable"),
-      dataIndex: "averageHumanReadable",
-      key: "averageHumanReadable"
-    },
     {
       title: t("job_lifecycle.columns.status_count"),
       key: "statusCount",

client/src/components/dms-log-events/dms-log-events.component.jsx

@@ -44,7 +44,7 @@ function LogLevelHierarchy(level) {
       return "orange";
     case "INFO":
       return "blue";
-    case "WARN":
+    case "WARNING":
       return "yellow";
     case "ERROR":
       return "red";

client/src/components/form-date-time-picker/form-date-time-picker.component.jsx

@@ -29,7 +29,7 @@ const DateTimePicker = ({
   const handleChange = useCallback(
     (newDate) => {
       if (onChange) {
-        onChange(bodyshop?.timezone && newDate ? dayjs(newDate).tz(bodyshop.timezone, true) : newDate);
+        onChange(bodyshop?.timezone ? dayjs(newDate).tz(bodyshop.timezone, true) : newDate);
       }
       setIsManualInput(false);
     },

client/src/components/task-list/task-list.component.jsx

@@ -144,7 +144,7 @@ function TaskListComponent({
     title: t("tasks.fields.created_by"),
     dataIndex: "created_by",
     key: "created_by",
-    width: "8%",
+    width: "10%",
     defaultSortOrder: "descend",
     sorter: true,
     sortOrder: sortcolumn === "created_by" && sortorder,
@@ -166,70 +166,65 @@ function TaskListComponent({
     });
   }
 
-  columns.push({
-    title: t("tasks.fields.related_items"),
-    key: "related_items",
-    width: "12%",
-    render: (text, record) => {
-      const items = [];
-
-      // Job
-      if (showRo && record.job) {
-        items.push(
-          <Link key="job" to={`/manage/jobs/${record.job.id}?tab=tasks`}>
-            {t("tasks.fields.job.ro_number")}: {record.job.ro_number}
-          </Link>
-        );
-      }
-      if (showRo && !record.job) {
-        items.push(`${t("tasks.fields.job.ro_number")}: ${t("general.labels.na")}`);
-      }
-
-      // Jobline
-      if (record.jobline?.line_desc) {
-        items.push(
-          <span key="jobline">
-            {t("tasks.fields.jobline")}: {record.jobline.line_desc}
-          </span>
-        );
-      }
-
-      // Parts Order
-      if (record.parts_order) {
-        const { order_number, vendor } = record.parts_order;
-        const partsOrderText =
-          order_number && vendor?.name ? `${order_number} - ${vendor.name}` : t("general.labels.na");
-        items.push(
-          <Link
-            key="parts_order"
-            to={`/manage/jobs/${record.job.id}?partsorderid=${record.parts_order.id}&tab=partssublet`}
-          >
-            {t("tasks.fields.parts_order")}: {partsOrderText}
-          </Link>
-        );
-      }
-
-      // Bill
-      if (record.bill) {
-        const { invoice_number, vendor } = record.bill;
-        const billText = invoice_number && vendor?.name ? `${invoice_number} - ${vendor.name}` : t("general.labels.na");
-        items.push(
-          <Link key="bill" to={`/manage/jobs/${record.job.id}?billid=${record.bill.id}&tab=partssublet`}>
-            {t("tasks.fields.bill")}: {billText}
-          </Link>
-        );
-      }
-
-      return items.length > 0 ? <Space direction="vertical">{items}</Space> : null;
-    }
-  });
+  if (showRo) {
+    columns.push({
+      title: t("tasks.fields.job.ro_number"),
+      dataIndex: ["job", "ro_number"],
+      key: "job.ro_number",
+      width: "8%",
+      render: (text, record) =>
+        record.job ? (
+          <Link to={`/manage/jobs/${record.job.id}?tab=tasks`}>{record.job.ro_number || t("general.labels.na")}</Link>
+        ) : (
+          t("general.labels.na")
+        )
+    });
+  }
 
   columns.push(
+    {
+      title: t("tasks.fields.jobline"),
+      dataIndex: ["jobline", "id"],
+      key: "jobline.id",
+      width: "8%",
+      render: (text, record) => record?.jobline?.line_desc || ""
+    },
+    {
+      title: t("tasks.fields.parts_order"),
+      dataIndex: ["parts_order", "id"],
+      key: "part_order.id",
+      width: "8%",
+      render: (text, record) =>
+        record.parts_order ? (
+          <Link to={`/manage/jobs/${record.job.id}?partsorderid=${record.parts_order.id}&tab=partssublet`}>
+            {record.parts_order.order_number && record.parts_order.vendor && record.parts_order.vendor.name
+              ? `${record.parts_order.order_number} - ${record.parts_order.vendor.name}`
+              : t("general.labels.na")}
+          </Link>
+        ) : (
+          ""
+        )
+    },
+    {
+      title: t("tasks.fields.bill"),
+      dataIndex: ["bill", "id"],
+      key: "bill.id",
+      width: "10%",
+      render: (text, record) =>
+        record.bill ? (
+          <Link to={`/manage/jobs/${record.job.id}?billid=${record.bill.id}&tab=partssublet`}>
+            {record.bill.invoice_number && record.bill.vendor && record.bill.vendor.name
+              ? `${record.bill.invoice_number} - ${record.bill.vendor.name}`
+              : t("general.labels.na")}
+          </Link>
+        ) : (
+          ""
+        )
+    },
     {
       title: t("tasks.fields.title"),
       dataIndex: "title",
       key: "title",
-      minWidth: "20%",
       sorter: true,
       sortOrder: sortcolumn === "title" && sortorder
     },
@@ -263,7 +258,7 @@ function TaskListComponent({
     {
       title: t("tasks.fields.actions"),
       key: "toggleCompleted",
-      width: "8%",
+      width: "5%",
       render: (text, record) => (
         <Space direction="horizontal">
           <Button

client/src/components/time-ticket-modal/time-ticket-modal.container.jsx

@@ -1,7 +1,7 @@
-import { PageHeader } from "@ant-design/pro-layout";
 import { useMutation, useQuery } from "@apollo/client";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Form, Modal, notification, Space } from "antd";
+import { PageHeader } from "@ant-design/pro-layout";
+import dayjs from "../../utils/day";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -11,9 +11,9 @@ import { INSERT_NEW_TIME_TICKET, UPDATE_TIME_TICKET } from "../../graphql/timeti
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectTimeTicket } from "../../redux/modals/modals.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import dayjs from "../../utils/day";
-import TimeTicketsCommitToggleComponent from "../time-tickets-commit-toggle/time-tickets-commit-toggle.component";
 import TimeTicketModalComponent from "./time-ticket-modal.component";
+import TimeTicketsCommitToggleComponent from "../time-tickets-commit-toggle/time-tickets-commit-toggle.component";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   timeTicketModal: selectTimeTicket,
@@ -87,7 +87,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
     if (enterAgain) {
       //Capture the existing information and repopulate it.
 
-      const prev = form.getFieldsValue(["date", "employeeid", "flat_rate"]);
+      const prev = form.getFieldsValue(["date", "employeeid"]);
 
       form.resetFields();
 

client/src/pages/dms-payables/dms-payables.container.jsx

@@ -71,7 +71,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
           ...logs,
           {
             timestamp: new Date(),
-            level: "WARN",
+            level: "WARNING",
             message: "Reconnected to CDK Export Service"
           }
         ];
@@ -125,7 +125,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
                 >
                   <Select.Option key="DEBUG">DEBUG</Select.Option>
                   <Select.Option key="INFO">INFO</Select.Option>
-                  <Select.Option key="WARN">WARN</Select.Option>
+                  <Select.Option key="WARNING">WARNING</Select.Option>
                   <Select.Option key="ERROR">ERROR</Select.Option>
                 </Select>
                 <Button onClick={() => setLogs([])}>Clear Logs</Button>

client/src/pages/dms/dms.container.jsx

@@ -90,7 +90,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
           ...logs,
           {
             timestamp: new Date(),
-            level: "warn",
+            level: "WARNING",
             message: "Reconnected to CDK Export Service"
           }
         ];
@@ -175,7 +175,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
                   >
                     <Select.Option key="DEBUG">DEBUG</Select.Option>
                     <Select.Option key="INFO">INFO</Select.Option>
-                    <Select.Option key="WARN">WARN</Select.Option>
+                    <Select.Option key="WARNING">WARNING</Select.Option>
                     <Select.Option key="ERROR">ERROR</Select.Option>
                   </Select>
                   <Button onClick={() => setLogs([])}>Clear Logs</Button>

client/src/translations/en_us/common.json

@@ -1338,8 +1338,6 @@
     },
     "job_lifecycle": {
       "columns": {
-        "average_human_readable": "Average Human Readable",
-        "average_value": "Average Value",
         "duration": "Duration",
         "end": "End",
         "human_readable": "Human Readable",
@@ -3206,7 +3204,6 @@
           "medium": "Medium"
         },
         "priority": "Priority",
-        "related_items": "Related Items",
         "remind_at": "Remind At",
         "title": "Title"
       },

client/src/translations/es/common.json

@@ -1338,8 +1338,6 @@
     },
     "job_lifecycle": {
       "columns": {
-        "average_human_readable": "",
-        "average_value": "",
         "duration": "",
         "end": "",
         "human_readable": "",
@@ -3206,7 +3204,6 @@
           "medium": ""
         },
         "priority": "",
-        "related_items": "",
         "remind_at": "",
         "title": ""
       },

client/src/translations/fr/common.json

@@ -1338,8 +1338,6 @@
     },
     "job_lifecycle": {
       "columns": {
-        "average_human_readable": "",
-        "average_value": "",
         "duration": "",
         "end": "",
         "human_readable": "",
@@ -3206,7 +3204,6 @@
           "medium": ""
         },
         "priority": "",
-        "related_items": "",
         "remind_at": "",
         "title": ""
       },

hasura/metadata/tables.yaml

@@ -69,6 +69,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           jobline:
             job:
@@ -179,6 +180,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           bodyshop:
             associations:
@@ -385,6 +387,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           bodyshop:
             associations:
@@ -501,6 +504,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           bill:
             job:
@@ -667,6 +671,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           _and:
             - job:
@@ -1280,6 +1285,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           courtesycar:
             bodyshop:
@@ -1520,6 +1526,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           bodyshop:
             associations:
@@ -1779,6 +1786,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           bodyshop:
             associations:
@@ -1912,6 +1920,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           _or:
             - job:
@@ -2096,6 +2105,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           employee_team:
             bodyshop:
@@ -2258,6 +2268,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           employee:
             bodyshop:
@@ -2438,6 +2449,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           bodyshop:
             associations:
@@ -2684,6 +2696,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           bodyshop:
             associations:
@@ -2795,6 +2808,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           conversation:
             bodyshop:
@@ -3109,6 +3123,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           job:
             bodyshop:
@@ -4217,6 +4232,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           bodyshop:
             associations:
@@ -4232,41 +4248,41 @@
         enable_manual: false
         update:
           columns:
-            - employee_prep
-            - clm_total
-            - suspended
-            - employee_body
-            - ro_number
-            - ownr_co_nm
-            - v_vin
-            - scheduled_completion
-            - special_coverage_policy
-            - scheduled_delivery
-            - actual_delivery
-            - actual_completion
-            - kanbanparent
-            - est_ct_fn
-            - alt_transport
-            - v_model_desc
             - clm_no
             - v_make_desc
             - date_next_contact
             - status
             - employee_csr
+            - employee_prep
+            - clm_total
+            - suspended
+            - employee_body
+            - ro_number
             - actual_in
+            - ownr_co_nm
             - v_model_yr
             - comment
             - job_totals
+            - v_vin
             - ownr_fn
+            - scheduled_completion
+            - special_coverage_policy
             - v_color
             - ca_gst_registrant
+            - scheduled_delivery
+            - actual_delivery
+            - actual_completion
+            - kanbanparent
+            - est_ct_fn
             - employee_refinish
             - ownr_ph1
             - date_last_contacted
+            - alt_transport
             - inproduction
             - est_ct_ln
             - production_vars
             - category
+            - v_model_desc
             - date_invoiced
             - est_co_nm
             - ownr_ln
@@ -4279,12 +4295,6 @@
         - name: event-secret
           value_from_env: EVENT_SECRET
       request_transform:
-        body:
-          action: transform
-          template: |-
-            {
-              "data": {{$body?.event?.data?.new}}
-            }
         method: POST
         query_params: {}
         template_engine: Kriti
@@ -4486,6 +4496,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           conversation:
             bodyshop:
@@ -4659,6 +4670,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           job:
             bodyshop:
@@ -4793,6 +4805,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           bodyshop:
             associations:
@@ -5097,6 +5110,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           parts_order:
             job:
@@ -5229,6 +5243,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           job:
             bodyshop:
@@ -5404,6 +5419,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           job:
             bodyshop:
@@ -5543,6 +5559,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           bodyshop:
             associations:
@@ -5653,6 +5670,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           _or:
             - parentjob_rel:
@@ -5742,6 +5760,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           job:
             bodyshop:
@@ -6026,6 +6045,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           bodyshop:
             associations:
@@ -6521,6 +6541,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           bodyshop:
             associations:
@@ -6677,6 +6698,7 @@
   delete_permissions:
     - role: user
       permission:
+        backend_only: false
         filter:
           bodyshop:
             associations:

hasura/migrations/1730516697278_idx_timetickets_date/down.sql

@@ -0,0 +1,3 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE INDEX idx_timetickets_date ON timetickets (date );

hasura/migrations/1730516697278_idx_timetickets_date/up.sql

@@ -0,0 +1 @@
+CREATE INDEX idx_timetickets_date ON timetickets (date );

hasura/migrations/1730517308367_run_sql_migration/down.sql

@@ -0,0 +1,9 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE INDEX idx_jobs_ownr_fn ON jobs USING gin (ownr_fn gin_trgm_ops);
+-- CREATE INDEX idx_jobs_ownr_ln ON jobs USING gin (ownr_ln gin_trgm_ops);
+-- CREATE INDEX idx_jobs_ownr_co_nm ON jobs USING gin (ownr_co_nm gin_trgm_ops);
+-- CREATE INDEX idx_jobs_clm_no ON jobs USING gin (clm_no gin_trgm_ops);
+-- CREATE INDEX idx_jobs_v_make_desc ON jobs USING gin (v_make_desc gin_trgm_ops);
+-- CREATE INDEX idx_jobs_v_model_desc ON jobs USING gin (v_model_desc gin_trgm_ops);
+-- CREATE INDEX idx_jobs_plate_no ON jobs USING gin (plate_no gin_trgm_ops);

hasura/migrations/1730517308367_run_sql_migration/up.sql

@@ -0,0 +1,7 @@
+CREATE INDEX idx_jobs_ownr_fn ON jobs USING gin (ownr_fn gin_trgm_ops);
+CREATE INDEX idx_jobs_ownr_ln ON jobs USING gin (ownr_ln gin_trgm_ops);
+CREATE INDEX idx_jobs_ownr_co_nm ON jobs USING gin (ownr_co_nm gin_trgm_ops);
+CREATE INDEX idx_jobs_clm_no ON jobs USING gin (clm_no gin_trgm_ops);
+CREATE INDEX idx_jobs_v_make_desc ON jobs USING gin (v_make_desc gin_trgm_ops);
+CREATE INDEX idx_jobs_v_model_desc ON jobs USING gin (v_model_desc gin_trgm_ops);
+CREATE INDEX idx_jobs_plate_no ON jobs USING gin (plate_no gin_trgm_ops);

hasura/migrations/1730518121867_run_sql_migration/down.sql

@@ -0,0 +1,3 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE INDEX idx_exportlog_createdat_desc ON exportlog (created_at desc);

hasura/migrations/1730518121867_run_sql_migration/up.sql

@@ -0,0 +1 @@
+CREATE INDEX idx_exportlog_createdat_desc ON exportlog (created_at desc);

hasura/migrations/1730521661838_run_sql_migration/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE index  idx_messages_unread_agg ON messages (read, isoutbound)
+-- WHERE read = false AND isoutbound = false;

hasura/migrations/1730521661838_run_sql_migration/up.sql

@@ -0,0 +1,2 @@
+CREATE index  idx_messages_unread_agg ON messages (read, isoutbound)
+WHERE read = false AND isoutbound = false;

server/accounting/pbs/pbs-job-export.js

@@ -611,7 +611,7 @@ async function InsertFailedExportLog(socket, error) {
           bodyshopid: socket.JobData.bodyshop.id,
           jobid: socket.JobData.id,
           successful: false,
-          message: JSON.stringify(error),
+          message: [error],
           useremail: socket.user.email
         }
       });

server/cdk/cdk-job-export.js

@@ -995,7 +995,7 @@ async function InsertFailedExportLog(socket, error) {
           bodyshopid: socket.JobData.bodyshop.id,
           jobid: socket.JobData.id,
           successful: false,
-          message: JSON.stringify(error),
+          message: [error],
           useremail: socket.user.email
         }
       });

server/cdk/cdk-wsdl.js

@@ -20,7 +20,7 @@ function CheckCdkResponseForError(socket, soapResponse) {
     //The response was null, this might be ok, it might not.
     CdkBase.createLogEvent(
       socket,
-      "warn",
+      "WARNING",
       `Warning detected in CDK Response - it appears to be null. Stack: ${new Error().stack}`
     );
     return;

server/data/chatter.js

@@ -160,8 +160,7 @@ async function getPrivateKey() {
   try {
     const { SecretString, SecretBinary } = await client.send(command);
     if (SecretString || SecretBinary) logger.log("chatter-retrieved-private-key", "DEBUG", "api", null, null);
-    const chatterPrivateKey = SecretString ? JSON.parse(SecretString) : JSON.parse(Buffer.from(SecretBinary, "base64").toString("ascii"));
-    return chatterPrivateKey.private_key;
+    return SecretString || Buffer.from(SecretBinary, "base64").toString("ascii");
   } catch (error) {
     logger.log("chatter-get-private-key", "ERROR", "api", null, error);
     throw err;

server/job/job-lifecycle.js

@@ -78,20 +78,16 @@ const jobLifecycle = async (req, res) => {
   Object.keys(flatGroupedAllDurations).forEach((status) => {
     const value = flatGroupedAllDurations[status].reduce((acc, curr) => acc + curr.value, 0);
     const humanReadable = durationToHumanReadable(moment.duration(value));
-    const percentage = finalTotal > 0 ? (value / finalTotal) * 100 : 0;
+    const percentage = (value / finalTotal) * 100;
     const color = getLifecycleStatusColor(status);
     const roundedPercentage = `${Math.round(percentage)}%`;
-    const averageValue = _.size(jobIDs) > 0 ? value / jobIDs.length : 0;
-    const averageHumanReadable = durationToHumanReadable(moment.duration(averageValue));
     finalSummations.push({
       status,
       value,
       humanReadable,
       percentage,
       color,
-      roundedPercentage,
-      averageValue,
-      averageHumanReadable
+      roundedPercentage
     });
   });
 
@@ -104,12 +100,7 @@ const jobLifecycle = async (req, res) => {
       totalStatuses: finalSummations.length,
       total: finalTotal,
       statusCounts: finalStatusCounts,
-      humanReadable: durationToHumanReadable(moment.duration(finalTotal)),
-      averageValue: _.size(jobIDs) > 0 ? finalTotal / jobIDs.length : 0,
-      averageHumanReadable:
-        _.size(jobIDs) > 0
-          ? durationToHumanReadable(moment.duration(finalTotal / jobIDs.length))
-          : durationToHumanReadable(moment.duration(0))
+      humanReadable: durationToHumanReadable(moment.duration(finalTotal))
     }
   });
 };

server/job/job-updated.js

@@ -2,16 +2,8 @@ const { isObject } = require("lodash");
 
 const jobUpdated = async (req, res) => {
   const { ioRedis, logger, ioHelpers } = req;
-  // Old Way
-  if (req?.body?.event?.data?.new || isObject(req?.body?.event?.data?.new)) {
-    const updatedJob = req.body.event.data.new;
-    const bodyshopID = updatedJob.shopid;
-    ioRedis.to(ioHelpers.getBodyshopRoom(bodyshopID)).emit("production-job-updated", updatedJob);
-    return res.json({ message: "Job updated and event emitted" });
-  }
 
-  // New way
-  if (!req?.body?.data || !isObject(req.body.data)) {
+  if (!req?.body?.event?.data?.new || !isObject(req?.body?.event?.data?.new)) {
     logger.log("job-update-error", "ERROR", req.user?.email, null, {
       message: `Malformed Job Update request sent from Hasura`,
       body: req?.body
@@ -23,14 +15,12 @@ const jobUpdated = async (req, res) => {
     });
   }
 
-  // Uncomment for further testing
-  // You can also test this using SocketIOAdmin
-  // logger.log("job-update", "DEBUG", req.user?.email, null, {
-  //   message: `Job updated event received from Hasura`,
-  //   jobid: req?.body?.event?.data?.new?.id
-  // });
+  logger.log("job-update", "DEBUG", req.user?.email, null, {
+    message: `Job updated event received from Hasura`,
+    jobid: req?.body?.event?.data?.new?.id
+  });
 
-  const updatedJob = req.body.data;
+  const updatedJob = req.body.event.data.new;
   const bodyshopID = updatedJob.shopid;
 
   // Emit the job-updated event only to the room corresponding to the bodyshop

server/mixdata/mixdata.js

@@ -59,7 +59,7 @@ exports.mixdataUpload = async (req, res) => {
     res.status(500).json(error);
     logger.log("job-mixdata-upload-error", "ERROR", null, null, {
       error: error.message,
-      stack: error.stack
+      ...error
     });
   }
 };

server/utils/logger.js

@@ -10,18 +10,6 @@ const WinstonCloudWatch = require("winston-cloudwatch");
 const { isString, isEmpty } = require("lodash");
 const { networkInterfaces, hostname } = require("node:os");
 
-const LOG_LEVELS = {
-  error: { level: 0, name: "error" },
-  warn: { level: 1, name: "warn" },
-  info: { level: 2, name: "info" },
-  http: { level: 3, name: "http" },
-  verbose: { level: 4, name: "verbose" },
-  debug: { level: 5, name: "debug" },
-  silly: { level: 6, name: "silly" }
-};
-
-const normalizeLevel = (level) => (level ? level.toLowerCase() : LOG_LEVELS.debug.name);
-
 const createLogger = () => {
   try {
     const isLocal = isString(process.env?.LOCALSTACK_HOSTNAME) && !isEmpty(process.env?.LOCALSTACK_HOSTNAME);
@@ -126,7 +114,7 @@ const createLogger = () => {
 
     const log = (message, type, user, record, meta) => {
       winstonLogger.log({
-        level: normalizeLevel(type),
+        level: type.toLowerCase(),
         message,
         user,
         record,
@@ -143,8 +131,7 @@ const createLogger = () => {
     console.error("Error setting up enhanced Logger, defaulting to console.: " + e?.message || "");
     return {
       log: console.log,
-      logger: console.log,
-      LOG_LEVELS
+      logger: console.log
     };
   }
 };

server/web-sockets/web-socket.js

@@ -212,7 +212,7 @@ function LogLevelHierarchy(level) {
       return 4;
     case "INFO":
       return 3;
-    case "WARN":
+    case "WARNING":
       return 2;
     case "ERROR":
       return 1;