drapcode-utility 1.7.1 → 1.7.3

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

@@ -3,6 +3,7 @@ export declare const createLoggerDateFormat: (timezone?: string) => any;
 export declare const createLoggerPreviouseDateFormat: () => any;
 export declare const createLogsDateFormat: (timezone?: string) => any;
 export declare const getDateValue: (value: string, timezone?: string) => any;
+export declare const getDateRangeValue: (key: string, field: string, value: 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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatProjectDates = exports.timezoneDateParse = exports.nextDayDate = exports.getDateValue = exports.createLogsDateFormat = exports.createLoggerPreviouseDateFormat = exports.createLoggerDateFormat = exports.DATE_REGEX = void 0;
+exports.formatProjectDates = exports.timezoneDateParse = exports.nextDayDate = exports.getDateRangeValue = exports.getDateValue = exports.createLogsDateFormat = exports.createLoggerPreviouseDateFormat = exports.createLoggerDateFormat = exports.DATE_REGEX = void 0;
 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})?)?$/;
@@ -46,6 +46,47 @@ var getDateValue = function (value, timezone) {
     return result.format(dateFormat);
 };
 exports.getDateValue = getDateValue;
+var getDateRangeValue = function (key, field, value) {
+    var _a, _b, _c;
+    var dateFormat = "YYYY-MM-DDTHH:mm:ss.SSS";
+    var finalValue = "";
+    var startValue = "";
+    var endValue = "";
+    switch (value) {
+        case drapcode_constant_1.CURRENT_MONTH:
+            // Start of the current month
+            startValue = moment().startOf("month");
+            // End of the current month
+            endValue = moment().endOf("month");
+            break;
+        case drapcode_constant_1.CURRENT_YEAR:
+            // Start of the current year
+            startValue = moment().startOf("year");
+            // End of the current year
+            endValue = moment().endOf("year");
+            break;
+        default:
+            break;
+    }
+    if (key === drapcode_constant_1.EQUALS) {
+        finalValue = (_a = {},
+            _a[field] = {
+                $gte: startValue.format(dateFormat),
+                $lte: endValue.format(dateFormat),
+            },
+            _a);
+    }
+    else if (key === drapcode_constant_1.NOT_EQUAL) {
+        finalValue = {
+            $or: [
+                (_b = {}, _b[field] = { $gte: endValue.format(dateFormat) }, _b),
+                (_c = {}, _c[field] = { $lte: startValue.format(dateFormat) }, _c),
+            ],
+        };
+    }
+    return finalValue;
+};
+exports.getDateRangeValue = getDateRangeValue;
 var getDateUnit = function (unit) {
     switch (unit) {
         case drapcode_constant_1.HOUR:

package/build/utils/query-parser.js

@@ -276,6 +276,13 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
     if (currentUser === void 0) { currentUser = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
     if (currentUserSetting === void 0) { currentUserSetting = {}; }
+    var key = query.key, field = query.field, value = query.value, fieldType = query.fieldType;
+    if ([drapcode_constant_1.EQUALS, drapcode_constant_1.NOT_EQUAL].includes(key) &&
+        drapcode_constant_1.DateRangeConstant.some(function (cnst) { return value.includes(cnst); })) {
+        var final = (0, date_util_1.getDateRangeValue)(key, field, value);
+        console.log("\n ===final getDateRangeValue", final);
+        return final;
+    }
     var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone);
     if (["undefined", "null", null, undefined, ""].includes(fieldValue)) {
         //TODO: In case field is not present in old record then fieldValue is undefined
@@ -287,7 +294,6 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
     console.log("fieldValue queryToMongo 1", fieldValue);
     var isDate = checkDate(fieldValue);
     console.log("isDate queryToMongo 2", isDate);
-    var key = query.key, field = query.field, value = query.value, fieldType = query.fieldType;
     // Todo: Remove if it's working properly
     // if (isDate) fieldValue = new Date(fieldValue);
     console.log("fieldValue queryToMongo 1", fieldValue);

package/build/utils/util.js

@@ -688,8 +688,10 @@ var validateData = function (fields, data) {
                 }
                 break;
             case "tel":
-                var telPattern = /^\+?(\d{1,3})?[-\s]?(\(\d{1,4}\)|\d{1,4})[-\s]?(\d{1,4}[-\s]?\d{1,4}|\d{7,10})$/;
-                if (typeof fieldValue !== "string" || !telPattern.test(fieldValue)) {
+                var removedSpace = fieldValue.replace(/\s+/g, "");
+                var telPattern = /^\+?(\d{1,3})?[-]?(\(\d{1,4}\)|\d{1,4})[-]?(\d{1,4}[-]?\d{1,4}|\d{7,10})$/;
+                if (typeof removedSpace !== "string" ||
+                    !telPattern.test(removedSpace)) {
                     errors.push("".concat(fieldTitle, " must be a valid phone number"));
                 }
                 break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -37,9 +37,9 @@
     "@types/voca": "^1.4.2",
     "axios": "^1.1.2",
     "dompurify": "^3.1.7",
-    "drapcode-constant": "^1.5.7",
-    "drapcode-logger": "^1.2.4",
-    "drapcode-redis": "^1.1.3",
+    "drapcode-constant": "^1.5.9",
+    "drapcode-logger": "^1.2.6",
+    "drapcode-redis": "^1.1.5",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",