Fix filter compare value casting for filter operators that take 2 or …

directus · May 8, 2024 · 1a7bdb1 · 1a7bdb1
1 parent 62e50fb
commit 1a7bdb1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.changeset/twenty-hats-laugh.md b/.changeset/twenty-hats-laugh.md
@@ -0,0 +1,5 @@
+---
+'@directus/api': patch
+---
+
+Fixed `_between` and `_nbetween` filters using a function, such as `count()` and `year()`
diff --git a/api/src/utils/apply-query.ts b/api/src/utils/apply-query.ts
@@ -666,7 +666,7 @@ export function applyFilter(
 				const type = getOutputTypeForFunction(functionName);
 
 				if (['integer', 'float', 'decimal'].includes(type)) {
-					compareValue = Number(compareValue);
+					compareValue = Array.isArray(compareValue) ? compareValue.map(Number) : Number(compareValue);
 				}
 			}
 
@@ -789,20 +789,20 @@ export function applyFilter(
 			}
 
 			if (operator === '_between') {
-				if (compareValue.length !== 2) return;
-
 				let value = compareValue;
 				if (typeof value === 'string') value = value.split(',');
 
+				if (value.length !== 2) return;
+
 				dbQuery[logical].whereBetween(selectionRaw, value);
 			}
 
 			if (operator === '_nbetween') {
-				if (compareValue.length !== 2) return;
-
 				let value = compareValue;
 				if (typeof value === 'string') value = value.split(',');
 
+				if (value.length !== 2) return;
+
 				dbQuery[logical].whereNotBetween(selectionRaw, value);
 			}