feature/IO-3357-Reynolds-and-Reynolds-DMS-API-Integration / Merges and adjustments

server/rr/rr-job-export.js

@@ -3,7 +3,7 @@ const { buildClientAndOpts } = require("./rr-lookup");
 const CreateRRLogEvent = require("./rr-logger-event");
 const { extractRrResponsibilityCenters } = require("./rr-responsibility-centers");
 const CdkCalculateAllocations = require("./rr-calculate-allocations").default;
-
+const { resolveRROpCodeFromBodyshop } = require("./rr-utils");
 /**
  * Derive RR status information from response object.
  * @param rrRes
@@ -137,19 +137,17 @@ const exportJobToRR = async (args) => {
     allocations = [];
   }
 
-  // 3) OpCode (global, but overridable)
-  //    - baseOpCode can come from bodyshop or rrCentersConfig (you'll map it in onboarding)
-  //    - txEnvelope can carry an explicit override field (opCode/opcode/op_code)
-  const baseOpCode = bodyshop?.rr_configuration?.baseOpCode || "28TOZ"; // TODO Change / implement default handling policy
+  const resolvedBaseOpCode = resolveRROpCodeFromBodyshop(bodyshop);
 
   const opCodeOverride = txEnvelope?.opCode || txEnvelope?.opcode || txEnvelope?.op_code || null;
 
-  if (opCodeOverride || baseOpCode) {
-    opCode = String(opCodeOverride || baseOpCode).trim() || null;
+  if (opCodeOverride || resolvedBaseOpCode) {
+    opCode = String(opCodeOverride || resolvedBaseOpCode).trim() || null;
   }
 
   CreateRRLogEvent(socket, "SILLY", "RR OP config resolved", {
-    opCode
+    opCode,
+    baseFromConfig: resolvedBaseOpCode
   });
 
   // Build RO payload for create.