drapcode-utility 2.4.4 → 2.4.5

package/build/utils/rest-client.d.ts

@@ -3,4 +3,11 @@ export declare const callCurlRequest: (setting: any, user?: any, tenant?: any, u
     status: number;
     success: boolean;
     headers: {};
+    mysqlError: {};
+} | {
+    data: any;
+    status: number;
+    success: boolean;
+    headers: {};
+    mysqlError?: undefined;
 }>;

package/build/utils/rest-client.js

@@ -146,6 +146,13 @@ const callCurlRequest = async (setting, user = {}, tenant = {}, userSetting = {}
             const { setting: extDbSetting } = dtoExternalDb;
             data["searchQuery"] = dtoSearchString;
             result = await makeMySqlCall(projectId, data, extDbSetting);
+            if (!result) {
+                const errorMessage = "No Response from MySQL Server";
+                return prepareReturnObject(errorMessage);
+            }
+            drapcode_logger_1.logger.info(`MySQL result.status: ${result?.status}`, { label: projectId });
+            deleteLocalFiles(isMultipart, toDeleteFiles);
+            return prepareReturnObject(result.data, result.status, result?.success || (result.status >= 200 && result.status < 300), result?.headers, result?.mysqlError);
         }
         else {
             result = await makeAxiosCall(projectId, methodType, url, headerValue, data, timeout, wrapJsonDataInArray, awsSignPluginConfig);
@@ -208,13 +215,24 @@ const deleteLocalFiles = (isMultipart, toDeleteFiles) => {
         });
     }
 };
-const prepareReturnObject = (data, status = 400, success = false, headers = {}) => {
-    return {
-        data,
-        status,
-        success,
-        headers,
-    };
+const prepareReturnObject = (data, status = 400, success = false, headers = {}, mysqlError = {}) => {
+    if (mysqlError && Object.keys(mysqlError).length > 0) {
+        return {
+            data,
+            status,
+            success,
+            headers,
+            mysqlError
+        };
+    }
+    else {
+        return {
+            data,
+            status,
+            success,
+            headers
+        };
+    }
 };
 const makeAxiosCall = async (projectId, methodType, url, axiosConfig, data, timeout, wrapJsonDataInArray, awsSignPluginConfig) => {
     axiosConfig = { url, method: methodType, ...axiosConfig };
@@ -334,6 +352,7 @@ const makeMySqlCall = async (projectId, data, extDbSetting) => {
                     totalRecords: total,
                     lastInsertedId: insertedId,
                     lastUpdatedId: updatedId,
+                    lastModifiedId: insertedId || updatedId,
                     returned: Array.isArray(rows) ? rows.length : 0
                 },
                 totalRecords: total,
@@ -342,7 +361,12 @@ const makeMySqlCall = async (projectId, data, extDbSetting) => {
         }
         catch (err) {
             console.error(`==> MySQL projectID: ${projectId} ~ err:`, err);
-            return { status: 500, error: err };
+            result = {
+                status: 500,
+                success: false,
+                mysqlError: err
+            };
+            return result;
         }
         finally {
             await connection.end();
@@ -352,6 +376,6 @@ const makeMySqlCall = async (projectId, data, extDbSetting) => {
     }
     catch (error) {
         console.error(`==> MySQL projectID: ${projectId} ~ error:`, error);
-        return { status: 500, error };
+        return { status: 500, success: false, data: {}, mysqlError: error };
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "description": "DrapCode Utility",
   "main": "build/index.js",
   "types": "build/index.d.ts",