drapcode-utility 1.9.2 → 1.9.3

package/build/utils/check-error.js

@@ -128,7 +128,6 @@ var handleMultErrorConfig = function (error, result, status) {
         console.log("handleMultErrorConfig result :>> ".concat(Object.keys(result)));
         apiErrorMessage = lodash_1.default.get(result, message);
         if (apiErrorMessage) {
-            console.log("*** utility 3 ***");
             if (typeof apiErrorMessage == "string") {
                 console.log("It's string so leave");
             }
@@ -145,16 +144,13 @@ var handleMultErrorConfig = function (error, result, status) {
             apiErrorValue = lodash_1.default.get(result, path);
         }
         else {
-            console.log("*** utility 7 ***");
             apiErrorValue = status;
         }
-        console.log("*** utility 8 ***");
     }
     else {
         console.log("result", result);
         apiErrorValue = status;
     }
-    console.log("apiErrorValue", apiErrorValue);
     apiErrorValue = "".concat(apiErrorValue);
     console.log("apiErrorMessage", apiErrorMessage);
     console.log("apiErrorValue", apiErrorValue);
@@ -165,7 +161,6 @@ var handleMultErrorConfig = function (error, result, status) {
         };
     }
     else if (["false", "error", "fail", "failed"].includes(apiErrorValue.toLowerCase())) {
-        console.log("*** utility 9 ***");
         return {
             status: 400,
             message: apiErrorMessage,
@@ -174,8 +169,6 @@ var handleMultErrorConfig = function (error, result, status) {
     else if (voca_1.default.startsWith(apiErrorValue, "3") ||
         voca_1.default.startsWith(apiErrorValue, "4") ||
         voca_1.default.startsWith(apiErrorValue, "5")) {
-        console.log("*** utility 10 ***");
-        console.log("Compare 4");
         return {
             status: apiErrorValue,
             message: apiErrorMessage,

package/build/utils/query-parser.js

@@ -73,16 +73,8 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     if (!query)
                         return [2 /*return*/, ""];
                     console.log("***1*** queryParser ***");
-                    console.log("%%%%% refCollectionFieldsInItems", JSON.stringify(refCollectionFieldsInItems));
-                    console.log("%%%% timezone", timezone);
-                    console.log("collectionName", collectionName);
-                    console.log("query", JSON.stringify(query));
-                    console.log("constants", JSON.stringify(constants));
-                    console.log("externalParams", JSON.stringify(externalParams));
-                    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, currentUserSetting, timezone);
+                    console.log("**************************");
                     console.log("filterQuery", JSON.stringify(filterQuery));
                     rlsFilterQuery = [];
                     if (rowLevelSecurityFilter && rowLevelSecurityFilter.conditions.length) {
@@ -100,13 +92,10 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                         if (searchObj) {
                             _a = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _a.searchAggregateQuery, likeQuery = _a.likeQuery;
                             aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery, true), searchAggregateQuery, true);
-                            console.log("likeQuery after getSearchObjQuery", JSON.stringify(likeQuery));
                             if (likeQuery && likeQuery.length > 0) {
                                 searchQueryObj = likeQuery;
                             }
                         }
-                        console.log("aggregateQuery After search object condition", JSON.stringify(aggregateQuery));
-                        console.log("searchQueryObj", JSON.stringify(searchQueryObj));
                         finalQuery = { $and: filterQuery };
                         if (rlsFilterQuery.length &&
                             ((rlsFilterQuery[0].$or && rlsFilterQuery[0].$or.length) ||
@@ -116,18 +105,15 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                         if (searchQueryObj) {
                             (_d = finalQuery.$and).push.apply(_d, searchQueryObj);
                         }
-                        console.log("finalQuery after", JSON.stringify(finalQuery));
                         aggregateQuery.push({ $match: finalQuery });
                     }
                     else if (searchObj) {
-                        console.log("I donot have filter query");
                         _b = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _b.searchAggregateQuery, likeQuery = _b.likeQuery;
                         aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery, true), searchAggregateQuery, true);
                         if (likeQuery.length) {
                             aggregateQuery.push({ $match: { $and: likeQuery } });
                         }
                     }
-                    console.log("aggregateQuery", JSON.stringify(aggregateQuery));
                     console.log("==> query", query);
                     console.log("lookupConfig", lookupConfig);
                     projection = mongoSelectQuery(query);
@@ -443,8 +429,9 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         if (fieldType === "number") {
             return _6 = {}, _6[field] = +fieldValue, _6;
         }
-        console.log("Nothing match");
-        return _7 = {}, _7[field] = "".concat(fieldValue), _7;
+        else {
+            return _7 = {}, _7[field] = fieldValue, _7;
+        }
     }
     if (key === drapcode_constant_1.EQUALS_OR_IGNORE) {
         if (fieldType === "boolean") {

package/build/utils/query-paser-new.js

@@ -202,10 +202,13 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                 }
                             }
                         });
+                        console.log("==> aggregateQuery", aggregateQuery);
+                        console.log("==> likeQuery", likeQuery_1);
                         if (likeQuery_1.length) {
                             aggregateQuery.push({ $match: { $and: likeQuery_1 } });
                         }
                     }
+                    console.log("==> query", query);
                     projection = mongoSelectQuery(query);
                     finder = query.finder, sortBy = query.sortBy, orderBy = query.orderBy, aggregateFunctionField = query.aggregateFunctionField;
                     if (!(finder != "COUNT" && refCollectionFieldsInItems)) return [3 /*break*/, 2];
@@ -501,8 +504,9 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         if (fieldType === "number") {
             return _8 = {}, _8[field] = +fieldValue, _8;
         }
-        console.log("Nothing match");
-        return _9 = {}, _9[field] = "".concat(fieldValue), _9;
+        else {
+            return _9 = {}, _9[field] = fieldValue, _9;
+        }
     }
     if (key === drapcode_constant_1.EQUALS_OR_IGNORE) {
         if (fieldType === "boolean") {
@@ -616,16 +620,20 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         else
             return "".concat(startValue_1, "---").concat(endValue_1);
     }
+    console.log("==> value", value);
+    console.log("==> currentUser", currentUser);
     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 = splitValues[1];
         var refCollectionField = splitValues[2];
         if (refCollection && refCollectionField) {
             console.log("I have refCollection and Field");
             var refCollectionData = currentUser[refCollection];
+            console.log("refCollectionData", refCollectionData);
             if (!refCollectionData) {
                 return "";
             }

package/build/utils/util.js

@@ -298,34 +298,28 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, u
     var _a;
     var contentList = (_a = expression
         .match(/{{(.*?)}}/g)) === null || _a === void 0 ? void 0 : _a.map(function (b) { return b.replace(/{{(.*?)}}/g, "$1"); });
-    console.log("1 replaceDataValueIntoExpression");
     contentList === null || contentList === void 0 ? void 0 : contentList.forEach(function (prop) {
         var needle = "{{".concat(prop, "}}");
-        console.log("needle :>> ", needle);
         var dataOfItem = "";
         if (prop.includes("current_user")) {
-            console.log("Current 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");
             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");
             prop = prop.replace("current_settings.", "");
             if (Object.keys(userSetting).length > 0) {
                 dataOfItem = (0, exports.parseValueFromData)(userSetting, 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
@@ -333,7 +327,6 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, u
             }
         }
         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
@@ -341,7 +334,6 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, u
             }
         }
         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
@@ -349,7 +341,6 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, u
             }
         }
         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
@@ -357,7 +348,6 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, u
             }
         }
         else if (prop.includes("COOKIES")) {
-            console.log("Cookies");
             prop = prop.replace("COOKIES.", "");
             if (Object.keys(cookiesValue).length > 0) {
                 //Session will contain multi level data
@@ -365,7 +355,6 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, u
             }
         }
         else if (prop.includes("environment_variable")) {
-            console.log("Environment Variable");
             prop = prop.replace("environment_variable.", "");
             if (Object.keys(envConstants).length > 0) {
                 var selectedConstant = envConstants.find(function (constant) { return constant.name === prop; });
@@ -373,16 +362,11 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, u
             }
         }
         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;
 };
@@ -441,7 +425,6 @@ var parseValueFromData = function (data, fieldName) {
     else {
         value = data ? data[fieldName] : "";
     }
-    console.log("value :>> ", value);
     if (value && Array.isArray(value) && typeof value[0] === "string") {
         return value.join(", ");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -37,9 +37,9 @@
     "@types/voca": "^1.4.2",
     "axios": "^1.1.2",
     "dompurify": "^3.1.7",
-    "drapcode-constant": "^1.6.6",
-    "drapcode-logger": "^1.3.2",
-    "drapcode-redis": "^1.2.2",
+    "drapcode-constant": "^1.6.7",
+    "drapcode-logger": "^1.3.3",
+    "drapcode-redis": "^1.2.3",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",