correction filtre dans la corbeile bug #168

Author: alainabbas

apps/api/src/_common/abstracts/abstract.service.schema.ts

@@ -78,12 +78,16 @@ export abstract class AbstractServiceSchema<T extends AbstractSchema | Document
   }
 
   public async trashAndCount<T extends AbstractSchema | Document>(
+    filter?: FilterQuery<T>,
     projection?: ProjectionType<T> | null | undefined,
     options?: QueryOptions<T> | null | undefined,
   ): Promise<[Array<T & Query<T, T, any, T>>, number]> {
-    const filter = { deletedFlag: true }
-    let count = await this._model.countDocuments(filter).exec()
-    let data = await this._model.find<T & Query<T, T, any, T>>(filter, projection, options).exec()
+    this.logger.debug(['trashAndCount', JSON.stringify(Object.values(arguments))].join(' '))
+    const trashFilter = { deletedFlag: true }
+    let trashedFilter = { ...(filter || {}), ...trashFilter } as FilterQuery<T>
+    trashedFilter = normalizeMongoFilterValues(trashedFilter)
+    let count = await this._model.countDocuments(trashedFilter).exec()
+    let data = await this._model.find<T & Query<T, T, any, T>>(trashedFilter, projection, options).exec()
     return [data, count]
   }
   public async findAndCount<T extends AbstractSchema | Document>(

apps/api/src/management/identities/identities-crud.controller.ts

@@ -109,6 +109,32 @@ export class IdentitiesCrudController extends AbstractController {
     });
   }
 
+  /**
+   * Construit le filtre Mongo commun aux listes d'identités (recherche plein texte + filtres `filters[...]`).
+   * Le type `FilterSchema` est récursif (valeurs attendues) alors qu'on injecte ici des opérateurs Mongo,
+   * d'où les casts `any` volontaires.
+   */
+  protected buildIdentitiesSearchFilter(
+    search: string,
+    searchFilterSchema: FilterSchema,
+    searchFields: string | string[],
+  ): any {
+    const searchFilters: any[] = [];
+
+    if (search && search.trim().length > 0) {
+      const effectiveSearchFields = mergeIdentitySearchFields(searchFields);
+      searchFilters.push({
+        $or: Object.keys(effectiveSearchFields).map((key) => ({
+          [key]: { $regex: `^${search}`, $options: 'i' },
+        })),
+      });
+    }
+
+    searchFilters.push(searchFilterSchema);
+
+    return searchFilters.length === 1 ? searchFilters[0] : { $and: searchFilters };
+  }
+
   @Get('getdeleted')
   @UseRoles({
     resource: '/management/identities',
@@ -119,7 +145,9 @@ export class IdentitiesCrudController extends AbstractController {
   public async getdeleted(
     @Res() res: Response,
     @Query('search') search: string,
+    @SearchFilterSchema() searchFilterSchema: FilterSchema,
     @SearchFilterOptions() searchFilterOptions: FilterOptions,
+    @Query('searchFields') searchFields: string | string[],
   ): Promise<
     Response<
       {
@@ -132,7 +160,12 @@ export class IdentitiesCrudController extends AbstractController {
       any
     >
   > {
-    const [data, total] = await this._service.trashAndCount(IdentitiesCrudController.projection, searchFilterOptions);
+    const searchFilter = this.buildIdentitiesSearchFilter(search, searchFilterSchema, searchFields);
+    const [data, total] = await this._service.trashAndCount(
+      searchFilter,
+      IdentitiesCrudController.projection,
+      searchFilterOptions,
+    );
     return res.status(HttpStatus.OK).json({
       statusCode: HttpStatus.OK,
       total,
@@ -163,7 +196,6 @@ export class IdentitiesCrudController extends AbstractController {
       validations?: MixedValue;
     }>
   > {
-    const searchFilters = [];
     // Par défaut, on cache les identités "ne pas synchroniser" dans la recherche.
     // Si le client fournit déjà un filtre `state`, on ne l'écrase pas.
     // Le type `FilterSchema` est récursif (valeurs attendues), alors que pour Mongo on injecte parfois
@@ -173,19 +205,7 @@ export class IdentitiesCrudController extends AbstractController {
       effectiveSearchFilterSchema.state = { $ne: IdentityState.DONT_SYNC };
     }
 
-    if (search && search.trim().length > 0) {
-      const effectiveSearchFields = mergeIdentitySearchFields(searchFields);
-      const searchRequest = {};
-      searchRequest['$or'] = Object.keys(effectiveSearchFields)
-        .map((key) => {
-          return { [key]: { $regex: `^${search}`, $options: 'i' } };
-        })
-        .filter((item) => item !== undefined);
-      searchFilters.push(searchRequest);
-      searchFilters.push(effectiveSearchFilterSchema);
-    } else {
-      searchFilters.push(effectiveSearchFilterSchema);
-    }
+    const searchFilters: any[] = [this.buildIdentitiesSearchFilter(search, effectiveSearchFilterSchema, searchFields)];
 
     const expiredQuery = parseInitInvitationExpiredQuery(initInvitationExpired);
     if (expiredQuery !== null) {

apps/web/src/pages/identities/trash.vue

@@ -74,12 +74,14 @@ export default defineNuxtComponent({
     const { getStateValue, fetchAllStateCount } = useIdentityStateStore()
     const { getStateName } = useIdentityStates()
     const { countFilters, hasFilters, getFilters, removeFilter } = useFiltersQuery(columns)
-    const { buildSearchFieldsHint } = useIdentitySearchFields()
+    const { getSearchFieldsQuery, buildSearchFieldsHint } = useIdentitySearchFields()
+    const searchFieldsQuery = getSearchFieldsQuery()
     const searchFieldsHint = computed(() => buildSearchFieldsHint(columns.value))
 
     const computedQuery = computed(() => {
       return {
         ...getDefaults(),
+        ...searchFieldsQuery,
         ...$route.query,
       }
     })