drapcode-utility 1.9.4 → 1.9.5

package/build/utils/query-parser.js

@@ -295,10 +295,10 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
     // if (isDate) fieldValue = new Date(fieldValue);
     console.log("fieldValue queryToMongo 1", fieldValue);
     var condition = [
-        "dynamic_option",
-        "reference",
-        "static_option",
-        "belongsTo",
+        drapcode_constant_1.FieldTypes.dynamic_option.id,
+        drapcode_constant_1.FieldTypes.reference.id,
+        drapcode_constant_1.FieldTypes.static_option.id,
+        drapcode_constant_1.FieldTypes.belongsTo.id,
     ].includes(fieldType);
     if (condition && key === drapcode_constant_1.EQUALS && !isDate) {
         if (!Array.isArray(fieldValue)) {
@@ -411,7 +411,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
             }
             : {};
     }
-    if (key == drapcode_constant_1.EQUALS && fieldType === "boolean" && fieldValue)
+    if (key == drapcode_constant_1.EQUALS && fieldType === drapcode_constant_1.FieldTypes.boolean.id && fieldValue)
         return JSON.parse(fieldValue)
             ? (_z = {},
                 _z[field] = JSON.parse(fieldValue),
@@ -421,7 +421,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
                 (_1 = {}, _1[field] = { $exists: false }, _1),
             ],
         };
-    if (key === drapcode_constant_1.EQUALS_OR_IGNORE && fieldType === "boolean") {
+    if (key === drapcode_constant_1.EQUALS_OR_IGNORE && fieldType === drapcode_constant_1.FieldTypes.boolean.id) {
         return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
             ? JSON.parse(fieldValue)
                 ? (_2 = {},
@@ -437,21 +437,21 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
     if (key == drapcode_constant_1.EQUALS) {
         console.log("I am query parser");
         console.log("fieldType", fieldType);
-        if (fieldType === "boolean") {
+        if (fieldType === drapcode_constant_1.FieldTypes.boolean.id) {
             return _5 = {}, _5[field] = !!fieldValue, _5;
         }
-        if (fieldType === "number") {
+        if (fieldType === drapcode_constant_1.FieldTypes.number.id) {
             return _6 = {}, _6[field] = +fieldValue, _6;
         }
         console.log("Nothing match");
         return _7 = {}, _7[field] = "".concat(fieldValue), _7;
     }
     if (key === drapcode_constant_1.EQUALS_OR_IGNORE) {
-        if (fieldType === "boolean") {
+        if (fieldType === drapcode_constant_1.FieldTypes.boolean.id) {
             return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
                 ? (_8 = {}, _8[field] = !!fieldValue, _8) : {};
         }
-        if (fieldType === "number") {
+        if (fieldType === drapcode_constant_1.FieldTypes.number.id) {
             return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
                 ? (_9 = {}, _9[field] = +fieldValue, _9) : {};
         }
@@ -461,13 +461,13 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         }
     }
     if (key == drapcode_constant_1.NOT_EQUAL)
-        if (fieldType === "number") {
+        if (fieldType === drapcode_constant_1.FieldTypes.number.id) {
             return _11 = {}, _11[field] = { $ne: +fieldValue }, _11;
         }
         else
             return _12 = {},
                 _12[field] = {
-                    $ne: fieldType === "boolean" && fieldValue
+                    $ne: fieldType === drapcode_constant_1.FieldTypes.boolean.id && fieldValue
                         ? JSON.parse(fieldValue)
                         : fieldValue,
                 },
@@ -517,12 +517,12 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
     var key = query.key, value = query.value, fieldType = query.fieldType;
     if (fieldType &&
         !requiredExternal &&
-        ["dynamic_option", "reference", "static_option", "belongsTo"].includes(fieldType)) {
+        [drapcode_constant_1.FieldTypes.dynamic_option.id, drapcode_constant_1.FieldTypes.reference.id, drapcode_constant_1.FieldTypes.static_option.id, drapcode_constant_1.FieldTypes.belongsTo.id].includes(fieldType)) {
         //Todo: Remove if filter is working properly
         // return value === CURRENT_USER ? currentUser["uuid"] : value;
         var refCollection = query.refCollection, refField = query.refField;
         var finalValue = "";
-        if (["dynamic_option", "static_option"].includes(fieldType)) {
+        if ([drapcode_constant_1.FieldTypes.dynamic_option.id, drapcode_constant_1.FieldTypes.static_option.id].includes(fieldType)) {
             if (!value) {
                 if (refCollection === drapcode_constant_1.CURRENT_USER) {
                     finalValue = currentUser[refField];
@@ -543,7 +543,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         return finalValue;
     }
     if (fieldType &&
-        fieldType === "boolean" &&
+        fieldType === drapcode_constant_1.FieldTypes.boolean.id &&
         ["true", "false", "", true, false].includes(value)) {
         return "" + value;
     }
@@ -702,10 +702,10 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                         _c));
                 }
                 else if ([
-                    "static_option",
-                    "dynamic_option",
-                    "reference",
-                    "belongsTo",
+                    drapcode_constant_1.FieldTypes.static_option.id,
+                    drapcode_constant_1.FieldTypes.dynamic_option.id,
+                    drapcode_constant_1.FieldTypes.reference.id,
+                    drapcode_constant_1.FieldTypes.belongsTo.id,
                 ].includes(searchQueryTypeKey)) {
                     // if input is string and db field type is array
                     searchAggregateQuery.push({
@@ -758,7 +758,7 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                             _l));
                     }
                 }
-                else if (["date", "createdAt", "time_slot"].includes(searchQueryTypeKey)) {
+                else if (__spreadArray(__spreadArray([drapcode_constant_1.FieldTypes.date.id], drapcode_constant_1.systemDateField, true), [drapcode_constant_1.FieldTypes.time_slot.id], false).includes(searchQueryTypeKey)) {
                     if (key.startsWith("start_") || key.startsWith("end_")) {
                         var fieldKey = key.replace("start_", "");
                         fieldKey = fieldKey.replace("end_", "");
@@ -770,7 +770,7 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                         if (key.startsWith("start_")) {
                             likeQuery.push((_o = {},
                                 _o["_".concat(key)] = {
-                                    $gte: (0, date_util_1.timezoneDateParse)(value, false, true),
+                                    $gte: (0, date_util_1.timezoneDateParse)(value, true, true),
                                 },
                                 _o));
                         }

package/package.json

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