drapcode-utility 1.9.3 → 1.9.5

package/build/utils/check-error.js

@@ -128,6 +128,7 @@ 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");
             }
@@ -144,13 +145,16 @@ 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);
@@ -161,6 +165,7 @@ var handleMultErrorConfig = function (error, result, status) {
         };
     }
     else if (["false", "error", "fail", "failed"].includes(apiErrorValue.toLowerCase())) {
+        console.log("*** utility 9 ***");
         return {
             status: 400,
             message: apiErrorMessage,
@@ -169,6 +174,8 @@ 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,8 +73,16 @@ 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) {
@@ -92,10 +100,13 @@ 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) ||
@@ -105,15 +116,18 @@ 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);
@@ -281,10 +295,10 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
     // if (isDate) fieldValue = new Date(fieldValue);
     console.log("fieldValue queryToMongo 1", fieldValue);
     var condition = [
-        "dynamic_option",
-        "reference",
-        "static_option",
-        "belongsTo",
+        drapcode_constant_1.FieldTypes.dynamic_option.id,
+        drapcode_constant_1.FieldTypes.reference.id,
+        drapcode_constant_1.FieldTypes.static_option.id,
+        drapcode_constant_1.FieldTypes.belongsTo.id,
     ].includes(fieldType);
     if (condition && key === drapcode_constant_1.EQUALS && !isDate) {
         if (!Array.isArray(fieldValue)) {
@@ -397,7 +411,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
             }
             : {};
     }
-    if (key == drapcode_constant_1.EQUALS && fieldType === "boolean" && fieldValue)
+    if (key == drapcode_constant_1.EQUALS && fieldType === drapcode_constant_1.FieldTypes.boolean.id && fieldValue)
         return JSON.parse(fieldValue)
             ? (_z = {},
                 _z[field] = JSON.parse(fieldValue),
@@ -407,7 +421,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
                 (_1 = {}, _1[field] = { $exists: false }, _1),
             ],
         };
-    if (key === drapcode_constant_1.EQUALS_OR_IGNORE && fieldType === "boolean") {
+    if (key === drapcode_constant_1.EQUALS_OR_IGNORE && fieldType === drapcode_constant_1.FieldTypes.boolean.id) {
         return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
             ? JSON.parse(fieldValue)
                 ? (_2 = {},
@@ -423,22 +437,21 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
     if (key == drapcode_constant_1.EQUALS) {
         console.log("I am query parser");
         console.log("fieldType", fieldType);
-        if (fieldType === "boolean") {
+        if (fieldType === drapcode_constant_1.FieldTypes.boolean.id) {
             return _5 = {}, _5[field] = !!fieldValue, _5;
         }
-        if (fieldType === "number") {
+        if (fieldType === drapcode_constant_1.FieldTypes.number.id) {
             return _6 = {}, _6[field] = +fieldValue, _6;
         }
-        else {
-            return _7 = {}, _7[field] = fieldValue, _7;
-        }
+        console.log("Nothing match");
+        return _7 = {}, _7[field] = "".concat(fieldValue), _7;
     }
     if (key === drapcode_constant_1.EQUALS_OR_IGNORE) {
-        if (fieldType === "boolean") {
+        if (fieldType === drapcode_constant_1.FieldTypes.boolean.id) {
             return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
                 ? (_8 = {}, _8[field] = !!fieldValue, _8) : {};
         }
-        if (fieldType === "number") {
+        if (fieldType === drapcode_constant_1.FieldTypes.number.id) {
             return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
                 ? (_9 = {}, _9[field] = +fieldValue, _9) : {};
         }
@@ -448,13 +461,13 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         }
     }
     if (key == drapcode_constant_1.NOT_EQUAL)
-        if (fieldType === "number") {
+        if (fieldType === drapcode_constant_1.FieldTypes.number.id) {
             return _11 = {}, _11[field] = { $ne: +fieldValue }, _11;
         }
         else
             return _12 = {},
                 _12[field] = {
-                    $ne: fieldType === "boolean" && fieldValue
+                    $ne: fieldType === drapcode_constant_1.FieldTypes.boolean.id && fieldValue
                         ? JSON.parse(fieldValue)
                         : fieldValue,
                 },
@@ -504,12 +517,12 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
     var key = query.key, value = query.value, fieldType = query.fieldType;
     if (fieldType &&
         !requiredExternal &&
-        ["dynamic_option", "reference", "static_option", "belongsTo"].includes(fieldType)) {
+        [drapcode_constant_1.FieldTypes.dynamic_option.id, drapcode_constant_1.FieldTypes.reference.id, drapcode_constant_1.FieldTypes.static_option.id, drapcode_constant_1.FieldTypes.belongsTo.id].includes(fieldType)) {
         //Todo: Remove if filter is working properly
         // return value === CURRENT_USER ? currentUser["uuid"] : value;
         var refCollection = query.refCollection, refField = query.refField;
         var finalValue = "";
-        if (["dynamic_option", "static_option"].includes(fieldType)) {
+        if ([drapcode_constant_1.FieldTypes.dynamic_option.id, drapcode_constant_1.FieldTypes.static_option.id].includes(fieldType)) {
             if (!value) {
                 if (refCollection === drapcode_constant_1.CURRENT_USER) {
                     finalValue = currentUser[refField];
@@ -530,7 +543,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         return finalValue;
     }
     if (fieldType &&
-        fieldType === "boolean" &&
+        fieldType === drapcode_constant_1.FieldTypes.boolean.id &&
         ["true", "false", "", true, false].includes(value)) {
         return "" + value;
     }
@@ -672,7 +685,7 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
     var searchAggregateQuery = [];
     var likeQuery = [];
     Object.entries(searchObj).forEach(function (_a) {
-        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         var key = _a[0], value = _a[1];
         if (value) {
             var searchQueryTypeKey = searchQueryTypeObj[key];
@@ -689,10 +702,10 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                         _c));
                 }
                 else if ([
-                    "static_option",
-                    "dynamic_option",
-                    "reference",
-                    "belongsTo",
+                    drapcode_constant_1.FieldTypes.static_option.id,
+                    drapcode_constant_1.FieldTypes.dynamic_option.id,
+                    drapcode_constant_1.FieldTypes.reference.id,
+                    drapcode_constant_1.FieldTypes.belongsTo.id,
                 ].includes(searchQueryTypeKey)) {
                     // if input is string and db field type is array
                     searchAggregateQuery.push({
@@ -719,41 +732,54 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                         _g));
                 }
                 else if (searchQueryTypeKey === "number") {
-                    // handling value when db field type is Double/Int
-                    searchAggregateQuery.push({
-                        $addFields: (_h = {},
-                            _h["_".concat(key)] = { $toString: { $toLong: "$".concat(key) } },
-                            _h),
-                    });
-                    likeQuery.push((_j = {},
-                        _j["_".concat(key)] = {
-                            $regex: value,
-                            $options: "i",
-                        },
-                        _j));
+                    if (key.startsWith("min_") || key.startsWith("max_")) {
+                        var fieldKey = key.replace("min_", "");
+                        fieldKey = fieldKey.replace("max_", "");
+                        var numericValue = Number(value);
+                        if (key.startsWith("min_")) {
+                            likeQuery.push((_h = {}, _h["".concat(fieldKey)] = { $gte: numericValue }, _h));
+                        }
+                        else if (key.startsWith("max_")) {
+                            likeQuery.push((_j = {}, _j["".concat(fieldKey)] = { $lte: numericValue }, _j));
+                        }
+                    }
+                    else {
+                        // handling value when db field type is Double/Int
+                        searchAggregateQuery.push({
+                            $addFields: (_k = {},
+                                _k["_".concat(key)] = { $toString: { $toLong: "$".concat(key) } },
+                                _k),
+                        });
+                        likeQuery.push((_l = {},
+                            _l["_".concat(key)] = {
+                                $regex: value,
+                                $options: "i",
+                            },
+                            _l));
+                    }
                 }
-                else if (["date", "createdAt", "time_slot"].includes(searchQueryTypeKey)) {
+                else if (__spreadArray(__spreadArray([drapcode_constant_1.FieldTypes.date.id], drapcode_constant_1.systemDateField, true), [drapcode_constant_1.FieldTypes.time_slot.id], false).includes(searchQueryTypeKey)) {
                     if (key.startsWith("start_") || key.startsWith("end_")) {
                         var fieldKey = key.replace("start_", "");
                         fieldKey = fieldKey.replace("end_", "");
                         searchAggregateQuery.push({
-                            $addFields: (_k = {},
-                                _k["_".concat(key)] = { $toString: "$".concat(fieldKey) },
-                                _k),
+                            $addFields: (_m = {},
+                                _m["_".concat(key)] = { $toString: "$".concat(fieldKey) },
+                                _m),
                         });
                         if (key.startsWith("start_")) {
-                            likeQuery.push((_l = {},
-                                _l["_".concat(key)] = {
-                                    $gte: (0, date_util_1.timezoneDateParse)(value, false, true),
+                            likeQuery.push((_o = {},
+                                _o["_".concat(key)] = {
+                                    $gte: (0, date_util_1.timezoneDateParse)(value, true, true),
                                 },
-                                _l));
+                                _o));
                         }
                         else if (key.startsWith("end_")) {
-                            likeQuery.push((_m = {},
-                                _m["_".concat(key)] = {
+                            likeQuery.push((_p = {},
+                                _p["_".concat(key)] = {
                                     $lt: (0, date_util_1.timezoneDateParse)(value, true),
                                 },
-                                _m));
+                                _p));
                         }
                     }
                 }
@@ -761,25 +787,25 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                     // if input is string and db field type is number
                     // converting db field to string first
                     searchAggregateQuery.push({
-                        $addFields: (_o = {},
-                            _o["_".concat(key)] = { $toString: "$".concat(key) },
-                            _o),
+                        $addFields: (_q = {},
+                            _q["_".concat(key)] = { $toString: "$".concat(key) },
+                            _q),
                     });
-                    likeQuery.push((_p = {},
-                        _p["_".concat(key)] = {
+                    likeQuery.push((_r = {},
+                        _r["_".concat(key)] = {
                             $regex: value,
                             $options: "i",
                         },
-                        _p));
+                        _r));
                 }
             }
             else {
-                likeQuery.push((_q = {},
-                    _q[key] = {
+                likeQuery.push((_s = {},
+                    _s[key] = {
                         $regex: value,
                         $options: "i",
                     },
-                    _q));
+                    _s));
             }
         }
     });

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

@@ -202,13 +202,10 @@ 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];
@@ -504,9 +501,8 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         if (fieldType === "number") {
             return _8 = {}, _8[field] = +fieldValue, _8;
         }
-        else {
-            return _9 = {}, _9[field] = fieldValue, _9;
-        }
+        console.log("Nothing match");
+        return _9 = {}, _9[field] = "".concat(fieldValue), _9;
     }
     if (key === drapcode_constant_1.EQUALS_OR_IGNORE) {
         if (fieldType === "boolean") {
@@ -620,20 +616,16 @@ 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,28 +298,34 @@ 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
@@ -327,6 +333,7 @@ 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
@@ -334,6 +341,7 @@ 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
@@ -341,6 +349,7 @@ 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
@@ -348,6 +357,7 @@ 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
@@ -355,6 +365,7 @@ 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; });
@@ -362,11 +373,16 @@ 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;
 };
@@ -425,6 +441,7 @@ 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.3",
+  "version": "1.9.5",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",