Skip to content
Snippets Groups Projects

Development to testing

Merged Ghost User requested to merge Development into testing
2 files
+ 2
2
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 12
8
@@ -4,7 +4,6 @@ import {
Length,
IsDateString,
IsNumber,
Validate,
Min,
Max,
ValidateNested,
@@ -15,7 +14,6 @@ import {
} from 'class-validator';
import { ObjectivePointEntity } from './game.entity';
import { CenterJSON } from '../shared/custom-validation';
import { FactionDTO } from '../faction/faction.dto';
import { CenterDTO, NodeSettingsDTO } from './game.json.dto';
import { Type } from 'class-transformer';
@@ -62,15 +60,19 @@ export class newGameDTO {
@IsNotEmpty()
@Length(1, 255)
desc: string;
@IsNotEmpty()
@Validate(CenterJSON)
center: JSON;
@ValidateNested()
@Type(() => CenterDTO)
center: CenterDTO;
@IsDateString()
@IsNotEmpty()
startdate: string;
@IsDateString()
@IsNotEmpty()
enddate: string;
@Length(0, 65)
image: string;
@Allow()
map?: JSON;
}
export class GameStateDTO {
@@ -86,16 +88,18 @@ export class FlagboxDTO {
objectivePointId: string;
@IsString()
@IsNotEmpty()
@Length(7)
@Length(7, 7)
objectivePointDescription: string;
@IsNumber()
objectivePointMultiplier: number;
@IsOptional()
data: JSON;
}
export class FlagboxEventDTO {
@IsString()
@IsNotEmpty()
@Length(7)
@Length(7, 7)
node_id: string;
@IsNumber()
@Min(0)
@@ -109,6 +113,6 @@ export class FlagboxEventDTO {
@Min(0)
@Max(3)
capture: number; // which faction is capturing, same logic as in owner with numbers
oP_HistoryTimestamp?: string;
oP_HistoryTimestamp?: number;
objective_point?: ObjectivePointEntity;
}
Loading