fix backend tests

Signed-off-by: engelharddirk <[email protected]>
amosproj · Dec 10, 2024 · 4f042e1 · 4f042e1
1 parent 7f9269e
commit 4f042e1
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 20 deletions.
diff --git a/apps/backend/src/app/alerting/alerting.controller.spec.ts b/apps/backend/src/app/alerting/alerting.controller.spec.ts
@@ -29,6 +29,7 @@ const mockedBackupDataEntity: BackupDataEntity = {
   sizeMB: 100,
   type: BackupType.FULL,
   creationDate: new Date(),
+  saveset: 'saveset1',
 };
 
 const mockedSizeAlertTypeEntity: AlertTypeEntity = {

diff --git a/apps/backend/src/app/alerting/alerting.service.spec.ts b/apps/backend/src/app/alerting/alerting.service.spec.ts
@@ -28,6 +28,7 @@ const mockedBackupDataEntity: BackupDataEntity = {
   sizeMB: 100,
   type: BackupType.FULL,
   creationDate: new Date(),
+  saveset: 'saveset1',
 };
 
 const mockedSizeAlertTypeEntity: AlertTypeEntity = {

diff --git a/apps/backend/src/app/alerting/alerting.service.ts b/apps/backend/src/app/alerting/alerting.service.ts
@@ -125,7 +125,7 @@ export class AlertingService {
   async createSizeAlert(createSizeAlertDto: CreateSizeAlertDto) {
     // Check if alert already exists
     const existingAlertEntity = await this.sizeAlertRepository.findOneBy({
-      backup: { id: createSizeAlertDto.backupUuid },
+      backup: { id: createSizeAlertDto.backupId },
     });
 
     if (existingAlertEntity) {
@@ -138,11 +138,11 @@ export class AlertingService {
     alert.referenceSize = createSizeAlertDto.referenceSize;
 
     const backup = await this.backupDataService.findOneById(
-      createSizeAlertDto.backupUuid
+      createSizeAlertDto.backupId
     );
     if (!backup) {
       throw new NotFoundException(
-        `Backup with id ${createSizeAlertDto.backupUuid} not found`
+        `Backup with id ${createSizeAlertDto.backupId} not found`
       );
     }
     alert.backup = backup;
@@ -167,7 +167,7 @@ export class AlertingService {
   ) {
     // Check if alert already exists
     const existingAlertEntity = await this.creationDateRepository.findOneBy({
-      backup: { id: createCreationDateAlertDto.backupUuid },
+      backup: { id: createCreationDateAlertDto.backupId },
     });
 
     if (existingAlertEntity) {
@@ -180,11 +180,11 @@ export class AlertingService {
     alert.referenceDate = createCreationDateAlertDto.referenceDate;
 
     const backup = await this.backupDataService.findOneById(
-      createCreationDateAlertDto.backupUuid
+      createCreationDateAlertDto.backupId
     );
     if (!backup) {
       throw new NotFoundException(
-        `Backup with id ${createCreationDateAlertDto.backupUuid} not found`
+        `Backup with id ${createCreationDateAlertDto.backupId} not found`
       );
     }
     alert.backup = backup;

diff --git a/apps/backend/src/app/alerting/dto/alerts/createCreationDateAlert.dto.ts b/apps/backend/src/app/alerting/dto/alerts/createCreationDateAlert.dto.ts
@@ -6,13 +6,7 @@ export class CreateCreationDateAlertDto {
     description: 'Uuid of the Backup',
     required: true,
   })
-  backupUuid!: string;
-
-  @ApiProperty({
-    description: 'Saveset name of the belonging backup',
-    required: true,
-  })
-  backupSaveset!: string;
+  backupId!: string;
 
   @ApiProperty({
     description: 'Date, the backup started',

diff --git a/apps/backend/src/app/alerting/dto/alerts/createSizeAlert.dto.ts b/apps/backend/src/app/alerting/dto/alerts/createSizeAlert.dto.ts
@@ -6,13 +6,7 @@ export class CreateSizeAlertDto {
     description: 'Uuid of the Backup',
     required: true,
   })
-  backupUuid!: string;
-
-  @ApiProperty({
-    description: 'Saveset name of the belonging backup',
-    required: true,
-  })
-  backupSaveset!: string;
+  backupId!: string;
 
   @ApiProperty({
     description: 'Size of the Backup, which is the reason for the alert',

diff --git a/apps/backend/src/app/backupData/backupData.controller.spec.ts b/apps/backend/src/app/backupData/backupData.controller.spec.ts
@@ -73,6 +73,7 @@ describe('BackupDataController (e2e)', () => {
 
     expect(response.body).toEqual({
       id: createBackupDataDto.id,
+      saveset: createBackupDataDto.saveset,
       sizeMB: createBackupDataDto.sizeMB,
       creationDate: createBackupDataDto.creationDate.toISOString(),
     });

diff --git a/apps/backend/src/app/utils/mail/mail.service.spec.ts b/apps/backend/src/app/utils/mail/mail.service.spec.ts
@@ -88,6 +88,7 @@ describe('MailService', () => {
         sizeMB: 100,
         type: BackupType.FULL,
         creationDate: new Date(),
+        saveset: 'saveset1',
       },
     };