drapcode-utility 2.6.3 → 2.6.4

package/build/query/queryBuilder.js

@@ -326,8 +326,12 @@ const conditionToQuery = (query, requiredExternal, externalParams, constants, ti
             const { startValue, endValue, isInteger } = (0, query_utils_1.getMinMaxValue)(fieldValue);
             return {
                 [field]: {
-                    $gte: isInteger ? +startValue : startValue,
-                    $lte: isInteger ? +endValue : endValue,
+                    $gte: isInteger
+                        ? +startValue
+                        : prepareBetweenValues(startValue, fieldType),
+                    $lte: isInteger
+                        ? +endValue
+                        : prepareBetweenValues(endValue, fieldType),
                 },
             };
         }
@@ -461,7 +465,7 @@ const changeExternalParams = (query, requiredExternal, externalParams, constants
         else {
             const resolveValue = (val) => {
                 if ([drapcode_constant_1.CURRENT_USER, ...drapcode_constant_1.DateConstant].some((cnst) => val.includes?.(cnst))) {
-                    return (0, query_utils_1.getValueOfProjectConstant)(val, user, timezone);
+                    return (0, query_utils_1.getValueOfProjectConstant)(val, user, timezone, fieldType);
                 }
                 else if (!isFixedValue) {
                     const found = constants.find((constant) => constant.name === val);
@@ -575,3 +579,8 @@ const prepareBooleanQuery = (field, fieldValue) => {
             $or: [{ [field]: boolVal }, { [field]: { $exists: false } }],
         };
 };
+const prepareBetweenValues = (value, fieldType) => {
+    if (["createdat", "updatedat", ...drapcode_constant_1.systemDateField].includes(fieldType))
+        return new Date(value);
+    return value;
+};

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

@@ -23,7 +23,7 @@ export declare const DATE_REGEX: RegExp;
 export declare const createLoggerDateFormat: (timezone?: string) => string;
 export declare const createLoggerPreviousDateFormat: () => string;
 export declare const createLogsDateFormat: (timezone?: string) => string;
-export declare const getDateValue: (value: string, timezone?: string) => string;
+export declare const getDateValue: (value: string, timezone?: string, fieldType?: string) => string;
 export declare const getDateRangeValue: (key: string, field: string, value: string) => DateRangeValue;
 export declare const nextDayDate: (date: string | Date) => string;
 export declare const timezoneDateParse: (value: string, nextDay?: boolean, prevDay?: boolean) => Date;

package/build/utils/date-util.js

@@ -47,11 +47,11 @@ const createLogsDateFormat = (timezone) => {
     }
 };
 exports.createLogsDateFormat = createLogsDateFormat;
-const getDateValue = (value, timezone) => {
+const getDateValue = (value, timezone, fieldType = "datetime-local") => {
     try {
         if (!value)
             return (0, exports.createLogsDateFormat)(timezone);
-        const dateFormat = "YYYY-MM-DDTHH:mm:ss.SSS";
+        const dateFormat = fieldType === "date" ? "YYYY-MM-DD" : "YYYY-MM-DDTHH:mm:ss.SSS";
         const [type, number, unit] = value.split(":");
         if (!["ADD", "SUB"].includes(type)) {
             return (0, exports.createLogsDateFormat)(timezone);

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

@@ -17,4 +17,4 @@ export declare const getMinMaxValue: (value: any) => {
     isInteger?: undefined;
 };
 export declare const isFixedValueQuery: (value: any) => boolean;
-export declare const getValueOfProjectConstant: (value: any, currentUser: any, timezone: string) => any;
+export declare const getValueOfProjectConstant: (value: any, currentUser: any, timezone: string, fieldType?: string) => any;

package/build/utils/query-utils.js

@@ -242,7 +242,7 @@ const isFixedValueQuery = (value) => {
     return isFixeValue;
 };
 exports.isFixedValueQuery = isFixedValueQuery;
-const getValueOfProjectConstant = (value, currentUser, timezone) => {
+const getValueOfProjectConstant = (value, currentUser, timezone, fieldType = "datetime-local") => {
     if (!timezone)
         timezone = "(GMT+5:30)";
     timezone = timezone.substring(4, 10);
@@ -254,7 +254,7 @@ const getValueOfProjectConstant = (value, currentUser, timezone) => {
     if ([drapcode_constant_1.CURRENT_TIME, drapcode_constant_1.CURRENT_DATE_TIME].includes(value))
         result = (0, date_util_1.createLogsDateFormat)(timezone);
     if (drapcode_constant_1.DateTimeUnit.some((cnst) => value.includes(cnst)))
-        result = (0, date_util_1.getDateValue)(value, timezone);
+        result = (0, date_util_1.getDateValue)(value, timezone, fieldType);
     return result;
 };
 exports.getValueOfProjectConstant = getValueOfProjectConstant;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "description": "DrapCode Utility",
   "main": "build/index.js",
   "types": "build/index.d.ts",