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

feature/IO-3357-Reynolds-and-Reynolds-DMS-API-Integration - Checkpoint

Browse Source
This commit is contained in:
Dave
2025-11-04 14:19:26 -05:00
parent ccf3d7df5b
commit 5bbda89fb9
10 changed files with 532 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
server/web-sockets/rr-register-socket-events.js
View File

@@ -1,5 +1,3 @@
// server/rr/rr-register-socket-events.js
const RRLogger = require("../rr/rr-logger");
const { rrCombinedSearch, rrGetAdvisors, rrGetParts } = require("../rr/rr-lookup");
const { QueryJobData } = require("../rr/rr-job-helpers");
@@ -7,6 +5,7 @@ const { exportJobToRR } = require("../rr/rr-job-export");
const CdkCalculateAllocations = require("../cdk/cdk-calculate-allocations").default;
const { createRRCustomer } = require("../rr/rr-customers");
const { buildClientAndOpts } = require("../rr/rr-lookup");
const { GraphQLClient } = require("graphql-request");
const queries = require("../graphql-client/queries");
@@ -232,8 +231,9 @@ function registerRREvents({ socket, redisHelpers }) {
}
});
// Export flow
socket.on("rr-export-job", async (payload = {}) => {
const log = RRLogger(socket, { ns: "rr" });
try {
// -------- 1) Resolve job --------
let job = payload.job || payload.txEnvelope?.job;
@@ -246,44 +246,36 @@ function registerRREvents({ socket, redisHelpers }) {
// -------- 2) Resolve bodyshop (+ full row via GraphQL) --------
let bodyshopId = payload.bodyshopId || payload.bodyshopid || payload.bodyshopUUID || job?.bodyshop?.id;
if (!bodyshopId) {
const sess = await getSessionOrSocket(redisHelpers, socket);
bodyshopId = sess.bodyshopId;
}
if (!bodyshopId) throw new Error("RR export: bodyshopId required");
// Authoritative bodyshop row for RR routing (env fallback handled downstream)
let bodyshop =
const bodyshop =
job?.bodyshop && (job.bodyshop.rr_dealerid || job.bodyshop.rr_configuration)
? job.bodyshop
: await getBodyshopForSocket({ bodyshopId, socket });
// Optional FE routing override (kept minimal/safe)
const feRouting = payload.rrRouting;
if (feRouting) {
const cfg = bodyshop.rr_configuration || {};
bodyshop = {
...bodyshop,
rr_dealerid: feRouting.dealerNumber ?? bodyshop.rr_dealerid,
rr_configuration: {
...cfg,
storeNumber: feRouting.storeNumber ?? cfg.storeNumber,
branchNumber: feRouting.areaNumber ?? cfg.branchNumber,
areaNumber: feRouting.areaNumber ?? cfg.areaNumber
}
};
}
// -------- 3) Resolve selected customer (payload → tx) --------
// -------- 3) Resolve advisor number from the posting form --------
const tx = (await redisHelpers.getSessionTransactionData(socket.id)) || {};
const advisorNo = payload.advisorNo || payload.advNo || payload.txEnvelope?.advisorNo || tx.rrAdvisorNo || null;
if (!advisorNo || String(advisorNo).trim() === "") {
socket.emit("export-failed", { vendor: "rr", jobId, error: "Advisor is required (advisorNo)." });
return;
}
// Persist for subsequent steps if useful
await redisHelpers.setSessionTransactionData(socket.id, { ...tx, rrAdvisorNo: String(advisorNo) });
// -------- 4) Resolve selected customer (payload → tx) --------
let selectedCustomer = null;
// from payload
if (payload.selectedCustomer) {
if (typeof payload.selectedCustomer === "object" && payload.selectedCustomer.custNo) {
selectedCustomer = { custNo: String(payload.selectedCustomer.custNo) };
} else if (typeof payload.selectedCustomer === "string") {
} else if (typeof payload.selectedCustomer === "string" || typeof payload.selectedCustomer === "number") {
selectedCustomer = { custNo: String(payload.selectedCustomer) };
}
}
@@ -297,9 +289,11 @@ function registerRREvents({ socket, redisHelpers }) {
}
}
// Flags
const forceCreate = payload.forceCreate === true || tx.rrCreateCustomer === true;
const autoCreateOnNoMatch = payload.autoCreateOnNoMatch !== false; // default TRUE
// -------- 4) If no selection & not "forceCreate", try auto-search then ask UI to pick --------
// -------- 5) If no selection & not "forceCreate", try auto-search first --------
if (!selectedCustomer && !forceCreate) {
const customerQuery = makeCustomerSearchPayloadFromJob(job);
const vehicleQuery = makeVehicleSearchPayloadFromJob(job);
@@ -320,7 +314,7 @@ function registerRREvents({ socket, redisHelpers }) {
});
log("info", "rr-export-job:auto-selected-customer", { jobId, custNo: selectedCustomer.custNo });
} else if (candidates.length > 1) {
// emit picker data and stop; UI will call rr-selected-customer next
// multiple matches → ask UI to pick and STOP here
const table = candidates.map((c) => ({
CustomerId: c.custNo,
customerId: c.custNo,
@@ -328,28 +322,57 @@ function registerRREvents({ socket, redisHelpers }) {
}));
socket.emit("rr-select-customer", table);
socket.emit("rr-log-event", { level: "info", message: "RR: customer selection required", ts: Date.now() });
return; // wait for user selection
return;
} else {
// 0 matches → auto-create by default
if (autoCreateOnNoMatch) {
const { createRRCustomer } = require("../rr/rr-customers");
const created = await createRRCustomer({ bodyshop, job, socket });
const custNo = created?.custNo || created?.customerNo || created?.CustomerNo || created?.dmsRecKey;
if (!custNo) throw new Error("RR create customer returned no custNo");
selectedCustomer = { custNo: String(custNo) };
await redisHelpers.setSessionTransactionData(socket.id, {
...tx,
rrSelectedCustomer: selectedCustomer.custNo,
rrCreateCustomer: false
});
log("info", "rr-export-job:auto-created-customer", { jobId, custNo: selectedCustomer.custNo });
} else {
await redisHelpers.setSessionTransactionData(socket.id, { ...tx, rrCreateCustomer: true });
socket.emit("rr-customer-create-required");
socket.emit("rr-log-event", { level: "info", message: "RR: create customer required", ts: Date.now() });
return;
}
}
} else {
// no usable query → fall back to create or UI prompt
if (autoCreateOnNoMatch) {
const { createRRCustomer } = require("../rr/rr-customers");
const created = await createRRCustomer({ bodyshop, job, socket });
const custNo = created?.custNo || created?.customerNo || created?.CustomerNo || created?.dmsRecKey;
if (!custNo) throw new Error("RR create customer returned no custNo");
selectedCustomer = { custNo: String(custNo) };
await redisHelpers.setSessionTransactionData(socket.id, {
...tx,
rrSelectedCustomer: selectedCustomer.custNo,
rrCreateCustomer: false
});
log("info", "rr-export-job:auto-created-customer(no-query)", { jobId, custNo: selectedCustomer.custNo });
} else {
await redisHelpers.setSessionTransactionData(socket.id, { ...tx, rrCreateCustomer: true });
socket.emit("rr-customer-create-required");
socket.emit("rr-log-event", { level: "info", message: "RR: create customer required", ts: Date.now() });
return;
}
}
// no query or no matches → ask UI to create
if (!selectedCustomer) {
await redisHelpers.setSessionTransactionData(socket.id, { ...tx, rrCreateCustomer: true });
socket.emit("rr-customer-create-required");
socket.emit("rr-log-event", { level: "info", message: "RR: create customer required", ts: Date.now() });
return;
}
}
// -------- 5) If still not selected & creation is allowed, create now --------
if (!selectedCustomer && forceCreate) {
// -------- 6) If still not selected & creation is allowed, create now --------
if (!selectedCustomer && (forceCreate || autoCreateOnNoMatch)) {
const { createRRCustomer } = require("../rr/rr-customers");
const created = await createRRCustomer({ bodyshop, job, socket });
// fallback when API returns only DMSRecKey
const custNo = created?.custNo || created?.customerNo || created?.CustomerNo || created?.dmsRecKey;
if (!custNo) throw new Error("RR create customer returned no custNo");
selectedCustomer = { custNo: String(custNo) };
await redisHelpers.setSessionTransactionData(socket.id, {
...tx,
@@ -361,18 +384,14 @@ function registerRREvents({ socket, redisHelpers }) {
if (!selectedCustomer?.custNo) throw new Error("RR export: selected customer missing custNo");
// -------- 6) Perform export --------
const advisorNo = payload.advisorNo || payload.advNo || tx.rrAdvisorNo;
const options = payload.options || payload.txEnvelope?.options || {};
// -------- 7) Perform export (ensure SV + create/update RO) --------
const result = await exportJobToRR({
bodyshop,
job,
selectedCustomer,
advisorNo,
existing: payload.existing,
logger: log,
...options
socket
});
if (result?.success) {
@@ -393,7 +412,7 @@ function registerRREvents({ socket, redisHelpers }) {
try {
socket.emit("export-failed", { vendor: "rr", jobId, error: error.message });
} catch {
//
/* ignore */
}
}
});