Further merge resolutions of RO into IO.

server/accounting/qb-receivables-lines.js

@@ -3,7 +3,7 @@ const DineroQbFormat = require("./accounting-constants").DineroQbFormat;
 const Dinero = require("dinero.js");
 const {DiscountNotAlreadyCounted} = require("../job/job-totals");
 const logger = require("../utils/logger");
-const InstanceManager  = require("../utils/instanceMgr");
+const InstanceManager  = require("../utils/instanceMgr").default;
 
 exports.default = function ({
                                 bodyshop,

server/accounting/qbo/qbo-callback.js

@@ -10,7 +10,7 @@ const OAuthClient = require("intuit-oauth");
 const client = require("../../graphql-client/graphql-client").client;
 const queries = require("../../graphql-client/queries");
 const {parse, stringify} = require("querystring");
-const InstanceManager = require("../../utils/instanceMgr");
+const InstanceManager = require("../../utils/instanceMgr").default;
 
 const oauthClient = new OAuthClient({
     clientId: process.env.QBO_CLIENT_ID,

server/email/sendemail.js

@@ -9,7 +9,7 @@ const axios = require("axios");
 let nodemailer = require("nodemailer");
 let aws = require("@aws-sdk/client-ses");
 let { defaultProvider } = require("@aws-sdk/credential-provider-node");
-const InstanceManager = require("../utils/instanceMgr");
+const InstanceManager = require("../utils/instanceMgr").default;
 const logger = require("../utils/logger");
 const client = require("../graphql-client/graphql-client").client;
 const queries = require("../graphql-client/queries");

server/job/job-totals-USA.js

@@ -26,7 +26,7 @@ exports.totalsSsu = async function (req, res) {
     const BearerToken = req.BearerToken;
     const client = req.userGraphQLClient;
 
-    logger.log("job-totals-ssu", "DEBUG", req.user.email, id, null);
+    logger.log("job-totals-ssu-USA", "DEBUG", req.user.email, id, null);
 
     try {
         const job = await client
@@ -55,7 +55,7 @@ exports.totalsSsu = async function (req, res) {
 
         res.status(200).send();
     } catch (error) {
-        logger.log("job-totals-ssu-error", "ERROR", req.user.email, id, {
+        logger.log("job-totals-ssu-USA-error", "ERROR", req.user.email, id, {
             jobid: id,
             error,
         });
@@ -78,7 +78,7 @@ async function TotalsServerSide(req, res) {
 
         return ret;
     } catch (error) {
-        logger.log("job-totals-ssu-error", "ERROR", req.user?.email, job.id, {
+        logger.log("job-totals-ssu-USA-error", "ERROR", req.user?.email, job.id, {
             jobid: job.id,
             error,
         });
@@ -92,11 +92,11 @@ async function Totals(req, res) {
     const logger = req.logger;
     const client = req.userGraphQLClient;
 
-    logger.log("job-totals", "DEBUG", req.user.email, job.id, {
+    logger.log("job-totals-USA", "DEBUG", req.user.email, job.id, {
         jobid: job.id,
     });
 
-    logger.log("job-totals-ssu", "DEBUG", req.user.email, id, null);
+    logger.log("job-totals-ssu-USA", "DEBUG", req.user.email, id, null);
 
     await AutoAddAtsIfRequired({job, client});
 
@@ -110,7 +110,7 @@ async function Totals(req, res) {
 
         res.status(200).json(ret);
     } catch (error) {
-        logger.log("job-totals-error", "ERROR", req.user.email, job.id, {
+        logger.log("job-totals-USA-error", "ERROR", req.user.email, job.id, {
             jobid: job.id,
             error,
         });

server/job/job.js

@@ -1,4 +1,4 @@
-const RenderInstanceManager = require("../utils/instanceMgr");
+const RenderInstanceManager = require("../utils/instanceMgr").default;
 
 exports.totals = RenderInstanceManager({
     imex: require("./job-totals").default,

server/sms/receive.js

@@ -11,7 +11,7 @@ const queries = require("../graphql-client/queries");
 const {phone} = require("phone");
 const {admin} = require("../firebase/firebase-handler");
 const logger = require("../utils/logger");
-const InstanceRenderManager = require("../../client/src/utils/instanceRenderMgr");
+const InstanceManager = require("../utils/instanceMgr");
 
 exports.receive = async (req, res) => {
     //Perform request validation
@@ -106,7 +106,7 @@ exports.receive = async (req, res) => {
                         topic: `${message.conversation.bodyshop.imexshopid}-messaging`,
                         notification: {
                             title:
-                            InstanceRenderManager({
+                            InstanceManager({
                                 imex:`ImEX Online Message - ${data.phone_num}` ,
                                 rome: `Rome Online Message - ${data.phone_num}`,
                                 promanager: `Pro Manager Message - ${data.phone_num}`

server/utils/instanceMgr.js

@@ -8,7 +8,7 @@
  * @property { string | object | function } imex  Return this prop if Rome.
  */
 
-export default function InstanceManager({ rome, promanager, imex }) {
+function InstanceManager({ rome, promanager, imex }) {
     let propToReturn = null;
 
     switch (process.env.INSTANCE) {
@@ -32,3 +32,5 @@ export default function InstanceManager({ rome, promanager, imex }) {
     // }
     return propToReturn;
 }
+
+exports.default = InstanceManager