Skip to content
Snippets Groups Projects

Join game

Merged Join game
JoinGame into Development
Merged Ghost User requested to merge JoinGame into Development
Viewing commit 631e4935
Prev
Show latest version
4 files
+ 32
− 12
Compare changes
  • Side-by-side
  • Inline
Files
4
  • 631e4935
    L4721
    Merge branch 'Development' into 'JoinGame' · 631e4935
    L4721 authored 
    # Conflicts:
#   src/game/coordinate.entity.ts
#   src/game/faction.entity.ts
#   src/game/game.controller.ts
#   src/game/game.dto.ts
#   src/game/game.entity.ts
#   src/game/game.module.ts
#   src/game/game.service.ts
#   src/user/user.entity.ts
#   src/user/user.module.ts
src/game/game.dto.ts
+ 23
− 52
@@ -22,14 +22,23 @@ export class GameDTO {
@IsDate()
@IsNotEmpty()
startDate: string;
@IsDate()
@Length(1, 255)
desc: string;
@IsNotEmpty()
endDate: string;
@IsArray()
//@IsJSON()
center: JSON;
//@IsJSON()
// doesn't accept with IsJSON, WIP to get validation for map and center
// IsJSON checks with json.parse, expecting string
map?: JSON;
@IsDateString()
@IsNotEmpty()
startdate: string;
@IsDateString()
@IsNotEmpty()
enddate: string;
// custom validation for array length (arr>min, arr<max)
//@Validate(ArrayLength, [4, 8])
factions?: FactionDTO[];
@IsArray()
@@ -44,53 +53,15 @@ export class GameDTO {
export class FactionDTO {
@IsString()
@IsNotEmpty()
@Length(3, 30)
factionName: string;
@IsString()
@IsNotEmpty()
@Length(3, 255)
faction_Password?: string;
}
/*export class PowerUpDTO {
@IsString() @IsNotEmpty()
powerUpName: string;
@IsString() @IsNotEmpty()
powerUpDescription?: string;
@IsInt() @IsNotEmpty()
amount: number;
@IsNotEmpty()
cooldown: string;
}*/
export class ObjectivePointDTO {
@IsString()
@IsNotEmpty()
objectivePointDescription: string;
@IsJSON()
@IsNotEmpty()
objectivePointCoordinates: JSON;
@IsArray()
@IsNotEmpty()
objectivePointHistory: ObjectivePointHistoryDTO[];
@Length(2, 15)
name: string;
id: string;
game: GameDTO;
password: string;
}
export class ObjectivePointHistoryDTO {
export class GameGroupDTO {
@IsString()
factionId: string;
@IsNotEmpty()
@IsInt()
@Min(0)
@Max(2)
oP_HistoryStatus: number;
@IsNotEmpty()
oP_HistoryTimestamp: Timestamp;
@Length(3, 31)
name: string;
}