feat: allow null value in filter list

tada5hi · Nov 27, 2022 · a264d6c · a264d6c
1 parent 363e260
commit a264d6c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/src/parameter/filters/build.ts b/src/parameter/filters/build.ts
@@ -26,8 +26,23 @@ export function buildQueryFilters<T extends ObjectLiteral = ObjectLiteral>(
             }
 
             if (Array.isArray(input)) {
-                // todo: check array elements are string
-                output[key] = input.join(',');
+                // preserve null values
+                const data : string[] = [];
+                for (let i = 0; i < input.length; i++) {
+                    if (input[i] === null) {
+                        input[i] = 'null';
+                    }
+
+                    if (typeof input[i] === 'number') {
+                        input[i] = `${input[i]}`;
+                    }
+
+                    if (typeof input[i] === 'string') {
+                        data.push(input[i]);
+                    }
+                }
+
+                output[key] = data.join(',');
 
                 return true;
             }

diff --git a/src/parameter/filters/utils/value.ts b/src/parameter/filters/utils/value.ts
@@ -45,7 +45,7 @@ export function transformFilterValue(input: FilterValueSimple) : FilterValueSimp
         }
 
         return (input as unknown[])
-            .filter((n) => n === 0 || !!n) as FilterValueSimple;
+            .filter((n) => n === 0 || n === null || !!n) as FilterValueSimple;
     }
 
     if (typeof input === 'undefined' || input === null) {

diff --git a/test/unit/build.spec.ts b/test/unit/build.spec.ts
@@ -137,10 +137,10 @@ describe('src/build.ts', () => {
         // with negation & in operator
         record = buildQuery<Entity>({
             filter: {
-                id: [1,2,3],
+                id: [null, 1,2,3],
             },
         });
-        expect(record).toEqual(buildURLQueryString({ [URLParameter.FILTERS]: { id: '1,2,3' } }));
+        expect(record).toEqual(buildURLQueryString({ [URLParameter.FILTERS]: { id: 'null,1,2,3' } }));
 
         // with negation & like operator
         record = buildQuery<Entity>({

diff --git a/test/unit/filters.spec.ts b/test/unit/filters.spec.ts
@@ -304,7 +304,7 @@ describe('src/filter/index.ts', () => {
             {
                 key: 'id',
                 operator: FilterComparisonOperator.IN,
-                value: [0, 1, 2, 3],
+                value: [null, 0, 1, 2, 3],
             },
         ] as FiltersParseOutput);