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

server/rr/rr-customers.js

@@ -1,6 +1,3 @@
-// server/rr/rr-customers.js
-// Minimal RR customer create helper (maps dmsRecKey -> custNo for callers)
-
 const { RRClient } = require("./lib/index.cjs");
 const { getRRConfigFromBodyshop } = require("./rr-config");
 const RRLogger = require("./rr-logger");
@@ -35,7 +32,7 @@ function buildClientAndOpts(bodyshop) {
 
 // minimal field extraction
 function digitsOnly(s) {
-  return String(s || "").replace(/[^\d]/g, "");
+  return String(s || "").replace(/\D/g, "");
 }
 
 function buildCustomerPayloadFromJob(job, overrides = {}) {
@@ -94,15 +91,7 @@ async function createRRCustomer({ bodyshop, job, overrides = {}, socket }) {
   const trx = res?.statusBlocks?.transaction;
 
   // Primary: map dmsRecKey -> custNo
-  let custNo =
-    data?.dmsRecKey ??
-    // legacy fallbacks (if shapes ever change)
-    data?.custNo ??
-    data?.CustNo ??
-    data?.customerNo ??
-    data?.CustomerNo ??
-    data?.customer?.custNo ??
-    data?.Customer?.CustNo;
+  let custNo = data?.dmsRecKey;
 
   if (!custNo) {
     log("error", "RR insertCustomer returned no dmsRecKey/custNo", {

server/rr/rr-job-export.js

@@ -1,28 +1,76 @@
+// server/rr/rr-job-export.js
 const { buildRRRepairOrderPayload } = require("./rr-job-helpers");
 const { buildClientAndOpts } = require("./rr-lookup");
+const { ensureRRServiceVehicle } = require("./rr-service-vehicles");
+const RRLogger = require("./rr-logger");
 
+/**
+ * Orchestrate an RR export (assumes custNo already resolved):
+ *  - Ensure service vehicle (create flows)
+ *  - Create or update the Repair Order
+ */
 async function exportJobToRR(args) {
-  const { bodyshop, job, selectedCustomer, advisorNo, existing } = args;
+  const { bodyshop, job, advisorNo, selectedCustomer, existing, socket } = args || {};
+  const log = RRLogger(socket, { ns: "rr-export" });
 
-  // Build client + opts (opts carries routing)
-  const { client, opts } = buildClientAndOpts(bodyshop);
-
-  const payload = buildRRRepairOrderPayload({ job, selectedCustomer, advisorNo });
-
-  let rrRes;
-  if (existing?.dmsRepairOrderId) {
-    rrRes = await client.updateRepairOrder({ ...payload, dmsRepairOrderId: existing.dmsRepairOrderId }, opts);
-  } else {
-    rrRes = await client.createRepairOrder(payload, opts);
+  if (!bodyshop) throw new Error("exportJobToRR: bodyshop is required");
+  if (!job) throw new Error("exportJobToRR: job is required");
+  if (advisorNo == null || String(advisorNo).trim() === "") {
+    throw new Error("exportJobToRR: advisorNo is required for RR");
   }
 
+  // Now strictly require custNo here
+  const custNo =
+    (selectedCustomer && (selectedCustomer.custNo || selectedCustomer.CustNo || selectedCustomer.customerNo)) ||
+    (typeof selectedCustomer === "string" || typeof selectedCustomer === "number" ? String(selectedCustomer) : null);
+  if (!custNo) throw new Error("exportJobToRR: selectedCustomer.custNo is required");
+
+  const { client, opts } = buildClientAndOpts(bodyshop);
+  const finalOpts = {
+    ...opts,
+    envelope: {
+      ...(opts?.envelope || {}),
+      sender: {
+        ...(opts?.envelope?.sender || {}),
+        task: "BSMRO",
+        referenceId: existing?.dmsRepairOrderId ? "Update" : "Insert"
+      }
+    }
+  };
+
+  // Ensure service vehicle for create flows (best-effort)
+  let svId = null;
+  if (!existing?.dmsRepairOrderId) {
+    try {
+      const svRes = await ensureRRServiceVehicle({ bodyshop, custNo, job, overrides: {}, socket });
+      svId = svRes?.svId || null;
+      log("info", "RR service vehicle ensured", { created: svRes?.created, svId });
+    } catch (e) {
+      log("warn", "RR ensure service vehicle failed; continuing", { error: e?.message });
+    }
+  }
+
+  const payload = buildRRRepairOrderPayload({
+    job,
+    selectedCustomer: { custNo },
+    advisorNo
+  });
+
+  const rrRes = existing?.dmsRepairOrderId
+    ? await client.updateRepairOrder({ ...payload, dmsRepairOrderId: existing.dmsRepairOrderId }, finalOpts)
+    : await client.createRepairOrder(payload, finalOpts);
+
+  const data = rrRes?.data || null;
+  const roStatus = data?.roStatus || null;
   return {
-    success: rrRes?.success === true,
-    data: rrRes?.data || null,
-    roStatus: rrRes?.data?.roStatus || null,
+    success: rrRes?.success === true || roStatus?.status === "Success",
+    data,
+    roStatus,
     statusBlocks: rrRes?.statusBlocks || [],
     xml: rrRes?.xml,
-    parsed: rrRes?.parsed
+    parsed: rrRes?.parsed,
+    custNo,
+    svId
   };
 }
 

server/rr/rr-job-helpers.js

@@ -56,21 +56,49 @@ async function QueryJobData(ctx = {}, jobId) {
  * Build minimal RR RO payload (keys match your RR client’s expectations).
  * Uses fields that exist in your schema (v_vin, ro_number, owner fields, etc).
  */
+/**
+ * Build minimal RR RO payload (keys match RR client expectations).
+ * - Requires advisorNo (maps to advNo)
+ * - Uses custNo (normalized) and a cleaned VIN (17 chars, A–Z/0–9)
+ */
 function buildRRRepairOrderPayload({ job, selectedCustomer, advisorNo }) {
-  const custNo =
-    (selectedCustomer && (selectedCustomer.custNo || selectedCustomer.customerNo)) ||
+  // Resolve custNo from object or primitive
+  const custNoRaw =
+    (selectedCustomer &&
+      (selectedCustomer.custNo ||
+        selectedCustomer.customerNo || // legacy alias, normalized below
+        selectedCustomer.CustNo)) ||
     (typeof selectedCustomer === "string" || typeof selectedCustomer === "number" ? String(selectedCustomer) : null);
 
+  const custNo = custNoRaw ? String(custNoRaw).trim() : null;
   if (!custNo) throw new Error("No RR customer selected (custNo missing)");
 
-  const vin = safeVin(job);
-  // For RR create flows, VIN is typically required; leave null allowed if you gate earlier in your flow.
+  // Advisor is required for RR
+  const advNo = advisorNo != null && String(advisorNo).trim() !== "" ? String(advisorNo).trim() : null;
+  if (!advNo) throw new Error("advisorNo is required for RR export");
+
+  // Clean/normalize VIN if present
+  const vinRaw = job?.v_vin || job?.vehicle?.vin || job?.vin;
+  const vin =
+    typeof vinRaw === "string"
+      ? vinRaw
+          .replace(/[^A-Za-z0-9]/g, "")
+          .toUpperCase()
+          .slice(0, 17) || undefined
+      : undefined;
+
+  // Pick a stable external RO number
+  const ro =
+    job?.ro_number != null ? job.ro_number : job?.job_number != null ? job.job_number : job?.id != null ? job.id : null;
+
+  if (ro == null) throw new Error("Missing repair order identifier (ro_number/job_number/id).");
+
   return {
-    repairOrderNumber: String(job?.ro_number || job?.job_number || job?.id),
+    repairOrderNumber: String(ro),
     deptType: "B",
-    vin: vin || undefined,
-    custNo,
-    advNo: advisorNo || undefined
+    vin, // undefined if absent/empty after cleaning
+    custNo: String(custNo),
+    advNo // mapped from advisorNo
   };
 }
 

server/rr/rr-logger.js

@@ -1,8 +1,3 @@
-// server/rr/rr-logger.js
-// Robust socket + server logger for RR flows (no more [object Object] in UI)
-
-"use strict";
-
 const util = require("util");
 const appLogger = require("../utils/logger");
 

server/rr/rr-lookup.js

@@ -1,6 +1,3 @@
-// server/rr/rr-lookup.js
-// Reynolds & Reynolds lookup helpers that adapt our bodyshop record to the RR client
-
 const { RRClient } = require("./lib/index.cjs");
 const { getRRConfigFromBodyshop } = require("./rr-config");
 

server/rr/rr-service-vehicles.js

@@ -0,0 +1,82 @@
+// server/rr/rr-service-vehicles.js
+const { RRClient } = require("./lib/index.cjs");
+const { getRRConfigFromBodyshop } = require("./rr-config");
+const RRLogger = require("./rr-logger");
+
+function buildClientAndOpts(bodyshop) {
+  const cfg = getRRConfigFromBodyshop(bodyshop);
+  const client = new RRClient({
+    baseUrl: cfg.baseUrl,
+    username: cfg.username,
+    password: cfg.password,
+    timeoutMs: cfg.timeoutMs,
+    retries: cfg.retries
+  });
+  const opts = {
+    routing: cfg.routing,
+    envelope: {
+      sender: {
+        component: "Rome",
+        task: "SV", // Service Vehicle op code; adjust if your lib expects another
+        referenceId: "Insert",
+        creator: "RCI",
+        senderName: "RCI"
+      }
+    }
+  };
+  return { client, opts };
+}
+
+function buildServiceVehiclePayload({ job, custNo, overrides = {} }) {
+  return {
+    custNo: String(custNo), // tie SV to customer
+    vin: overrides.vin ?? job?.v_vin,
+    year: overrides.year ?? job?.v_model_yr,
+    make: overrides.make ?? job?.dms_make ?? job?.v_make,
+    model: overrides.model ?? job?.dms_model ?? job?.v_model,
+    licensePlate: overrides.plate ?? job?.plate_no
+    // add other safe keys your RR client supports (color, mileage, etc.)
+  };
+}
+
+async function ensureRRServiceVehicle({ bodyshop, custNo, job, overrides = {}, socket }) {
+  const log = RRLogger(socket, { ns: "rr" });
+  const { client, opts } = buildClientAndOpts(bodyshop);
+
+  // Optional: first try a combined query by VIN to detect existing SV
+  try {
+    const queryRes = await client.combinedSearch(
+      { vin: job?.v_vin, maxRecs: 1 },
+      {
+        ...opts,
+        envelope: {
+          ...opts.envelope,
+          sender: { ...opts.envelope.sender, task: "CVC", referenceId: "Query" }
+        }
+      }
+    );
+    const hasVehicle = Array.isArray(queryRes?.vehicles)
+      ? queryRes.vehicles.length > 0
+      : Array.isArray(queryRes) && queryRes.length > 0;
+    if (hasVehicle) {
+      return { created: false, raw: queryRes };
+    }
+  } catch (e) {
+    // non-fatal, continue to insert
+    log("warn", "RR combined search failed before SV insert; proceeding to insert", { err: e?.message });
+  }
+
+  const payload = buildServiceVehiclePayload({ job, custNo, overrides });
+  const res = await client.insertServiceVehicle(payload, opts);
+  const data = res?.data ?? res;
+
+  // Normalize a simple id for later (RR often returns DMSRecKey on insert)
+  const svId = data?.svId ?? data?.serviceVehicleId ?? data?.dmsRecKey ?? data?.DMSRecKey;
+
+  if (!svId) {
+    log("error", "RR insert service vehicle returned no id", { data });
+  }
+  return { created: true, svId, raw: data };
+}
+
+module.exports = { ensureRRServiceVehicle };