drapcode-utility 2.6.5 → 2.6.6-preview

package/build/encryption/index.js

@@ -132,7 +132,6 @@ const drapcodeEncryptDecrypt = async (data, encrypt) => {
 };
 exports.drapcodeEncryptDecrypt = drapcodeEncryptDecrypt;
 const cryptFile = async (filePath, encryption, decrypt) => {
-    console.log("encryption cryptFile:>> ", encryption);
     const data = await (0, file_1.processFileEncryptionDecryption)(filePath, encryption, decrypt);
     return data;
 };

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/build/utils/s3-util.js

@@ -33,7 +33,6 @@ const createS3Client = (awsConfig) => {
 exports.createS3Client = createS3Client;
 const fileUploadToS3 = async (files, s3Client, s3Config, publicS3Client, publicS3Config, isGenerateIcons, encryption, options = {}, encrypted = false) => {
     if (Array.isArray(files)) {
-        console.log("Multiple file");
         const fileOptions = [];
         const s3Key = s3Config.key;
         for (const file of files) {
@@ -49,21 +48,17 @@ const fileUploadToS3 = async (files, s3Client, s3Config, publicS3Client, publicS
         return fileOptions;
     }
     else {
-        console.log("Single file");
         const fileSlug = slugifyFileName(files.originalname);
         if (s3Config.append) {
             s3Config.key = `${s3Config.key}/${(0, uuid_1.v4)()}/${fileSlug}`;
         }
-        console.log("encryption :>> ", encryption);
         return await processFileUploadToS3(files, s3Client, s3Config, publicS3Client, publicS3Config, isGenerateIcons, encryption, options, encrypted);
     }
 };
 exports.fileUploadToS3 = fileUploadToS3;
 const processFileUploadToS3 = async (file, s3Client, s3Config, publicS3Client, publicS3Config, isGenerateIcons, encryption, options = {}, encrypt = false) => {
     try {
-        console.log("encrypt :>> ", encrypt);
         const contentType = mime_types_1.default.lookup(file.originalname) || "";
-        console.log("s3Config :>> ", s3Config);
         const { acl, key, bucket } = s3Config;
         let params = null;
         let encryptedFilePath = null;
@@ -88,8 +83,6 @@ const processFileUploadToS3 = async (file, s3Client, s3Config, publicS3Client, p
                 ...options,
             };
         }
-        console.log("encryptedFilePath :>> ", encryptedFilePath);
-        console.log("params :>> ", params);
         const parallelUploads3 = new lib_storage_1.Upload({ client: s3Client, params });
         const data = await parallelUploads3.done();
         const { smallIcon, mediumIcon, largeIcon } = await handleIconUpload(file, contentType, publicS3Client, publicS3Config, isGenerateIcons, key, options);

package/build/utils/util.d.ts

@@ -102,7 +102,7 @@ export declare const evaluateExpression: (expression: string, data: any, user: a
 export declare const evaluateCurrency: (formatType: string, subject: number | string | any, currency: string, position: string, maxFraction: number, user?: any, tenant?: any) => string;
 export declare const evaluateJSLogic: (expression: string, data: any, user: any, envConstants: any) => any;
 export declare const formatDate: (formatType: string, datentime: any, timezone: string, unixType: any, offset?: boolean) => string;
-export declare const dateDifference: (formatType: string, datentime1: any, datentime2: any, timezone: string) => string;
+export declare const dateDifference: (formatType: string, datentime1: any, datentime2: any, timezone: string, dateFormat: string) => string;
 export declare const mergeObjects: (arrayOfObjects: any, data?: any, user?: any, tenant?: any, userSetting?: any, subTenant?: any, sessionValue?: any, envConstants?: any, sessionFormValue?: any, dataTransferObject?: any, localStorageValue?: any, cookiesValue?: any) => any;
 export declare const getFindQuery: (item: any, customKey?: string) => {
     [x: string]: any;

package/build/utils/util.js

@@ -333,7 +333,6 @@ const replaceDataValueIntoExpression = (expression, data, user, tenant, userSett
     const contentList = expression
         .match(/{{(.*?)}}/g)
         ?.map((b) => b.replace(/{{(.*?)}}/g, "$1"));
-    console.log("1 replaceDataValueIntoExpression");
     contentList?.forEach((prop) => {
         const needle = `{{${prop}}}`;
         prop = voca_1.default.trim(prop);
@@ -1114,15 +1113,15 @@ const formatDate = function (formatType, datentime, timezone, unixType, offset =
     return datentime ? formatDateNTime.format(formatType) : "";
 };
 exports.formatDate = formatDate;
-const dateDifference = (formatType, datentime1, datentime2, timezone) => {
+const dateDifference = (formatType, datentime1, datentime2, timezone, dateFormat) => {
     let result = "";
     const dateExist = !datentime1 || !datentime2;
     const firstDate = datentime1 === "CURRENT_DATE_TIME"
         ? (0, moment_1.default)().utcOffset(timezone)
-        : (0, moment_1.default)(datentime1).utcOffset(timezone);
+        : (0, moment_1.default)(datentime1, dateFormat).utcOffset(timezone);
     const secondDate = datentime2 === "CURRENT_DATE_TIME"
         ? (0, moment_1.default)().utcOffset(timezone)
-        : (0, moment_1.default)(datentime2).utcOffset(timezone);
+        : (0, moment_1.default)(datentime2, dateFormat).utcOffset(timezone);
     const patterns = formatType.split(",");
     patterns.forEach((format, i) => {
         const diff = firstDate.diff(secondDate, format);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "drapcode-utility",
-  "version": "2.6.5",
-  "description": "DrapCode Utility",
+  "version": "2.6.6-preview",
+  "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [
@@ -42,9 +42,9 @@
     "axios": "^1.1.2",
     "date-fns": "^4.1.0",
     "dompurify": "^3.1.7",
-    "drapcode-constant": "^2.0.8",
-    "drapcode-logger": "^1.3.6",
-    "drapcode-redis": "^1.5.5",
+    "drapcode-constant": "^1.8.0",
+    "drapcode-logger": "^1.3.5",
+    "drapcode-redis": "^1.3.5",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",