feature/IO-3357-Reynolds-and-Reynolds-DMS-API-Integration - Checkpoint
This commit is contained in:
@@ -3,8 +3,10 @@ const FortellisLogger = require("../fortellis/fortellis-logger");
|
||||
const RRLogger = require("../rr/rr-logger");
|
||||
const { FortellisJobExport, FortellisSelectedCustomer } = require("../fortellis/fortellis");
|
||||
const CdkCalculateAllocations = require("../cdk/cdk-calculate-allocations").default;
|
||||
const { exportJobToRR } = require("../rr/rr-job-export");
|
||||
|
||||
const lookupApi = require("../rr/rr-lookup");
|
||||
const { SelectedCustomer } = require("../rr/rr-selected-customer");
|
||||
const { QueryJobData } = require("../rr/rr-job-helpers");
|
||||
|
||||
const redisSocketEvents = ({
|
||||
io,
|
||||
@@ -341,109 +343,80 @@ const redisSocketEvents = ({
|
||||
};
|
||||
|
||||
// Reynolds & Reynolds socket events (uses new client-backed ops)
|
||||
const registerRREvents = (socket) => {
|
||||
const log = (level, message, ctx) => RRLogger(socket)(level, message, ctx);
|
||||
function registerRREvents(socket) {
|
||||
const logger = require("../utils/logger");
|
||||
const log = RRLogger(socket);
|
||||
const {
|
||||
redisHelpers // { setSessionData, getSessionData, ... setSessionTransactionData, getSessionTransactionData }
|
||||
} = require("../utils/ioHelpers").getHelpers?.() || { redisHelpers: {} };
|
||||
|
||||
const resolveBodyshopId = (payload, job) =>
|
||||
payload?.bodyshopId || socket.bodyshopId || job?.shopid || job?.bodyshopId;
|
||||
const resolveJobId = (maybeId, packet, fallback) => maybeId || packet?.jobid || fallback;
|
||||
|
||||
const resolveJobId = (explicitJobId, payload, job) =>
|
||||
explicitJobId ||
|
||||
payload?.jobid ||
|
||||
payload?.txEnvelope?.jobid ||
|
||||
job?.id ||
|
||||
payload?.txEnvelope?.job?.id ||
|
||||
null;
|
||||
|
||||
// Orchestrated Export (Customer → Vehicle → Repair Order)
|
||||
socket.on("rr-export-job", async (payload = {}) => {
|
||||
// Lookups
|
||||
socket.on("rr-get-advisors", async (params = {}, cb) => {
|
||||
try {
|
||||
const job = payload.job || payload.txEnvelope?.job;
|
||||
const options = payload.options || payload.txEnvelope?.options || {};
|
||||
const bodyshopId = resolveBodyshopId(payload, job);
|
||||
const jobid = resolveJobId(payload.jobid, payload, job);
|
||||
|
||||
if (!job) {
|
||||
log("error", "RR export missing job payload", { jobid });
|
||||
return;
|
||||
}
|
||||
if (!bodyshopId) {
|
||||
log("error", "RR export missing bodyshopId", { jobid });
|
||||
return;
|
||||
}
|
||||
|
||||
const result = await exportJobToRR({ bodyshopId, job, logger: log, ...options });
|
||||
|
||||
// Broadcast keyed by bodyshop + include jobid
|
||||
const room = getBodyshopRoom(bodyshopId);
|
||||
io.to(room).emit("rr-export-job:result", { jobid, bodyshopId, result });
|
||||
} catch (error) {
|
||||
const jobid = resolveJobId(payload?.jobid, payload, payload?.job || payload?.txEnvelope?.job);
|
||||
log("error", `Error during RR export: ${error.message}`, { jobid, stack: error.stack });
|
||||
logger.log("rr-job-export-error", "error", null, null, { jobid, message: error.message, stack: error.stack });
|
||||
}
|
||||
});
|
||||
|
||||
// Combined search (customer/vehicle)
|
||||
socket.on("rr-lookup-combined", async ({ jobid, params } = {}, cb) => {
|
||||
try {
|
||||
const bodyshopId = resolveBodyshopId({ bodyshopId: params?.bodyshopId }, null);
|
||||
const resolvedJobId = resolveJobId(jobid, { jobid }, null);
|
||||
if (!bodyshopId) throw new Error("Missing bodyshopId");
|
||||
|
||||
const res = await lookupApi.combinedSearch({ bodyshopId, ...(params || {}) });
|
||||
cb?.({ jobid: resolvedJobId, data: res?.data ?? res });
|
||||
} catch (e) {
|
||||
log("error", `RR combined lookup error: ${e.message}`, { jobid });
|
||||
cb?.({ jobid, error: e.message });
|
||||
}
|
||||
});
|
||||
|
||||
// Get Advisors
|
||||
socket.on("rr-get-advisors", async ({ jobid, params } = {}, cb) => {
|
||||
try {
|
||||
const bodyshopId = resolveBodyshopId({ bodyshopId: params?.bodyshopId }, null);
|
||||
const resolvedJobId = resolveJobId(jobid, { jobid }, null);
|
||||
if (!bodyshopId) throw new Error("Missing bodyshopId");
|
||||
|
||||
const bodyshopId = params.bodyshopId || socket?.user?.bodyshopid;
|
||||
const res = await lookupApi.getAdvisors({ bodyshopId, ...(params || {}) });
|
||||
cb?.({ jobid: resolvedJobId, data: res?.data ?? res });
|
||||
cb?.({ data: res?.data ?? res });
|
||||
} catch (e) {
|
||||
log("error", `RR get advisors error: ${e.message}`, { jobid });
|
||||
cb?.({ jobid, error: e.message });
|
||||
log("error", `RR get advisors error: ${e.message}`);
|
||||
cb?.({ error: e.message });
|
||||
}
|
||||
});
|
||||
|
||||
// Get Parts
|
||||
socket.on("rr-get-parts", async ({ jobid, params } = {}, cb) => {
|
||||
socket.on("rr-get-parts", async (params = {}, cb) => {
|
||||
try {
|
||||
const bodyshopId = resolveBodyshopId({ bodyshopId: params?.bodyshopId }, null);
|
||||
const resolvedJobId = resolveJobId(jobid, { jobid }, null);
|
||||
if (!bodyshopId) throw new Error("Missing bodyshopId");
|
||||
|
||||
const bodyshopId = params.bodyshopId || socket?.user?.bodyshopid;
|
||||
const res = await lookupApi.getParts({ bodyshopId, ...(params || {}) });
|
||||
cb?.({ jobid: resolvedJobId, data: res?.data ?? res });
|
||||
cb?.({ data: res?.data ?? res });
|
||||
} catch (e) {
|
||||
log("error", `RR get parts error: ${e.message}`, { jobid });
|
||||
log("error", `RR get parts error: ${e.message}`);
|
||||
cb?.({ error: e.message });
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* NEW: QueryJobData — return the canonical job payload used for DMS exports
|
||||
* payload: { jobid }
|
||||
*/
|
||||
socket.on("rr-query-job-data", async ({ jobid } = {}, cb) => {
|
||||
try {
|
||||
const resolvedJobId = resolveJobId(jobid, { jobid }, null);
|
||||
const job = await QueryJobData({ socket, jobid: resolvedJobId });
|
||||
cb?.({ jobid: resolvedJobId, job });
|
||||
} catch (e) {
|
||||
log("error", `RR query job data error: ${e.message}`, { jobid });
|
||||
cb?.({ jobid, error: e.message });
|
||||
}
|
||||
});
|
||||
|
||||
// Optional: Selected customer — currently a no-op for RR
|
||||
socket.on("rr-selected-customer", async ({ jobid, selectedCustomerId } = {}) => {
|
||||
const resolvedJobId = resolveJobId(jobid, { jobid }, null);
|
||||
log("info", "rr-selected-customer not implemented for RR (no-op)", {
|
||||
jobid: resolvedJobId,
|
||||
selectedCustomerId
|
||||
});
|
||||
/**
|
||||
* NEW: Selected Customer — cache the chosen DMS customer (or upsert from job if not provided)
|
||||
* payload: { jobid, selectedCustomerId?, bodyshopId? }
|
||||
*/
|
||||
socket.on("rr-selected-customer", async ({ jobid, selectedCustomerId, bodyshopId } = {}, cb) => {
|
||||
try {
|
||||
const resolvedJobId = resolveJobId(jobid, { jobid }, null);
|
||||
const result = await SelectedCustomer({
|
||||
socket,
|
||||
jobid: resolvedJobId,
|
||||
bodyshopId,
|
||||
selectedCustomerId,
|
||||
redisHelpers
|
||||
});
|
||||
cb?.({ jobid: resolvedJobId, selectedCustomerId: result.selectedCustomerId });
|
||||
} catch (e) {
|
||||
log("error", `RR selected customer error: ${e.message}`, { jobid });
|
||||
cb?.({ jobid, error: e.message });
|
||||
}
|
||||
});
|
||||
|
||||
// Calculate allocations (CDK utility unchanged)
|
||||
// Calculate allocations (unchanged)
|
||||
socket.on("rr-calculate-allocations", async (jobid, callback) => {
|
||||
try {
|
||||
const resolvedJobId = resolveJobId(jobid, { jobid }, null);
|
||||
const allocations = await CdkCalculateAllocations(socket, resolvedJobId);
|
||||
callback({ jobid: resolvedJobId, allocations });
|
||||
callback?.({ jobid: resolvedJobId, allocations });
|
||||
} catch (error) {
|
||||
log("error", `Error during RR calculate allocations: ${error.message}`, { jobid, stack: error.stack });
|
||||
logger.log("rr-calc-allocations-error", "error", null, null, {
|
||||
@@ -454,8 +427,9 @@ const redisSocketEvents = ({
|
||||
callback?.({ jobid, error: error.message });
|
||||
}
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = { registerRREvents };
|
||||
// Call Handlers
|
||||
registerRoomAndBroadcastEvents(socket);
|
||||
registerUpdateEvents(socket);
|
||||
|
||||
Reference in New Issue
Block a user