Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2776-cdk-fortellis

# Conflicts:
#	client/src/components/dms-post-form/dms-post-form.component.jsx
#	package-lock.json
#	package.json
#	server/web-sockets/redisSocketEvents.js

server/utils/ioHelpers.js

@@ -1,3 +1,11 @@
+/**
+ * @module ioHelpers
+ * @param app
+ * @param api
+ * @param io
+ * @param logger
+ * @returns {{getBodyshopRoom: (function(*): string), getBodyshopConversationRoom: (function({bodyshopId: *, conversationId: *}): string)}}
+ */
 const applyIOHelpers = ({ app, api, io, logger }) => {
   // Global Bodyshop Room
   const getBodyshopRoom = (bodyshopId) => `bodyshop-broadcast-room:${bodyshopId}`;

server/utils/logger.js

@@ -12,6 +12,9 @@ const { uploadFileToS3 } = require("./s3");
 const { v4 } = require("uuid");
 const { InstanceRegion } = require("./instanceMgr");
 const getHostNameOrIP = require("./getHostNameOrIP");
+const client = require("../graphql-client/graphql-client").client;
+const queries = require("../graphql-client/queries");
+
 
 const LOG_LEVELS = {
   error: { level: 0, name: "error" },
@@ -99,13 +102,11 @@ const createLogger = () => {
             const labelColor = "\x1b[33m"; // Yellow
             const separatorColor = "\x1b[35m|\x1b[0m"; // Magenta for separators
 
-            return `${timestampColor} [${hostnameColor}] [${level}]: ${message} ${
-              user ? `${separatorColor} ${labelColor}user:\x1b[0m ${JSON.stringify(user)}` : ""
-            } ${record ? `${separatorColor} ${labelColor}record:\x1b[0m ${JSON.stringify(record)}` : ""}${
-              meta
+            return `${timestampColor} [${hostnameColor}] [${level}]: ${message} ${user ? `${separatorColor} ${labelColor}user:\x1b[0m ${JSON.stringify(user)}` : ""
+              } ${record ? `${separatorColor} ${labelColor}record:\x1b[0m ${JSON.stringify(record)}` : ""}${meta
                 ? `\n${separatorColor} ${labelColor}meta:\x1b[0m ${JSON.stringify(meta, null, 2)} ${separatorColor}`
                 : ""
-            }`;
+              }`;
           })
         )
       })
@@ -194,9 +195,45 @@ const createLogger = () => {
       winstonLogger.log(logEntry);
     };
 
+    const LogIntegrationCall = async ({ platform, method, name, jobid, paymentid, billid, status, bodyshopid, email }) => {
+      try {
+        //Insert the record. 
+        await client.request(queries.INSERT_INTEGRATION_LOG, {
+          log: {
+            platform,
+            method,
+            name,
+            jobid,
+            paymentid,
+            billid,
+            status: status?.toString() ?? "0",
+            bodyshopid,
+            email
+          }
+        });
+
+      } catch (error) {
+        console.trace("Stack", error?.stack);
+        log("integration-log-error", "ERROR", email, null, {
+          message: error?.message,
+          stack: error?.stack,
+          platform,
+          method,
+          name,
+          jobid,
+          paymentid,
+          billid,
+          status,
+          bodyshopid,
+          email
+        });
+      }
+    };
+
     return {
       log,
-      logger: winstonLogger
+      logger: winstonLogger,
+      LogIntegrationCall
     };
   } catch (e) {
     console.error("Error setting up enhanced Logger, defaulting to console.: " + e?.message || "");

server/utils/s3.js

@@ -9,6 +9,7 @@ const {
 const { defaultProvider } = require("@aws-sdk/credential-provider-node");
 const { InstanceRegion } = require("./instanceMgr");
 const { isString, isEmpty } = require("lodash");
+const { getSignedUrl } = require("@aws-sdk/s3-request-presigner");
 
 const createS3Client = () => {
   const S3Options = {
@@ -95,6 +96,17 @@ const createS3Client = () => {
       throw error;
     }
   };
+
+  const getPresignedUrl = async ({ bucketName, key }) => {
+    const command = new PutObjectCommand({
+      Bucket: bucketName,
+      Key: key,
+      StorageClass: "INTELLIGENT_TIERING"
+    });
+    const presignedUrl = await getSignedUrl(s3Client, command, { expiresIn: 360 });
+    return presignedUrl;
+  }
+
   return {
     uploadFileToS3,
     downloadFileFromS3,
@@ -102,8 +114,12 @@ const createS3Client = () => {
     deleteFileFromS3,
     copyFileInS3,
     fileExistsInS3,
+    getPresignedUrl,
     ...s3Client
   };
 };
 
+
+
+
 module.exports = createS3Client();