Added explicit delete of data-targets when deleting an application

Author: fcv-iteratorIt

src/modules/device-management/application.module.ts

@@ -1,19 +1,20 @@
-import { Module, forwardRef } from "@nestjs/common";
-
+import { forwardRef, Module } from "@nestjs/common";
 import { ApplicationController } from "@admin-controller/application.controller";
 import { SharedModule } from "@modules/shared.module";
 import { OrganizationModule } from "@modules/user-management/organization.module";
 import { ApplicationService } from "@services/device-management/application.service";
 import { ChirpstackAdministrationModule } from "@modules/device-integrations/chirpstack-administration.module";
 import { PermissionModule } from "@modules/user-management/permission.module";
 import { MulticastModule } from "./multicast.module";
+import { DataTargetModule } from "@modules/device-management/data-target.module";
 
 @Module({
     imports: [
         SharedModule,
         forwardRef(() => OrganizationModule),
         forwardRef(() => PermissionModule),
         forwardRef(() => MulticastModule), // because of circular reference
+        forwardRef(() => DataTargetModule),
         ChirpstackAdministrationModule,
     ],
     exports: [ApplicationService],

src/modules/device-management/data-target.module.ts

@@ -3,7 +3,7 @@ import configuration from "@config/configuration";
 import { ApplicationModule } from "@modules/device-management/application.module";
 import { SharedModule } from "@modules/shared.module";
 import { OrganizationModule } from "@modules/user-management/organization.module";
-import { Module } from "@nestjs/common";
+import { forwardRef, Module } from "@nestjs/common";
 import { ConfigModule } from "@nestjs/config";
 import { DataTargetService } from "@services/data-targets/data-target.service";
 import { OS2IoTMail } from "@services/os2iot-mail.service";
@@ -15,7 +15,7 @@ import {
 @Module({
     imports: [
         SharedModule,
-        ApplicationModule,
+        forwardRef(() => ApplicationModule),
         OrganizationModule,
         ConfigModule.forRoot({ load: [configuration] }),
     ],

src/services/data-targets/data-target.service.ts

@@ -12,12 +12,21 @@ import { OpenDataDkDataset } from "@entities/open-data-dk-dataset.entity";
 import { dataTargetTypeMap } from "@enum/data-target-type-mapping";
 import { DataTargetType } from "@enum/data-target-type.enum";
 import { ErrorCodes } from "@enum/error-codes.enum";
-import { BadRequestException, Inject, Injectable, Logger } from "@nestjs/common";
+import {
+    BadRequestException,
+    forwardRef,
+    Inject,
+    Injectable,
+    Logger,
+} from "@nestjs/common";
 import { InjectRepository } from "@nestjs/typeorm";
 import { ApplicationService } from "@services/device-management/application.service";
 import { OS2IoTMail } from "@services/os2iot-mail.service";
 import { DeleteResult, Repository, SelectQueryBuilder } from "typeorm";
-import { CLIENT_SECRET_PROVIDER, ClientSecretProvider } from "../../helpers/fiware-token.helper";
+import {
+    CLIENT_SECRET_PROVIDER,
+    ClientSecretProvider,
+} from "../../helpers/fiware-token.helper";
 import { User } from "@entities/user.entity";
 
 @Injectable()
@@ -27,9 +36,11 @@ export class DataTargetService {
         private dataTargetRepository: Repository<DataTarget>,
         @InjectRepository(User)
         private userRepository: Repository<User>,
+        @Inject(forwardRef(() => ApplicationService))
         private applicationService: ApplicationService,
-        @Inject(CLIENT_SECRET_PROVIDER) private clientSecretProvider: ClientSecretProvider,
-        private oS2IoTMail: OS2IoTMail,
+        @Inject(CLIENT_SECRET_PROVIDER)
+        private clientSecretProvider: ClientSecretProvider,
+        private oS2IoTMail: OS2IoTMail
     ) {}
     private readonly logger = new Logger(DataTargetService.name);
 
@@ -97,7 +108,7 @@ export class DataTargetService {
     ): Promise<DataTarget[]> {
         const res = await this.dataTargetRepository
             .createQueryBuilder("dt")
-            .addSelect('dt.clientSecret')
+            .addSelect("dt.clientSecret")
             .innerJoin(
                 "iot_device_payload_decoder_data_target_connection",
                 "con",

src/services/device-management/application.service.ts

@@ -27,6 +27,7 @@ import { OrganizationService } from "@services/user-management/organization.serv
 import { PermissionService } from "@services/user-management/permission.service";
 import { DeleteResult, In, Repository } from "typeorm";
 import { MulticastService } from "./multicast.service";
+import { DataTargetService } from "@services/data-targets/data-target.service";
 
 @Injectable()
 export class ApplicationService {
@@ -40,7 +41,9 @@ export class ApplicationService {
         private multicastService: MulticastService,
         private chirpstackDeviceService: ChirpstackDeviceService,
         @Inject(forwardRef(() => PermissionService))
-        private permissionService: PermissionService
+        private permissionService: PermissionService,
+        @Inject(forwardRef(() => DataTargetService))
+        private dataTargetService: DataTargetService
     ) {}
 
     async findAndCountInList(
@@ -262,7 +265,7 @@ export class ApplicationService {
     async delete(id: number): Promise<DeleteResult> {
         const application = await this.applicationRepository.findOne({
             where: { id },
-            relations: ["iotDevices", "multicasts"],
+            relations: ["iotDevices", "multicasts", "dataTargets"],
         });
 
         // Don't allow delete if this application contains any sigfox devices.
@@ -274,6 +277,10 @@ export class ApplicationService {
             throw new ConflictException(ErrorCodes.DeleteNotAllowedHasSigfoxDevice);
         }
 
+        for (const dataTarget of application.dataTargets) {
+            await this.dataTargetService.delete(dataTarget.id);
+        }
+
         // Delete all LoRaWAN devices in ChirpStack
         const loRaWANDevices = application.iotDevices.filter(
             device => device.type === IoTDeviceType.LoRaWAN
@@ -293,7 +300,6 @@ export class ApplicationService {
                 dbMulticast.lorawanMulticastDefinition.chirpstackGroupId
             );
         }
-
         return this.applicationRepository.delete(id);
     }