This commit is contained in:
@@ -56,14 +56,12 @@ public class TournamentDivideService {
|
|||||||
registrations = groupRegistrations(event.getRegistrations());
|
registrations = groupRegistrations(event.getRegistrations());
|
||||||
} else {
|
} else {
|
||||||
registrations = event.getRegistrations();
|
registrations = event.getRegistrations();
|
||||||
log.info("Aantal registrations: %s".formatted(registrations.size()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
event.setGroups(new ArrayList<>());
|
event.setGroups(new ArrayList<>());
|
||||||
|
|
||||||
if (registrations.size() <= 16) {
|
if (registrations.size() <= 16) {
|
||||||
var group = getGroup(registrations, event.getType());
|
var group = getGroup(registrations, event.getType());
|
||||||
log.info("Groepgrootte: " + group.getTeams().size());
|
|
||||||
group.setEvent(event);
|
group.setEvent(event);
|
||||||
event.getGroups().add(group);
|
event.getGroups().add(group);
|
||||||
} else {
|
} else {
|
||||||
@@ -94,11 +92,9 @@ public class TournamentDivideService {
|
|||||||
group.setType(type);
|
group.setType(type);
|
||||||
group.setStatus(Status.IN_PROGRESS);
|
group.setStatus(Status.IN_PROGRESS);
|
||||||
group.setTeams(new ArrayList<>());
|
group.setTeams(new ArrayList<>());
|
||||||
log.info("getGroup: aantal registrations = " + registrations.size());
|
|
||||||
for (var registration : registrations) {
|
for (var registration : registrations) {
|
||||||
// group.getTeams().add(getTeam(registration, group));
|
// group.getTeams().add(getTeam(registration, group));
|
||||||
addTeamToGroup(registration, group);
|
addTeamToGroup(registration, group);
|
||||||
log.info("in getGroup-loop; groepgrootte = " + group.getTeams().size());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
|
|||||||
@@ -168,22 +168,12 @@ public class TournamentPlayService {
|
|||||||
|
|
||||||
round.setMatches(matches);
|
round.setMatches(matches);
|
||||||
|
|
||||||
printRound(round, standings);
|
|
||||||
|
|
||||||
group.getRounds().add(round);
|
group.getRounds().add(round);
|
||||||
|
|
||||||
tournamentRepository.save(tournament);
|
tournamentRepository.save(tournament);
|
||||||
return tournament;
|
return tournament;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void printRound(Round round, List<StandingsEntry> standings) {
|
|
||||||
for (var match: round.getMatches()) {
|
|
||||||
log.info("%s - %s".formatted(
|
|
||||||
String.valueOf(standings.stream().filter(entry -> entry.getTeam().equals(match.getTeam1())).map(StandingsEntry::getPosition).findFirst().get()),
|
|
||||||
String.valueOf(standings.stream().filter(entry -> entry.getTeam().equals(match.getTeam2())).map(StandingsEntry::getPosition).findFirst().get())));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public Tournament playerSubstitutions(Tournament tournament, Long playerId, TournamentPlayerSubstitutionDto[] substitutions) {
|
public Tournament playerSubstitutions(Tournament tournament, Long playerId, TournamentPlayerSubstitutionDto[] substitutions) {
|
||||||
var tournamentPlayer = getTournamentPlayer(tournament, playerId);
|
var tournamentPlayer = getTournamentPlayer(tournament, playerId);
|
||||||
|
|
||||||
@@ -244,7 +234,6 @@ public class TournamentPlayService {
|
|||||||
if (!findPreviousMatchOccurence(newMatch.getTeam1(), remainingTeams.get(opponentIndex), group)) {
|
if (!findPreviousMatchOccurence(newMatch.getTeam1(), remainingTeams.get(opponentIndex), group)) {
|
||||||
newMatch.setTeam2(remainingTeams.get(opponentIndex));
|
newMatch.setTeam2(remainingTeams.get(opponentIndex));
|
||||||
} else {
|
} else {
|
||||||
log.info("Wedstrijd %s - %s kwam al eerder voor.".formatted(newMatch.getTeam1().toString(), remainingTeams.get(opponentIndex).toString()));
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
var newRemainingTeams = getRemainingTeams(remainingTeams, opponentIndex);
|
var newRemainingTeams = getRemainingTeams(remainingTeams, opponentIndex);
|
||||||
|
|||||||
Reference in New Issue
Block a user