improve test cov

Author: virgilchiriac

apps/server/src/modules/deletion-console/deletion-client/deletion.client.spec.ts

@@ -249,5 +249,28 @@ describe(DeletionClient.name, () => {
 				await expect(client.executeDeletions()).rejects.toThrow(Error);
 			});
 		});
+
+		describe('when runFailed is true', () => {
+			const setup = () => {
+				setupConfig();
+
+				const response: AxiosResponse<DeletionRequestOutput> = axiosResponseFactory.build({
+					status: 204,
+				});
+
+				httpService.post.mockReturnValueOnce(of(response));
+
+				const fullUrl = 'http://api-admin:4030/admin/api/v1/deletionExecutions?runFailed=true';
+
+				return { fullUrl };
+			};
+			it('should call endpoint with runFailed param', async () => {
+				const { fullUrl } = setup();
+
+				await client.executeDeletions(undefined, true);
+
+				expect(httpService.post).toHaveBeenCalledWith(fullUrl, null, expect.any(Object));
+			});
+		});
 	});
 });

apps/server/src/modules/deletion-console/deletion-execution.console.ts

@@ -14,12 +14,14 @@ export class DeletionExecutionConsole {
 		options: [
 			{
 				flags: '-l, --limit <value>',
+				/* istanbul ignore next */
 				fn: (value: string) => (value ? Number(value) : undefined),
 				description: 'Limit of the requested deletion executions that should be performed.',
 				required: false,
 			},
 			{
 				flags: '-f, --runFailed <value>',
+				/* istanbul ignore next */
 				fn: (value: string) => /^(true|yes|1)$/i.test(value),
 				description: 'Limit of the requested deletion executions that should be performed.',
 				required: false,

apps/server/src/modules/deletion/api/uc/deletion-request.uc.spec.ts

@@ -1,7 +1,7 @@
 import { LegacyLogger } from '@core/logger';
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { MikroORM } from '@mikro-orm/core';
-import { ConfigModule } from '@nestjs/config';
+import { ConfigModule, ConfigService } from '@nestjs/config';
 import { EventBus } from '@nestjs/cqrs';
 import { Test, TestingModule } from '@nestjs/testing';
 import { createConfigModuleOptions } from '@shared/common/config-module-options';
@@ -17,13 +17,15 @@ import { DeletionRequestLogResponseBuilder } from '../builder';
 import { DeletionRequestBodyProps } from '../controller/dto';
 import { DeletionLogStatisticBuilder, DeletionTargetRefBuilder } from '../controller/dto/builder';
 import { DeletionRequestUc } from './deletion-request.uc';
+import { DeletionConfig } from '../../deletion.config';
 
 describe(DeletionRequestUc.name, () => {
 	let module: TestingModule;
 	let uc: DeletionRequestUc;
 	let deletionRequestService: DeepMocked<DeletionRequestService>;
 	let deletionLogService: DeepMocked<DeletionLogService>;
 	let eventBus: DeepMocked<EventBus>;
+	let configService: DeepMocked<ConfigService<DeletionConfig, true>>;
 
 	beforeAll(async () => {
 		const orm = await setupEntities();
@@ -54,13 +56,18 @@ describe(DeletionRequestUc.name, () => {
 					provide: MikroORM,
 					useValue: orm,
 				},
+				{
+					provide: ConfigService,
+					useValue: createMock<ConfigService>(),
+				},
 			],
 		}).compile();
 
 		uc = module.get(DeletionRequestUc);
 		deletionRequestService = module.get(DeletionRequestService);
 		deletionLogService = module.get(DeletionLogService);
 		eventBus = module.get(EventBus);
+		configService = module.get(ConfigService);
 	});
 
 	beforeEach(() => {
@@ -183,6 +190,17 @@ describe(DeletionRequestUc.name, () => {
 					new UserDeletedEvent(deletionRequest.id, deletionRequest.targetRefId)
 				);
 			});
+
+			it('should work with a delay of 0', async () => {
+				const { deletionRequest } = setup();
+				configService.get.mockReturnValueOnce(0);
+
+				deletionRequestService.findAllItemsToExecute.mockResolvedValueOnce([deletionRequest]);
+
+				await uc.executeDeletionRequests();
+
+				expect(deletionRequestService.markDeletionRequestAsFailed).not.toHaveBeenCalled();
+			});
 		});
 
 		describe('when an error occurred', () => {

apps/server/src/modules/deletion/repo/deletion-request.repo.spec.ts

@@ -224,6 +224,68 @@ describe(DeletionRequestRepo.name, () => {
 		});
 	});
 
+	describe('findAllFailedItems', () => {
+		const setup = async () => {
+			const limit = 10;
+			const olderThan = new Date(2023, 11, 1);
+			const newerThan = new Date(2023, 8, 1);
+
+			const deletionRequestEntity1: DeletionRequestEntity = deletionRequestEntityFactory.build({
+				createdAt: new Date(2023, 7, 1),
+				updatedAt: new Date(2023, 8, 2),
+				deleteAfter: new Date(2023, 8, 1),
+				status: StatusModel.PENDING,
+			});
+			const deletionRequestEntity2: DeletionRequestEntity = deletionRequestEntityFactory.build({
+				createdAt: new Date(2023, 7, 1),
+				updatedAt: new Date(2023, 8, 2),
+				deleteAfter: new Date(2023, 8, 1),
+				status: StatusModel.FAILED,
+			});
+			const deletionRequestEntity3: DeletionRequestEntity = deletionRequestEntityFactory.build({
+				createdAt: new Date(2023, 8, 1),
+				updatedAt: new Date(2023, 7, 1),
+				deleteAfter: new Date(2023, 9, 1),
+				status: StatusModel.FAILED,
+			});
+			const deletionRequestEntity4: DeletionRequestEntity = deletionRequestEntityFactory.build({
+				createdAt: new Date(2023, 8, 1),
+				updatedAt: new Date(2023, 8, 1),
+				deleteAfter: new Date(2023, 9, 1),
+				status: StatusModel.REGISTERED,
+			});
+
+			await em.persistAndFlush([
+				deletionRequestEntity1,
+				deletionRequestEntity2,
+				deletionRequestEntity3,
+				deletionRequestEntity4,
+			]);
+			em.clear();
+
+			return { limit, olderThan, newerThan, deletionRequestEntity1, deletionRequestEntity2 };
+		};
+
+		it('should throw an error if olderThan is less than newerThan', async () => {
+			const { limit } = await setup();
+
+			const olderThan = new Date(2023, 10, 1);
+			const newerThan = new Date(2023, 11, 1);
+
+			await expect(repo.findAllFailedItems(limit, olderThan, newerThan)).rejects.toThrow();
+		});
+
+		it('should return failed deletion requests within the specified date range', async () => {
+			const { limit, olderThan, newerThan, deletionRequestEntity1, deletionRequestEntity2 } = await setup();
+
+			const results = await repo.findAllFailedItems(limit, olderThan, newerThan);
+
+			expect(results.length).toBe(2);
+			expect(results[0].id).toBe(deletionRequestEntity1.id);
+			expect(results[1].id).toBe(deletionRequestEntity2.id);
+		});
+	});
+
 	describe('update', () => {
 		describe('when updating deletionRequest', () => {
 			const setup = async () => {