fix query

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

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

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

@@ -1,4 +1,5 @@
 import { Scope } from '@shared/repo/scope';
+import { FilterQuery } from '@mikro-orm/core';
 import { DeletionRequestEntity } from '../entity';
 import { StatusModel } from '../../domain/types';
 
@@ -10,18 +11,22 @@ export class DeletionRequestScope extends Scope<DeletionRequestEntity> {
 	}
 
 	byStatusAndDate(status: StatusModel[], olderThan?: Date, newerThan?: Date): this {
-		let query = { status: { $in: status } };
+		const query: any[] = [];
+
+		const statusQuery = { status: { $in: status } };
+		query.push(statusQuery);
+
 		if (olderThan) {
 			const olderThanQuery = { updatedAt: { $lt: olderThan } };
-			query = { ...query, ...olderThanQuery };
+			query.push(olderThanQuery);
 		}
 
 		if (newerThan) {
 			const newerThanQuery = { updatedAt: { $gte: newerThan } };
-			query = { ...query, ...newerThanQuery };
+			query.push(newerThanQuery);
 		}
 
-		this.addQuery(query);
+		this.addQuery({ ...query });
 
 		return this;
 	}