drapcode-utility 2.7.1 → 2.7.3

package/build/query/queryBuilder.js

@@ -231,7 +231,7 @@ const conditionToQuery = (query, requiredExternal, externalParams, constants, ti
     if ([drapcode_constant_1.NOT_EQUAL, ...isEqualOrIgnore].includes(key) &&
         typeof value === "string" &&
         drapcode_constant_1.DateRangeConstant.some((cnst) => value.includes(cnst))) {
-        let final = (0, date_util_1.getDateRangeValue)(key, field, value);
+        let final = (0, date_util_1.getDateRangeValue)(key, field, value, fieldType);
         return final;
     }
     console.log("No date range constants");

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

@@ -6,16 +6,16 @@ interface DateField {
     type: string;
     extraFieldSetting?: Map<string, ExtraFieldSetting>;
 }
+interface DateComparison {
+    $gte?: string | Date;
+    $lte?: string | Date;
+    $lt?: string | Date;
+    $gt?: string | Date;
+}
 interface DateRangeValue {
-    [key: string]: {
-        $gte?: string;
-        $lte?: string;
-    } | {
+    [key: string]: DateComparison | {
         $or?: Array<{
-            [key: string]: {
-                $gte?: string;
-                $lte?: string;
-            };
+            [key: string]: DateComparison;
         }>;
     };
 }
@@ -24,7 +24,7 @@ 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, fieldType?: string) => string;
-export declare const getDateRangeValue: (key: string, field: string, value: string) => DateRangeValue;
+export declare const getDateRangeValue: (key: string, field: string, value: string, fieldType?: string) => DateRangeValue;
 export declare const nextDayDate: (date: string | Date) => string;
 export declare const timezoneDateParse: (value: string, nextDay?: boolean, prevDay?: boolean, isDateTime?: any) => any;
 export declare const formatProjectDates: (item: Record<string, any> | Record<string, any>[], dateFormat: string, fields: DateField[], reverse: boolean) => Record<string, any> | Record<string, any>[];

package/build/utils/date-util.js

@@ -7,7 +7,6 @@ exports.formatProjectDates = exports.timezoneDateParse = exports.nextDayDate = e
 const drapcode_constant_1 = require("drapcode-constant");
 const lodash_1 = __importDefault(require("lodash"));
 const moment_1 = __importDefault(require("moment"));
-const dateFormat = "YYYY-MM-DDTHH:mm:ss.SSS";
 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})?)?$/;
 const createLoggerDateFormat = (timezone) => {
     try {
@@ -81,7 +80,7 @@ const getDateValue = (value, timezone, fieldType = "datetime-local") => {
     }
 };
 exports.getDateValue = getDateValue;
-const getDateRangeValue = (key, field, value) => {
+const getDateRangeValue = (key, field, value, fieldType = "datetime-local") => {
     try {
         let startValue = null;
         let endValue = null;
@@ -94,19 +93,23 @@ const getDateRangeValue = (key, field, value) => {
                 startValue = (0, moment_1.default)().startOf("year");
                 endValue = (0, moment_1.default)().endOf("year");
                 break;
+            case drapcode_constant_1.CURRENT_WEEK:
+                startValue = (0, moment_1.default)().startOf("isoWeek");
+                endValue = (0, moment_1.default)().endOf("isoWeek");
+                break;
             default:
                 return {};
         }
         if (!startValue || !endValue) {
             return {};
         }
-        startValue = formatDate(startValue);
-        endValue = formatDate(endValue);
+        startValue = getDateValueForQuery(field, fieldType, startValue);
+        endValue = getDateValueForQuery(field, fieldType, endValue);
         if ([drapcode_constant_1.EQUALS, drapcode_constant_1.EQUALS_OR_IGNORE].includes(key)) {
             return {
                 [field]: {
                     $gte: startValue,
-                    $lte: endValue,
+                    $lt: endValue,
                 },
             };
         }
@@ -114,7 +117,7 @@ const getDateRangeValue = (key, field, value) => {
             return {
                 $or: [
                     { [field]: { $gte: endValue } },
-                    { [field]: { $lte: startValue } },
+                    { [field]: { $lt: startValue } },
                 ],
             };
         }
@@ -126,10 +129,16 @@ const getDateRangeValue = (key, field, value) => {
     }
 };
 exports.getDateRangeValue = getDateRangeValue;
-const formatDate = (date) => {
-    if (!date)
-        return `${date}`;
-    return date.format(dateFormat);
+const getDateValueForQuery = (field, fieldType, value) => {
+    if (!value)
+        return `${value}`;
+    if (["createdAt", "updatedAt"].includes(field)) {
+        return value.toDate();
+    }
+    if (fieldType === "date") {
+        return value.format("YYYY-MM-DD");
+    }
+    return value.format("YYYY-MM-DDTHH:mm:ss");
 };
 const getDateUnit = (unit) => {
     switch (unit) {

package/build/utils/util.js

@@ -1104,8 +1104,8 @@ const evaluateJSLogic = function (expression, data, user, envConstants) {
 exports.evaluateJSLogic = evaluateJSLogic;
 const formatDate = function (formatType, datentime, timezone, unixType, offset = false) {
     let formatDateNTime = unixType && unixType === "SEC"
-        ? (0, moment_1.default)(datentime * 1000)
-        : (0, moment_1.default)(datentime);
+        ? moment_1.default.utc(datentime * 1000)
+        : moment_1.default.utc(datentime);
     if (offset) {
         formatDateNTime = formatDateNTime.utcOffset(timezone);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "2.7.1",
+  "version": "2.7.3",
   "description": "DrapCode Utility",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,9 +42,9 @@
     "axios": "^1.1.2",
     "date-fns": "^4.1.0",
     "dompurify": "^3.1.7",
-    "drapcode-constant": "^2.0.8",
+    "drapcode-constant": "^2.0.9",
     "drapcode-logger": "^1.3.6",
-    "drapcode-redis": "^1.5.5",
+    "drapcode-redis": "^1.5.6",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",