feature/IO-3017-Lifecycle-Average-Time - Small fixes

Signed-off-by: Dave Richer <dave@imexsystems.ca>

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

@@ -1,10 +1,10 @@
 import { Card, Table, Tag } from "antd";
-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";
+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 DashboardRefreshRequired from "../refresh-required.component";
 
 const fortyFiveDaysAgo = () => dayjs().subtract(45, "day").toLocaleString();
 
@@ -46,6 +46,11 @@ 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/translations/en_us/common.json

@@ -1338,6 +1338,8 @@
     },
     "job_lifecycle": {
       "columns": {
+        "average_human_readable": "Average Human Readable",
+        "average_value": "Average Value",
         "duration": "Duration",
         "end": "End",
         "human_readable": "Human Readable",

client/src/translations/es/common.json

@@ -1338,6 +1338,8 @@
     },
     "job_lifecycle": {
       "columns": {
+        "average_human_readable": "",
+        "average_value": "",
         "duration": "",
         "end": "",
         "human_readable": "",

client/src/translations/fr/common.json

@@ -1338,6 +1338,8 @@
     },
     "job_lifecycle": {
       "columns": {
+        "average_human_readable": "",
+        "average_value": "",
         "duration": "",
         "end": "",
         "human_readable": "",

server/data/autohouse.js

@@ -13,7 +13,6 @@ let Client = require("ssh2-sftp-client");
 
 const client = require("../graphql-client/graphql-client").client;
 const { sendServerEmail } = require("../email/sendemail");
-
 const AHDineroFormat = "0.00";
 const AhDateFormat = "MMDDYYYY";
 
@@ -27,177 +26,170 @@ const ftpSetup = {
   password: process.env.AUTOHOUSE_PASSWORD,
   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"]
   }
 };
 
-const allxmlsToUpload = [];
-const allErrors = [];
-
 exports.default = async (req, res) => {
   // Only process if in production environment.
   if (process.env.NODE_ENV !== "production") {
     res.sendStatus(403);
     return;
   }
-  // Only process if the appropriate token is provided.
+
+  //Query for the List of Bodyshop Clients.
+  logger.log("autohouse-start", "DEBUG", "api", null, null);
+  const { bodyshops } = await client.request(queries.GET_AUTOHOUSE_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(200).send();
-
+  const allxmlsToUpload = [];
+  const allErrors = [];
   try {
-    logger.log("autohouse-start", "DEBUG", "api", null, null);
-    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);
-
-    if (shopsToProcess.length === 0) {
-      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);
-
-        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(
-        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count, result: x.result })),
-        null,
-        2
-      )}`
-    });
-
-    logger.log("autohouse-end", "DEBUG", "api", null, null);
-  } catch (error) {
-    logger.log("autohouse-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
-  }
-};
-
-async function processBatch(batch, start, end) {
-  for (const bodyshop of batch) {
-    const erroredJobs = [];
-    try {
+    for (const bodyshop of specificShopIds ? bodyshops.filter((b) => specificShopIds.includes(b.id)) : bodyshops) {
       logger.log("autohouse-start-shop-extract", "DEBUG", "api", bodyshop.id, {
         shopname: bodyshop.shopname
       });
-
-      const { jobs, bodyshops_by_pk } = await client.request(queries.AUTOHOUSE_QUERY, {
-        bodyshopid: bodyshop.id,
-        start: start ? moment(start).startOf("day") : moment().subtract(5, "days").startOf("day"),
-        ...(end && { end: moment(end).endOf("day") })
-      });
-
-      const autoHouseObject = {
-        AutoHouseExport: {
-          RepairOrder: 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("autohouse-failed-jobs", "ERROR", "api", bodyshop.id, {
-          count: erroredJobs.length,
-          jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
-        });
-      }
-
-      const ret = builder.create({}, autoHouseObject).end({ allowEmptyTags: true });
-
-      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, {
-        shopname: bodyshop.shopname
-      });
-    } catch (error) {
-      //Error at the shop level.
-      logger.log("autohouse-error-shop", "ERROR", "api", bodyshop.id, { error: error.message, stack: error.stack });
-
-      allErrors.push({
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        autuhouseid: bodyshop.autuhouseid,
-        fatal: true,
-        errors: [error.toString()]
-      });
-    } finally {
-      allErrors.push({
-        bodyshopid: bodyshop.id,
-        imexshopid: bodyshop.imexshopid,
-        autuhouseid: bodyshop.autuhouseid,
-        errors: erroredJobs.map((ej) => ({
-          ro_number: ej.job?.ro_number,
-          jobid: ej.job?.id,
-          error: ej.error
-        }))
-      });
-    }
-  }
-}
-
-async function uploadViaSFTP(allxmlsToUpload) {
-  const sftp = new Client();
-  sftp.on("error", (errors) =>
-    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);
-
-    for (const xmlObj of allxmlsToUpload) {
+      const erroredJobs = [];
       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
+        const { jobs, bodyshops_by_pk } = await client.request(queries.AUTOHOUSE_QUERY, {
+          bodyshopid: bodyshop.id,
+          start: start ? moment(start).startOf("day") : moment().subtract(5, "days").startOf("day"),
+          ...(end && { end: moment(end).endOf("day") })
+        });
+
+        const autoHouseObject = {
+          AutoHouseExport: {
+            RepairOrder: 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("autohouse-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,
+            },
+            autoHouseObject
+          )
+          .end({ allowEmptyTags: true });
+
+        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, {
+          shopname: bodyshop.shopname
         });
       } catch (error) {
-        logger.log("autohouse-sftp-upload-error", "ERROR", "api", null, {
-          filename: xmlObj.filename,
-          error: error.message,
-          stack: error.stack
+        //Error at the shop level.
+        logger.log("autohouse-error-shop", "ERROR", "api", bodyshop.id, {
+          ...error
+        });
+
+        allErrors.push({
+          bodyshopid: bodyshop.id,
+          imexshopid: bodyshop.imexshopid,
+          autuhouseid: bodyshop.autuhouseid,
+          fatal: true,
+          errors: [error.toString()]
+        });
+      } finally {
+        allErrors.push({
+          bodyshopid: bodyshop.id,
+          imexshopid: bodyshop.imexshopid,
+          autohouseid: bodyshop.autohouseid,
+          errors: erroredJobs.map((ej) => ({
+            ro_number: ej.job?.ro_number,
+            jobid: ej.job?.id,
+            error: ej.error
+          }))
         });
-        throw error;
       }
     }
+
+    if (skipUpload) {
+      for (const xmlObj of allxmlsToUpload) {
+        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
+      }
+
+      res.json(allxmlsToUpload);
+      sendServerEmail({
+        subject: `Autohouse 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("autohouse-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("autohouse-sftp-upload", "DEBUG", "api", null, {
+          filename: xmlObj.filename
+        });
+
+        const uploadResult = await sftp.put(Buffer.from(xmlObj.xml), `/${xmlObj.filename}`);
+        logger.log("autohouse-sftp-upload-result", "DEBUG", "api", null, {
+          uploadResult
+        });
+      }
+
+      //***TODO  Change filing naming when creating the cron job. IM_ShopInternalName_DDMMYYYY_HHMMSS.xml
+    } catch (error) {
+      logger.log("autohouse-sftp-error", "ERROR", "api", null, {
+        ...error
+      });
+    } finally {
+      sftp.end();
+    }
+    sendServerEmail({
+      subject: `Autohouse 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("autohouse-sftp-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
-    throw error;
-  } finally {
-    sftp.end();
+    res.status(200).json(error);
   }
-}
+};
 
 const CreateRepairOrderTag = (job, errorCallback) => {
   //Level 2
@@ -295,8 +287,8 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         InsuranceCo: job.ins_co_nm || "",
         CompanyName: job.ins_co_nm || "",
         Address: job.ins_addr1 || "",
-        City: job.ins_city || "",
-        State: job.ins_st || "",
+        City: job.ins_addr1 || "",
+        State: job.ins_city || "",
         Zip: job.ins_zip || "",
         Phone: job.ins_ph1 || "",
         Fax: job.ins_fax || "",

server/job/job-lifecycle.js

@@ -78,16 +78,20 @@ 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 = (value / finalTotal) * 100;
+    const percentage = finalTotal > 0 ? (value / finalTotal) * 100 : 0;
     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
+      roundedPercentage,
+      averageValue,
+      averageHumanReadable
     });
   });
 
@@ -100,7 +104,12 @@ const jobLifecycle = async (req, res) => {
       totalStatuses: finalSummations.length,
       total: finalTotal,
       statusCounts: finalStatusCounts,
-      humanReadable: durationToHumanReadable(moment.duration(finalTotal))
+      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))
     }
   });
 };