diff --git a/apps/api/src/modules/base_locale/base_locale.service.ts b/apps/api/src/modules/base_locale/base_locale.service.ts index 86b49629..7bc1ceee 100644 --- a/apps/api/src/modules/base_locale/base_locale.service.ts +++ b/apps/api/src/modules/base_locale/base_locale.service.ts @@ -110,14 +110,17 @@ export class BaseLocaleService { limit?: number, offset?: number, ): Promise { - return this.basesLocalesRepository + const query = this.basesLocalesRepository .createQueryBuilder() .select() .where(where) - .andWhere('lower(emails::text)::text[] @> ARRAY[:email]', { email }) .limit(limit) - .offset(offset) - .getMany(); + .offset(offset); + + if (email) { + query.andWhere('lower(emails::text)::text[] @> ARRAY[:email]', { email }); + } + return query.getMany(); } public async countGroupByStatus(): Promise { diff --git a/apps/api/src/modules/base_locale/pipe/search_query.pipe.ts b/apps/api/src/modules/base_locale/pipe/search_query.pipe.ts index 0fa9299e..b0f1a1ec 100644 --- a/apps/api/src/modules/base_locale/pipe/search_query.pipe.ts +++ b/apps/api/src/modules/base_locale/pipe/search_query.pipe.ts @@ -4,7 +4,7 @@ import { HttpException, HttpStatus, } from '@nestjs/common'; -import { FindOptionsWhere, Not } from 'typeorm'; +import { FindOptionsWhere, IsNull, Not } from 'typeorm'; import { BaseLocale, @@ -46,9 +46,9 @@ export class SearchQueryPipe implements PipeTransform { } if (query.deleted === 'false') { - res.filters.deletedAt = null; + res.filters.deletedAt = IsNull(); } else if (query.deleted === 'true') { - res.filters.deletedAt = Not(null); + res.filters.deletedAt = Not(IsNull()); } else if (query.deleted) { throw new HttpException( 'La valeur du champ "deleted" est invalide',