drapcode-utility 1.4.4 → 1.4.6

package/build/utils/query-parser.d.ts

@@ -1,4 +1,4 @@
-export declare const queryParser: (collectionName: string, query: any, constants: any[], externalParams: any, currentUser: any, timezone: string, searchObj?: any, refCollectionFieldsInItems?: any, searchQueryTypeObj?: any, currentTenant?: any, lookupConfig?: any) => Promise<string>;
+export declare const queryParser: (collectionName: string, query: any, constants: any[], externalParams: any, currentUser: any, timezone: string, searchObj?: any, refCollectionFieldsInItems?: any, searchQueryTypeObj?: any, currentTenant?: any, currentUserSetting?: any, lookupConfig?: any) => Promise<string>;
 export declare const isEntityInCondition: (value: any) => boolean;
 export declare const getMinMaxValue: (value: any) => {
     startValue: any;

package/build/utils/query-parser.js

@@ -50,12 +50,13 @@ var drapcode_constant_1 = require("drapcode-constant");
 var date_util_1 = require("./date-util");
 var util_1 = require("./util");
 var prepare_query_1 = require("./prepare-query");
-var queryParser = function (collectionName, query, constants, externalParams, currentUser, timezone, searchObj, refCollectionFieldsInItems, searchQueryTypeObj, currentTenant, lookupConfig) {
+var queryParser = function (collectionName, query, constants, externalParams, currentUser, timezone, searchObj, refCollectionFieldsInItems, searchQueryTypeObj, currentTenant, currentUserSetting, lookupConfig) {
     if (currentUser === void 0) { currentUser = {}; }
     if (searchObj === void 0) { searchObj = null; }
     if (refCollectionFieldsInItems === void 0) { refCollectionFieldsInItems = null; }
     if (searchQueryTypeObj === void 0) { searchQueryTypeObj = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
+    if (currentUserSetting === void 0) { currentUserSetting = {}; }
     if (lookupConfig === void 0) { lookupConfig = []; }
     return __awaiter(void 0, void 0, void 0, function () {
         var filterQuery, aggregateQuery, queryStr, searchQueryObj, _a, searchAggregateQuery, likeQuery, finalQuery, _b, searchAggregateQuery, likeQuery, projection, finder, sortBy, orderBy, offset, limit, direction, str;
@@ -77,7 +78,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     console.log("currentUser", JSON.stringify(currentUser));
                     console.log("searchObj", JSON.stringify(searchObj));
                     console.log("searchQueryTypeObj", JSON.stringify(searchQueryTypeObj));
-                    filterQuery = mongoFilterQuery(query, externalParams, constants, currentUser, currentTenant, timezone);
+                    filterQuery = mongoFilterQuery(query, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone);
                     console.log("filterQuery", JSON.stringify(filterQuery));
                     aggregateQuery = [];
                     queryStr = ".aggregate([])";
@@ -167,16 +168,17 @@ var toBoolean = function (value) {
             return false;
     }
 };
-var mongoFilterQuery = function (query, externalParams, constants, currentUser, currentTenant, timezone) {
+var mongoFilterQuery = function (query, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone) {
     if (currentUser === void 0) { currentUser = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
+    if (currentUserSetting === void 0) { currentUserSetting = {}; }
     var filterQuery = { $or0: [] };
     var conditions = query.conditions;
     var queryConjunctions = [];
     conditions.forEach(function (queryObj, index) {
         var query = queryObj.query, requiredExternal = queryObj.requiredExternal;
         console.log("query :>> ", JSON.stringify(query));
-        var mongoQuery = queryToMongo(query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone);
+        var mongoQuery = queryToMongo(query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone);
         console.log(":::::::::mongoQuery::::", JSON.stringify(mongoQuery));
         queryConjunctions.push(queryObj.conjunctionType);
         if (queryObj.conjunctionType == "OR") {
@@ -247,11 +249,12 @@ var modifyQuery = function (obj, hasAndQueryConjunction) {
     console.log("🚀 ~ file: query-parser.ts:303 ~ Object.entries ~ arr:", arr);
     return arr;
 };
-var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone) {
+var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
     if (currentUser === void 0) { currentUser = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
-    var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone);
+    if (currentUserSetting === void 0) { currentUserSetting = {}; }
+    var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone);
     if (["undefined", "null", null, undefined, ""].includes(fieldValue)) {
         //TODO: In case field is not present in old record then fieldValue is undefined
         //TODO: In case of this, we assign some random string to avoid resulting all values
@@ -408,7 +411,7 @@ var isEntityInCondition = function (value) {
     return isEntity;
 };
 exports.isEntityInCondition = isEntityInCondition;
-var replaceExternalParams = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone) {
+var replaceExternalParams = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone) {
     var key = query.key, value = query.value, fieldType = query.fieldType;
     if (fieldType &&
         !requiredExternal &&
@@ -425,6 +428,9 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
                 if (refCollection === drapcode_constant_1.CURRENT_TENANT) {
                     finalValue = currentTenant[refField];
                 }
+                if (refCollection === drapcode_constant_1.CURRENT_SETTINGS) {
+                    finalValue = currentUserSetting[refField];
+                }
             }
         }
         if (value === drapcode_constant_1.CURRENT_USER) {
@@ -450,6 +456,22 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
                 });
             });
         }
+        else {
+            var constantDataObj = [
+                { constantName: drapcode_constant_1.CURRENT_USER, data: currentUser },
+                { constantName: drapcode_constant_1.CURRENT_TENANT, data: currentTenant },
+                { constantName: drapcode_constant_1.CURRENT_SETTINGS, data: currentUserSetting },
+            ];
+            constantDataObj.forEach(function (cnst) {
+                if (value.includes(cnst.constantName)) {
+                    var currentDataValue = getCurrentDataValueFrom(value, cnst.constantName, cnst.data, true);
+                    if (currentDataValue) {
+                        valueList_1 = Array.isArray(currentDataValue)
+                            ? __spreadArray(__spreadArray([], valueList_1), currentDataValue) : __spreadArray(__spreadArray([], valueList_1), [currentDataValue]);
+                    }
+                }
+            });
+        }
         return valueList_1;
     }
     if (key === drapcode_constant_1.BETWEEN) {
@@ -488,92 +510,18 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         else
             return startValue_1 + "---" + endValue_1;
     }
-    if (value.includes(drapcode_constant_1.CURRENT_USER)) {
-        if (value === drapcode_constant_1.CURRENT_USER) {
-            return currentUser["uuid"];
-        }
-        var splitValues = value.split("::");
-        console.log("splitValues", splitValues);
-        var refCollection = "", refCollectionField = "";
-        if (splitValues.length > 2) {
-            refCollection = splitValues[1];
-            refCollectionField = splitValues[2];
-        }
-        else if (splitValues.length === 2) {
-            refCollection = splitValues[0];
-            refCollectionField = splitValues[1];
-        }
-        else {
-            refCollection = splitValues[0];
-            refCollectionField = "";
-        }
-        console.log("refCollection", refCollection);
-        console.log("refCollectionField", refCollectionField);
-        console.log("first", refCollectionField && refCollection);
-        if (refCollection && refCollectionField) {
-            console.log("I have refCollection and Field");
-            if (refCollection === drapcode_constant_1.CURRENT_USER) {
-                return currentUser[refCollectionField];
-            }
-            else {
-                var refCollectionData = currentUser[refCollection];
-                if (!refCollectionData) {
-                    return "";
-                }
-                if (refCollectionData.length > 1) {
-                    //TODO: Need to handle multi ref
-                    return "";
-                }
-                refCollectionData = refCollectionData[0];
-                console.log("refCollectionData[refCollectionField]", refCollectionData[refCollectionField]);
-                return refCollectionData[refCollectionField];
-            }
-        }
-        //this means that data has to be match with currnet user field that is not ref type
-        if (refCollection) {
-            return currentUser[refCollection];
-        }
-        return currentUser["uuid"];
-    }
-    if (value.includes(drapcode_constant_1.CURRENT_TENANT)) {
-        if (value === drapcode_constant_1.CURRENT_TENANT) {
-            return currentTenant["uuid"];
-        }
-        var splitValues = value.split("::");
-        console.log("splitValues", splitValues);
-        var refCollection = "", refCollectionField = "";
-        if (splitValues.length > 2) {
-            refCollection = splitValues[1];
-            refCollectionField = splitValues[2];
-        }
-        else if (splitValues.length === 2) {
-            refCollection = splitValues[0];
-            refCollectionField = splitValues[1];
-        }
-        else {
-            refCollection = splitValues[0];
-            refCollectionField = "";
-        }
-        if (refCollection && refCollectionField) {
-            console.log("I have refCollection and Field");
-            if (refCollection === "CURRENT_TENANT") {
-                return currentTenant[refCollectionField];
-            }
-            else {
-                var refCollectionData = currentTenant[refCollection];
-                if (!refCollectionData)
-                    return "";
-                if (refCollectionData.length > 1)
-                    return "";
-                refCollectionData = refCollectionData[0];
-                return refCollectionData[refCollectionField];
-            }
-        }
-        //this means that data has to be match with currnet user field that is not ref type
-        if (refCollection)
-            return currentTenant[refCollection];
-        return currentTenant["uuid"];
-    }
+    var currentUserValue = getCurrentDataValueFrom(value, drapcode_constant_1.CURRENT_USER, currentUser);
+    console.log("\n currentUserValue :>> ", currentUserValue);
+    if (currentUserValue)
+        return currentUserValue;
+    var currentTenantValue = getCurrentDataValueFrom(value, drapcode_constant_1.CURRENT_TENANT, currentTenant);
+    console.log("\n currentTenantValue :>> ", currentTenantValue);
+    if (currentTenantValue)
+        return currentTenantValue;
+    var currentUserSettingsValue = getCurrentDataValueFrom(value, drapcode_constant_1.CURRENT_SETTINGS, currentUserSetting);
+    console.log("\n currentUserSettingsValue :>> ", currentUserSettingsValue);
+    if (currentUserSettingsValue)
+        return currentUserSettingsValue;
     if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); })) {
         return getValueOfProjectConstant(value, {}, timezone);
     }
@@ -745,3 +693,59 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
     console.log("==> likeQuery", JSON.stringify(likeQuery));
     return { searchAggregateQuery: searchAggregateQuery, likeQuery: likeQuery };
 };
+var getCurrentDataValueFrom = function (value, constantName, data, isMultiRef) {
+    if (isMultiRef === void 0) { isMultiRef = false; }
+    if (value.includes(constantName)) {
+        if (value === constantName)
+            return data["uuid"];
+        var splitValues = value.split("::");
+        console.log("splitValues", splitValues);
+        var refCollection = "", refCollectionField_1 = "";
+        if (splitValues.length > 2) {
+            refCollection = splitValues[1];
+            refCollectionField_1 = splitValues[2];
+        }
+        else if (splitValues.length === 2) {
+            refCollection = splitValues[0];
+            refCollectionField_1 = splitValues[1];
+        }
+        else {
+            refCollection = splitValues[0];
+            refCollectionField_1 = "";
+        }
+        console.log("refCollection", refCollection);
+        console.log("refCollectionField", refCollectionField_1);
+        console.log("first", refCollectionField_1 && refCollection);
+        if (refCollection && refCollectionField_1) {
+            console.log("I have refCollection and Field");
+            if (refCollection === constantName) {
+                return data[refCollectionField_1];
+            }
+            else {
+                var refCollectionData = data[refCollection];
+                console.log("refCollectionData", refCollectionData);
+                if (!refCollectionData)
+                    return "";
+                if (refCollectionData.length > 1) {
+                    //TODO: Need to handle multi ref
+                    // Handled For IN_LIST and NOT_IN_LIST Condition
+                    if (!isMultiRef)
+                        return "";
+                    var finalValue_1 = [];
+                    refCollectionData.forEach(function (refData) {
+                        if (refData[refCollectionField_1])
+                            finalValue_1.push(refData[refCollectionField_1]);
+                    });
+                    return finalValue_1;
+                }
+                refCollectionData = refCollectionData[0];
+                console.log("refCollectionData[refCollectionField]", refCollectionData[refCollectionField_1]);
+                return refCollectionData[refCollectionField_1];
+            }
+        }
+        //this means that data has to be match with currnet user field that is not ref type
+        if (refCollection)
+            return data[refCollection];
+        return data["uuid"];
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -33,8 +33,8 @@
     "@types/express": "^4.17.7",
     "@types/voca": "^1.4.2",
     "axios": "^1.1.2",
-    "drapcode-constant": "^1.3.9",
-    "drapcode-logger": "^1.1.3",
+    "drapcode-constant": "^1.4.0",
+    "drapcode-logger": "^1.1.4",
     "drapcode-redis": "^1.0.5",
     "express": "^4.17.1",
     "lodash": "^4.17.21",