From 2b16c4fdd14812dbca786217be3751d588ff765f Mon Sep 17 00:00:00 2001 From: virgilchiriac Date: Fri, 24 Jan 2025 19:26:05 +0100 Subject: [PATCH] fix query --- .../deletion-console/deletion-execution.console.ts | 4 ++-- .../deletion/repo/scope/deletion-request-scope.ts | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/apps/server/src/modules/deletion-console/deletion-execution.console.ts b/apps/server/src/modules/deletion-console/deletion-execution.console.ts index 6915420b2fd..4d97390130e 100644 --- a/apps/server/src/modules/deletion-console/deletion-execution.console.ts +++ b/apps/server/src/modules/deletion-console/deletion-execution.console.ts @@ -15,14 +15,14 @@ export class DeletionExecutionConsole { { flags: '-l, --limit ', /* 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 ', /* 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, }, diff --git a/apps/server/src/modules/deletion/repo/scope/deletion-request-scope.ts b/apps/server/src/modules/deletion/repo/scope/deletion-request-scope.ts index 116c8aca393..a31ac7ff15f 100644 --- a/apps/server/src/modules/deletion/repo/scope/deletion-request-scope.ts +++ b/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 { } 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; }