IO-3031 Appointment Schedule View Day

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

.vscode/settings.json

@@ -13,30 +13,13 @@
     "antd",
     "appointmentconfirmation",
     "appt",
-    "autohouse",
-    "autohouseid",
-    "billlines",
     "bodyshop",
-    "bodyshopid",
-    "bodyshops",
-    "CIECA",
-    "claimscorp",
-    "claimscorpid",
-    "Dinero",
-    "driveable",
     "IMEX",
-    "imexshopid",
-    "jobid",
-    "joblines",
-    "Kaizen",
     "labhrs",
     "larhrs",
-    "mixdata",
     "ownr",
     "promanager",
-    "shopname",
     "smartscheduling",
-    "timetickets",
     "touchtime"
   ]
 }

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

@@ -1,4 +1,4 @@
-import { DatePicker } from "antd";
+import { DatePicker, Space, TimePicker } from "antd";
 import PropTypes from "prop-types";
 import React, { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -20,6 +20,7 @@ const DateTimePicker = ({
   onlyFuture,
   onlyToday,
   isDateOnly = false,
+  isSeparatedTime = false,
   bodyshop,
   ...restProps
 }) => {
@@ -87,24 +88,57 @@ const DateTimePicker = ({
 
   return (
     <div onKeyDown={handleKeyDown} id={id} style={{ width: "100%" }}>
-      <DatePicker
-        showTime={
-          isDateOnly
-            ? false
-            : {
-                format: "hh:mm a",
-                minuteStep: 15,
-                defaultValue: dayjs(dayjs(), "HH:mm:ss")
-              }
-        }
-        format={isDateOnly ? "MM/DD/YYYY" : "MM/DD/YYYY hh:mm a"}
-        value={value ? dayjs(value) : null}
-        onChange={handleChange}
-        placeholder={isDateOnly ? t("general.labels.date") : t("general.labels.datetime")}
-        onBlur={onBlur || handleBlur}
-        disabledDate={handleDisabledDate}
-        {...restProps}
-      />
+      {isSeparatedTime && (
+        <Space direction="vertical" style={{ width: "100%" }}>
+          <DatePicker
+            showTime={false}
+            format="MM/DD/YYYY"
+            value={value ? dayjs(value) : null}
+            onChange={handleChange}
+            placeholder={t("general.labels.date")}
+            onBlur={handleBlur}
+            disabledDate={handleDisabledDate}
+            isDateOnly={true}
+            {...restProps}
+          />
+          {value && (
+            <TimePicker
+              format="hh:mm a"
+              minuteStep={15}
+              defaultOpenValue={dayjs(value)
+                .hour(dayjs().hour())
+                .minute(Math.floor(dayjs().minute() / 15) * 15)
+                .second(0)}
+              onChange={(value) => {
+                handleChange(value);
+                onBlur();
+              }}
+              placeholder={t("general.labels.time")}
+              {...restProps}
+            />
+          )}
+        </Space>
+      )}
+      {!isSeparatedTime && (
+        <DatePicker
+          showTime={
+            isDateOnly
+              ? false
+              : {
+                  format: "hh:mm a",
+                  minuteStep: 15,
+                  defaultValue: dayjs(dayjs(), "HH:mm:ss")
+                }
+          }
+          format={isDateOnly ? "MM/DD/YYYY" : "MM/DD/YYYY hh:mm a"}
+          value={value ? dayjs(value) : null}
+          onChange={handleChange}
+          placeholder={isDateOnly ? t("general.labels.date") : t("general.labels.datetime")}
+          onBlur={onBlur || handleBlur}
+          disabledDate={handleDisabledDate}
+          {...restProps}
+        />
+      )}
     </div>
   );
 };
@@ -116,7 +150,8 @@ DateTimePicker.propTypes = {
   id: PropTypes.string,
   onlyFuture: PropTypes.bool,
   onlyToday: PropTypes.bool,
-  isDateOnly: PropTypes.bool
+  isDateOnly: PropTypes.bool,
+  isSeparatedTime: PropTypes.bool
 };
 
 export default connect(mapStateToProps, null)(DateTimePicker);

client/src/components/schedule-job-modal/schedule-job-modal.component.jsx

@@ -1,6 +1,5 @@
 import { Button, Col, Form, Input, Row, Select, Space, Switch, Typography } from "antd";
 import axios from "axios";
-import dayjs from "../../utils/day";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -8,13 +7,14 @@ import { createStructuredSelector } from "reselect";
 import { calculateScheduleLoad } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateFormatter } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import EmailInput from "../form-items-formatted/email-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import ScheduleDayViewContainer from "../schedule-day-view/schedule-day-view.container";
 import ScheduleExistingAppointmentsList from "../schedule-existing-appointments-list/schedule-existing-appointments-list.component";
 import "./schedule-job-modal.scss";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -84,7 +84,7 @@ export function ScheduleJobModalComponent({
               }
             ]}
           >
-            <DateTimePicker onBlur={handleDateBlur} onlyFuture />
+            <DateTimePicker onBlur={handleDateBlur} onlyFuture isSeparatedTime />
           </Form.Item>
           <Form.Item
             name="scheduled_completion"

client/src/translations/en_us/common.json

@@ -1254,6 +1254,7 @@
         "sunday": "Sunday",
         "text": "Text",
         "thursday": "Thursday",
+        "time": "Select Time",
         "total": "Total",
         "totals": "Totals",
         "tuesday": "Tuesday",

client/src/translations/es/common.json

@@ -1254,6 +1254,7 @@
         "sunday": "",
         "text": "",
         "thursday": "",
+        "time": "",
         "total": "",
         "totals": "",
         "tuesday": "",

client/src/translations/fr/common.json

@@ -1254,6 +1254,7 @@
         "sunday": "",
         "text": "",
         "thursday": "",
+        "time": "",
         "total": "",
         "totals": "",
         "tuesday": "",

package-lock.json

@@ -53,7 +53,7 @@
         "soap": "^1.1.5",
         "socket.io": "^4.8.0",
         "socket.io-adapter": "^2.5.5",
-        "ssh2-sftp-client": "^11.0.0",
+        "ssh2-sftp-client": "^10.0.3",
         "twilio": "^4.23.0",
         "uuid": "^10.0.0",
         "winston": "^3.15.0",
@@ -7760,17 +7760,16 @@
       }
     },
     "node_modules/ssh2-sftp-client": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-11.0.0.tgz",
-      "integrity": "sha512-lOjgNYtioYquhtgyHwPryFNhllkuENjvCKkUXo18w/Q4UpEffCnEUBfiOTlwFdKIhG1rhrOGnA6DeKPSF2CP6w==",
-      "license": "Apache-2.0",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-10.0.3.tgz",
+      "integrity": "sha512-Wlhasz/OCgrlqC8IlBZhF19Uw/X/dHI8ug4sFQybPE+0sDztvgvDf7Om6o7LbRLe68E7XkFZf3qMnqAvqn1vkQ==",
       "dependencies": {
         "concat-stream": "^2.0.0",
         "promise-retry": "^2.0.1",
         "ssh2": "^1.15.0"
       },
       "engines": {
-        "node": ">=18.20.4"
+        "node": ">=16.20.2"
       },
       "funding": {
         "type": "individual",

package.json

@@ -63,7 +63,7 @@
     "soap": "^1.1.5",
     "socket.io": "^4.8.0",
     "socket.io-adapter": "^2.5.5",
-    "ssh2-sftp-client": "^11.0.0",
+    "ssh2-sftp-client": "^10.0.3",
     "twilio": "^4.23.0",
     "uuid": "^10.0.0",
     "winston": "^3.15.0",

server/data/autohouse.js

@@ -25,15 +25,15 @@ const ftpSetup = {
   port: process.env.AUTOHOUSE_PORT,
   username: process.env.AUTOHOUSE_USER,
   password: process.env.AUTOHOUSE_PASSWORD,
-  debug:
-    process.env.NODE_ENV !== "production"
-      ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
-      : () => {},
+  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
   algorithms: {
     serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
   }
 };
 
+const allxmlsToUpload = [];
+const allErrors = [];
+
 exports.default = async (req, res) => {
   // Only process if in production environment.
   if (process.env.NODE_ENV !== "production") {
@@ -47,21 +47,16 @@ exports.default = async (req, res) => {
   }
 
   // Send immediate response and continue processing.
-  res.status(202).json({
-    success: true,
-    message: "Processing request ...",
-    timestamp: new Date().toISOString()
-  });
+  res.status(200).send();
 
   try {
     logger.log("autohouse-start", "DEBUG", "api", null, null);
-    const allXMLResults = [];
-    const allErrors = [];
-
     const { bodyshops } = await client.request(queries.GET_AUTOHOUSE_SHOPS); //Query for the List of Bodyshop Clients.
     const specificShopIds = req.body.bodyshopIds; // ['uuid];
     const { start, end, skipUpload } = req.body; //YYYY-MM-DD
 
+    const batchSize = 10;
+
     const shopsToProcess =
       specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
     logger.log("autohouse-shopsToProcess-generated", "DEBUG", "api", null, null);
@@ -70,18 +65,27 @@ exports.default = async (req, res) => {
       logger.log("autohouse-shopsToProcess-empty", "DEBUG", "api", null, null);
       return;
     }
+    const batchPromises = [];
+    for (let i = 0; i < shopsToProcess.length; i += batchSize) {
+      const batch = shopsToProcess.slice(i, i + batchSize);
+      const batchPromise = (async () => {
+        await processBatch(batch, start, end);
 
-    await processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors);
-
+        if (skipUpload) {
+          for (const xmlObj of allxmlsToUpload) {
+            fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
+          }
+        } else {
+          await uploadViaSFTP(allxmlsToUpload);
+        }
+      })();
+      batchPromises.push(batchPromise);
+    }
+    await Promise.all(batchPromises);
     await sendServerEmail({
       subject: `Autohouse Report ${moment().format("MM-DD-YY")}`,
       text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
-        allXMLResults.map((x) => ({
-          imexshopid: x.imexshopid,
-          filename: x.filename,
-          count: x.count,
-          result: x.result
-        })),
+        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count, result: x.result })),
         null,
         2
       )}`
@@ -93,8 +97,8 @@ exports.default = async (req, res) => {
   }
 };
 
-async function processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors) {
-  for (const bodyshop of shopsToProcess) {
+async function processBatch(batch, start, end) {
+  for (const bodyshop of batch) {
     const erroredJobs = [];
     try {
       logger.log("autohouse-start-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -124,27 +128,12 @@ async function processShopData(shopsToProcess, start, end, skipUpload, allXMLRes
         });
       }
 
-      const xmlObj = {
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        xml: builder.create({}, autoHouseObject).end({ allowEmptyTags: true }),
-        filename: `IM_${bodyshop.autohouseid}_${moment().format("DDMMYYYY_HHMMss")}.xml`,
-        count: autoHouseObject.AutoHouseExport.RepairOrder.length
-      };
+      const ret = builder.create({}, autoHouseObject).end({ allowEmptyTags: true });
 
-      if (skipUpload) {
-        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
-      } else {
-        await uploadViaSFTP(xmlObj);
-      }
-
-      allXMLResults.push({
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        autohouseid: bodyshop.autohouseid,
-        count: xmlObj.count,
-        filename: xmlObj.filename,
-        result: xmlObj.result
+      allxmlsToUpload.push({
+        count: autoHouseObject.AutoHouseExport.RepairOrder.length,
+        xml: ret,
+        filename: `IM_${bodyshop.autohouseid}_${moment().format("DDMMYYYY_HHMMss")}.xml`
       });
 
       logger.log("autohouse-end-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -157,7 +146,7 @@ async function processShopData(shopsToProcess, start, end, skipUpload, allXMLRes
       allErrors.push({
         bodyshopid: bodyshop.id,
         imexshopid: bodyshop.imexshopid,
-        autohouseid: bodyshop.autohouseid,
+        autuhouseid: bodyshop.autuhouseid,
         fatal: true,
         errors: [error.toString()]
       });
@@ -165,7 +154,7 @@ async function processShopData(shopsToProcess, start, end, skipUpload, allXMLRes
       allErrors.push({
         bodyshopid: bodyshop.id,
         imexshopid: bodyshop.imexshopid,
-        autohouseid: bodyshop.autohouseid,
+        autuhouseid: bodyshop.autuhouseid,
         errors: erroredJobs.map((ej) => ({
           ro_number: ej.job?.ro_number,
           jobid: ej.job?.id,
@@ -176,35 +165,34 @@ async function processShopData(shopsToProcess, start, end, skipUpload, allXMLRes
   }
 }
 
-async function uploadViaSFTP(xmlObj) {
+async function uploadViaSFTP(allxmlsToUpload) {
   const sftp = new Client();
   sftp.on("error", (errors) =>
-    logger.log("autohouse-sftp-connection-error", "ERROR", "api", xmlObj.bodyshopid, {
-      error: errors.message,
-      stack: errors.stack
-    })
+    logger.log("autohouse-sftp-connection-error", "ERROR", "api", null, { error: errors.message, stack: errors.stack })
   );
   try {
     //Connect to the FTP and upload all.
     await sftp.connect(ftpSetup);
 
-    try {
-      xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
-      logger.log("autohouse-sftp-upload", "DEBUG", "api", xmlObj.bodyshopid, {
-        imexshopid: xmlObj.imexshopid,
-        filename: xmlObj.filename,
-        result: xmlObj.result
-      });
-    } catch (error) {
-      logger.log("autohouse-sftp-upload-error", "ERROR", "api", xmlObj.bodyshopid, {
-        filename: xmlObj.filename,
-        error: error.message,
-        stack: error.stack
-      });
-      throw error;
+    for (const xmlObj of allxmlsToUpload) {
+      try {
+        logger.log("autohouse-sftp-upload", "DEBUG", "api", null, { filename: xmlObj.filename });
+        xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
+        logger.log("autohouse-sftp-upload-result", "DEBUG", "api", null, {
+          filename: xmlObj.filename,
+          result: xmlObj.result
+        });
+      } catch (error) {
+        logger.log("autohouse-sftp-upload-error", "ERROR", "api", null, {
+          filename: xmlObj.filename,
+          error: error.message,
+          stack: error.stack
+        });
+        throw error;
+      }
     }
   } catch (error) {
-    logger.log("autohouse-sftp-error", "ERROR", "api", xmlObj.bodyshopid, { error: error.message, stack: error.stack });
+    logger.log("autohouse-sftp-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
     throw error;
   } finally {
     sftp.end();
@@ -621,7 +609,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
     };
     return ret;
   } catch (error) {
-    logger.log("autohouse-job-calculate-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
+    logger.log("autohouse-job-calculate-error", "ERROR", "api", null, {
+      error
+    });
+
     errorCallback({ jobid: job.id, ro_number: job.ro_number, error });
   }
 };

server/data/chatter.js

@@ -17,9 +17,7 @@ const ftpSetup = {
   port: process.env.CHATTER_PORT,
   username: process.env.CHATTER_USER,
   privateKey: null,
-  debug: process.env.NODE_ENV !== "production" 
-    ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
-    : () => {},
+  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
   algorithms: {
     serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
   }
@@ -41,11 +39,7 @@ exports.default = async (req, res) => {
   }
 
   // Send immediate response and continue processing.
-  res.status(202).json({
-    success: true,
-    message: "Processing request ...",
-    timestamp: new Date().toISOString()
-  });
+  res.status(200).send();
 
   try {
     logger.log("chatter-start", "DEBUG", "api", null, null);
@@ -182,8 +176,9 @@ async function uploadViaSFTP(allcsvsToUpload) {
 
     for (const csvObj of allcsvsToUpload) {
       try {
+        logger.log("chatter-sftp-upload", "DEBUG", "api", null, { filename: csvObj.filename });
         csvObj.result = await sftp.put(Buffer.from(csvObj.csv), `${csvObj.filename}`);
-        logger.log("chatter-sftp-upload", "DEBUG", "api", null, {
+        logger.log("chatter-sftp-upload-result", "DEBUG", "api", null, {
           filename: csvObj.filename,
           result: csvObj.result
         });

server/data/claimscorp.js

@@ -24,12 +24,9 @@ const ftpSetup = {
   port: process.env.CLAIMSCORP_PORT,
   username: process.env.CLAIMSCORP_USER,
   password: process.env.CLAIMSCORP_PASSWORD,
-  debug:
-    process.env.NODE_ENV !== "production"
-      ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
-      : () => {},
+  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
   algorithms: {
-    serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
+    serverHostKey: ["ssh-rsa", "ssh-dss"]
   }
 };
 
@@ -39,183 +36,164 @@ exports.default = async (req, res) => {
     res.sendStatus(403);
     return;
   }
-  // Only process if the appropriate token is provided.
+
+  //Query for the List of Bodyshop Clients.
+  logger.log("claimscorp-start", "DEBUG", "api", null, null);
+  const { bodyshops } = await client.request(queries.GET_CLAIMSCORP_SHOPS);
+
+  const specificShopIds = req.body.bodyshopIds; // ['uuid]
+  const { start, end, skipUpload } = req.body; //YYYY-MM-DD
   if (req.headers["x-imex-auth"] !== process.env.AUTOHOUSE_AUTH_TOKEN) {
     res.sendStatus(401);
     return;
   }
-
-  // Send immediate response and continue processing.
-  res.status(202).json({
-    success: true,
-    message: "Processing request ...",
-    timestamp: new Date().toISOString()
-  });
-
+  const allxmlsToUpload = [];
+  const allErrors = [];
   try {
-    logger.log("claimscorp-start", "DEBUG", "api", null, null);
-    const allXMLResults = [];
-    const allErrors = [];
-
-    const { bodyshops } = await client.request(queries.GET_CLAIMSCORP_SHOPS); //Query for the List of Bodyshop Clients.
-    const specificShopIds = req.body.bodyshopIds; // ['uuid];
-    const { start, end, skipUpload } = req.body; //YYYY-MM-DD
-
-    const shopsToProcess =
-      specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
-    logger.log("claimscorp-shopsToProcess-generated", "DEBUG", "api", null, null);
-
-    if (shopsToProcess.length === 0) {
-      logger.log("claimscorp-shopsToProcess-empty", "DEBUG", "api", null, null);
-      return;
-    }
-
-    await processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors);
-
-    await sendServerEmail({
-      subject: `ClaimsCorp Report ${moment().format("MM-DD-YY")}`,
-      text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
-        allXMLResults.map((x) => ({
-          imexshopid: x.imexshopid,
-          filename: x.filename,
-          count: x.count,
-          result: x.result
-        })),
-        null,
-        2
-      )}`
-    });
-
-    logger.log("claimscorp-end", "DEBUG", "api", null, null);
-  } catch (error) {
-    logger.log("claimscorp-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
-  }
-};
-
-async function processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors) {
-  for (const bodyshop of shopsToProcess) {
-    const erroredJobs = [];
-    try {
+    for (const bodyshop of specificShopIds ? bodyshops.filter((b) => specificShopIds.includes(b.id)) : bodyshops) {
       logger.log("claimscorp-start-shop-extract", "DEBUG", "api", bodyshop.id, {
         shopname: bodyshop.shopname
       });
+      const erroredJobs = [];
+      try {
+        const { jobs, bodyshops_by_pk } = await client.request(queries.CLAIMSCORP_QUERY, {
+          bodyshopid: bodyshop.id,
+          start: start ? moment(start).startOf("day") : moment().subtract(5, "days").startOf("day"),
+          ...(end && { end: moment(end).endOf("day") })
+        });
 
-      const { jobs, bodyshops_by_pk } = await client.request(queries.CLAIMSCORP_QUERY, {
-        bodyshopid: bodyshop.id,
-        start: start ? moment(start).startOf("day") : moment().subtract(5, "days").startOf("day"),
-        ...(end && { end: moment(end).endOf("day") })
-      });
-
-      const claimsCorpObject = {
-        DataFeed: {
-          ShopInfo: {
-            ShopID: bodyshops_by_pk.claimscorpid,
-            ShopName: bodyshops_by_pk.shopname,
-            RO: jobs.map((j) =>
-              CreateRepairOrderTag({ ...j, bodyshop: bodyshops_by_pk }, function ({ job, error }) {
-                erroredJobs.push({ job: job, error: error.toString() });
-              })
-            )
+        const claimsCorpObject = {
+          DataFeed: {
+            ShopInfo: {
+              ShopID: bodyshops_by_pk.claimscorpid,
+              ShopName: bodyshops_by_pk.shopname,
+              RO: jobs.map((j) =>
+                CreateRepairOrderTag({ ...j, bodyshop: bodyshops_by_pk }, function ({ job, error }) {
+                  erroredJobs.push({ job: job, error: error.toString() });
+                })
+              )
+            }
           }
-        }
-      };
+        };
 
-      if (erroredJobs.length > 0) {
-        logger.log("claimscorp-failed-jobs", "ERROR", "api", bodyshop.id, {
-          count: erroredJobs.length,
-          jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
+        if (erroredJobs.length > 0) {
+          logger.log("claimscorp-failed-jobs", "ERROR", "api", bodyshop.id, {
+            count: erroredJobs.length,
+            jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
+          });
+        }
+
+        var ret = builder
+          .create(
+            {
+              // version: "1.0",
+              // encoding: "UTF-8",
+              //keepNullNodes: true,
+            },
+            claimsCorpObject
+          )
+          .end({ allowEmptyTags: true });
+
+        allxmlsToUpload.push({
+          count: claimsCorpObject.DataFeed.ShopInfo.RO.length,
+          xml: ret,
+          filename: `${bodyshop.claimscorpid}-${moment().format("YYYYMMDDTHHMMss")}.xml`
+        });
+
+        logger.log("claimscorp-end-shop-extract", "DEBUG", "api", bodyshop.id, {
+          shopname: bodyshop.shopname
+        });
+      } catch (error) {
+        //Error at the shop level.
+        logger.log("claimscorp-error-shop", "ERROR", "api", bodyshop.id, {
+          ...error
+        });
+
+        allErrors.push({
+          bodyshopid: bodyshop.id,
+          imexshopid: bodyshop.imexshopid,
+          claimscorpid: bodyshop.claimscorpid,
+          fatal: true,
+          errors: [error.toString()]
+        });
+      } finally {
+        allErrors.push({
+          bodyshopid: bodyshop.id,
+          imexshopid: bodyshop.imexshopid,
+          claimscorpid: bodyshop.claimscorpid,
+          errors: erroredJobs.map((ej) => ({
+            ro_number: ej.job?.ro_number,
+            jobid: ej.job?.id,
+            error: ej.error
+          }))
+        });
+      }
+    }
+
+    if (skipUpload) {
+      for (const xmlObj of allxmlsToUpload) {
+        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
+      }
+
+      res.json(allxmlsToUpload);
+      sendServerEmail({
+        subject: `ClaimsCorp Report ${moment().format("MM-DD-YY")}`,
+        text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
+      Uploaded: ${JSON.stringify(
+        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
+        null,
+        2
+      )}
+      `
+      });
+      return;
+    }
+
+    let sftp = new Client();
+    sftp.on("error", (errors) =>
+      logger.log("claimscorp-sftp-error", "ERROR", "api", null, {
+        ...errors
+      })
+    );
+    try {
+      //Connect to the FTP and upload all.
+
+      await sftp.connect(ftpSetup);
+
+      for (const xmlObj of allxmlsToUpload) {
+        logger.log("claimscorp-sftp-upload", "DEBUG", "api", null, {
+          filename: xmlObj.filename
+        });
+
+        const uploadResult = await sftp.put(Buffer.from(xmlObj.xml), `/${xmlObj.filename}`);
+        logger.log("claimscorp-sftp-upload-result", "DEBUG", "api", null, {
+          uploadResult
         });
       }
 
-      const xmlObj = {
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        xml: builder.create({}, claimsCorpObject).end({ allowEmptyTags: true }),
-        filename: `${bodyshop.claimscorpid}-${moment().format("YYYYMMDDTHHMMss")}.xml`,
-        count: claimsCorpObject.DataFeed.ShopInfo.RO.length
-      };
-
-      if (skipUpload) {
-        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
-      } else {
-        await uploadViaSFTP(xmlObj);
-      }
-
-      allXMLResults.push({
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        claimscorpid: bodyshop.claimscorpid,
-        count: xmlObj.count,
-        filename: xmlObj.filename,
-        result: xmlObj.result
-      });
-
-      logger.log("claimscorp-end-shop-extract", "DEBUG", "api", bodyshop.id, {
-        shopname: bodyshop.shopname
-      });
+      //***TODO  Change filing naming when creating the cron job. IM_ShopInternalName_DDMMYYYY_HHMMSS.xml
     } catch (error) {
-      //Error at the shop level.
-      logger.log("claimscorp-error-shop", "ERROR", "api", bodyshop.id, { error: error.message, stack: error.stack });
-
-      allErrors.push({
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        claimscorpid: bodyshop.claimscorpid,
-        fatal: true,
-        errors: [error.toString()]
+      logger.log("claimscorp-sftp-error", "ERROR", "api", null, {
+        ...error
       });
     } finally {
-      allErrors.push({
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        claimscorpid: bodyshop.claimscorpid,
-        errors: erroredJobs.map((ej) => ({
-          ro_number: ej.job?.ro_number,
-          jobid: ej.job?.id,
-          error: ej.error
-        }))
-      });
+      sftp.end();
     }
-  }
-}
-
-async function uploadViaSFTP(xmlObj) {
-  const sftp = new Client();
-  sftp.on("error", (errors) =>
-    logger.log("claimscorp-sftp-connection-error", "ERROR", "api", xmlObj.bodyshopid, {
-      error: errors.message,
-      stack: errors.stack
-    })
-  );
-  try {
-    //Connect to the FTP and upload all.
-    await sftp.connect(ftpSetup);
-
-    try {
-      xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
-      logger.log("claimscorp-sftp-upload", "DEBUG", "api", xmlObj.bodyshopid, {
-        imexshopid: xmlObj.imexshopid,
-        filename: xmlObj.filename,
-        result: xmlObj.result
-      });
-    } catch (error) {
-      logger.log("claimscorp-sftp-upload-error", "ERROR", "api", xmlObj.bodyshopid, {
-        filename: xmlObj.filename,
-        error: error.message,
-        stack: error.stack
-      });
-      throw error;
-    }
-  } catch (error) {
-    logger.log("claimscorp-sftp-error", "ERROR", "api", xmlObj.bodyshopid, {
-      error: error.message,
-      stack: error.stack
+    sendServerEmail({
+      subject: `ClaimsCorp Report ${moment().format("MM-DD-YY")}`,
+      text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
+      Uploaded: ${JSON.stringify(
+        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
+        null,
+        2
+      )}
+      `
     });
-    throw error;
-  } finally {
-    sftp.end();
+    res.sendStatus(200);
+  } catch (error) {
+    res.status(200).json(error);
   }
-}
+};
 
 const CreateRepairOrderTag = (job, errorCallback) => {
   //Level 2
@@ -467,7 +445,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
     };
     return ret;
   } catch (error) {
-    logger.log("claimscorp-job-calculate-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
+    logger.log("claimscorp-job-calculate-error", "ERROR", "api", null, {
+      error
+    });
+
     errorCallback({ jobid: job.id, ro_number: job.ro_number, error });
   }
 };

server/data/kaizen.js

@@ -16,17 +16,15 @@ const { sendServerEmail } = require("../email/sendemail");
 const DineroFormat = "0,0.00";
 const DateFormat = "MM/DD/YYYY";
 
-const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE", "SHAW"];
+const repairOpCodes = ["OP4", "OP9", "OP10"];
+const replaceOpCodes = ["OP2", "OP5", "OP11", "OP12"];
 
 const ftpSetup = {
   host: process.env.KAIZEN_HOST,
   port: process.env.KAIZEN_PORT,
   username: process.env.KAIZEN_USER,
   password: process.env.KAIZEN_PASSWORD,
-  debug:
-    process.env.NODE_ENV !== "production"
-      ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
-      : () => {},
+  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
   algorithms: {
     serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
   }
@@ -38,178 +36,167 @@ exports.default = async (req, res) => {
     res.sendStatus(403);
     return;
   }
-  // Only process if the appropriate token is provided.
+
+  //Query for the List of Bodyshop Clients.
+  logger.log("kaizen-start", "DEBUG", "api", null, null);
+  const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE", "SHAW"];
+
+  const { bodyshops } = await client.request(queries.GET_KAIZEN_SHOPS, {
+    imexshopid: kaizenShopsIDs
+  });
+
+  const specificShopIds = req.body.bodyshopIds; // ['uuid]
+  const { start, end, skipUpload } = req.body; //YYYY-MM-DD
   if (req.headers["x-imex-auth"] !== process.env.AUTOHOUSE_AUTH_TOKEN) {
     res.sendStatus(401);
     return;
   }
-
-  // Send immediate response and continue processing.
-  res.status(202).json({
-    success: true,
-    message: "Processing request ...",
-    timestamp: new Date().toISOString()
-  });
-
+  const allxmlsToUpload = [];
+  const allErrors = [];
   try {
-    logger.log("kaizen-start", "DEBUG", "api", null, null);
-    const allXMLResults = [];
-    const allErrors = [];
-
-    const { bodyshops } = await client.request(queries.GET_KAIZEN_SHOPS, { imexshopid: kaizenShopsIDs }); //Query for the List of Bodyshop Clients.
-    const specificShopIds = req.body.bodyshopIds; // ['uuid];
-    const { start, end, skipUpload } = req.body; //YYYY-MM-DD
-
-    const shopsToProcess =
-      specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
-    logger.log("kaizen-shopsToProcess-generated", "DEBUG", "api", null, null);
-
-    if (shopsToProcess.length === 0) {
-      logger.log("kaizen-shopsToProcess-empty", "DEBUG", "api", null, null);
-      return;
-    }
-
-    await processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors);
-
-    await sendServerEmail({
-      subject: `Kaizen Report ${moment().format("MM-DD-YY")}`,
-      text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
-        allXMLResults.map((x) => ({
-          imexshopid: x.imexshopid,
-          filename: x.filename,
-          count: x.count,
-          result: x.result
-        })),
-        null,
-        2
-      )}`
-    });
-
-    logger.log("kaizen-end", "DEBUG", "api", null, null);
-  } catch (error) {
-    logger.log("kaizen-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
-  }
-};
-
-async function processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors) {
-  for (const bodyshop of shopsToProcess) {
-    const erroredJobs = [];
-    try {
+    for (const bodyshop of specificShopIds ? bodyshops.filter((b) => specificShopIds.includes(b.id)) : bodyshops) {
       logger.log("kaizen-start-shop-extract", "DEBUG", "api", bodyshop.id, {
         shopname: bodyshop.shopname
       });
+      const erroredJobs = [];
+      try {
+        const { jobs, bodyshops_by_pk } = await client.request(queries.KAIZEN_QUERY, {
+          bodyshopid: bodyshop.id,
+          start: start ? moment(start).startOf("day") : moment().subtract(5, "days").startOf("day"),
+          ...(end && { end: moment(end).endOf("day") })
+        });
 
-      const { jobs, bodyshops_by_pk } = await client.request(queries.KAIZEN_QUERY, {
-        bodyshopid: bodyshop.id,
-        start: start ? moment(start).startOf("day") : moment().subtract(5, "days").startOf("day"),
-        ...(end && { end: moment(end).endOf("day") })
-      });
-
-      const kaizenObject = {
-        DataFeed: {
-          ShopInfo: {
-            ShopName: bodyshops_by_pk.shopname,
-            Jobs: jobs.map((j) =>
-              CreateRepairOrderTag({ ...j, bodyshop: bodyshops_by_pk }, function ({ job, error }) {
-                erroredJobs.push({ job: job, error: error.toString() });
-              })
-            )
+        const kaizenObject = {
+          DataFeed: {
+            ShopInfo: {
+              ShopName: bodyshops_by_pk.shopname,
+              Jobs: jobs.map((j) =>
+                CreateRepairOrderTag({ ...j, bodyshop: bodyshops_by_pk }, function ({ job, error }) {
+                  erroredJobs.push({ job: job, error: error.toString() });
+                })
+              )
+            }
           }
-        }
-      };
+        };
 
-      if (erroredJobs.length > 0) {
-        logger.log("kaizen-failed-jobs", "ERROR", "api", bodyshop.id, {
-          count: erroredJobs.length,
-          jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
+        if (erroredJobs.length > 0) {
+          logger.log("kaizen-failed-jobs", "ERROR", "api", bodyshop.id, {
+            count: erroredJobs.length,
+            jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
+          });
+        }
+
+        var ret = builder
+          .create(
+            {
+              // version: "1.0",
+              // encoding: "UTF-8",
+              //keepNullNodes: true,
+            },
+            kaizenObject
+          )
+          .end({ allowEmptyTags: true });
+
+        allxmlsToUpload.push({
+          count: kaizenObject.DataFeed.ShopInfo.Jobs.length,
+          xml: ret,
+          filename: `${bodyshop.shopname}-${moment().format("YYYYMMDDTHHMMss")}.xml`
+        });
+
+        logger.log("kaizen-end-shop-extract", "DEBUG", "api", bodyshop.id, {
+          shopname: bodyshop.shopname
+        });
+      } catch (error) {
+        //Error at the shop level.
+        logger.log("kaizen-error-shop", "ERROR", "api", bodyshop.id, {
+          ...error
+        });
+
+        allErrors.push({
+          bodyshopid: bodyshop.id,
+          imexshopid: bodyshop.imexshopid,
+          shopname: bodyshop.shopname,
+          fatal: true,
+          errors: [error.toString()]
+        });
+      } finally {
+        allErrors.push({
+          bodyshopid: bodyshop.id,
+          imexshopid: bodyshop.imexshopid,
+          shopname: bodyshop.shopname,
+          errors: erroredJobs.map((ej) => ({
+            ro_number: ej.job?.ro_number,
+            jobid: ej.job?.id,
+            error: ej.error
+          }))
+        });
+      }
+    }
+
+    if (skipUpload) {
+      for (const xmlObj of allxmlsToUpload) {
+        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
+      }
+
+      res.json(allxmlsToUpload);
+      sendServerEmail({
+        subject: `Kaizen Report ${moment().format("MM-DD-YY")}`,
+        text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
+      Uploaded: ${JSON.stringify(
+        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
+        null,
+        2
+      )}
+      `
+      });
+      return;
+    }
+
+    let sftp = new Client();
+    sftp.on("error", (errors) =>
+      logger.log("kaizen-sftp-error", "ERROR", "api", null, {
+        ...errors
+      })
+    );
+    try {
+      //Connect to the FTP and upload all.
+
+      await sftp.connect(ftpSetup);
+
+      for (const xmlObj of allxmlsToUpload) {
+        logger.log("kaizen-sftp-upload", "DEBUG", "api", null, {
+          filename: xmlObj.filename
+        });
+
+        const uploadResult = await sftp.put(Buffer.from(xmlObj.xml), `/${xmlObj.filename}`);
+        logger.log("kaizen-sftp-upload-result", "DEBUG", "api", null, {
+          uploadResult
         });
       }
 
-      const xmlObj = {
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        xml: builder.create({}, kaizenObject).end({ allowEmptyTags: true }),
-        filename: `${bodyshop.shopname}-${moment().format("YYYYMMDDTHHMMss")}.xml`,
-        count: kaizenObject.DataFeed.ShopInfo.Jobs.length
-      };
-
-      if (skipUpload) {
-        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
-      } else {
-        await uploadViaSFTP(xmlObj);
-      }
-
-      allXMLResults.push({
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        count: xmlObj.count,
-        filename: xmlObj.filename,
-        result: xmlObj.result
-      });
-
-      logger.log("kaizen-end-shop-extract", "DEBUG", "api", bodyshop.id, {
-        shopname: bodyshop.shopname
-      });
+      //***TODO  Change filing naming when creating the cron job. IM_ShopInternalName_DDMMYYYY_HHMMSS.xml
     } catch (error) {
-      //Error at the shop level.
-      logger.log("kaizen-error-shop", "ERROR", "api", bodyshop.id, { error: error.message, stack: error.stack });
-
-      allErrors.push({
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        shopname: bodyshop.shopname,
-        fatal: true,
-        errors: [error.toString()]
+      logger.log("kaizen-sftp-error", "ERROR", "api", null, {
+        ...error
       });
     } finally {
-      allErrors.push({
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        shopname: bodyshop.shopname,
-        errors: erroredJobs.map((ej) => ({
-          ro_number: ej.job?.ro_number,
-          jobid: ej.job?.id,
-          error: ej.error
-        }))
-      });
-    }
-  }
-}
-
-async function uploadViaSFTP(xmlObj) {
-  const sftp = new Client();
-  sftp.on("error", (errors) =>
-    logger.log("kaizen-sftp-connection-error", "ERROR", "api", xmlObj.bodyshopid, {
-      error: errors.message,
-      stack: errors.stack
-    })
-  );
-  try {
-    //Connect to the FTP and upload all.
-    await sftp.connect(ftpSetup);
-
-    try {
-      xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
-      logger.log("kaizen-sftp-upload", "DEBUG", "api", xmlObj.bodyshopid, {
-        imexshopid: xmlObj.imexshopid,
-        filename: xmlObj.filename,
-        result: xmlObj.result
-      });
-    } catch (error) {
-      logger.log("kaizen-sftp-upload-error", "ERROR", "api", xmlObj.bodyshopid, {
-        filename: xmlObj.filename,
-        error: error.message,
-        stack: error.stack
-      });
-      throw error;
+      sftp.end();
     }
+    sendServerEmail({
+      subject: `Kaizen Report ${moment().format("MM-DD-YY")}`,
+      text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
+      Uploaded: ${JSON.stringify(
+        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
+        null,
+        2
+      )}
+      `
+    });
+    res.sendStatus(200);
   } catch (error) {
-    logger.log("kaizen-sftp-error", "ERROR", "api", xmlObj.bodyshopid, { error: error.message, stack: error.stack });
-    throw error;
-  } finally {
-    sftp.end();
+    res.status(200).json(error);
   }
-}
+};
 
 const CreateRepairOrderTag = (job, errorCallback) => {
   //Level 2
@@ -433,7 +420,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
     };
     return ret;
   } catch (error) {
-    logger.log("kaizen-job-calculate-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
+    logger.log("kaizen-job-calculate-error", "ERROR", "api", null, {
+      error
+    });
+
     errorCallback({ jobid: job.id, ro_number: job.ro_number, error });
   }
 };