Merged stage into master for v.1.1.1

Author: nlg

.github/dependabot.yml.disable

@@ -3,7 +3,7 @@
 # Please see the documentation for all configuration options:
 # https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
 
-version: 2
+version: 3
 updates:
   - package-ecosystem: "npm" # See documentation for possible values
     directory: "/" # Location of package manifests

package-lock.json

@@ -43,6 +43,7 @@
         "@types/kafkajs": "^1.9.0",
         "@types/passport-saml": "^1.1.2",
         "@types/uuid": "^8.3.0",
+        "@types/ws": "^8.5.3",
         "@types/xml2js": "^0.4.7",
         "ajv": "^6.12.6",
         "axios-cache-adapter": "^2.5.0",
@@ -67,9 +68,9 @@
         "rimraf": "^3.0.2",
         "rxjs": "^6.6.3",
         "swagger-ui-express": "^4.1.5",
-        "typeorm": "^0.2.29",
+        "typeorm": "^0.2.34",
         "uuid": "^8.3.2",
-        "vm2": "^3.9.2",
+        "vm2": "^3.9.9",
         "wait-for-expect": "^3.0.2"
     },
     "devDependencies": {
@@ -86,6 +87,7 @@
         "@types/passport-local": "^1.0.33",
         "@types/supertest": "^2.0.10",
         "@types/validator": "^13.7.1",
+        "@types/ws": "^8.5.2",
         "@typescript-eslint/eslint-plugin": "^4.10.0",
         "@typescript-eslint/parser": "^4.10.0",
         "eslint": "^7.15.0",

package.json

@@ -0,0 +1,17 @@
+import { ApplicationDeviceTypeUnion } from "@enum/device-type.enum";
+import { Column, Entity, JoinColumn, ManyToOne } from "typeorm";
+import { Application } from "./application.entity";
+import { DbBaseEntity } from "./base.entity";
+
+@Entity("application_device_type")
+export class ApplicationDeviceType extends DbBaseEntity {
+    @Column()
+    type: ApplicationDeviceTypeUnion;
+
+    @ManyToOne(() => Application, application => application.deviceTypes, {
+        onDelete: "CASCADE",
+        // Delete the row instead of null'ing application. Useful for updates
+        orphanedRowAction: "delete",
+    })
+    application: Application;
+}

src/entities/application-device-type.entity.ts

@@ -1,21 +1,23 @@
+import { DbBaseEntity } from "@entities/base.entity";
+import { DataTarget } from "@entities/data-target.entity";
+import { IoTDevice } from "@entities/iot-device.entity";
+import { OrganizationApplicationPermission } from "@entities/organization-application-permission.entity";
+import { Organization } from "@entities/organization.entity";
+import { ApplicationStatus } from "@enum/application-status.enum";
 import {
     Column,
+    CreateDateColumn,
     Entity,
     JoinTable,
     ManyToMany,
     ManyToOne,
     OneToMany,
     Unique,
 } from "typeorm";
-
-import { DbBaseEntity } from "@entities/base.entity";
-import { DataTarget } from "@entities/data-target.entity";
-import { IoTDevice } from "@entities/iot-device.entity";
-import { OrganizationApplicationPermission } from "@entities/organization-application-permission.entity";
-import { Organization } from "@entities/organization.entity";
+import { ApplicationDeviceType } from "./application-device-type.entity";
+import { ControlledProperty } from "./controlled-property.entity";
 import { Multicast } from "./multicast.entity";
 
-
 @Entity("application")
 @Unique(["name"])
 export class Application extends DbBaseEntity {
@@ -64,4 +66,46 @@ export class Application extends DbBaseEntity {
     )
     @JoinTable()
     permissions: OrganizationApplicationPermission[];
+
+    @Column({ nullable: true })
+    status?: ApplicationStatus;
+
+    @CreateDateColumn({ nullable: true })
+    startDate?: Date;
+
+    @CreateDateColumn({ nullable: true })
+    endDate?: Date;
+
+    @Column({ nullable: true })
+    category?: string;
+
+    @Column({ nullable: true })
+    owner?: string;
+
+    @Column({ nullable: true })
+    contactPerson?: string;
+
+    @Column({ nullable: true })
+    contactEmail?: string;
+
+    @Column({ nullable: true })
+    contactPhone?: string;
+
+    @Column({ nullable: true })
+    personalData?: boolean;
+
+    @Column({ nullable: true })
+    hardware?: string;
+
+    @OneToMany(() => ControlledProperty, entity => entity.application, {
+        nullable: true,
+        cascade: true,
+    })
+    controlledProperties?: ControlledProperty[];
+
+    @OneToMany(() => ApplicationDeviceType, entity => entity.application, {
+        nullable: true,
+        cascade: true,
+    })
+    deviceTypes?: ApplicationDeviceType[];
 }

src/entities/application.entity.ts

@@ -0,0 +1,17 @@
+import { ControlledPropertyTypes } from "@enum/controlled-property.enum";
+import { Column, Entity, ManyToOne } from "typeorm";
+import { Application } from "./application.entity";
+import { DbBaseEntity } from "./base.entity";
+
+@Entity("controlled_property")
+export class ControlledProperty extends DbBaseEntity {
+    @Column()
+    type: ControlledPropertyTypes;
+
+    @ManyToOne(() => Application, application => application.controlledProperties, {
+        onDelete: "CASCADE",
+        // Delete the row instead of null'ing application. Useful for updates
+        orphanedRowAction: "delete",
+    })
+    application: Application;
+}

src/entities/controlled-property.entity.ts

@@ -1,5 +1,21 @@
+import { ApplicationStatus } from "@enum/application-status.enum";
+import { ControlledPropertyTypes } from "@enum/controlled-property.enum";
+import { ApplicationDeviceTypes, ApplicationDeviceTypeUnion } from "@enum/device-type.enum";
+import { ValidateDate } from "@helpers/date.validator";
+import { IsSwaggerOptional } from "@helpers/optional-validator";
+import { IsPhoneNumberString } from "@helpers/phone-number.validator";
+import { nameof } from "@helpers/type-helper";
 import { ApiProperty } from "@nestjs/swagger";
-import { IsOptional, IsString, MaxLength, MinLength } from "class-validator";
+import {
+    ArrayUnique,
+    IsArray,
+    IsBoolean,
+    IsEnum,
+    IsOptional,
+    IsString,
+    MaxLength,
+    MinLength,
+} from "class-validator";
 
 export class CreateApplicationDto {
     @ApiProperty({ required: true })
@@ -16,4 +32,62 @@ export class CreateApplicationDto {
     @IsString()
     @MaxLength(1024)
     description?: string;
+
+    @IsSwaggerOptional()
+    @IsEnum(ApplicationStatus)
+    status?: ApplicationStatus;
+
+    @IsSwaggerOptional()
+    @ValidateDate()
+    startDate?: Date;
+
+    @IsSwaggerOptional()
+    @ValidateDate()
+    endDate?: Date;
+
+    @IsSwaggerOptional()
+    @IsString()
+    @MaxLength(100)
+    category?: string;
+
+    @IsSwaggerOptional()
+    @IsString()
+    @MaxLength(100)
+    owner?: string;
+
+    @IsSwaggerOptional()
+    @IsString()
+    @MaxLength(100)
+    contactPerson?: string;
+
+    @IsSwaggerOptional()
+    @IsString()
+    @MaxLength(100)
+    contactEmail?: string;
+
+    @IsSwaggerOptional()
+    @IsPhoneNumberString(nameof<CreateApplicationDto>("contactPhone"))
+    @MaxLength(12)
+    contactPhone?: string;
+
+    @IsSwaggerOptional()
+    @IsBoolean()
+    personalData?: boolean;
+
+    @IsSwaggerOptional()
+    @IsString()
+    @MaxLength(1024)
+    hardware?: string;
+
+    @IsSwaggerOptional()
+    @IsArray()
+    @ArrayUnique()
+    @IsEnum(ControlledPropertyTypes, { each: true })
+    controlledProperties?: ControlledPropertyTypes[];
+
+    @IsSwaggerOptional()
+    @IsArray()
+    @ArrayUnique()
+    @IsEnum(ApplicationDeviceTypes, { each: true })
+    deviceTypes?: ApplicationDeviceTypeUnion[];
 }

src/entities/dto/controlled-property/create-controlled-property.dto.ts

@@ -16,6 +16,8 @@ import { IoTDeviceType } from "@enum/device-type.enum";
 
 import { CreateLoRaWANSettingsDto } from "./create-lorawan-settings.dto";
 import { CreateSigFoxSettingsDto } from "./create-sigfox-settings.dto";
+import { IsMetadataJson } from "@helpers/is-metadata-json.validator";
+import { nameof } from "@helpers/type-helper";
 
 export class CreateIoTDeviceDto {
     @ApiProperty({ required: true })
@@ -60,6 +62,7 @@ export class CreateIoTDeviceDto {
 
     @ApiProperty({ required: false })
     @IsOptional()
+    @IsMetadataJson(nameof<CreateIoTDeviceDto>("metadata"))
     metadata?: JSON;
 
     @ApiProperty({ required: false })

src/entities/dto/create-application.dto.ts

@@ -0,0 +1,7 @@
+export enum ApplicationStatus {
+    "NONE" = "NONE",
+    "IN-OPERATION" = "IN-OPERATION",
+    "PROJECT" = "PROJECT",
+    "PROTOTYPE" = "PROTOTYPE",
+    "OTHER" = "OTHER",
+}