Merge pull request #270 from smartprocure/feature/range-from-fix

Fix date_range agg

Author: dubiousdavid

.changeset/clean-wasps-protect.md

@@ -0,0 +1,5 @@
+---
+'contexture-elasticsearch': patch
+---
+
+date_range agg uses from/to

packages/provider-elasticsearch/src/example-types/filters/dateRangeFacet.js

@@ -5,15 +5,47 @@ import {
   rollingRangeToDates,
 } from 'contexture-util/dateUtil.js'
 
-let getDateRange = (range, timezone) => {
+const typeToFields = {
+  range: {
+    fromField: 'gte',
+    toField: 'lte',
+  },
+  date_range: {
+    fromField: 'from',
+    toField: 'to',
+  },
+}
+
+let getDateRange = (range, timezone, type) => {
   let { from, to } = rollingRangeToDates(range, timezone)
+  let { fromField, toField } = typeToFields[type]
+
   return F.compactObject({
-    gte: getDateIfValid(from),
-    lte: getDateIfValid(to),
+    [fromField]: getDateIfValid(from),
+    [toField]: getDateIfValid(to),
   })
 }
 
-export default {
+const genAggsQuery = (field, format, ranges, timezone) => ({
+  aggs: {
+    range: {
+      date_range: {
+        field,
+        format: format || 'date_optional_time',
+        ranges: _.map(
+          ({ range, key }) => ({
+            key,
+            ...getDateRange(range, timezone, 'date_range'),
+          }),
+          ranges
+        ),
+      },
+    },
+  },
+  size: 0,
+})
+
+var dateRangeFacet_default = {
   hasValue: _.get('values.length'),
   /**
    * VALID CONTEXT
@@ -37,12 +69,11 @@ export default {
         range: {
           [field]: {
             format: 'date_optional_time',
-            ...getDateRange(range, timezone),
+            ...getDateRange(range, timezone, 'range'),
           },
         },
       }))
     )(ranges)
-
     return { bool: { should } }
   },
   /**
@@ -56,24 +87,7 @@ export default {
       ]
    */
   async result({ field, format, timezone = 'UTC', ranges }, search) {
-    let counts = await search({
-      aggs: {
-        range: {
-          date_range: {
-            field,
-            format: format || 'date_optional_time',
-            ranges: _.map(
-              ({ range, key }) => ({
-                key,
-                ...getDateRange(range, timezone),
-              }),
-              ranges
-            ),
-          },
-        },
-      },
-      size: 0,
-    })
+    let counts = await search(genAggsQuery(field, format, ranges, timezone))
     return {
       options: _.flow(
         _.get('aggregations.range.buckets'),
@@ -85,3 +99,5 @@ export default {
     }
   },
 }
+
+export { dateRangeFacet_default as default, genAggsQuery }

packages/provider-elasticsearch/src/example-types/filters/dateRangeFacet.test.js

@@ -3,7 +3,7 @@ import {
   getDateIfValid,
   rollingRangeToDates,
 } from 'contexture-util/dateUtil.js'
-import dateRangeFacet from './dateRangeFacet.js'
+import dateRangeFacet, { genAggsQuery } from './dateRangeFacet.js'
 import { expect, describe, it } from 'vitest'
 
 let commonFilterParts = {
@@ -67,3 +67,59 @@ describe('dateRangeFacet/filter', () => {
     })
   })
 })
+
+describe('genAggsQuery', () => {
+  it('should generate correct aggregation query with default format', () => {
+    const field = 'test_field'
+    const ranges = [
+      { range: 'allFutureDates', key: 'future' },
+      { range: 'allPastDates', key: 'past' },
+    ]
+    const timezone = 'UTC'
+
+    const result = genAggsQuery(field, undefined, ranges, timezone)
+
+    expect(result).toEqual({
+      aggs: {
+        range: {
+          date_range: {
+            field: 'test_field',
+            format: 'date_optional_time',
+            ranges: [
+              {
+                key: 'future',
+                from: getDatePart('allFutureDates', 'from'),
+              },
+              {
+                key: 'past',
+                to: getDatePart('allPastDates', 'to'),
+              },
+            ],
+          },
+        },
+      },
+      size: 0,
+    })
+  })
+
+  it('should handle empty ranges array', () => {
+    const field = 'empty_field'
+    const ranges = []
+    const timezone = 'UTC'
+
+    const result = genAggsQuery(field, undefined, ranges, timezone)
+
+    expect(result).toEqual({
+      aggs: {
+        range: {
+          date_range: {
+            field: 'empty_field',
+            format: 'date_optional_time',
+            ranges: [],
+          },
+        },
+      },
+      size: 0,
+    })
+  })
+})