fix(filter): fix filter value and omit undefined filters

seedium · Oct 31, 2022 · bff1cc0 · bff1cc0
1 parent 081f586
commit bff1cc0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/packages/filter/lib/interceptors/filter.interceptor.ts b/packages/filter/lib/interceptors/filter.interceptor.ts
@@ -7,7 +7,7 @@ import {
   SelectDatabaseOptions,
 } from '@knexion/core';
 import { FilterObject, FilterObjectOptions } from '../interfaces';
-import { isPlainObject } from '@nestjs/common/utils/shared.utils';
+import { isPlainObject, isUndefined } from '@nestjs/common/utils/shared.utils';
 
 export class FilterInterceptor<TRecord, TResult>
   implements KnexionInterceptor<TRecord, TResult>
@@ -40,11 +40,13 @@ export class FilterInterceptor<TRecord, TResult>
     alias?: string,
   ): Record<string, unknown> {
     return Object.fromEntries(
-      Object.entries(filter).map(([name, value]) => {
-        const { useAlias = true } = this.options;
-        const column = useAlias ? addPrefixColumn(name, alias) : name;
-        return [column, value];
-      }),
+      Object.entries(filter)
+        .filter(([, value]) => !isUndefined(value))
+        .map(([name, value]) => {
+          const { useAlias = true } = this.options;
+          const column = useAlias ? addPrefixColumn(name, alias) : name;
+          return [column, value];
+        }),
     );
   }
 }
diff --git a/packages/filter/lib/interfaces/filter-options.interface.ts b/packages/filter/lib/interfaces/filter-options.interface.ts
@@ -3,7 +3,7 @@ export interface FilterOptions {
 }
 
 export type FilterObject<TRecord> = Partial<
-  Record<keyof TRecord, string | number | null>
+  Record<keyof TRecord, string | number | boolean | null>
 >;
 
 export interface FilterObjectOptions extends FilterOptions {