admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2024-11-01 (pull request #1864)

Browse Source 
release/2024-11-01 - Misc fixes
This commit is contained in:
Dave Richer
2024-10-29 16:55:24 +00:00
parent f65ab128f9 3f247a9227
commit f65993d097
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/job/job-updated.js
View File

@@ -15,7 +15,7 @@ const jobUpdated = async (req, res) => {
}); });
} }
logger.log("job-update", "INFO", req.user?.email, null, { logger.log("job-update", "DEBUG", req.user?.email, null, {
message: `Job updated event received from Hasura`, message: `Job updated event received from Hasura`,
jobid: req?.body?.event?.data?.new?.id jobid: req?.body?.event?.data?.new?.id
}); });

12
server/mixdata/mixdata.js
View File

@@ -9,11 +9,9 @@ require("dotenv").config({
}); });
exports.mixdataUpload = async (req, res) => { exports.mixdataUpload = async (req, res) => {
const { bodyshopid } = req.body;
const client = req.userGraphQLClient; const client = req.userGraphQLClient;
logger.log("job-mixdata-upload", "DEBUG", req.user.email, null, null); logger.log("job-mixdata-upload", "DEBUG", req?.user?.email, null, null);
try { try {
for (const element of req.files) { for (const element of req.files) {
@@ -23,7 +21,7 @@ exports.mixdataUpload = async (req, res) => {
explicitArray: false explicitArray: false
}); });
logger.log("job-mixdata-parse", "DEBUG", req.user.email, inboundRequest); logger.log("job-mixdata-parse", "DEBUG", req?.user?.email, null, { inboundRequest });
const ScaleType = DetermineScaleType(inboundRequest); const ScaleType = DetermineScaleType(inboundRequest);
const RoNumbersFromInboundRequest = GetListOfRos(inboundRequest, ScaleType); const RoNumbersFromInboundRequest = GetListOfRos(inboundRequest, ScaleType);
@@ -70,7 +68,7 @@ function DetermineScaleType(inboundRequest) {
const ret = { type: "", verson: 0 }; const ret = { type: "", verson: 0 };
//PPG Mix Data //PPG Mix Data
if (inboundRequest.PPG && inboundRequest.PPG.Header.Protocol.Name === "PPG") { if (inboundRequest?.PPG?.Header?.Protocol?.Name === "PPG") {
return { return {
type: inboundRequest.PPG.Header.Protocol.Name, type: inboundRequest.PPG.Header.Protocol.Name,
company: "PPG", company: "PPG",
@@ -80,13 +78,13 @@ function DetermineScaleType(inboundRequest) {
} }
function GetListOfRos(inboundRequest, ScaleType) { function GetListOfRos(inboundRequest, ScaleType) {
if (ScaleType.company === "PPG" && ScaleType.version === "1.3.0") { if (ScaleType?.company === "PPG" && ScaleType?.version === "1.3.0") {
return inboundRequest.PPG.MixDataInterface.ROData.RepairOrders.RO.map((r) => r.RONumber); return inboundRequest.PPG.MixDataInterface.ROData.RepairOrders.RO.map((r) => r.RONumber);
} }
} }
function GenerateMixDataArray(inboundRequest, ScaleType, jobHash) { function GenerateMixDataArray(inboundRequest, ScaleType, jobHash) {
if (ScaleType.company === "PPG" && ScaleType.version === "1.3.0") { if (ScaleType?.company === "PPG" && ScaleType?.version === "1.3.0") {
return inboundRequest.PPG.MixDataInterface.ROData.RepairOrders.RO.map((r) => { return inboundRequest.PPG.MixDataInterface.ROData.RepairOrders.RO.map((r) => {
return { return {
jobid: jobHash[r.RONumber]?.jobid, jobid: jobHash[r.RONumber]?.jobid,