src/users/controllers/userRegistry.controller.spec.ts

@@ -16,7 +16,6 @@ describe('UserRegistryController', () => {
   const userRegistryServiceMock = {
     findAllForIndexation: jest.fn(),
     countAllUserRegistry: jest.fn(),
-    findAllUserRegistry: jest.fn(),
     findUsersByNameEmployerOrJobsGroup: jest.fn(),
     initUserRegistryIndex: jest.fn(),
     populateES: jest.fn(),
@@ -103,12 +102,12 @@ describe('UserRegistryController', () => {
       expect(reply).toStrictEqual([multipleUsers[0]]);
     });
     it('should findAll with no searchTerm and no filter arrays', async () => {
-      userRegistryServiceMock.findAllUserRegistry.mockResolvedValue(multipleUsers);
+      userRegistryServiceMock.findUsersByNameEmployerOrJobsGroup.mockResolvedValue(multipleUsers);
       const reply = await userRegistryController.findAll({ search: '' }, { page: 1 });
       expect(reply).toBe(multipleUsers);
     });
     it('should findAll with empty search end undefined filters', async () => {
-      userRegistryServiceMock.findAllUserRegistry.mockResolvedValue(multipleUsers);
+      userRegistryServiceMock.findUsersByNameEmployerOrJobsGroup.mockResolvedValue(multipleUsers);
       const reply = await userRegistryController.findAll({ search: '' });
       expect(reply).toBe(multipleUsers);
     });

src/users/controllers/userRegistry.controller.ts

@@ -25,17 +25,13 @@ export class UsersRegistryController {
     @Query() query?: { search: string },
     @Body() filters?: { jobsGroup?: string[]; employer?: string[]; page: number }
   ): Promise<UserRegistryPaginatedResponse> {
-    if (query.search || filters?.jobsGroup?.length || filters?.employer?.length) {
-      this.logger.debug(`findAll with query ${query.search}`);
-      return this.userRegistryService.findUsersByNameEmployerOrJobsGroup(
-        query.search || '',
-        filters?.page || 1,
-        filters?.jobsGroup || [],
-        filters?.employer || []
-      );
-    }
-    this.logger.debug('findAll without query');
-    return this.userRegistryService.findAllUserRegistry(filters?.page || 1);
+    this.logger.debug(`findAll with query '${query.search}' and ${JSON.stringify(filters)}`);
+    return this.userRegistryService.findUsersByNameEmployerOrJobsGroup(
+      query.search || '',
+      filters?.page || 1,
+      filters?.jobsGroup || [],
+      filters?.employer || []
+    );
   }
 
   /**

src/users/services/userRegistry.service.spec.ts

@@ -95,11 +95,11 @@ describe('userRegistryService', () => {
       mockUserRegistryModel.exec.mockResolvedValueOnce(result.length);
       expect(await userRegistryService.countAllUserRegistry()).toBe(result.length);
     });
-    it('should findAllUserRegistry with page number 1', async () => {
+    it('should findAll UserRegistry with page number 1', async () => {
       const res = { count: 1, docs: result };
-      mockUserRegistryModel.exec.mockResolvedValueOnce(1);
       mockUserRegistryModel.exec.mockResolvedValueOnce(result);
-      expect(await userRegistryService.findAllUserRegistry(1)).toStrictEqual(res);
+      mockUserRegistrySearchService.search.mockResolvedValueOnce(result);
+      expect(await userRegistryService.findUsersByNameEmployerOrJobsGroup('', 1)).toStrictEqual(res);
     });
   });
   describe('find with filter', () => {

src/users/services/userRegistry.service.ts

@@ -49,23 +49,6 @@ export class UserRegistryService {
       .exec();
   }
 
-  public async findAllUserRegistry(page: number): Promise<UserRegistryPaginatedResponse> {
-    this.logger.debug('findAllUserRegistry');
-    const limit = this.maxPerPage * page;
-    const count = await this.countAllUserRegistry();
-    const docs = await this.userModel
-      .find({ email: { $ne: process.env.MAIL_CONTACT } })
-      .where('emailVerified')
-      .equals(true)
-      .populate('employer job')
-      .select('name surname employer job _id withAppointment')
-      .limit(limit)
-      .collation({ locale: 'fr' })
-      .sort({ surname: 1 })
-      .exec();
-    return { count: count, docs: docs };
-  }
-
   private callbackFilter(users: IUser[], employersList: Employer[], jobsGroupsList: JobsGroupsDocument[]): IUser[] {
     this.logger.debug('callbackFilter');
     const jobsGroupsIds: string[] = jobsGroupsList.map((jobsGroup) => jobsGroup._id.toString());
@@ -91,7 +74,6 @@ export class UserRegistryService {
     this.logger.debug('findUsersByNameEmployerOrJobsGroup');
     const results = await this.userRegistrySearchService.search(searchParam);
     const ids = results.map((result) => result.id);
-    const limit = page * this.maxPerPage || this.maxPerPage;
     const jobsGroupsList: JobsGroupsDocument[] = [];
     const employersList: Employer[] = [];
     if (jobsGroups) {
@@ -119,7 +101,10 @@ export class UserRegistryService {
       .then((res) => {
         return this.callbackFilter(res, employersList, jobsGroupsList);
       });
-    return { count: resultsWithFilter.length, docs: resultsWithFilter.splice(0, limit) };
+    return {
+      count: resultsWithFilter.length,
+      docs: resultsWithFilter.slice(this.maxPerPage * (page - 1), this.maxPerPage * page),
+    };
   }
 
   public async initUserRegistryIndex() {