drapcode-utility 1.0.2 → 1.0.3

package/build/utils/query-parser.js

@@ -324,7 +324,7 @@ var modifyQuery = function (obj, hasAndQueryConjunction) {
     return arr;
 };
 var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
     if (currentUser === void 0) { currentUser = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
     var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone);
@@ -393,66 +393,72 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         return _o = {}, _o[field] = { $nin: fieldValue || [] }, _o;
     }
     if (key === drapcode_constant_1.EQUALS && isDate) {
-        if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); })) {
-            return _p = {},
-                _p[field] = {
-                    $gte: fieldValue,
-                },
-                _p;
-        }
-        else {
-            //TODO: Handle timezone here
-            return _q = {},
-                _q[field] = {
-                    $gte: fieldValue,
-                    $lt: new Date(date_util_1.nextDayDate(fieldValue)),
-                },
-                _q;
-        }
+        return _p = {},
+            _p[field] = {
+                $gte: fieldValue,
+                $lt: date_util_1.nextDayDate(fieldValue),
+            },
+            _p;
+        // Todo: Remove this if works properly
+        // if (DateConstant.some((cnst) => value.includes(cnst))) {
+        //   return {
+        //     [field]: {
+        //       $gte: fieldValue,
+        //     },
+        //   };
+        // } else {
+        //   //TODO: Handle timezone here
+        //   return {
+        //     [field]: {
+        //       $gte: fieldValue,
+        //       $lt: new Date(nextDayDate(fieldValue)),
+        //     },
+        //   };
+        // }
     }
     if (key == drapcode_constant_1.EQUALS && field === "createdBy")
         return {
             $and: [
-                (_r = {}, _r[field] = { $ne: null }, _r),
-                (_s = {}, _s[field] = { $ne: "" }, _s),
-                (_t = {}, _t[field] = { $eq: fieldValue }, _t),
+                (_q = {}, _q[field] = { $ne: null }, _q),
+                (_r = {}, _r[field] = { $ne: "" }, _r),
+                (_s = {}, _s[field] = { $eq: fieldValue }, _s),
             ],
         };
     if (key == drapcode_constant_1.EQUALS && fieldType === "boolean" && fieldValue)
         return JSON.parse(fieldValue)
-            ? (_u = {},
-                _u[field] = JSON.parse(fieldValue),
-                _u) : {
+            ? (_t = {},
+                _t[field] = JSON.parse(fieldValue),
+                _t) : {
             $or: [
-                (_v = {}, _v[field] = JSON.parse(fieldValue), _v),
-                (_w = {}, _w[field] = { $exists: false }, _w),
+                (_u = {}, _u[field] = JSON.parse(fieldValue), _u),
+                (_v = {}, _v[field] = { $exists: false }, _v),
             ],
         };
     if (key == drapcode_constant_1.EQUALS) {
-        return _x = {},
-            _x[field] = fieldType === "boolean" && fieldValue
+        return _w = {},
+            _w[field] = fieldType === "boolean" && fieldValue
                 ? JSON.parse(fieldValue)
                 : !isNaN(fieldValue)
                     ? +fieldValue
                     : fieldValue,
-            _x;
+            _w;
     }
     if (key == drapcode_constant_1.NOT_EQUAL)
-        return _y = {},
-            _y[field] = {
+        return _x = {},
+            _x[field] = {
                 $ne: fieldType === "boolean" && fieldValue
                     ? JSON.parse(fieldValue)
                     : fieldValue,
             },
-            _y;
+            _x;
     if (key == drapcode_constant_1.BETWEEN) {
-        var _0 = exports.getMinMaxValue(fieldValue), startValue = _0.startValue, endValue = _0.endValue, isInteger = _0.isInteger;
-        return _z = {},
-            _z[field] = {
+        var _z = exports.getMinMaxValue(fieldValue), startValue = _z.startValue, endValue = _z.endValue, isInteger = _z.isInteger;
+        return _y = {},
+            _y[field] = {
                 $gte: isInteger ? +startValue : startValue,
                 $lte: isInteger ? +endValue : endValue,
             },
-            _z;
+            _y;
     }
 };
 var isEntityInCondition = function (value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",