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

Merged in release/2025-12-19 (pull request #2702)

Browse Source 
IO-3462 Project Mexico Mod
This commit is contained in:
Dave Richer
2025-12-10 20:18:34 +00:00
parent d6079f7861 05d5c96491
commit 6140903529
2 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/data/carfax-rps.js
View File

@@ -117,13 +117,14 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
imexshopid: shopid, imexshopid: shopid,
json: JSON.stringify(carfaxObject, null, 2), json: JSON.stringify(carfaxObject, null, 2),
filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`, filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
count: carfaxObject.job.length count: carfaxObject?.job?.length || 0
}; };
if (skipUpload) { if (skipUpload) {
fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json); fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
uploadToS3(jsonObj, S3_BUCKET_NAME); uploadToS3(jsonObj, S3_BUCKET_NAME);
} else { } else {
if (jsonObj.count > 0) {
await uploadViaSFTP(jsonObj); await uploadViaSFTP(jsonObj);
await sendMexicoBillingEmail({ await sendMexicoBillingEmail({
@@ -148,13 +149,14 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
)}` )}`
}); });
} }
}
allJSONResults.push({ jsonObj.count > 0 && allJSONResults.push({
bodyshopid: bodyshop.id, bodyshopid: bodyshop.id,
imexshopid: shopid, imexshopid: shopid,
count: jsonObj.count, count: jsonObj.count,
filename: jsonObj.filename, filename: jsonObj.filename,
result: jsonObj.result result: jsonObj.result || "No Upload Result Available"
}); });
logger.log("CARFAX-RPS-end-shop-extract", "DEBUG", "api", bodyshop.id, { logger.log("CARFAX-RPS-end-shop-extract", "DEBUG", "api", bodyshop.id, {

6
server/data/carfax.js
View File

@@ -160,13 +160,14 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
imexshopid: shopid, imexshopid: shopid,
json: JSON.stringify(carfaxObject, null, 2), json: JSON.stringify(carfaxObject, null, 2),
filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`, filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
count: carfaxObject.job.length count: carfaxObject?.job?.length || 0
}; };
if (skipUpload) { if (skipUpload) {
fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json); fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
uploadToS3(jsonObj); uploadToS3(jsonObj);
} else { } else {
if (jsonObj.count > 0) {
await uploadViaSFTP(jsonObj); await uploadViaSFTP(jsonObj);
await sendMexicoBillingEmail({ await sendMexicoBillingEmail({
@@ -195,13 +196,14 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
)}` )}`
}); });
} }
}
allJSONResults.push({ allJSONResults.push({
bodyshopid: bodyshop.id, bodyshopid: bodyshop.id,
imexshopid: shopid, imexshopid: shopid,
count: jsonObj.count, count: jsonObj.count,
filename: jsonObj.filename, filename: jsonObj.filename,
result: jsonObj.result result: jsonObj.result || "No Upload Result Available"
}); });
logger.log("CARFAX-end-shop-extract", "DEBUG", "api", bodyshop.id, { logger.log("CARFAX-end-shop-extract", "DEBUG", "api", bodyshop.id, {