From 6dacd4ece0eb8908c0651a57d717762a66320fa8 Mon Sep 17 00:00:00 2001
From: Ronnie Friman <L4168@student.jamk.fi>
Date: Tue, 2 Jul 2019 19:22:53 +0300
Subject: [PATCH] added json validation for editgame factions
---
src/faction/faction.dto.ts | 11 ++++++++++-
src/game/game.dto.ts | 3 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/faction/faction.dto.ts b/src/faction/faction.dto.ts
index 1db90ce..a5b9f04 100644
--- a/src/faction/faction.dto.ts
+++ b/src/faction/faction.dto.ts
@@ -4,6 +4,9 @@ import {
Validate,
IsString,
IsNotEmpty,
+ IsNumber,
+ Min,
+ Max,
} from 'class-validator';
import { GameEntity } from '../game/game.entity';
@@ -14,9 +17,15 @@ import { FactionEntity, GameGroupEntity } from './faction.entity';
export class FactionDTO {
@IsString()
@IsNotEmpty()
- @Length(2, 15)
+ @Length(2, 31)
factionName: string;
+ @IsString()
+ @IsNotEmpty()
+ @Length(3, 15)
factionPassword: string;
+ @IsNumber()
+ @Min(1)
+ @Max(3)
multiplier?: number;
game: GameDTO;
}
diff --git a/src/game/game.dto.ts b/src/game/game.dto.ts
index e4f12e3..5549aa0 100644
--- a/src/game/game.dto.ts
+++ b/src/game/game.dto.ts
@@ -40,7 +40,8 @@ export class GameDTO {
@IsDateString()
@IsNotEmpty()
enddate: string;
- @Allow()
+ @ValidateNested()
+ @Type(() => FactionDTO)
factions?: FactionDTO[];
@Allow()
objective_points?: FlagboxDTO[];
--
GitLab