json validation for node_settings

src/game/game.dto.ts

@@ -14,7 +14,7 @@ import {
 import { ObjectivePointEntity } from './game.entity';
 import { CenterJSON } from '../shared/custom-validation';
 import { FactionDTO } from '../faction/faction.dto';
-import { CenterDTO } from './game.json.dto';
+import { CenterDTO, NodeSettingsDTO } from './game.json.dto';
 import { Type } from 'class-transformer';
 
 export class GameDTO {
@@ -25,14 +25,15 @@ export class GameDTO {
   @IsNotEmpty()
   @Length(1, 255)
   desc: string;
-  @IsNotEmpty()
   @ValidateNested()
   @Type(() => CenterDTO)
   center: CenterDTO;
   @Allow()
-  map?: JSON;
+  @ValidateNested()
+  @Type(() => NodeSettingsDTO)
+  nodesettings?: NodeSettingsDTO;
   @Allow()
-  nodesettings?: JSON;
+  map?: JSON;
   @IsDateString()
   @IsNotEmpty()
   startdate: string;

src/game/game.entity.ts

@@ -14,7 +14,7 @@ import { PersonEntity } from '../user/user.entity';
 import { GameGroupEntity } from '../faction/faction.entity';
 import { FactionEntity } from '../faction/faction.entity';
 import { TaskEntity } from '../task/task.entity';
-import { CenterDTO } from './game.json.dto';
+import { CenterDTO, NodeSettingsDTO } from './game.json.dto';
 
 // table that stores all created games
 @Entity('Game')
@@ -24,7 +24,7 @@ export class GameEntity {
   @Column('text') desc: string;
   @Column('json') center: CenterDTO;
   @Column({ type: 'json', nullable: true }) map: JSON;
-  @Column({ type: 'json', nullable: true }) nodesettings?: JSON;
+  @Column({ type: 'json', nullable: true }) nodesettings?: NodeSettingsDTO;
   @Column('timestamp') startdate: Timestamp;
   @Column('timestamp') enddate: Timestamp;
 

src/game/game.json-nested.dto.ts

+import { IsNumber } from 'class-validator';
+
+export class NodeCoreSettingsDTO {
+  @IsNumber()
+  capture_time: number;
+  @IsNumber()
+  confirmation_time: number;
+  @IsNumber()
+  owner: number;
+  @IsNumber()
+  capture: number;
+  @IsNumber()
+  buttons_available: number;
+  @IsNumber()
+  heartbeat_interval: number;
+}

src/game/game.json.dto.ts

-import { GameDTO } from './game.dto';
-import { IsNumber } from 'class-validator';
+import { IsNumber, ValidateNested } from 'class-validator';
+import { NodeCoreSettingsDTO } from './game.json-nested.dto';
+import { Type } from 'class-transformer';
 
 export class CenterDTO {
   @IsNumber()
@@ -7,3 +8,9 @@ export class CenterDTO {
   @IsNumber()
   lng: number;
 }
+
+export class NodeSettingsDTO {
+  @ValidateNested()
+  @Type(() => NodeCoreSettingsDTO)
+  node_settings: NodeCoreSettingsDTO;
+}