IO-3027 Add in bodyshop.id to logging in SFTP

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

.vscode/settings.json

@@ -8,5 +8,35 @@
       "pattern": "**/IMEX.xml",
       "systemId": "logs/IMEX.xsd"
     }
+  ],
+  "cSpell.words": [
+    "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"
   ]
 }

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": "^10.0.3",
+        "ssh2-sftp-client": "^11.0.0",
         "twilio": "^4.23.0",
         "uuid": "^10.0.0",
         "winston": "^3.15.0",
@@ -7760,16 +7760,17 @@
       }
     },
     "node_modules/ssh2-sftp-client": {
-      "version": "10.0.3",
+      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-10.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-11.0.0.tgz",
-      "integrity": "sha512-Wlhasz/OCgrlqC8IlBZhF19Uw/X/dHI8ug4sFQybPE+0sDztvgvDf7Om6o7LbRLe68E7XkFZf3qMnqAvqn1vkQ==",
+      "integrity": "sha512-lOjgNYtioYquhtgyHwPryFNhllkuENjvCKkUXo18w/Q4UpEffCnEUBfiOTlwFdKIhG1rhrOGnA6DeKPSF2CP6w==",
+      "license": "Apache-2.0",
       "dependencies": {
         "concat-stream": "^2.0.0",
         "promise-retry": "^2.0.1",
         "ssh2": "^1.15.0"
       },
       "engines": {
-        "node": ">=16.20.2"
+        "node": ">=18.20.4"
       },
       "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": "^10.0.3",
+    "ssh2-sftp-client": "^11.0.0",
     "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: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
+  debug:
+    process.env.NODE_ENV !== "production"
+      ? (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,16 +47,21 @@ exports.default = async (req, res) => {
   }
 
   // Send immediate response and continue processing.
-  res.status(200).send();
+  res.status(202).json({
+    success: true,
+    message: "Processing request ...",
+    timestamp: new Date().toISOString()
+  });
 
   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);
@@ -65,27 +70,18 @@ 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);
 
-        if (skipUpload) {
+    await processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors);
-          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 })),
+        allXMLResults.map((x) => ({
+          imexshopid: x.imexshopid,
+          filename: x.filename,
+          count: x.count,
+          result: x.result
+        })),
         null,
         2
       )}`
@@ -97,8 +93,8 @@ exports.default = async (req, res) => {
   }
 };
 
-async function processBatch(batch, start, end) {
+async function processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors) {
-  for (const bodyshop of batch) {
+  for (const bodyshop of shopsToProcess) {
     const erroredJobs = [];
     try {
       logger.log("autohouse-start-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -128,12 +124,27 @@ async function processBatch(batch, start, end) {
         });
       }
 
-      const ret = builder.create({}, autoHouseObject).end({ allowEmptyTags: true });
+      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
+      };
 
-      allxmlsToUpload.push({
+      if (skipUpload) {
-        count: autoHouseObject.AutoHouseExport.RepairOrder.length,
+        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
-        xml: ret,
+      } else {
-        filename: `IM_${bodyshop.autohouseid}_${moment().format("DDMMYYYY_HHMMss")}.xml`
+        await uploadViaSFTP(xmlObj);
+      }
+
+      allXMLResults.push({
+        bodyshopid: bodyshop.id,
+        imexshopid: bodyshop.imexshopid,
+        autohouseid: bodyshop.autohouseid,
+        count: xmlObj.count,
+        filename: xmlObj.filename,
+        result: xmlObj.result
       });
 
       logger.log("autohouse-end-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -146,7 +157,7 @@ async function processBatch(batch, start, end) {
       allErrors.push({
         bodyshopid: bodyshop.id,
         imexshopid: bodyshop.imexshopid,
-        autuhouseid: bodyshop.autuhouseid,
+        autohouseid: bodyshop.autohouseid,
         fatal: true,
         errors: [error.toString()]
       });
@@ -154,7 +165,7 @@ async function processBatch(batch, start, end) {
       allErrors.push({
         bodyshopid: bodyshop.id,
         imexshopid: bodyshop.imexshopid,
-        autuhouseid: bodyshop.autuhouseid,
+        autohouseid: bodyshop.autohouseid,
         errors: erroredJobs.map((ej) => ({
           ro_number: ej.job?.ro_number,
           jobid: ej.job?.id,
@@ -165,34 +176,35 @@ async function processBatch(batch, start, end) {
   }
 }
 
-async function uploadViaSFTP(allxmlsToUpload) {
+async function uploadViaSFTP(xmlObj) {
   const sftp = new Client();
   sftp.on("error", (errors) =>
-    logger.log("autohouse-sftp-connection-error", "ERROR", "api", null, { error: errors.message, stack: errors.stack })
+    logger.log("autohouse-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);
 
-    for (const xmlObj of allxmlsToUpload) {
+    try {
-      try {
+      xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
-        logger.log("autohouse-sftp-upload", "DEBUG", "api", null, { filename: xmlObj.filename });
+      logger.log("autohouse-sftp-upload", "DEBUG", "api", xmlObj.bodyshopid, {
-        xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
+        imexshopid: xmlObj.imexshopid,
-        logger.log("autohouse-sftp-upload-result", "DEBUG", "api", null, {
+        filename: xmlObj.filename,
-          filename: xmlObj.filename,
+        result: xmlObj.result
-          result: xmlObj.result
+      });
-        });
+    } catch (error) {
-      } catch (error) {
+      logger.log("autohouse-sftp-upload-error", "ERROR", "api", xmlObj.bodyshopid, {
-        logger.log("autohouse-sftp-upload-error", "ERROR", "api", null, {
+        filename: xmlObj.filename,
-          filename: xmlObj.filename,
+        error: error.message,
-          error: error.message,
+        stack: error.stack
-          stack: error.stack
+      });
-        });
+      throw error;
-        throw error;
-      }
     }
   } catch (error) {
-    logger.log("autohouse-sftp-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
+    logger.log("autohouse-sftp-error", "ERROR", "api", xmlObj.bodyshopid, { error: error.message, stack: error.stack });
     throw error;
   } finally {
     sftp.end();
@@ -609,10 +621,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
     };
     return ret;
   } catch (error) {
-    logger.log("autohouse-job-calculate-error", "ERROR", "api", null, {
+    logger.log("autohouse-job-calculate-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
-      error
-    });
-
     errorCallback({ jobid: job.id, ro_number: job.ro_number, error });
   }
 };

server/data/chatter.js

@@ -17,7 +17,9 @@ const ftpSetup = {
   port: process.env.CHATTER_PORT,
   username: process.env.CHATTER_USER,
   privateKey: null,
-  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
+  debug: process.env.NODE_ENV !== "production" 
+    ? (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"]
   }
@@ -39,7 +41,11 @@ exports.default = async (req, res) => {
   }
 
   // Send immediate response and continue processing.
-  res.status(200).send();
+  res.status(202).json({
+    success: true,
+    message: "Processing request ...",
+    timestamp: new Date().toISOString()
+  });
 
   try {
     logger.log("chatter-start", "DEBUG", "api", null, null);
@@ -176,9 +182,8 @@ 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-result", "DEBUG", "api", null, {
+        logger.log("chatter-sftp-upload", "DEBUG", "api", null, {
           filename: csvObj.filename,
           result: csvObj.result
         });

server/data/claimscorp.js

@@ -24,9 +24,12 @@ const ftpSetup = {
   port: process.env.CLAIMSCORP_PORT,
   username: process.env.CLAIMSCORP_USER,
   password: process.env.CLAIMSCORP_PASSWORD,
-  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
+  debug:
+    process.env.NODE_ENV !== "production"
+      ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
+      : () => {},
   algorithms: {
-    serverHostKey: ["ssh-rsa", "ssh-dss"]
+    serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
   }
 };
 
@@ -36,164 +39,183 @@ 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;
   }
-  const allxmlsToUpload = [];
+
-  const allErrors = [];
+  // Send immediate response and continue processing.
+  res.status(202).json({
+    success: true,
+    message: "Processing request ...",
+    timestamp: new Date().toISOString()
+  });
+
   try {
-    for (const bodyshop of specificShopIds ? bodyshops.filter((b) => specificShopIds.includes(b.id)) : bodyshops) {
+    logger.log("claimscorp-start", "DEBUG", "api", null, null);
-      logger.log("claimscorp-start-shop-extract", "DEBUG", "api", bodyshop.id, {
+    const allXMLResults = [];
-        shopname: bodyshop.shopname
+    const allErrors = [];
-      });
-      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 claimsCorpObject = {
+    const { bodyshops } = await client.request(queries.GET_CLAIMSCORP_SHOPS); //Query for the List of Bodyshop Clients.
-          DataFeed: {
+    const specificShopIds = req.body.bodyshopIds; // ['uuid];
-            ShopInfo: {
+    const { start, end, skipUpload } = req.body; //YYYY-MM-DD
-              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) {
+    const shopsToProcess =
-          logger.log("claimscorp-failed-jobs", "ERROR", "api", bodyshop.id, {
+      specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
-            count: erroredJobs.length,
+    logger.log("claimscorp-shopsToProcess-generated", "DEBUG", "api", null, null);
-            jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
-          });
-        }
 
-        var ret = builder
+    if (shopsToProcess.length === 0) {
-          .create(
+      logger.log("claimscorp-shopsToProcess-empty", "DEBUG", "api", null, null);
-            {
-              // 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();
+    await processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors);
-    sftp.on("error", (errors) =>
+
-      logger.log("claimscorp-sftp-error", "ERROR", "api", null, {
+    await sendServerEmail({
-        ...errors
+      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 {
-      //Connect to the FTP and upload all.
+      logger.log("claimscorp-start-shop-extract", "DEBUG", "api", bodyshop.id, {
+        shopname: bodyshop.shopname
+      });
 
-      await sftp.connect(ftpSetup);
+      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") })
+      });
 
-      for (const xmlObj of allxmlsToUpload) {
+      const claimsCorpObject = {
-        logger.log("claimscorp-sftp-upload", "DEBUG", "api", null, {
+        DataFeed: {
-          filename: xmlObj.filename
+          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 uploadResult = await sftp.put(Buffer.from(xmlObj.xml), `/${xmlObj.filename}`);
+      if (erroredJobs.length > 0) {
-        logger.log("claimscorp-sftp-upload-result", "DEBUG", "api", null, {
+        logger.log("claimscorp-failed-jobs", "ERROR", "api", bodyshop.id, {
-          uploadResult
+          count: erroredJobs.length,
+          jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
         });
       }
 
-      //***TODO  Change filing naming when creating the cron job. IM_ShopInternalName_DDMMYYYY_HHMMSS.xml
+      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
+      });
     } catch (error) {
-      logger.log("claimscorp-sftp-error", "ERROR", "api", null, {
+      //Error at the shop level.
-        ...error
+      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()]
       });
     } finally {
-      sftp.end();
+      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
+        }))
+      });
     }
-    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
-      )}
-      `
-    });
-    res.sendStatus(200);
-  } catch (error) {
-    res.status(200).json(error);
   }
-};
+}
+
+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
+    });
+    throw error;
+  } finally {
+    sftp.end();
+  }
+}
 
 const CreateRepairOrderTag = (job, errorCallback) => {
   //Level 2
@@ -445,10 +467,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
     };
     return ret;
   } catch (error) {
-    logger.log("claimscorp-job-calculate-error", "ERROR", "api", null, {
+    logger.log("claimscorp-job-calculate-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
-      error
-    });
-
     errorCallback({ jobid: job.id, ro_number: job.ro_number, error });
   }
 };

server/data/kaizen.js

@@ -16,15 +16,17 @@ const { sendServerEmail } = require("../email/sendemail");
 const DineroFormat = "0,0.00";
 const DateFormat = "MM/DD/YYYY";
 
-const repairOpCodes = ["OP4", "OP9", "OP10"];
+const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE", "SHAW"];
-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: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
+  debug:
+    process.env.NODE_ENV !== "production"
+      ? (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"]
   }
@@ -36,167 +38,178 @@ 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;
   }
-  const allxmlsToUpload = [];
+
-  const allErrors = [];
+  // Send immediate response and continue processing.
+  res.status(202).json({
+    success: true,
+    message: "Processing request ...",
+    timestamp: new Date().toISOString()
+  });
+
   try {
-    for (const bodyshop of specificShopIds ? bodyshops.filter((b) => specificShopIds.includes(b.id)) : bodyshops) {
+    logger.log("kaizen-start", "DEBUG", "api", null, null);
-      logger.log("kaizen-start-shop-extract", "DEBUG", "api", bodyshop.id, {
+    const allXMLResults = [];
-        shopname: bodyshop.shopname
+    const allErrors = [];
-      });
-      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 kaizenObject = {
+    const { bodyshops } = await client.request(queries.GET_KAIZEN_SHOPS, { imexshopid: kaizenShopsIDs }); //Query for the List of Bodyshop Clients.
-          DataFeed: {
+    const specificShopIds = req.body.bodyshopIds; // ['uuid];
-            ShopInfo: {
+    const { start, end, skipUpload } = req.body; //YYYY-MM-DD
-              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) {
+    const shopsToProcess =
-          logger.log("kaizen-failed-jobs", "ERROR", "api", bodyshop.id, {
+      specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
-            count: erroredJobs.length,
+    logger.log("kaizen-shopsToProcess-generated", "DEBUG", "api", null, null);
-            jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
-          });
-        }
 
-        var ret = builder
+    if (shopsToProcess.length === 0) {
-          .create(
+      logger.log("kaizen-shopsToProcess-empty", "DEBUG", "api", null, null);
-            {
-              // 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();
+    await processShopData(shopsToProcess, start, end, skipUpload, allXMLResults, allErrors);
-    sftp.on("error", (errors) =>
+
-      logger.log("kaizen-sftp-error", "ERROR", "api", null, {
+    await sendServerEmail({
-        ...errors
+      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 {
-      //Connect to the FTP and upload all.
+      logger.log("kaizen-start-shop-extract", "DEBUG", "api", bodyshop.id, {
+        shopname: bodyshop.shopname
+      });
 
-      await sftp.connect(ftpSetup);
+      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") })
+      });
 
-      for (const xmlObj of allxmlsToUpload) {
+      const kaizenObject = {
-        logger.log("kaizen-sftp-upload", "DEBUG", "api", null, {
+        DataFeed: {
-          filename: xmlObj.filename
+          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 uploadResult = await sftp.put(Buffer.from(xmlObj.xml), `/${xmlObj.filename}`);
+      if (erroredJobs.length > 0) {
-        logger.log("kaizen-sftp-upload-result", "DEBUG", "api", null, {
+        logger.log("kaizen-failed-jobs", "ERROR", "api", bodyshop.id, {
-          uploadResult
+          count: erroredJobs.length,
+          jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
         });
       }
 
-      //***TODO  Change filing naming when creating the cron job. IM_ShopInternalName_DDMMYYYY_HHMMSS.xml
+      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
+      });
     } catch (error) {
-      logger.log("kaizen-sftp-error", "ERROR", "api", null, {
+      //Error at the shop level.
-        ...error
+      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()]
       });
     } finally {
-      sftp.end();
+      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
+        }))
+      });
     }
-    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) {
-    res.status(200).json(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;
+    }
+  } catch (error) {
+    logger.log("kaizen-sftp-error", "ERROR", "api", xmlObj.bodyshopid, { error: error.message, stack: error.stack });
+    throw error;
+  } finally {
+    sftp.end();
+  }
+}
 
 const CreateRepairOrderTag = (job, errorCallback) => {
   //Level 2
@@ -420,10 +433,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
     };
     return ret;
   } catch (error) {
-    logger.log("kaizen-job-calculate-error", "ERROR", "api", null, {
+    logger.log("kaizen-job-calculate-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
-      error
-    });
-
     errorCallback({ jobid: job.id, ro_number: job.ro_number, error });
   }
 };