IOT-262 add integration to backend

Author: Jeppe Elkjær Jørgensen

src/app/models/payload-device-data.ts

@@ -3,7 +3,19 @@ import { IotDevice } from '@my-applications/iot-devices/iot-device.model';
 import { Datatarget } from './datatarget';
 
 export class PayloadDeviceDatatarget {
-    devices: number[];
+    id: number;
+    iotDeviceIds: number[];
     payloadDecoderId: number;
-    datatargetId: number;
+    dataTargetId: number;
+}
+
+export interface PayloadDeviceDatatargetGetByDataTargetResponse {
+    data: PayloadDeviceDatatargetGetByDataTarget[]
+}
+
+export interface PayloadDeviceDatatargetGetByDataTarget {
+    id: number;
+    iotDevices: IotDevice[];
+    payloadDecoder: PayloadDecoder;
+    dataTarget: Datatarget;
 }

src/app/shared/form/form-body-datatarget/form-body-datatarget.component.html

@@ -60,7 +60,7 @@ <h4>Efter oprettelse af dit data target dette parres det med en payload decoder
                         multiple
                         name="devices"
                         [compareWith]="compare"
-                        [(value)]="element.devices">
+                        [(value)]="element.iotDeviceIds">
                         <mat-option disabled="disabled" 
                         class="filter-option">
                           <button

src/app/shared/form/form-body-datatarget/form-body-datatarget.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, ViewChild } from '@angular/core';
+import { Component, OnInit, Input, ViewChild, OnDestroy } from '@angular/core';
 import { Datatarget } from 'src/app/models/datatarget';
 import { Subscription } from 'rxjs';
 import { ActivatedRoute } from '@angular/router';
@@ -12,20 +12,22 @@ import { Application } from '@app/models/application';
 import { IotDevice } from '@my-applications/iot-devices/iot-device.model';
 import { PayloadDecoderService } from '@shared/services/payload-decoder.service';
 import { PayloadDecoderResponse } from '@app/payload-decoder/payload-decoder.model';
-import { PayloadDeviceDatatarget } from '@app/models/payload-device-data';
+import { PayloadDeviceDatatarget, PayloadDeviceDatatargetGetByDataTarget, PayloadDeviceDatatargetGetByDataTargetResponse } from '@app/models/payload-device-data';
 import { faTimesCircle } from '@fortawesome/free-solid-svg-icons';
 import { NgModel } from '@angular/forms';
+import { PayloadDeviceDatatargetService } from '@shared/services/payloadDeviceDatatarget.service';
 
 @Component({
   selector: 'app-form-body-datatarget',
   templateUrl: './form-body-datatarget.component.html',
   styleUrls: ['./form-body-datatarget.component.scss']
 })
-export class FormBodyDatatargetComponent implements OnInit {
+export class FormBodyDatatargetComponent implements OnInit, OnDestroy {
   @Input() submitButton: string;
   public datatarget: Datatarget = new Datatarget();
   faTimesCircle = faTimesCircle;
   public datatargetSubscription: Subscription;
+  public relationSubscription: Subscription;
   public applicationSubscription: Subscription;
   public payloadDecoderSubscription: Subscription;
   public errorMessages: any;
@@ -46,7 +48,8 @@ export class FormBodyDatatargetComponent implements OnInit {
     private datatargetService: DatatargetService,
     private location: Location,
     private applicationService: ApplicationService,
-    private payloadDecoderService: PayloadDecoderService
+    private payloadDecoderService: PayloadDecoderService,
+    private payloadDeviceDataTargetService: PayloadDeviceDatatargetService
   ) { }
 
   ngOnInit(): void {
@@ -55,30 +58,38 @@ export class FormBodyDatatargetComponent implements OnInit {
     this.applicationId = +this.route.snapshot.paramMap.get('id');
     if (this.datatargetid !== 0) {
       this.getDatatarget(this.datatargetid);
+      this.getPayloadDeviceDatatarget(this.datatargetid);
     }
     if (this.applicationId !== 0) {
       this.getDevices();
     }
     this.getPayloadDecoders();
+    console.log(this.devices, this.payloadDecoders);
   }
 
   addRow() {
     if (!this.payloadDeviceDatatarget) {
       this.payloadDeviceDatatarget = [];
     }
-    this.payloadDeviceDatatarget.push({devices: [], payloadDecoderId: null, datatargetId: this.datatargetid});
+    this.payloadDeviceDatatarget.push({id: null, iotDeviceIds: [], payloadDecoderId: null, dataTargetId: this.datatargetid});
   }
 
   deleteRow(index) {
       if (this.payloadDeviceDatatarget.length === 0) {
+      } else if (this.payloadDeviceDatatarget[index]?.id === null) {
+        this.payloadDeviceDatatarget.splice(index, 1);
       } else {
-          this.payloadDeviceDatatarget.splice(index, 1);
+          this.payloadDeviceDataTargetService.delete(this.payloadDeviceDatatarget[index].id)
+            .subscribe( (response) => {
+              this.payloadDeviceDatatarget.splice(index, 1);
+            });
       }
   }
 
   onSubmit(): void {
     if (this.datatargetid) {
       this.updateDatatarget();
+      this.addPayloadDeviceDatatarget();
     } else {
       this.createDatatarget();
     }
@@ -93,7 +104,6 @@ export class FormBodyDatatargetComponent implements OnInit {
       .subscribe(
         (datatargetResponse: DatatargetResponse) => {
           this.datatarget = this.mapToDatatarget(datatargetResponse);
-          this.routeBack();
         },
         (error: HttpErrorResponse) => {
           this.handleError(error);
@@ -102,6 +112,38 @@ export class FormBodyDatatargetComponent implements OnInit {
       );
   }
 
+  addPayloadDeviceDatatarget() {
+    this.payloadDeviceDatatarget.forEach((relation) => {
+      if (relation.id) {
+        this.payloadDeviceDataTargetService.put(relation).subscribe(
+          (response) => {
+            console.log(response);
+          },
+          (error) => {
+            this.handleError(error);
+          }
+        );
+      } else {
+        this.payloadDeviceDataTargetService.post(relation).subscribe(
+          (res: any) => {
+            console.log(res);
+          },
+          (error) => {
+            this.handleError(error);
+          }
+        );
+      }
+      });
+  }
+
+  getPayloadDeviceDatatarget(id: number) {
+    this.relationSubscription = this.payloadDeviceDataTargetService
+      .getByDataTarget(id)
+      .subscribe((response: PayloadDeviceDatatargetGetByDataTargetResponse) => {
+        this.mapToDatatargetDevicePayload(response);
+      });
+  }
+
   createDatatarget() {
     this.datatarget.applicationId = this.applicationId;
     this.datatargetService.create(this.datatarget)
@@ -124,13 +166,13 @@ export class FormBodyDatatargetComponent implements OnInit {
   }
 
   public selectAllDevices(index: number) {
-    console.log(this.payloadDeviceDatatarget[0].devices);
-    this.payloadDeviceDatatarget[index].devices = this.devices.map( device => device.id);
+    console.log(this.payloadDeviceDatatarget[0].iotDeviceIds);
+    this.payloadDeviceDatatarget[index].iotDeviceIds = this.devices.map( device => device.id);
   }
 
   public deSelectAllDevices(index: number) {
-    console.log(this.payloadDeviceDatatarget[0].devices);
-    this.payloadDeviceDatatarget[index].devices = [];
+    console.log(this.payloadDeviceDatatarget[0].iotDeviceIds);
+    this.payloadDeviceDatatarget[index].iotDeviceIds = [];
   }
 
   getPayloadDecoders() {
@@ -143,12 +185,16 @@ export class FormBodyDatatargetComponent implements OnInit {
   handleError(error: HttpErrorResponse) {
     this.errorFields = [];
     this.errorMessages = [];
-    error.error.message.forEach((err) => {
-      this.errorFields.push(err.property);
-      this.errorMessages = this.errorMessages.concat(
-        Object.values(err.constraints)
-      );
-    });
+    if (typeof error.error.message === 'string') {
+      this.errorMessages.push(error.error.message);
+    } else {
+      error.error.message.forEach((err) => {
+        this.errorFields.push(err.property);
+        this.errorMessages = this.errorMessages.concat(
+          Object.values(err.constraints)
+        );
+      });
+    }
   }
 
   routeBack(): void {
@@ -174,6 +220,35 @@ export class FormBodyDatatargetComponent implements OnInit {
       });
   }
 
+  ngOnDestroy(): void {
+    if (this.relationSubscription) {
+      this.relationSubscription.unsubscribe();
+    }
+    if (this.applicationSubscription) {
+      this.applicationSubscription.unsubscribe();
+    }
+    if (this.datatargetSubscription) {
+      this.datatargetSubscription.unsubscribe();
+    }
+    if (this.payloadDecoderSubscription) {
+      this.payloadDecoderSubscription.unsubscribe();
+    }
+  }
+
+  private mapToDatatargetDevicePayload(dto: PayloadDeviceDatatargetGetByDataTargetResponse): PayloadDeviceDatatarget[] {
+    this.payloadDeviceDatatarget = [];
+    dto.data.forEach(
+      (element) => {
+        this.payloadDeviceDatatarget.push({
+          id: element.id,
+          iotDeviceIds: element.iotDevices.map((x) => x.id),
+          payloadDecoderId: element.payloadDecoder?.id,
+          dataTargetId: element.dataTarget.id
+        });
+      }
+    );
+  }
+
   private mapToDatatarget(data: DatatargetResponse): Datatarget {
     const dt: Datatarget = {
       id: data.id,

src/app/shared/services/datatarget.service.ts

@@ -10,39 +10,39 @@ import { DatatargetResponse } from 'src/app/models/datatarget-response';
 })
 export class DatatargetService {
 
-  private url: string = 'data-target';
+  private dataTargetURL = 'data-target';
 
   constructor(private restService: RestService) { }
 
   get(id: number): Observable<DatatargetResponse> {
-    return this.restService.get(this.url, null, id);
+    return this.restService.get(this.dataTargetURL, null, id);
   }
 
   getByApplicationId(
-    limit: number,offset: number, applicationId: number
+    limit: number, offset: number, applicationId: number
   ): Observable<DatatargetData> {
     const body = {
-      limit: limit,
-      offset: offset,
-      applicationId: applicationId
-      //sort: sort,
-      //orderOn: orderOn,
-      //todo tilføj når iot-314 er tilføjet
+      limit,
+      offset,
+      applicationId
+      // sort: sort,
+      // orderOn: orderOn,
+      // todo tilføj når iot-314 er tilføjet
     };
-    return this.restService.get(this.url, body)
+    return this.restService.get(this.dataTargetURL, body);
   }
 
   update(datatarget: Datatarget): Observable<DatatargetResponse> {
-    return this.restService.put(this.url,datatarget,datatarget.id,{observe: 'response'});
+    return this.restService.put(this.dataTargetURL, datatarget, datatarget.id, {observe: 'response'});
 
   }
 
   create(datatarget: Datatarget): Observable<any> {
-    return this.restService.post(this.url,datatarget);
+    return this.restService.post(this.dataTargetURL, datatarget);
   }
 
   delete(id: number) {
-    return this.restService.delete(this.url,id);
+    return this.restService.delete(this.dataTargetURL, id);
   }
 
 }

src/app/shared/services/payloadDeviceDatatarget.service.ts

@@ -0,0 +1,37 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { RestService } from './rest.service';
+import { PayloadDeviceDatatarget, PayloadDeviceDatatargetGetByDataTargetResponse } from '@app/models/payload-device-data';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class PayloadDeviceDatatargetService {
+
+  private BASEURL = 'iot-device-payload-decoder-data-target-connection';
+  private BYDATATARGETURL = '/byDataTarget';
+
+  constructor(private restService: RestService) { }
+
+  get(id: number): Observable<any> {
+    return this.restService.get(this.BASEURL, null, id);
+  }
+
+  put(payloadDeviceDatatarget: PayloadDeviceDatatarget): Observable<any> {
+    return this.restService.put(this.BASEURL, payloadDeviceDatatarget, payloadDeviceDatatarget.id, {observe: 'response'});
+
+  }
+
+  post(payloadDeviceDatatarget: PayloadDeviceDatatarget): Observable<any> {
+    return this.restService.post(this.BASEURL, payloadDeviceDatatarget);
+  }
+
+  delete(id: number) {
+    return this.restService.delete(this.BASEURL, id);
+  }
+
+  getByDataTarget(id: number): Observable<PayloadDeviceDatatargetGetByDataTargetResponse> {
+    return this.restService.get(this.BASEURL + this.BYDATATARGETURL, null, id);
+  }
+
+}