diff --git a/src/main/java/nl/connectedit/swiss/domain/entity/Tournament.java b/src/main/java/nl/connectedit/swiss/domain/entity/Tournament.java index d0d8b8e..8e695f3 100644 --- a/src/main/java/nl/connectedit/swiss/domain/entity/Tournament.java +++ b/src/main/java/nl/connectedit/swiss/domain/entity/Tournament.java @@ -11,7 +11,6 @@ import nl.connectedit.swiss.domain.TournamentStatus; import java.time.LocalDate; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -37,7 +36,7 @@ public class Tournament extends AbstractEntity { private TournamentStatus status; @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) - private List events;// = new ArrayList<>(); + private List events; @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) private List tournamentPlayers; diff --git a/src/main/java/nl/connectedit/swiss/dto/TournamentRegistrationDto.java b/src/main/java/nl/connectedit/swiss/dto/TournamentRegistrationDto.java index 9d32fc3..0235cfc 100644 --- a/src/main/java/nl/connectedit/swiss/dto/TournamentRegistrationDto.java +++ b/src/main/java/nl/connectedit/swiss/dto/TournamentRegistrationDto.java @@ -21,5 +21,7 @@ public class TournamentRegistrationDto extends AbstractDto { private String status; + private Boolean active; + private List events; } diff --git a/src/main/java/nl/connectedit/swiss/mapper/TournamentPlayerRegistrationMapper.java b/src/main/java/nl/connectedit/swiss/mapper/TournamentPlayerRegistrationMapper.java index 3cef07f..58ed7e2 100644 --- a/src/main/java/nl/connectedit/swiss/mapper/TournamentPlayerRegistrationMapper.java +++ b/src/main/java/nl/connectedit/swiss/mapper/TournamentPlayerRegistrationMapper.java @@ -31,6 +31,7 @@ public class TournamentPlayerRegistrationMapper { tournamentRegistrationDto.setEditable(tournament.getStatus() == TournamentStatus.UPCOMING); tournamentRegistrationDto.setDate(tournament.getDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy"))); tournamentRegistrationDto.setStatus(tournament.getStatus().name()); + tournamentRegistrationDto.setActive(tournament.getActive()); tournamentRegistrationDto.setEvents( tournament.getEvents() .stream()