fix test

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

@@ -66,17 +66,18 @@ describe(DeletionRequestUc.name, () => {
 		deletionLogService = module.get(DeletionLogService);
 		eventBus = module.get(EventBus);
 		configService = module.get(ConfigService);
-
-		jest.useFakeTimers();
 	});
 
-	beforeEach(() => {
+	afterEach(() => {
 		jest.clearAllMocks();
+		jest.useRealTimers();
 	});
 
 	describe('createDeletionRequest', () => {
 		describe('when creating a deletionRequest', () => {
 			const setup = () => {
+				jest.useFakeTimers().setSystemTime(new Date());
+
 				const deleteAfterMinutes = 1;
 				const deletionRequestToCreate: DeletionRequestBodyProps = {
 					targetRef: {
@@ -158,7 +159,7 @@ describe(DeletionRequestUc.name, () => {
 
 	describe('executeDeletionRequests', () => {
 		describe('when deletionRequests to execute exists', () => {
-			const setup = () => {
+			const setup = (noDelay = false) => {
 				deletionRequestService.findInProgressCount.mockResolvedValue(1);
 
 				configService.get.mockImplementation((key) => {
@@ -175,8 +176,9 @@ describe(DeletionRequestUc.name, () => {
 						return 2;
 					}
 					if (key === 'ADMIN_API__DELETION_DELAY_MILLISECONDS') {
-						return 100;
+						return noDelay ? 0 : 100;
 					}
+					return deletionTestConfig()[key];
 				});
 
 				const deletionRequest = deletionRequestFactory.buildWithId({ deleteAfter: new Date('2023-01-01') });
@@ -249,24 +251,13 @@ describe(DeletionRequestUc.name, () => {
 				);
 			});
 
-			/*
 			it('should work with a delay of 0', async () => {
-				const deletionRequest = deletionRequestFactory.buildWithId({ deleteAfter: new Date('2023-01-01') });
-				configService.get.mockImplementation((key) => {
-					if (key === 'ADMIN_API__DELETION_DELAY_MILLISECONDS') {
-						return 0;
-					}
-					return deletionTestConfig()[key];
-				});
-
-				deletionRequestService.findAllItemsToExecute.mockResolvedValueOnce([deletionRequest]);
-				deletionRequestService.findInProgressCount.mockResolvedValueOnce(0);
+				setup(true);
 
 				await uc.executeDeletionRequests();
 
 				expect(deletionRequestService.markDeletionRequestAsFailed).not.toHaveBeenCalled();
 			});
-			 */
 		});
 
 		describe('when an error occurred', () => {

apps/server/src/modules/deletion/domain/service/deletion-request.service.spec.ts

@@ -33,8 +33,7 @@ describe(DeletionRequestService.name, () => {
 
 		await setupEntities();
 
-		jest.useFakeTimers();
-		jest.setSystemTime(new Date());
+		jest.useFakeTimers().setSystemTime(new Date());
 	});
 
 	beforeEach(() => {

apps/server/src/modules/deletion/domain/service/deletion-request.service.ts

@@ -9,19 +9,17 @@ import { DeletionConfig } from '../../deletion.config';
 
 @Injectable()
 export class DeletionRequestService {
-	private olderThan: Date;
+	private thresholdOlder: number;
 
-	private newerThan: Date;
+	private thresholdNewer: number;
 
 	constructor(
 		private readonly deletionRequestRepo: DeletionRequestRepo,
 		private readonly configService: ConfigService<DeletionConfig, true>
 	) {
-		const thresholdOlder = this.configService.get<number>('ADMIN_API__DELETION_MODIFICATION_THRESHOLD_MS');
-		this.olderThan = new Date(Date.now() - thresholdOlder);
+		this.thresholdOlder = this.configService.get<number>('ADMIN_API__DELETION_MODIFICATION_THRESHOLD_MS');
 
-		const thresholdNewer = this.configService.get<number>('ADMIN_API__DELETION_CONSIDER_FAILED_AFTER_MS');
-		this.newerThan = new Date(Date.now() - thresholdNewer);
+		this.thresholdNewer = this.configService.get<number>('ADMIN_API__DELETION_CONSIDER_FAILED_AFTER_MS');
 	}
 
 	async createDeletionRequest(
@@ -49,15 +47,18 @@ export class DeletionRequestService {
 	}
 
 	public async findAllItemsToExecute(limit: number, getFailed = false): Promise<DeletionRequest[]> {
+		const newerThan = new Date(Date.now() - this.thresholdNewer);
+		const olderThan = new Date(Date.now() - this.thresholdOlder);
 		const deletionRequests = getFailed
-			? await this.deletionRequestRepo.findAllFailedItems(limit, this.olderThan, this.newerThan)
+			? await this.deletionRequestRepo.findAllFailedItems(limit, olderThan, newerThan)
 			: await this.deletionRequestRepo.findAllItems(limit);
 
 		return deletionRequests;
 	}
 
 	public async findInProgressCount(): Promise<number> {
-		const count = await this.deletionRequestRepo.findInProgressCount(this.newerThan);
+		const newerThan = new Date(Date.now() - this.thresholdNewer);
+		const count = await this.deletionRequestRepo.findInProgressCount(newerThan);
 		return count;
 	}