drapcode-utility 2.5.0 → 2.5.1-preview

package/build/utils/rest-client.js

@@ -155,7 +155,7 @@ const callCurlRequest = async (setting, user = {}, tenant = {}, userSetting = {}
             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);
+            result = await makeAxiosCall(projectId, methodType, url, headerValue, data, timeout, wrapJsonDataInArray, awsSignPluginConfig, dtoExternalAPI);
         }
         drapcode_logger_1.logger.info(`result.headers: ${result?.headers}`, { label: projectId });
         if (!result) {
@@ -234,14 +234,19 @@ const prepareReturnObject = (data, status = 400, success = false, headers = {},
         };
     }
 };
-const makeAxiosCall = async (projectId, methodType, url, axiosConfig, data, timeout, wrapJsonDataInArray, awsSignPluginConfig) => {
+const makeAxiosCall = async (projectId, methodType, url, axiosConfig, data, timeout, wrapJsonDataInArray, awsSignPluginConfig, dtoExternalAPI) => {
     axiosConfig = { url, method: methodType, ...axiosConfig };
     let result = "";
     const instance = axios_1.default.create();
     instance.defaults.timeout = timeout * 1000;
+    const { dtoBodyDataFrom } = dtoExternalAPI || {};
+    const isNoBodyData = !dtoBodyDataFrom || dtoBodyDataFrom === "noDynamicData";
+    console.log(`\n ==> isNoBodyData for projectID: ${projectId}:`, isNoBodyData);
     switch (methodType) {
         case "GET":
-            axiosConfig["data"] = data ? data : {};
+            if (!isNoBodyData) {
+                axiosConfig["data"] = data ? data : {};
+            }
             break;
         case "POST":
         case "PUT":

package/build/utils/util.js

@@ -408,19 +408,21 @@ const parseJsonString = (str) => {
 exports.parseJsonString = parseJsonString;
 const parseValueFromData = (data, fieldName) => {
     let value = "";
+    let valueIndex = "";
+    let valueIndexFieldName = "";
     if (fieldName && fieldName.includes(".")) {
         let fullNameParts = fieldName.split(".");
         let prefix = "";
-        let stack = data || "";
+        let stack = data || {};
         for (let k = 0; k < fullNameParts.length; k++) {
             prefix = fullNameParts[k];
-            if (Array.isArray(stack)) {
+            if (stack && Array.isArray(stack)) {
                 stack[prefix] = stack.map((item) => {
                     if (item[prefix])
                         return item[prefix];
                 });
             }
-            if (stack && stack[prefix] === undefined) {
+            if (stack && !stack[prefix]) {
                 stack[prefix] = "";
             }
             stack = stack[prefix];
@@ -430,14 +432,57 @@ const parseValueFromData = (data, fieldName) => {
             value = value.filter(() => true);
         }
     }
+    else if (fieldName && fieldName.includes("[")) {
+        //Todo: Need to Refactor
+        let fullNameParts = fieldName.split("[");
+        let prefix = "";
+        let stack = data || {};
+        for (let k = 0; k < fullNameParts.length - 1; k++) {
+            const cValue = fullNameParts[k];
+            const nValue = fullNameParts[k + 1];
+            prefix = cValue ? (!cValue.includes("]") ? cValue : "") : "";
+            valueIndex = nValue
+                ? nValue.includes("]")
+                    ? nValue.split("]")[0]
+                    : nValue
+                : "";
+            if (stack && Array.isArray(stack)) {
+                stack[prefix] = stack.map((item) => {
+                    if (item[prefix])
+                        return item[prefix];
+                });
+            }
+            if (stack && !stack[prefix]) {
+                stack[prefix] = "";
+            }
+            stack = valueIndex ? stack[prefix][valueIndex] : stack[prefix];
+            if (fieldName.includes("]:")) {
+                valueIndexFieldName = nValue.split("]:")[1];
+                if (valueIndexFieldName) {
+                    stack = stack[valueIndexFieldName];
+                }
+            }
+        }
+        value = stack ? stack : "";
+        if (Array.isArray(value)) {
+            value = value.filter(() => true);
+        }
+    }
     else {
         value = data ? data[fieldName] : "";
     }
+    if (value && Array.isArray(value) && value.length === 1)
+        return value[0];
     if (value && Array.isArray(value) && typeof value[0] === "string") {
-        return value.join(", ");
+        return value.join(",");
     }
-    if (typeof value !== undefined && typeof value === "number") {
-        return value.toString();
+    if (!value || value == "undefined" || value === "undefined") {
+        if (value === 0) {
+            value = "0";
+        }
+        else {
+            value = "";
+        }
     }
     return value;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "2.5.0",
+  "version": "2.5.1-preview",
   "description": "DrapCode Utility",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,9 +42,9 @@
     "axios": "^1.1.2",
     "date-fns": "^4.1.0",
     "dompurify": "^3.1.7",
-    "drapcode-constant": "^2.0.2",
-    "drapcode-logger": "^1.3.5",
-    "drapcode-redis": "^1.4.9",
+    "drapcode-constant": "^2.0.2-preview",
+    "drapcode-logger": "^1.3.5-preview",
+    "drapcode-redis": "^1.4.9-preview",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",