Refactoring Date filter

Author: Lucas Cosmo Rocha

lib/mapper/filters.js

@@ -42,20 +42,27 @@ function processQuery(key, value) {
 }
 
 function treatValue(value) {
-    if (isDate(value)) return new Date(value).toISOString()
+    if (isDate(value) || isDateTime(value)) return new Date(value).toISOString()
+    else if (value.includes('*')) return buildRegEx(value)
+    else if (value.includes(':')) return getCompareOperator(value)
+    else if (value === 'now') return new Date().toISOString()
     else if (parseInt(value)) return parseInt(value)
-    else if (value.includes('*')) value = buildRegEx(value)
-    else if (value.includes(':')) {
-        var result = {}
-        value = value.split(':')
-        result[`$${value[0]}`] = treatValue(value[1])
-        value = result
-    }
     return value
 }
 
 function isDate(value) {
-    return /(^\d{4}-\d{1,2}-\d{1,2}$)|(^\d{4}-\d{1,2}-\d{1,2}T\d{2}:\d{2}:\d{2}$)/.test(value)
+    return /^([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01]))$/.test(value)
+}
+function isDateTime(value) {
+    return /^([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01]))T(0[0-9]|1[0-9]|2[0-3]):([0-9]|[0-5][0-9]):([0-9]|[0-5][0-9])$/.test(value)
+}
+
+function getCompareOperator(value) {
+    if (value.startsWith('gte')) return { '$gte': treatValue(value.slice(4)) }
+    else if (value.startsWith('gt')) return { '$gt': treatValue(value.slice(3)) }
+    else if (value.startsWith('lte')) return { '$lte': treatValue(value.slice(4)) }
+    else if (value.startsWith('lt')) return { '$lt': treatValue(value.slice(3)) }
+    return value
 }
 
 function splitByCommas(key, value) {
@@ -79,13 +86,13 @@ function buildRegEx(value) {
 function parseDate(query, options) {
     var result = []
     if (query.period) {
-        (query.date_end && isDate(query.date_end)) ?
+        (query.date_end) ?
             result.push(
-                processQuery(options.date_field, 'lt:'.concat(getDateStart('0d', new Date(query.date_end)))),
+                processQuery(options.date_field, 'lt:'.concat(query.date_end)),
                 processQuery(options.date_field, 'gte:'.concat(
                     getDateStart(query.period, new Date(query.date_end))))) :
             result.push(
-                processQuery(options.date_field, 'lt:'.concat(getDateStart('0d', new Date()))),
+                processQuery(options.date_field, 'lt:now'),
                 processQuery(options.date_field, 'gte:'.concat(
                     getDateStart(query.period, new Date()))))
         return result
@@ -97,7 +104,7 @@ function parseDate(query, options) {
                 processQuery(options.date_field, 'lt:'.concat(query.date_end)))
         } else {
             result.push(
-                processQuery(options.date_field, 'lt:'.concat(getDateStart('0d', new Date()))))
+                processQuery(options.date_field, 'lt:now'))
         }
         result.push(
             processQuery(options.date_field, 'gte:'.concat(query.date_start)))
@@ -110,7 +117,7 @@ function getDateStart(period, date_end) {
         return dateToString(new Date(
             date_end.getFullYear(),
             date_end.getMonth(),
-            (date_end.getDate() - onlyNumbers(period) + 1)))
+            (date_end.getDate() - onlyNumbers(period))))
     }
     else if (period.endsWith('w')) {
         return dateToString(new Date(