drapcode-utility 1.0.0 → 1.0.2

package/build/errors/app-error.js

@@ -7,6 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/build/errors/axios-error.d.ts

@@ -8,6 +8,3 @@ export declare const parseAxiosError: (error: AxiosError) => {
     error: any;
     status: number;
 };
-export declare const parseXanoConfigError: (error: any) => string;
-export declare const parseAirtableConfigError: (error: any) => string;
-export declare const parseSupabaseConfigError: (error: any) => string;

package/build/errors/axios-error.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseSupabaseConfigError = exports.parseAirtableConfigError = exports.parseXanoConfigError = exports.parseAxiosError = void 0;
+exports.parseAxiosError = void 0;
 var parseAxiosError = function (error) {
     if (!error) {
         return {};
@@ -29,50 +29,3 @@ var parseAxiosError = function (error) {
     return { success: false, error: errData, status: errStatus };
 };
 exports.parseAxiosError = parseAxiosError;
-var parseXanoConfigError = function (error) {
-    if (!error || !error.code) {
-        return "Failed from Xano";
-    }
-    var errorMessage = "";
-    switch (error.code) {
-        case "ERROR_CODE_UNAUTHORIZED":
-            errorMessage = "Developer API Key is wrong";
-            break;
-        default:
-            errorMessage = "Failed from Xano";
-            break;
-    }
-    return errorMessage;
-};
-exports.parseXanoConfigError = parseXanoConfigError;
-var parseAirtableConfigError = function (error) {
-    if (!error || !error.error || !error.error.type) {
-        return "Failed from Airtable";
-    }
-    var errorMessage = "";
-    switch (error.error.type) {
-        case "AUTHENTICATION_REQUIRED":
-            errorMessage = "Authorization is missing/wrong.";
-            break;
-        default:
-            errorMessage = "Failed from Airtable";
-            break;
-    }
-    return errorMessage;
-};
-exports.parseAirtableConfigError = parseAirtableConfigError;
-var parseSupabaseConfigError = function (error) {
-    if (!error) {
-        return "Failed from Supabase";
-    }
-    var errorMessage = "";
-    switch (error) {
-        case "ENOTFOUND":
-            errorMessage = "Given Supabase URL does not exists/API Key is wrong";
-            break;
-        default:
-            break;
-    }
-    return errorMessage;
-};
-exports.parseSupabaseConfigError = parseSupabaseConfigError;

package/build/errors/bad-request-error.js

@@ -7,6 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/build/errors/custom-error.js

@@ -7,6 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/build/errors/not-found.js

@@ -7,6 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/build/format-fields/index.d.ts

@@ -0,0 +1 @@
+export declare const formatFieldsOfItem: (item: any, fields: any) => any;

package/build/format-fields/index.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatFieldsOfItem = void 0;
+var drapcode_constant_1 = require("drapcode-constant");
+var formatFieldsOfItem = function (item, fields) {
+    if (!item)
+        return item;
+    if (!fields && !fields.length)
+        return item;
+    if (Array.isArray(item)) {
+        item = item.map(function (itemData) { return formatField(itemData, fields); });
+    }
+    else
+        item = formatField(item, fields);
+    return item;
+};
+exports.formatFieldsOfItem = formatFieldsOfItem;
+var formatField = function (itemData, fields) {
+    var newItemData = {};
+    Object.keys(itemData).forEach(function (key) {
+        var field = fields.find(function (field) { return field.fieldName === key; });
+        newItemData[key] = field
+            ? getFormatFieldData(itemData[key], field.type)
+            : itemData[key];
+    });
+    return newItemData;
+};
+var getFormatFieldData = function (fieldData, fieldType) {
+    var createdAt = drapcode_constant_1.FieldTypes.createdAt, text = drapcode_constant_1.FieldTypes.text, large_text = drapcode_constant_1.FieldTypes.large_text, date = drapcode_constant_1.FieldTypes.date, password = drapcode_constant_1.FieldTypes.password, uuid = drapcode_constant_1.FieldTypes.uuid, custom_uuid = drapcode_constant_1.FieldTypes.custom_uuid, email = drapcode_constant_1.FieldTypes.email, url = drapcode_constant_1.FieldTypes.url, number = drapcode_constant_1.FieldTypes.number, unix_timestamp = drapcode_constant_1.FieldTypes.unix_timestamp, reference = drapcode_constant_1.FieldTypes.reference, belongsTo = drapcode_constant_1.FieldTypes.belongsTo, multi_reference = drapcode_constant_1.FieldTypes.multi_reference, dynamic_option = drapcode_constant_1.FieldTypes.dynamic_option, static_option = drapcode_constant_1.FieldTypes.static_option, boolean = drapcode_constant_1.FieldTypes.boolean, time_slot = drapcode_constant_1.FieldTypes.time_slot;
+    var stringType = [
+        createdAt.id,
+        text.id,
+        large_text.id,
+        date.id,
+        password.id,
+        uuid.id,
+        custom_uuid.id,
+        email.id,
+        url.id,
+        time_slot.id,
+    ];
+    var numberType = [number.id, unix_timestamp.id];
+    var arrayType = [
+        reference.id,
+        belongsTo.id,
+        multi_reference.id,
+        dynamic_option.id,
+        static_option.id,
+    ];
+    if (stringType.includes(fieldType)) {
+        if (typeof fieldData !== "string")
+            fieldData = String(fieldData);
+    }
+    if (numberType.includes(fieldType)) {
+        if (typeof fieldData !== "number")
+            fieldData = Number(fieldData);
+    }
+    if (fieldType === boolean.id) {
+        if (typeof fieldData !== "boolean")
+            fieldData = Boolean(fieldData);
+    }
+    if (arrayType.includes(fieldType)) {
+        if (!Array.isArray(fieldData)) {
+            fieldData = fieldData ? [fieldData] : [];
+        }
+    }
+    return fieldData;
+};

package/build/index.d.ts

@@ -15,3 +15,4 @@ export * from "./utils/uuid-generator";
 export * from "./utils/check-error";
 export * from "./utils/prepare-query";
 export * from "./encryption/index";
+export * from "./format-fields/index";

package/build/index.js

@@ -27,3 +27,4 @@ __exportStar(require("./utils/uuid-generator"), exports);
 __exportStar(require("./utils/check-error"), exports);
 __exportStar(require("./utils/prepare-query"), exports);
 __exportStar(require("./encryption/index"), exports);
+__exportStar(require("./format-fields/index"), exports);

package/build/utils/check-error.js

@@ -35,12 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -119,6 +117,7 @@ var handleMultErrorConfig = function (error, result, status) {
         console.log("handleMultErrorConfig result :>> " + 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");
             }
@@ -135,13 +134,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 = "" + apiErrorValue;
     console.log("apiErrorMessage", apiErrorMessage);
     console.log("apiErrorValue", apiErrorValue);
@@ -152,6 +154,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,
@@ -160,6 +163,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,
@@ -176,7 +181,7 @@ var nestedValue = function (data, messages) {
             messages.push(value);
         }
         else if (Array.isArray(value)) {
-            messages = __spreadArrays(messages, value);
+            messages = __spreadArray(__spreadArray([], messages), value);
         }
         else {
             if (Object.keys(value).length) {

package/build/utils/date-util.d.ts

@@ -1,8 +1,8 @@
 export declare const DATE_REGEX: RegExp;
-export declare const createLoggerDateFormat: () => any;
+export declare const createLoggerDateFormat: (timezone?: string) => any;
 export declare const createLoggerPreviouseDateFormat: () => any;
-export declare const createLogsDateFormat: () => any;
-export declare const getDateValue: (value: string) => any;
+export declare const createLogsDateFormat: (timezone?: string) => any;
+export declare const getDateValue: (value: string, timezone?: string) => any;
 export declare const nextDayDate: (date: any) => any;
 export declare const timezoneDateParse: (value: string, nextDay?: boolean, prevDay?: boolean) => Date;
 export declare const formatProjectDates: (item: any, dateFormat: string, fields: Array<object>, reverse: boolean) => any;

package/build/utils/date-util.js

@@ -4,32 +4,46 @@ exports.formatProjectDates = exports.timezoneDateParse = exports.nextDayDate = e
 var drapcode_constant_1 = require("drapcode-constant");
 var moment = require("moment");
 exports.DATE_REGEX = /^[12]\d{3}(-(0[1-9]|1[0-2])(-(0[1-9]|[12][0-9]|3[01]))?)(T| )?(([01][0-9]|2[0-3]):[0-5]\d(:[0-5]\d(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?)?$/;
-var createLoggerDateFormat = function () {
-    return moment().format("YYYY-MM-DD");
+var createLoggerDateFormat = function (timezone) {
+    if (timezone === void 0) { timezone = ""; }
+    var result = moment();
+    console.log("\n result 1 :>> ", result);
+    result = timezone ? result.utcOffset(timezone) : result;
+    console.log("\n result 2 :>> ", result);
+    return result.format("YYYY-MM-DD");
 };
 exports.createLoggerDateFormat = createLoggerDateFormat;
 var createLoggerPreviouseDateFormat = function () {
     return moment().subtract(10, "days").format("YYYY-MM-DD");
 };
 exports.createLoggerPreviouseDateFormat = createLoggerPreviouseDateFormat;
-var createLogsDateFormat = function () {
-    return moment().format("YYYY-MM-DDTHH:mm:ss.SSS");
+var createLogsDateFormat = function (timezone) {
+    if (timezone === void 0) { timezone = ""; }
+    var result = moment();
+    console.log("\n result 1 :>> ", result);
+    result = timezone ? result.utcOffset(timezone) : result;
+    console.log("\n result 2 :>> ", result);
+    return result.format("YYYY-MM-DDTHH:mm:ss.SSS");
 };
 exports.createLogsDateFormat = createLogsDateFormat;
-var getDateValue = function (value) {
+var getDateValue = function (value, timezone) {
+    if (timezone === void 0) { timezone = ""; }
     if (!value)
-        return exports.createLogsDateFormat();
+        return exports.createLogsDateFormat(timezone);
     var dateFormat = "YYYY-MM-DDTHH:mm:ss.SSS";
     var _a = value.split(":"), type = _a[0], number = _a[1], unit = _a[2];
+    if (!["ADD", "SUB"].includes(type))
+        return exports.createLogsDateFormat(timezone);
     var dateUnit = getDateUnit(unit);
+    var result;
     if (type === "ADD") {
-        return moment().add(number, dateUnit).format(dateFormat);
+        result = moment().add(number, dateUnit);
     }
     else if (type === "SUB") {
-        return moment().subtract(number, dateUnit).format(dateFormat);
+        result = moment().subtract(number, dateUnit);
     }
-    else
-        return exports.createLogsDateFormat();
+    result = timezone ? result.utcOffset(timezone) : result;
+    return result.format(dateFormat);
 };
 exports.getDateValue = getDateValue;
 var getDateUnit = function (unit) {

package/build/utils/query-parser.js

@@ -35,12 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -68,10 +66,17 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     if (!query)
                         return [2 /*return*/, ""];
                     console.log("***1*** queryParser ***");
-                    filterQuery = mongoFilterQuery(query, externalParams, constants, currentUser, currentTenant);
-                    console.log("**************************");
+                    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, timezone);
                     console.log("filterQuery", JSON.stringify(filterQuery));
-                    console.log("==> searchQueryTypeObj :>>", searchQueryTypeObj);
                     aggregateQuery = [];
                     queryStr = ".aggregate([])";
                     if (filterQuery.length &&
@@ -80,25 +85,31 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                         searchQueryObj = null;
                         if (searchObj) {
                             _a = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _a.searchAggregateQuery, likeQuery = _a.likeQuery;
-                            aggregateQuery = __spreadArrays(aggregateQuery, searchAggregateQuery);
+                            aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
+                            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 (searchQueryObj) {
                             (_c = finalQuery.$and).push.apply(_c, 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 = __spreadArrays(aggregateQuery, searchAggregateQuery);
+                        aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
                         if (likeQuery.length) {
                             // aggregateQuery.push({ $match: { $or: likeQuery } });
                             aggregateQuery.push({ $match: { $and: likeQuery } });
                         }
                     }
+                    console.log("aggregateQuery", JSON.stringify(aggregateQuery));
                     console.log("==> query", query);
                     projection = mongoSelectQuery(query);
                     finder = query.finder, sortBy = query.sortBy, orderBy = query.orderBy;
@@ -210,6 +221,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                         aggregateQuery.push({ $skip: +offset }, { $limit: +limit });
                     }
                     console.log("==> aggregateQuery", aggregateQuery);
+                    console.log("==> aggregateQuery", JSON.stringify(aggregateQuery));
                     queryStr = ".aggregate(" + JSON.stringify(aggregateQuery) + ", { collation: { locale: \"en\" } })";
                     str = "req.db.collection('" + collectionName + "')" + queryStr;
                     str += ".toArray()";
@@ -233,7 +245,7 @@ var toBoolean = function (value) {
             return false;
     }
 };
-var mongoFilterQuery = function (query, externalParams, constants, currentUser, currentTenant) {
+var mongoFilterQuery = function (query, externalParams, constants, currentUser, currentTenant, timezone) {
     if (currentUser === void 0) { currentUser = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
     var filterQuery = { $or0: [] };
@@ -242,7 +254,7 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser,
     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);
+        var mongoQuery = queryToMongo(query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone);
         console.log(":::::::::mongoQuery::::", JSON.stringify(mongoQuery));
         queryConjunctions.push(queryObj.conjunctionType);
         if (queryObj.conjunctionType == "OR") {
@@ -311,11 +323,11 @@ 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) {
+var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, 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;
     if (currentUser === void 0) { currentUser = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
-    var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser, currentTenant);
+    var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser, currentTenant, 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
@@ -327,8 +339,8 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
     var isDate = checkDate(fieldValue);
     console.log("isDate queryToMongo 2", isDate);
     var key = query.key, field = query.field, value = query.value, fieldType = query.fieldType;
-    if (isDate)
-        fieldValue = new Date(fieldValue);
+    // Todo: Remove if it's working properly
+    // if (isDate) fieldValue = new Date(fieldValue);
     console.log("fieldValue queryToMongo 1", fieldValue);
     var condition = [
         "dynamic_option",
@@ -458,7 +470,7 @@ var isEntityInCondition = function (value) {
     return isEntity;
 };
 exports.isEntityInCondition = isEntityInCondition;
-var replaceExternalParams = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant) {
+var replaceExternalParams = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone) {
     var key = query.key, value = query.value, fieldType = query.fieldType;
     if (fieldType &&
         !requiredExternal &&
@@ -490,16 +502,16 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             endValue_1 = "" + externalParams[endValue_1];
         }
         else {
-            if (__spreadArrays([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
                 return startValue_1.includes(cnst);
             })) {
-                startValue_1 = getValueOfProjectConstant(startValue_1, currentUser);
+                startValue_1 = getValueOfProjectConstant(startValue_1, currentUser, timezone);
             }
             else {
                 startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
             }
-            if (__spreadArrays([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
-                endValue_1 = getValueOfProjectConstant(endValue_1, currentUser);
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
+                endValue_1 = getValueOfProjectConstant(endValue_1, currentUser, timezone);
             }
             else {
                 endValue_1 = constants.filter(function (constant) { return constant.name == endValue_1; });
@@ -611,7 +623,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         return currentTenant["uuid"];
     }
     if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); })) {
-        return getValueOfProjectConstant(value, {});
+        return getValueOfProjectConstant(value, {}, timezone);
     }
     if (exports.isEntityInCondition(value)) {
         var key_1 = value.replace("ENTITY::", "");
@@ -647,15 +659,20 @@ var getMinMaxValue = function (value) {
     }
 };
 exports.getMinMaxValue = getMinMaxValue;
-var getValueOfProjectConstant = function (value, currentUser) {
+var getValueOfProjectConstant = function (value, currentUser, timezone) {
+    if (!timezone)
+        timezone = "(GMT+5:30)";
+    timezone = timezone.substring(4, 10);
+    var result;
     if (value === drapcode_constant_1.CURRENT_USER)
         return currentUser["uuid"];
     if (value === drapcode_constant_1.CURRENT_DATE)
-        return date_util_1.createLoggerDateFormat();
+        result = date_util_1.createLoggerDateFormat(timezone);
     if ([drapcode_constant_1.CURRENT_TIME, drapcode_constant_1.CURRENT_DATE_TIME].includes(value))
-        return date_util_1.createLogsDateFormat();
+        result = date_util_1.createLogsDateFormat(timezone);
     if (drapcode_constant_1.DateTimeUnit.some(function (cnst) { return value.includes(cnst); }))
-        return date_util_1.getDateValue(value);
+        result = date_util_1.getDateValue(value, timezone);
+    return result;
 };
 var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
     var searchAggregateQuery = [];

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

@@ -35,12 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryParserNew = void 0;
@@ -193,14 +191,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                 }
                             }
                         });
-                        console.log("==> aggregateQuery", aggregateQuery);
-                        console.log("==> likeQuery", likeQuery_1);
                         if (likeQuery_1.length) {
                             // aggregateQuery.push({ $match: { $or: likeQuery } });
                             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];
@@ -331,7 +326,6 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                     if (finder != "COUNT" && limit) {
                         aggregateQuery.push({ $skip: +offset }, { $limit: +limit });
                     }
-                    console.log("==> aggregateQuery", JSON.stringify(aggregateQuery, null, 2));
                     queryStr = ".aggregate(" + JSON.stringify(aggregateQuery) + ", { collation: { locale: \"en\" } })";
                     str = "req.db.collection('" + collectionName + "')" + queryStr;
                     str += ".toArray()";
@@ -573,7 +567,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             endValue_1 = "" + externalParams[endValue_1];
         }
         else {
-            if (__spreadArrays([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
                 return startValue_1.includes(cnst);
             })) {
                 startValue_1 = getValueOfProjectConstant(startValue_1, currentUser);
@@ -581,7 +575,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             else {
                 startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
             }
-            if (__spreadArrays([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
                 endValue_1 = getValueOfProjectConstant(endValue_1, currentUser);
             }
             else {
@@ -603,20 +597,16 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         else
             return startValue_1 + "---" + 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

@@ -263,6 +263,8 @@ var replaceDataValueIntoExpression = function (expression, data, user, sessionVa
         else {
             if (Object.keys(data).length > 0) {
                 dataOfItem = exports.parseValueFromData(data, prop);
+                //TODO: Need better way
+                delete data[prop];
             }
         }
         expression = replaceValueInExpression(needle, dataOfItem, expression);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",