@outliant/sunrise-utils 1.1.28 → 1.1.29

package/CHANGELOG.md

@@ -4,10 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.1.29](https://github.com/outliant/sunrise-utils/compare/1.1.28...1.1.29)
+
+- chore: fix task field date filter #86b0j0q70 [`#38`](https://github.com/outliant/sunrise-utils/pull/38)
+- chore: update task field date filter #86b0j0q70 [`3e806ba`](https://github.com/outliant/sunrise-utils/commit/3e806bac4a3144a9aa77ade67f980e6b583759c2)
+
 #### [1.1.28](https://github.com/outliant/sunrise-utils/compare/1.1.27...1.1.28)
 
+> 4 April 2024
+
 - task starred column #86azquc2z [`#36`](https://github.com/outliant/sunrise-utils/pull/36)
 - banners name and options update #85ztcymgr [`#37`](https://github.com/outliant/sunrise-utils/pull/37)
+- chore(release): 1.1.28 [`980137b`](https://github.com/outliant/sunrise-utils/commit/980137bef447c8c0fac3b9a116bc72c972bc13fd)
 - starredTaskIds parameter default value [`d1f69b5`](https://github.com/outliant/sunrise-utils/commit/d1f69b59611dc6b31d7c68a43e18b2920ea46c27)
 
 #### [1.1.27](https://github.com/outliant/sunrise-utils/compare/1.1.26...1.1.27)

package/helpers/taskFilter/taskFieldFilter.js

@@ -16,6 +16,9 @@ module.exports = (filter) => {
     case 'is_not_empty':
       return module.exports.isNotEmpty(filter);
     case 'is_equal':
+      if (filter.type === 'ready_at') {
+        return module.exports.isReadyAt(filter);
+      }
       return module.exports.isEqual(filter);
     case 'not_equal':
       return module.exports.isNotEqual(filter);
@@ -297,6 +300,51 @@ module.exports.isEqual = (filter) => {
   };
 };
 
+module.exports.isReadyAt = (filter) => {
+  const startOfDay = moment(filter.value).startOf('day').valueOf();
+  const endOfDay = moment(filter.value).endOf('day').valueOf();
+
+  return {
+    script: {
+      script: {
+        source: `
+          try {
+            def filterType = params.filterType;
+            def taskFilter = doc[filterType];
+
+            if (taskFilter.size() == 0) {
+              return false;
+            }
+
+            long startOfDay = params.startOfDay;
+            long endOfDay = params.endOfDay;
+
+            if (
+              filterType == 'ready_at' &&
+              doc['is_complete'].size() != 0 &&
+              doc['is_complete'].value == true &&
+              doc['completed_at'].size() != 0
+            ) {
+              long completedAt = doc['completed_at'].value.millis;
+              return completedAt >= startOfDay && completedAt <= endOfDay;
+            } else {
+              long taskFilterValue = taskFilter.value.millis;
+              return taskFilterValue >= startOfDay && taskFilterValue <= endOfDay;
+            }
+          } catch(Exception err){
+            return false;
+          }`,
+        lang: 'painless',
+        params: {
+          startOfDay,
+          endOfDay,
+          filterType: filter.type
+        }
+      }
+    }
+  };
+};
+
 module.exports.isBefore = (filter) => {
   let param;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@outliant/sunrise-utils",
   "description": "Helper functions for project Sunrise",
-  "version": "1.1.28",
+  "version": "1.1.29",
   "license": "ISC",
   "author": "Outliant",
   "main": "index.js",

package/test/helpers/taskFilter/taskFieldFilter.spec.js

@@ -435,6 +435,29 @@ describe('taskFieldFilter', function () {
         second_value: ''
       },
       output: null
+    },
+    {
+      input: {
+        condition: 'is_equal',
+        field_id: '',
+        type: 'ready_at',
+        field_type: 'date',
+        value: 1675296000000,
+        second_value: ''
+      },
+      output: {
+        script:{
+          script: {
+            source: "\n          try {\n            def filterType = params.filterType;\n            def taskFilter = doc[filterType];\n\n            if (taskFilter.size() == 0) {\n              return false;\n            }\n\n            long startOfDay = params.startOfDay;\n            long endOfDay = params.endOfDay;\n\n            if (\n              filterType == 'ready_at' &&\n              doc['is_complete'].size() != 0 &&\n              doc['is_complete'].value == true &&\n              doc['completed_at'].size() != 0\n            ) {\n              long completedAt = doc['completed_at'].value.millis;\n              return completedAt >= startOfDay && completedAt <= endOfDay;\n            } else {\n              long taskFilterValue = taskFilter.value.millis;\n              return taskFilterValue >= startOfDay && taskFilterValue <= endOfDay;\n            }\n          } catch(Exception err){\n            return false;\n          }",
+            lang: 'painless',
+            params: {
+              startOfDay: 1675267200000,
+              endOfDay: 1675353599999,
+              filterType: 'ready_at'
+            }
+          }
+        }
+      }
     }
   ];