Merge branch 'master-beta' into master-AIO

server/data/kaizen.js

@@ -193,28 +193,33 @@ exports.default = async (req, res) => {
                 });
             }
 
-            //***TODO  Change filing naming when creating the cron job. IM_ShopInternalName_DDMMYYYY_HHMMSS.xml
-        } catch (error) {
-            logger.log("kaizen-sftp-error", "ERROR", "api", null, {
-                ...error,
-            });
-        } finally {
-            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);
+      //***TODO  Change filing naming when creating the cron job. IM_ShopInternalName_DDMMYYYY_HHMMSS.xml
     } catch (error) {
-        res.status(200).json(error);
+      logger.log("kaizen-sftp-error", "ERROR", "api", null, {
+        ...error,
+      });
+    } finally {
+      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) {
+    res.status(200).json(error);
+        sendServerEmail({
+            subject: `Kaizen Report ${moment().format("MM-DD-YY @ HH:mm:ss")}`,
+            text: `Errors: JSON.stringify(error)}
+      All Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}`,
+        });
+  }
 };
 
 const CreateRepairOrderTag = (job, errorCallback) => {

server/ioevent/ioevent.js

@@ -11,27 +11,40 @@ require("dotenv").config({
 });
 
 exports.default = async (req, res) => {
-    const {operationName, time, dbevent, user, imexshopid} = req.body;
+    const {
+        useremail,
+        bodyshopid,
+        operationName,
+        variables,
+        env,
+        time,
+        dbevent,
+        user,
+    } = req.body;
 
     try {
-        // await client.request(queries.INSERT_IOEVENT, {
-        //   event: {
-        //     operationname: operationName,
-        //     time,
-        //     dbevent,
-        //   },
-        // });
-        console.log("IOEVENT", operationName, time, dbevent, user, imexshopid);
-        logger.log("ioevent", "trace", user, null, {
-            imexshopid,
-            operationName,
-            time,
-            dbevent,
+        await client.request(queries.INSERT_IOEVENT, {
+            event: {
+                operationname: operationName,
+                time,
+                dbevent,
+                env,
+                variables,
+                bodyshopid,
+                useremail,
+            },
         });
-
         res.sendStatus(200);
     } catch (error) {
-        console.log("error", error);
-        res.status(400).send(error);
+        logger.log("ioevent-error", "trace", user, null, {
+            operationname: operationName,
+            time,
+            dbevent,
+            env,
+            variables,
+            bodyshopid,
+            useremail,
+        });
+        res.sendStatus(200);
     }
 };

server/job/job-lifecycle.js

@@ -3,6 +3,7 @@ const queries = require("../graphql-client/queries");
 const moment = require("moment");
 const durationToHumanReadable = require("../utils/durationToHumanReadable");
 const calculateStatusDuration = require("../utils/calculateStatusDuration");
+const getLifecycleStatusColor = require("../utils/getLifecycleStatusColor");
 
 const jobLifecycle = async (req, res) => {
     // Grab the jobids and statuses from the request body
@@ -28,12 +29,12 @@ const jobLifecycle = async (req, res) => {
             jobIDs,
             transitions: []
         });
-
     }
 
     const transitionsByJobId = _.groupBy(resp.transitions, 'jobid');
 
     const groupedTransitions = {};
+    const allDurations = [];
 
     for (let jobId in transitionsByJobId) {
         let lifecycle = transitionsByJobId[jobId].map(transition => {
@@ -53,15 +54,57 @@ const jobLifecycle = async (req, res) => {
             return transition;
         });
 
+        const durations = calculateStatusDuration(lifecycle, statuses);
+
         groupedTransitions[jobId] = {
-            lifecycle: lifecycle,
-            durations: calculateStatusDuration(lifecycle, statuses),
+            lifecycle,
+            durations
         };
+
+        if (durations?.summations) {
+            allDurations.push(durations.summations);
+        }
     }
 
+    const finalSummations = [];
+    const flatGroupedAllDurations = _.groupBy(allDurations.flat(),'status');
+
+    const finalStatusCounts = Object.keys(flatGroupedAllDurations).reduce((acc, status) => {
+        acc[status] = flatGroupedAllDurations[status].length;
+        return acc;
+    }, {});
+    // Calculate total value of all statuses
+    const finalTotal = Object.values(flatGroupedAllDurations).reduce((total, statusArr) => {
+        return total + statusArr.reduce((acc, curr) => acc + curr.value, 0);
+    }, 0);
+
+    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 color = getLifecycleStatusColor(status);
+        const roundedPercentage = `${Math.round(percentage)}%`;
+        finalSummations.push({
+            status,
+            value,
+            humanReadable,
+            percentage,
+            color,
+            roundedPercentage
+        });
+    });
+
     return res.status(200).json({
         jobIDs,
         transition: groupedTransitions,
+        durations: {
+            jobs: jobIDs.length,
+            summations: finalSummations,
+            totalStatuses: finalSummations.length,
+            total: finalTotal,
+            statusCounts: finalStatusCounts,
+            humanReadable:  durationToHumanReadable(moment.duration(finalTotal))
+        }
     });
 }
 

server/utils/calculateStatusDuration.js

@@ -1,15 +1,7 @@
 const durationToHumanReadable = require("./durationToHumanReadable");
 const moment = require("moment");
+const getLifecycleStatusColor = require("./getLifecycleStatusColor");
 const _ = require("lodash");
-const crypto = require('crypto');
-
-const getColor = (key) => {
-    const hash = crypto.createHash('sha256');
-    hash.update(key);
-    const hashedKey = hash.digest('hex');
-    const num = parseInt(hashedKey, 16);
-    return '#' + (num % 16777215).toString(16).padStart(6, '0');
-};
 
 const calculateStatusDuration = (transitions, statuses) => {
     let statusDuration = {};
@@ -33,26 +25,16 @@ const calculateStatusDuration = (transitions, statuses) => {
         if (!transition.prev_value) {
             statusDuration[transition.value] = {
                 value: duration,
-                humanReadable: transition.duration_readable
+                humanReadable: durationToHumanReadable(moment.duration(duration))
             };
-        } else if (!transition.next_value) {
+        }  else {
             if (statusDuration[transition.value]) {
                 statusDuration[transition.value].value += duration;
-                statusDuration[transition.value].humanReadable = transition.duration_readable;
+                statusDuration[transition.value].humanReadable = durationToHumanReadable(moment.duration(statusDuration[transition.value].value));
             } else {
                 statusDuration[transition.value] = {
                     value: duration,
-                    humanReadable: transition.duration_readable
-                };
-            }
-        } else {
-            if (statusDuration[transition.value]) {
-                statusDuration[transition.value].value += duration;
-                statusDuration[transition.value].humanReadable = transition.duration_readable;
-            } else {
-                statusDuration[transition.value] = {
-                    value: duration,
-                    humanReadable: transition.duration_readable
+                    humanReadable: durationToHumanReadable(moment.duration(duration))
                 };
             }
         }
@@ -79,7 +61,7 @@ const calculateStatusDuration = (transitions, statuses) => {
                 value,
                 humanReadable,
                 percentage: statusDuration[status].percentage,
-                color: getColor(status),
+                color: getLifecycleStatusColor(status),
                 roundedPercentage: `${Math.round(statusDuration[status].percentage)}%`
             });
         }

server/utils/getLifecycleStatusColor.js

@@ -0,0 +1,11 @@
+const crypto = require('crypto');
+
+const getLifecycleStatusColor = (key) => {
+    const hash = crypto.createHash('sha256');
+    hash.update(key);
+    const hashedKey = hash.digest('hex');
+    const num = parseInt(hashedKey, 16);
+    return '#' + (num % 16777215).toString(16).padStart(6, '0');
+};
+
+module.exports = getLifecycleStatusColor;