drapcode-utility 1.9.6 → 1.9.78

package/build/utils/{query-paser-new.js → query-parser-new.js}

@@ -50,6 +50,7 @@ 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 query_utils_1 = require("./query-utils");
 var queryParserNew = function (collectionName, query, constants, externalParams, currentUser, timezone, searchObj, refCollectionFieldsInItems, searchQueryTypeObj, lookupConfig) {
     if (currentUser === void 0) { currentUser = {}; }
     if (searchObj === void 0) { searchObj = null; }
@@ -57,10 +58,10 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
     if (searchQueryTypeObj === void 0) { searchQueryTypeObj = {}; }
     if (lookupConfig === void 0) { lookupConfig = []; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var filterQuery, aggregateQuery, queryStr, searchQueryObj_1, finalQuery, likeQuery_1, projection, finder, sortBy, orderBy, aggregateFunctionField, offset, limit, direction;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var filterQuery, aggregateQuery, queryStr, searchQueryObj_1, finalQuery, _a, searchAggregateQuery, likeQuery, projection, finder, sortBy, orderBy, aggregateFunctionField, offset, limit, direction;
+        var _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     if (!collectionName)
                         return [2 /*return*/, ""];
@@ -115,106 +116,22 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                         aggregateQuery.push({ $match: finalQuery });
                     }
                     else if (searchObj) {
-                        likeQuery_1 = [];
-                        Object.entries(searchObj).forEach(function (_a) {
-                            var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-                            var key = _a[0], value = _a[1];
-                            if (value) {
-                                if (searchQueryTypeObj[key]) {
-                                    if (searchQueryTypeObj[key] === "boolean") {
-                                        // if input is string and db field type is boolean
-                                        aggregateQuery.push({
-                                            $addFields: (_b = {},
-                                                _b["_".concat(key)] = "$".concat(key),
-                                                _b),
-                                        });
-                                        likeQuery_1.push((_c = {},
-                                            _c["_".concat(key)] = toBoolean(value),
-                                            _c));
-                                    }
-                                    else if ([
-                                        "static_option",
-                                        "dynamic_option",
-                                        "reference",
-                                        "belongsTo",
-                                    ].includes(searchQueryTypeObj[key])) {
-                                        // if input is string and db field type is array
-                                        aggregateQuery.push({
-                                            $addFields: (_d = {},
-                                                _d["_".concat(key)] = "$".concat(key),
-                                                _d),
-                                        });
-                                        likeQuery_1.push((_e = {},
-                                            _e["_".concat(key)] = { $all: [value] },
-                                            _e));
-                                    }
-                                    else if (searchQueryTypeObj[key] === "tel") {
-                                        // handling value when db field type is tel
-                                        aggregateQuery.push({
-                                            $addFields: (_f = {},
-                                                _f["_".concat(key)] = { $toString: "$".concat(key) },
-                                                _f),
-                                        });
-                                        likeQuery_1.push((_g = {},
-                                            _g["_".concat(key)] = {
-                                                $regex: value.startsWith("+") ? value.replace("+", "") : value,
-                                                $options: "i",
-                                            },
-                                            _g));
-                                    }
-                                    else if (searchQueryTypeObj[key] === "number") {
-                                        // handling value when db field type is Double/Int
-                                        aggregateQuery.push({
-                                            $addFields: (_h = {},
-                                                _h["_".concat(key)] = { $toString: { $toLong: "$".concat(key) } },
-                                                _h),
-                                        });
-                                        likeQuery_1.push((_j = {},
-                                            _j["_".concat(key)] = {
-                                                $regex: value,
-                                                $options: "i",
-                                            },
-                                            _j));
-                                    }
-                                    else {
-                                        // if input is string and db field type is number
-                                        // converting db field to string first
-                                        aggregateQuery.push({
-                                            $addFields: (_k = {},
-                                                _k["_".concat(key)] = { $toString: "$".concat(key) },
-                                                _k),
-                                        });
-                                        likeQuery_1.push((_l = {},
-                                            _l["_".concat(key)] = {
-                                                $regex: value,
-                                                $options: "i",
-                                            },
-                                            _l));
-                                    }
-                                }
-                                else {
-                                    likeQuery_1.push((_m = {},
-                                        _m[key] = {
-                                            $regex: value,
-                                            $options: "i",
-                                        },
-                                        _m));
-                                }
-                            }
-                        });
-                        if (likeQuery_1.length) {
-                            aggregateQuery.push({ $match: { $and: likeQuery_1 } });
+                        _a = (0, query_utils_1.getSearchObjQuery)(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _a.searchAggregateQuery, likeQuery = _a.likeQuery;
+                        aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery, true), searchAggregateQuery, true);
+                        if (likeQuery.length) {
+                            aggregateQuery.push({ $match: { $and: likeQuery } });
                         }
                     }
-                    projection = mongoSelectQuery(query);
+                    console.log("==> query", query);
+                    projection = (0, query_utils_1.mongoSelectQuery)(query);
                     finder = query.finder, sortBy = query.sortBy, orderBy = query.orderBy, aggregateFunctionField = query.aggregateFunctionField;
                     if (!(finder != "COUNT" && refCollectionFieldsInItems)) return [3 /*break*/, 2];
                     return [4 /*yield*/, Promise.all(refCollectionFieldsInItems.map(function (field) {
                             return (0, prepare_query_1.commonLookupSetting)(field, lookupConfig, aggregateQuery);
                         }))];
                 case 1:
-                    _b.sent();
-                    _b.label = 2;
+                    _c.sent();
+                    _c.label = 2;
                 case 2:
                     if (!["COUNT", "SUM", "AVG", "MIN", "MAX"].includes(finder) &&
                         !(0, util_1.isEmpty)(projection)) {
@@ -251,7 +168,7 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                     }
                     if (finder != "COUNT" && sortBy) {
                         direction = orderBy && orderBy == "asc" ? 1 : -1;
-                        aggregateQuery.push({ $sort: (_a = {}, _a[sortBy] = direction, _a) });
+                        aggregateQuery.push({ $sort: (_b = {}, _b[sortBy] = direction, _b) });
                     }
                     if (finder != "COUNT" && limit) {
                         aggregateQuery.push({ $skip: +offset }, { $limit: +limit });
@@ -310,56 +227,17 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser)
     });
     console.log("==> *** filterQuery #2 :>> ", filterQuery);
     var hasAndQueryConjunction = queryConjunctions.includes("AND");
-    return modifyQuery(filterQuery, hasAndQueryConjunction);
-};
-var mongoSelectQuery = function (query) {
-    if (query === void 0) { query = {}; }
-    var projection = {};
-    var fieldsInclude = query.fieldsInclude, fieldsExclude = query.fieldsExclude, finder = query.finder;
-    if (!fieldsExclude)
-        fieldsExclude = [];
-    if (fieldsInclude[0] === "*") {
-        fieldsExclude.map(function (field) {
-            if (field)
-                return (projection["".concat(field)] = 0);
-        });
-    }
-    else {
-        if (["FIND_ALL", "FIND"].includes(finder))
-            fieldsInclude = (0, util_1.processFieldsInlcude)(fieldsInclude);
-        fieldsInclude.map(function (field) {
-            if (field)
-                return (projection["".concat(field)] = 1);
-        });
-    }
-    return projection;
-};
-var modifyQuery = function (obj, hasAndQueryConjunction) {
-    if (obj === void 0) { obj = {}; }
-    if (hasAndQueryConjunction === void 0) { hasAndQueryConjunction = false; }
-    var arr = [];
-    console.log("🚀 ~ file: query-parser-new.ts:294 ~ modifyQuery ~ hasAndQueryConjunction:", hasAndQueryConjunction);
-    Object.entries(obj).forEach(function (_a) {
-        var key = _a[0], value = _a[1];
-        if (hasAndQueryConjunction) {
-            arr.push({ $and: value });
-        }
-        else {
-            arr.push({ $or: value });
-        }
-    });
-    console.log("🚀 ~ file: query-parser-new.ts:303 ~ Object.entries ~ arr:", arr);
-    return arr;
+    return (0, query_utils_1.modifyQuery)(filterQuery, hasAndQueryConjunction);
 };
 var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser) {
     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, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14;
     if (currentUser === void 0) { currentUser = {}; }
     var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser);
-    var isDate = checkDate(fieldValue);
+    var isDate = (0, query_utils_1.checkDate)(fieldValue);
     var key = query.key, field = query.field, value = query.value, fieldType = query.fieldType;
     if (isDate)
         fieldValue = new Date(fieldValue);
-    var condition = ["dynamic_option", "reference", "static_option"].includes(fieldType);
+    var condition = drapcode_constant_1.SelectOptionFields.includes(fieldType);
     if (condition && key === drapcode_constant_1.EQUALS && !isDate) {
         if (!Array.isArray(fieldValue)) {
             fieldValue = [fieldValue];
@@ -527,7 +405,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
             },
             _13;
     if (key == drapcode_constant_1.BETWEEN) {
-        var _15 = getMinMaxValue(fieldValue), startValue = _15.startValue, endValue = _15.endValue, isInteger = _15.isInteger;
+        var _15 = (0, query_utils_1.getMinMaxValue)(fieldValue), startValue = _15.startValue, endValue = _15.endValue, isInteger = _15.isInteger;
         return _14 = {},
             _14[field] = {
                 $gte: isInteger ? +startValue : startValue,
@@ -540,12 +418,12 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
     var key = query.key, value = query.value, fieldType = query.fieldType;
     if (fieldType &&
         !requiredExternal &&
-        ["dynamic_option", "static_option", "reference"].includes(fieldType)) {
+        drapcode_constant_1.SelectOptionFields.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.OptionTypeFields.includes(fieldType)) {
             if (!value) {
                 if (refCollection === drapcode_constant_1.CURRENT_USER) {
                     finalValue = currentUser[refField];
@@ -580,7 +458,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         return valueList_1;
     }
     if (key === drapcode_constant_1.BETWEEN) {
-        var _a = getMinMaxValue(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger;
+        var _a = (0, query_utils_1.getMinMaxValue)(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger;
         if (requiredExternal) {
             startValue_1 = "".concat(externalParams[startValue_1]);
             endValue_1 = "".concat(externalParams[endValue_1]);
@@ -589,13 +467,13 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) {
                 return startValue_1.includes(cnst);
             })) {
-                startValue_1 = getValueOfProjectConstant(startValue_1, currentUser);
+                startValue_1 = (0, query_utils_1.getValueOfProjectConstant)(startValue_1, currentUser, "");
             }
             else {
                 startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
             }
             if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) { return endValue_1.includes(cnst); })) {
-                endValue_1 = getValueOfProjectConstant(endValue_1, currentUser);
+                endValue_1 = (0, query_utils_1.getValueOfProjectConstant)(endValue_1, currentUser, "");
             }
             else {
                 endValue_1 = constants.filter(function (constant) { return constant.name == endValue_1; });
@@ -647,7 +525,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         return currentUser["uuid"];
     }
     if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); })) {
-        return getValueOfProjectConstant(value, {});
+        return (0, query_utils_1.getValueOfProjectConstant)(value, {}, "");
     }
     //TODO: This is just to confirm if external then it should be get from externalParams
     if (requiredExternal) {
@@ -661,31 +539,3 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
     var constantArr = constants.filter(function (constant) { return constant.name == value; });
     return constantArr.length ? "" + constantArr[0].value : "";
 };
-var checkDate = function (queryValue) {
-    return ("" + queryValue).match(date_util_1.DATE_REGEX);
-};
-var getMinMaxValue = function (value) {
-    var isValid = value && value.includes("---");
-    if (isValid) {
-        var isInteger = value.includes("^");
-        var result = value.split("---");
-        var endValue = result[1];
-        if (isInteger && result.length)
-            endValue = endValue.slice(0, -1);
-        return { startValue: result[0], endValue: endValue, isInteger: isInteger };
-    }
-    else {
-        return { startValue: "", endValue: "" };
-    }
-};
-//TODO: need to fix for all app constant with these
-var getValueOfProjectConstant = function (value, currentUser) {
-    if (value === drapcode_constant_1.CURRENT_USER)
-        return currentUser["uuid"];
-    if (value === drapcode_constant_1.CURRENT_DATE)
-        return (0, date_util_1.createLoggerDateFormat)();
-    if ([drapcode_constant_1.CURRENT_TIME, drapcode_constant_1.CURRENT_DATE_TIME].includes(value))
-        return (0, date_util_1.createLogsDateFormat)();
-    if (drapcode_constant_1.DateTimeUnit.some(function (cnst) { return value.includes(cnst); }))
-        return (0, date_util_1.getDateValue)(value);
-};

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

@@ -1,14 +1,2 @@
 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, currentSubTenant: any, lookupConfig: any, rowLevelSecurityFilter: any) => Promise<any>;
 export declare const isEntityInCondition: (value: any) => boolean;
-export declare const isFixedValueQuery: (value: any) => boolean;
-export declare const getMinMaxValue: (value: any) => {
-    startValue: any;
-    endValue: any;
-    isInteger: any;
-    isFixedValue: boolean;
-} | {
-    startValue: string;
-    endValue: string;
-    isFixedValue: boolean;
-    isInteger?: undefined;
-};