Added filter options for taskId and TaskName

Signed-off-by: Florian Oberndörfer <[email protected]>
amosproj · Dec 5, 2024 · 8b1e629 · 8b1e629
1 parent 0770c57
commit 8b1e629
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/apps/backend/src/app/backupData/backupData.service.ts b/apps/backend/src/app/backupData/backupData.service.ts
@@ -2,6 +2,7 @@ import { BadRequestException, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import {
   Between,
+  FindOptionsWhere,
   ILike,
   LessThanOrEqual,
   MoreThanOrEqual,
@@ -21,7 +22,7 @@ import { BackupType } from './dto/backupType';
 export class BackupDataService extends PaginationService {
   constructor(
     @InjectRepository(BackupDataEntity)
-    private backupDataRepository: Repository<BackupDataEntity>
+    private readonly backupDataRepository: Repository<BackupDataEntity>
   ) {
     super();
   }
@@ -79,7 +80,7 @@ export class BackupDataService extends PaginationService {
    * @param backupDataFilterDto
    */
   createWhereClause(backupDataFilterDto: BackupDataFilterDto) {
-    let where: any = {};
+    const where: FindOptionsWhere<BackupDataEntity> = {};
 
     //ID search
     if (backupDataFilterDto.id) {
@@ -138,6 +139,18 @@ export class BackupDataService extends PaginationService {
       where.sizeMB = LessThanOrEqual(backupDataFilterDto.toSizeMB);
     }
 
+    //Task id search
+    if (backupDataFilterDto.taskId) {
+      where.taskId = { id: backupDataFilterDto.taskId };
+    }
+
+    //Task name search
+    if (backupDataFilterDto.taskName) {
+      where.taskId = {
+        displayName: ILike(`%${backupDataFilterDto.taskName}%`),
+      };
+    }
+
     where.type = BackupType.FULL;
 
     return where;

diff --git a/apps/backend/src/app/backupData/dto/backupDataFilter.dto.ts b/apps/backend/src/app/backupData/dto/backupDataFilter.dto.ts
@@ -1,4 +1,4 @@
-import { IsDate, IsInt, IsOptional, IsString } from 'class-validator';
+import { IsOptional, IsString } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class BackupDataFilterDto {
@@ -39,4 +39,18 @@ export class BackupDataFilterDto {
   })
   @IsOptional()
   toSizeMB?: number;
+
+  @ApiProperty({
+    description: 'Task id',
+    required: false,
+  })
+  @IsOptional()
+  taskId?: string;
+
+  @ApiProperty({
+    description: 'Task name',
+    required: false,
+  })
+  @IsOptional()
+  taskName?: string;
 }