connected-it/swiss-backend
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix when no groups
All checks were successful
Gitea/swiss-backend/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Michel ten Voorde
2025-10-25 15:27:19 +02:00
parent 1385dc56a1
commit cca133d67c
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/nl/connectedit/swiss/mapper/TournamentMapper.java
View File

@@ -94,13 +94,15 @@ public class TournamentMapper implements DtoMapper<Tournament, TournamentDto>, E
var playersCounting = new ArrayList<Long>(); var playersCounting = new ArrayList<Long>();
for (var event : tournament.getEvents()) { for (var event : tournament.getEvents()) {
for (var group : event.getGroups()) { if (event.getGroups() != null) {
for (var round : group.getRounds()) { for (var group : event.getGroups()) {
for (var match : round.getMatches()) { for (var round : group.getRounds()) {
if (match.getStatus() == Status.IN_PROGRESS && match.getCounter() != null) { for (var match : round.getMatches()) {
var counter = getTournamentPlayerFromPlayerId(tournament, match.getCounter().getId()); if (match.getStatus() == Status.IN_PROGRESS && match.getCounter() != null) {
if (counter != null) { var counter = getTournamentPlayerFromPlayerId(tournament, match.getCounter().getId());
playersCounting.add(counter.getId()); if (counter != null) {
playersCounting.add(counter.getId());
}
} }
} }
} }
@@ -114,11 +116,13 @@ public class TournamentMapper implements DtoMapper<Tournament, TournamentDto>, E
var playersPlaying = new ArrayList<Long>(); var playersPlaying = new ArrayList<Long>();
for (var event : tournament.getEvents()) { for (var event : tournament.getEvents()) {
for (var group : event.getGroups()) { if (event.getGroups() != null) {
for (var round : group.getRounds()) { for (var group : event.getGroups()) {
for (var match : round.getMatches()) { for (var round : group.getRounds()) {
if (match.getStatus() == Status.IN_PROGRESS) { for (var match : round.getMatches()) {
playersPlaying.addAll(getPlayersInMatch(tournament, match)); if (match.getStatus() == Status.IN_PROGRESS) {
playersPlaying.addAll(getPlayersInMatch(tournament, match));
}
} }
} }
} }
@@ -129,6 +133,10 @@ public class TournamentMapper implements DtoMapper<Tournament, TournamentDto>, E
} }
private List<Long> getPlayersAvailable(Tournament tournament) { private List<Long> getPlayersAvailable(Tournament tournament) {
if (tournament.getTournamentPlayers() == null) {
return List.of();
}
var playersAvailable = tournament.getTournamentPlayers() var playersAvailable = tournament.getTournamentPlayers()
.stream() .stream()
.map(TournamentPlayer::getId) .map(TournamentPlayer::getId)