drapcode-utility 2.6.5 → 2.6.6

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

@@ -26,6 +26,6 @@ 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 nextDayDate: (date: string | Date) => string;
-export declare const timezoneDateParse: (value: string, nextDay?: boolean, prevDay?: boolean) => Date;
+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>[];
 export {};

package/build/utils/date-util.js

@@ -161,8 +161,10 @@ const nextDayDate = (date) => {
     }
 };
 exports.nextDayDate = nextDayDate;
-const timezoneDateParse = (value, nextDay = false, prevDay = false) => {
+const timezoneDateParse = (value, nextDay = false, prevDay = false, isDateTime = null) => {
     try {
+        // Checking False because in case of null and true we need date with time
+        const format = isDateTime === false ? "YYYY-MM-DD" : "YYYY-MM-DDTHH:mm:ss";
         let timeZoneDate = (0, moment_1.default)(value);
         if (!timeZoneDate.isValid()) {
             throw new Error("Invalid date input");
@@ -173,9 +175,9 @@ const timezoneDateParse = (value, nextDay = false, prevDay = false) => {
         if (prevDay && value.length <= 10) {
             timeZoneDate = timeZoneDate.subtract(1, "days");
         }
-        const formatted = timeZoneDate.format("YYYY-MM-DDTHH:mm:ss");
-        return new Date(formatted);
-        // return timeZoneDate.toDate();
+        const formatted = timeZoneDate.format(format);
+        return typeof isDateTime === "boolean" ? formatted : new Date(formatted);
+        // return new Date(formatted);
     }
     catch (error) {
         console.error("Error in timezoneDateParse:", error);

package/build/utils/query-utils.js

@@ -83,8 +83,7 @@ const getSearchObjQuery = (searchObj, searchQueryTypeObj) => {
                 ].includes(searchQueryTypeKey)) {
                     const isDateTime = ["datetime", ...drapcode_constant_1.systemDateField].includes(searchQueryTypeKey);
                     if (key.startsWith("start_") || key.startsWith("end_")) {
-                        let fieldKey = key.replace("start_", "");
-                        fieldKey = fieldKey.replace("end_", "");
+                        let fieldKey = key.replace(/^start_/, "").replace(/^end_/, "");
                         searchAggregateQuery.push({
                             $addFields: {
                                 [`_${key}`]: { $toString: `$${fieldKey}` },
@@ -93,14 +92,14 @@ const getSearchObjQuery = (searchObj, searchQueryTypeObj) => {
                         if (key.startsWith("start_")) {
                             likeQuery.push({
                                 [`_${key}`]: {
-                                    $gte: (0, date_util_1.timezoneDateParse)(value, isDateTime, true),
+                                    $gte: (0, date_util_1.timezoneDateParse)(value, false, false, isDateTime),
                                 },
                             });
                         }
                         else if (key.startsWith("end_")) {
                             likeQuery.push({
                                 [`_${key}`]: {
-                                    $lt: (0, date_util_1.timezoneDateParse)(value, isDateTime),
+                                    $lt: (0, date_util_1.timezoneDateParse)(value, true, false, isDateTime),
                                 },
                             });
                         }

package/package.json

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