drapcode-utility 2.3.9 → 2.4.1

package/build/utils/rest-client.js

@@ -306,7 +306,7 @@ const makeMySqlCall = async (projectId, data, extDbSetting) => {
             database: mysqlDbName,
             port: mysqlDbPort,
         };
-        console.log(`==> Final MySQL data for projectID: ${projectId}:>> `, data, " with finalSql:>> ", finalSql, " and values:>> ", values);
+        console.log(`==> Final MySQL projectID: ${projectId} ~ data:>> `, data, " ~ query type :>> ", operation, " ~ finalSql:>> ", finalSql, " ~ values:>> ", values);
         const connection = await (0, util_1.createMySqlConnection)(mysqlDBConfig);
         try {
             const [rows] = await connection.execute(finalSql, values);
@@ -314,12 +314,26 @@ const makeMySqlCall = async (projectId, data, extDbSetting) => {
             if (sqlPagination?.getTotal) {
                 total = await (0, util_1.getTotalRecords)(connection, sqlQuery, sqlParams);
             }
+            let insertedId = null;
+            let updatedId = null;
+            if (operation === 'insert') {
+                insertedId = rows?.insertId || null;
+            }
+            else if (operation === 'update') {
+                const hasLastInsertId = finalSql.toLowerCase().includes("last_insert_id(");
+                console.log(`==> MySQL projectID: ${projectId} ~ hasLastInsertId:`, hasLastInsertId);
+                if (hasLastInsertId) {
+                    updatedId = await (0, util_1.getLastUpdatedId)(connection, sqlParams);
+                }
+            }
             result = {
                 status: 200,
                 success: true,
                 data: {
                     content: rows,
                     totalRecords: total,
+                    lastInsertedId: insertedId,
+                    lastUpdatedId: updatedId,
                     returned: Array.isArray(rows) ? rows.length : 0
                 },
                 totalRecords: total,

package/build/utils/util.d.ts

@@ -155,21 +155,28 @@ type responseDataType = {
     data: any;
 };
 export declare const getAwsSignature: (axiosConfig: any, awsSignPluginConfig: any) => Promise<responseDataType>;
+/**
+ * MySQL Helper to create connection
+ */
 export declare const createMySqlConnection: (config: any) => Promise<any>;
 /**
- * Helper to parse search query string into SQL WHERE clause
+ * MySQL Helper to parse search query string into SQL WHERE clause
  */
 export declare const buildWhereClause: (searchQuery: string) => string;
 /**
- * Helper to build ORDER BY clause
+ * MySQL Helper to build ORDER BY clause
  */
 export declare const buildOrderByClause: (sqlSort: any) => string;
 /**
- * Helper to build LIMIT/OFFSET clause and update values array
+ * MySQL Helper to build LIMIT/OFFSET clause and update values array
  */
 export declare const buildLimitOffsetClause: (sqlPagination: any, values: any[]) => string;
 /**
- * Helper to get total record count for pagination
+ * MySQL Helper to get total record count for pagination
  */
 export declare const getTotalRecords: (connection: any, sqlQuery: string, sqlParams: any[]) => Promise<number | null>;
+/**
+ * MySQL Helper to get last updated ID
+ */
+export declare const getLastUpdatedId: (connection: any, sqlParams: any[]) => Promise<number | null>;
 export {};

package/build/utils/util.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.multiply = exports.average = exports.substraction = exports.addition = exports.validateNumbers = exports.checkAndConvertNumber = exports.evaluateCustomSentence = exports.strJoin = exports.markdownToHtml = exports.substr = exports.truncate = exports.titleCase = exports.trim = exports.slugify = exports.upperCase = exports.lowerCase = exports.capitalize = exports.replaceUnderscoreWithSlash = exports.replaceSlashWithUnderscore = exports.toggleConsoleLogs = exports.validateUrl = exports.validateData = exports.fillDefaultValues = exports.replaceValueFromSource = exports.processFieldsInclude = exports.removeMongoDbId = exports.replaceTransferObjectValueIntoExpression = exports.unflattenObject = exports.parseValueFromData = exports.parseJsonString = exports.replaceDataValueIntoExpression = exports.formatCustomCSSClasses = exports.validateAlphanumericString = exports.convertItemToArray = exports.arraysEqual = exports.checkAndCompareValue = exports.restructureData = exports.formatCollectionAndFieldName = exports.cleanCollectionAndFieldName = exports.getSpecialCharectorReplacedExpression = exports.validateUuidString = exports.validateEmail = exports.dynamicSort = exports.isObject = exports.isEmptyObject = exports.isEmpty = exports.clearSpaceAndReformat = exports.camelize = exports.validateString = exports.nonFindQuery = void 0;
-exports.getTotalRecords = exports.buildLimitOffsetClause = exports.buildOrderByClause = exports.buildWhereClause = exports.createMySqlConnection = exports.getAwsSignature = exports.replaceValuesFromRequestMapping = exports.replaceValuesFromObjArr = exports.checkFieldValueType = exports.getPrimaryFieldNameOfDataSource = exports.getFieldSchemaForDataSourcePrimaryId = exports.getMappingObjKey = exports.getItemDataForArrayFields = exports.getFileObjectList = exports.getFindQuery = exports.mergeObjects = exports.dateDifference = exports.formatDate = exports.evaluateJSLogic = exports.evaluateCurrency = exports.evaluateExpression = exports.divide = void 0;
+exports.getLastUpdatedId = exports.getTotalRecords = exports.buildLimitOffsetClause = exports.buildOrderByClause = exports.buildWhereClause = exports.createMySqlConnection = exports.getAwsSignature = exports.replaceValuesFromRequestMapping = exports.replaceValuesFromObjArr = exports.checkFieldValueType = exports.getPrimaryFieldNameOfDataSource = exports.getFieldSchemaForDataSourcePrimaryId = exports.getMappingObjKey = exports.getItemDataForArrayFields = exports.getFileObjectList = exports.getFindQuery = exports.mergeObjects = exports.dateDifference = exports.formatDate = exports.evaluateJSLogic = exports.evaluateCurrency = exports.evaluateExpression = exports.divide = void 0;
 const drapcode_constant_1 = require("drapcode-constant");
 const lodash_1 = __importDefault(require("lodash"));
 const showdown_1 = __importDefault(require("showdown"));
@@ -302,37 +302,32 @@ const replaceDataValueIntoExpression = (expression, data, user, tenant, userSett
     console.log("1 replaceDataValueIntoExpression");
     contentList?.forEach((prop) => {
         const needle = `{{${prop}}}`;
-        console.log("needle :>> ", needle);
         let dataOfItem = "";
-        if (prop.includes("current_user")) {
-            console.log("Current User");
+        if (prop.includes("current_user") && user) {
             prop = prop.replace("current_user.", "");
             if (Object.keys(user).length > 0) {
                 dataOfItem = (0, exports.parseValueFromData)(user, prop);
             }
         }
-        else if (prop.includes("current_tenant")) {
-            console.log("Current Tenant");
+        else if (prop.includes("current_tenant") && tenant) {
             prop = prop.replace("current_tenant.", "");
             if (Object.keys(tenant).length > 0) {
                 dataOfItem = (0, exports.parseValueFromData)(tenant, prop);
             }
         }
-        else if (prop.includes("current_settings")) {
-            console.log("Current Setting");
+        else if (prop.includes("current_settings") && userSetting) {
             prop = prop.replace("current_settings.", "");
             if (Object.keys(userSetting).length > 0) {
                 dataOfItem = (0, exports.parseValueFromData)(userSetting, prop);
             }
         }
-        else if (prop.includes("current_sub_tenant")) {
+        else if (prop.includes("current_sub_tenant") && subTenant) {
             prop = prop.replace("current_sub_tenant.", "");
             if (Object.keys(userSetting).length > 0) {
                 dataOfItem = (0, exports.parseValueFromData)(subTenant, prop);
             }
         }
         else if (prop.includes("current_session")) {
-            console.log("Current Session");
             prop = prop.replace("current_session.", "");
             if (Object.keys(sessionValue).length > 0) {
                 //Session will contain multi level data
@@ -340,7 +335,6 @@ const replaceDataValueIntoExpression = (expression, data, user, tenant, userSett
             }
         }
         else if (prop.includes("form_data_session")) {
-            console.log("Form Data Session");
             prop = prop.replace("form_data_session.", "");
             if (Object.keys(sessionFormValue).length > 0) {
                 //Form Session will contain multi level data
@@ -348,7 +342,6 @@ const replaceDataValueIntoExpression = (expression, data, user, tenant, userSett
             }
         }
         else if (prop.includes("SESSION_STORAGE")) {
-            console.log("Session Storage");
             prop = prop.replace("SESSION_STORAGE.", "");
             if (Object.keys(sessionValue).length > 0) {
                 //Session will contain multi level data
@@ -356,7 +349,6 @@ const replaceDataValueIntoExpression = (expression, data, user, tenant, userSett
             }
         }
         else if (prop.includes("LOCAL_STORAGE")) {
-            console.log("Local Storage");
             prop = prop.replace("LOCAL_STORAGE.", "");
             if (Object.keys(localStorageValue).length > 0) {
                 //Session will contain multi level data
@@ -364,7 +356,6 @@ const replaceDataValueIntoExpression = (expression, data, user, tenant, userSett
             }
         }
         else if (prop.includes("COOKIES")) {
-            console.log("Cookies");
             prop = prop.replace("COOKIES.", "");
             if (Object.keys(cookiesValue).length > 0) {
                 //Session will contain multi level data
@@ -372,7 +363,6 @@ const replaceDataValueIntoExpression = (expression, data, user, tenant, userSett
             }
         }
         else if (prop.includes("environment_variable")) {
-            console.log("Environment Variable");
             prop = prop.replace("environment_variable.", "");
             if (Object.keys(envConstants).length > 0) {
                 const selectedConstant = envConstants.find((constant) => constant.name === prop);
@@ -380,16 +370,11 @@ const replaceDataValueIntoExpression = (expression, data, user, tenant, userSett
             }
         }
         else {
-            console.log("Nothing Matches");
             if (Object.keys(data).length > 0) {
                 dataOfItem = (0, exports.parseValueFromData)(data, prop);
-                //TODO: Need better way
-                delete data[prop];
             }
         }
-        console.log("dataOfItem :>> ", dataOfItem);
         expression = replaceValueInExpression(needle, dataOfItem, expression);
-        console.log("expression :>> ", expression);
     });
     return expression;
 };
@@ -448,7 +433,6 @@ const parseValueFromData = (data, fieldName) => {
     else {
         value = data ? data[fieldName] : "";
     }
-    console.log("value :>> ", value);
     if (value && Array.isArray(value) && typeof value[0] === "string") {
         return value.join(", ");
     }
@@ -1224,6 +1208,9 @@ const getAwsSignature = async (axiosConfig, awsSignPluginConfig) => {
     return response;
 };
 exports.getAwsSignature = getAwsSignature;
+/**
+ * MySQL Helper to create connection
+ */
 const createMySqlConnection = async (config) => {
     try {
         const { host, user, password, database, port } = config || {};
@@ -1245,7 +1232,7 @@ const createMySqlConnection = async (config) => {
 };
 exports.createMySqlConnection = createMySqlConnection;
 /**
- * Helper to parse search query string into SQL WHERE clause
+ * MySQL Helper to parse search query string into SQL WHERE clause
  */
 const buildWhereClause = (searchQuery) => {
     if (!searchQuery)
@@ -1258,7 +1245,7 @@ const buildWhereClause = (searchQuery) => {
 };
 exports.buildWhereClause = buildWhereClause;
 /**
- * Helper to build ORDER BY clause
+ * MySQL Helper to build ORDER BY clause
  */
 const buildOrderByClause = (sqlSort) => {
     if (sqlSort?.column && sqlSort?.order) {
@@ -1269,18 +1256,20 @@ const buildOrderByClause = (sqlSort) => {
 };
 exports.buildOrderByClause = buildOrderByClause;
 /**
- * Helper to build LIMIT/OFFSET clause and update values array
+ * MySQL Helper to build LIMIT/OFFSET clause and update values array
  */
 const buildLimitOffsetClause = (sqlPagination, values) => {
     if (sqlPagination?.limit && sqlPagination?.offset !== undefined) {
+        const limit = Math.max(Number(sqlPagination.limit) || 10, 1);
+        const offset = Math.max(Number(sqlPagination.offset) || 0, 0);
         values.push(parseInt(sqlPagination.limit), parseInt(sqlPagination.offset));
-        return " LIMIT ? OFFSET ?";
+        return ` LIMIT ${limit} OFFSET ${offset}`;
     }
     return "";
 };
 exports.buildLimitOffsetClause = buildLimitOffsetClause;
 /**
- * Helper to get total record count for pagination
+ * MySQL Helper to get total record count for pagination
  */
 const getTotalRecords = async (connection, sqlQuery, sqlParams) => {
     const countSql = `SELECT COUNT(*) as total FROM (${sqlQuery}) as count_table`;
@@ -1288,3 +1277,12 @@ const getTotalRecords = async (connection, sqlQuery, sqlParams) => {
     return countRows[0]?.total ?? null;
 };
 exports.getTotalRecords = getTotalRecords;
+/**
+ * MySQL Helper to get last updated ID
+ */
+const getLastUpdatedId = async (connection, sqlParams) => {
+    const lastUpdatedIdSql = `SELECT LAST_INSERT_ID() as lastId`;
+    const [lastUpdatedIdRows] = await connection.execute(lastUpdatedIdSql, sqlParams);
+    return lastUpdatedIdRows[0]?.lastId ?? null;
+};
+exports.getLastUpdatedId = getLastUpdatedId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "2.3.9",
+  "version": "2.4.1",
   "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": "^1.9.7",
+    "drapcode-constant": "^1.9.8",
     "drapcode-logger": "^1.3.5",
-    "drapcode-redis": "^1.4.3",
+    "drapcode-redis": "^1.4.4",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",