diff --git a/src/admin/admin.controller.spec.ts b/src/admin/admin.controller.spec.ts index 521fd7fc3ab7050cfecbc198cc55bdeac1c6f3bd..7ee7f21f6f526c7acf3e466cc49d469179c6d509 100644 --- a/src/admin/admin.controller.spec.ts +++ b/src/admin/admin.controller.spec.ts @@ -51,7 +51,6 @@ describe('AdminController', () => { validate: jest.fn(), update: jest.fn(), mergeEmployer: jest.fn(), - deleteInvalidEmployer: jest.fn(), }; const mockJobService = { diff --git a/src/structures/structures.controller.ts b/src/structures/structures.controller.ts index 7e74151e7f56c2047a3d698a92f2931afdc2fafa..7188c77695d21f9f859d2344ee91952536f75b4a 100644 --- a/src/structures/structures.controller.ts +++ b/src/structures/structures.controller.ts @@ -166,7 +166,7 @@ export class StructuresController { this.logger.debug(`find with ${id}`); const structure = await this.structureService.findOne(id); if (!structure || (structure.deletedAt && !hasAdminRole(req.user))) { - this.logger.warn(`structure with ${id} does not exist`); + this.logger.log(`structure with ${id} does not exist`); throw new HttpException('Structure does not exist', HttpStatus.NOT_FOUND); } return structure; diff --git a/src/users/controllers/employer.controller.spec.ts b/src/users/controllers/employer.controller.spec.ts index d39b9f57002b96b422464dc55d7bfeffbee854a2..a6aca4923fe8c45850600d6758114360893c7433 100644 --- a/src/users/controllers/employer.controller.spec.ts +++ b/src/users/controllers/employer.controller.spec.ts @@ -28,7 +28,6 @@ describe('EmployerController', () => { validate: jest.fn(), update: jest.fn(), mergeEmployer: jest.fn(), - deleteInvalidEmployer: jest.fn(), }; beforeEach(async () => { @@ -252,7 +251,7 @@ describe('EmployerController', () => { name: 'Sopra', validated: true, }); - employerServiceMock.deleteInvalidEmployer.mockResolvedValueOnce({ + employerServiceMock.deleteOneId.mockResolvedValueOnce({ n: 1, ok: 1, deletedCount: 1, diff --git a/src/users/services/employer.service.spec.ts b/src/users/services/employer.service.spec.ts index 4bf192bca3e37b388f9bc143a3245cd6f1008dcd..c245a4e3e70f345a9db0faae78a6bc2e19e3f269 100644 --- a/src/users/services/employer.service.spec.ts +++ b/src/users/services/employer.service.spec.ts @@ -279,13 +279,9 @@ describe('EmployerService', () => { name: 'Sopra', validated: false, }) - .mockResolvedValueOnce(result) - .mockResolvedValueOnce({ - _id: new Types.ObjectId('623aed68c5d45b6fbbaa7e60'), - name: 'Sopra', - validated: false, - }); + .mockResolvedValueOnce(result); mockUserService.replaceEmployers.mockResolvedValueOnce(null); + jest.spyOn(employerService, 'deleteOneId').mockResolvedValueOnce(null); const reply = await employerService.mergeEmployer({ sourceEmployerId: '623aed68c5d45b6fbbaa7e60', targetEmployerId: '623aed68c5d45b6fbbaa7e61', @@ -300,7 +296,7 @@ describe('EmployerService', () => { }; mockEmployerModel.findById.mockReturnThis(); mockEmployerModel.exec.mockResolvedValueOnce(null).mockResolvedValueOnce(result); - jest.spyOn(employerService, 'deleteInvalidEmployer').mockRejectedValueOnce({}); + jest.spyOn(employerService, 'deleteOneId').mockRejectedValueOnce({}); mockUserService.replaceEmployers.mockResolvedValueOnce(null); try { await employerService.mergeEmployer({ @@ -409,29 +405,6 @@ describe('EmployerService', () => { }); }); - describe('deleteInvalidEmployer', () => { - it('should delete invalid employer', async () => { - mockEmployerModel.findById.mockReturnThis(); - mockEmployerModel.exec.mockResolvedValueOnce({ - _id: new Types.ObjectId('623aed68c5d45b6fbbaa7e60'), - name: 'Sopra', - validated: false, - save: jest.fn().mockResolvedValueOnce(null), - }); - mockEmployerSearchService.deleteIndex.mockResolvedValueOnce(null); - mockEmployerModel.deleteOne.mockReturnThis(); - mockEmployerModel.exec.mockResolvedValueOnce({ - _id: new Types.ObjectId('623aed68c5d45b6fbbaa7e60'), - name: 'Sopra', - validated: false, - save: jest.fn().mockResolvedValueOnce(null), - }); - await employerService.deleteInvalidEmployer('6231aefe76598527c8d0b5bc'); - expect(mockEmployerSearchService.deleteIndex).toBeCalled(); - expect(mockEmployerModel.deleteOne).toBeCalled(); - }); - }); - describe('deleteOneId', () => { it('should delete ', async () => { mockEmployerModel.findOne.mockReturnThis(); diff --git a/src/users/services/employer.service.ts b/src/users/services/employer.service.ts index 416bae8f011d5f34caba9ad22991f5e93e0c871b..083f638e5451f8313dac4d43bb55af744103d738 100644 --- a/src/users/services/employer.service.ts +++ b/src/users/services/employer.service.ts @@ -109,13 +109,13 @@ export class EmployerService { sourceEmployerId, targetEmployerId, }: MergeEmployerDto): Promise<Employer | HttpException> { - this.logger.debug(`mergeEmployer: ${sourceEmployerId} into ${targetEmployerId}`); + this.logger.log(`mergeEmployer: ${sourceEmployerId} into ${targetEmployerId}`); const sourceEmployer = await this.employerModel.findById(new Types.ObjectId(sourceEmployerId)).exec(); const targetEmployer = await this.employerModel.findById(new Types.ObjectId(targetEmployerId)).exec(); if (targetEmployer && sourceEmployer) { await this.userService.replaceEmployers(sourceEmployer, targetEmployer); if (!sourceEmployer.validated) { - await this.deleteInvalidEmployer(sourceEmployerId); + await this.deleteOneId(sourceEmployerId); } return targetEmployer; } else { @@ -123,18 +123,13 @@ export class EmployerService { } } - public async deleteInvalidEmployer(id: string): Promise<mongodb.DeleteResult> { - this.logger.debug(`deleteInvalidEmployer: ${id}`); - const document = await this.employerModel.findById(new Types.ObjectId(id)).exec(); - this.employerSearchService.deleteIndex(document, document._id); - return this.employerModel.deleteOne({ _id: id }).exec(); - } - public async deleteOneId(id: string): Promise<Employer> { - const employer = await this.employerModel.findOne({ _id: id }).exec(); + this.logger.log(`delete employer: ${id}`); + const employer = await this.employerModel.findById(new Types.ObjectId(id)).exec(); if (!employer) { throw new HttpException('Invalid employer id', HttpStatus.BAD_REQUEST); } + this.employerSearchService.deleteIndex(employer, employer._id); return employer.deleteOne(); }