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

Invallers
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-09-18 23:27:10 +02:00
parent b4bbefff46
commit b43358f071
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/nl/connectedit/swiss/dto/TournamentPlayerDto.java
View File

@@ -10,6 +10,8 @@ import java.util.List;
@Setter @Setter
public class TournamentPlayerDto extends AbstractDto { public class TournamentPlayerDto extends AbstractDto {
private Long id;
private Long playerId; private Long playerId;
private String name; private String name;

3
src/main/java/nl/connectedit/swiss/dto/TournamentPlayerSubstitutionDto.java
View File

@@ -11,5 +11,6 @@ public class TournamentPlayerSubstitutionDto extends AbstractDto {
private String event; private String event;
private TournamentPlayerDto substitute; // private TournamentPlayerDto substitute;
private Long substitute;
} }

4
src/main/java/nl/connectedit/swiss/mapper/TournamentPlayerMapper.java
View File

@@ -18,6 +18,7 @@ public class TournamentPlayerMapper implements DtoMapper<TournamentPlayer, Tourn
@Override @Override
public TournamentPlayerDto toDto(TournamentPlayer tournamentPlayer) { public TournamentPlayerDto toDto(TournamentPlayer tournamentPlayer) {
var tournamentPlayerDto = new TournamentPlayerDto(); var tournamentPlayerDto = new TournamentPlayerDto();
tournamentPlayerDto.setId(tournamentPlayer.getId());
tournamentPlayerDto.setPlayerId(tournamentPlayer.getPlayer().getId()); tournamentPlayerDto.setPlayerId(tournamentPlayer.getPlayer().getId());
tournamentPlayerDto.setName(tournamentPlayer.getPlayer().getFullName()); tournamentPlayerDto.setName(tournamentPlayer.getPlayer().getFullName());
tournamentPlayerDto.setEvents(new ArrayList<>(tournamentPlayer.getEvents())); tournamentPlayerDto.setEvents(new ArrayList<>(tournamentPlayer.getEvents()));
@@ -41,7 +42,8 @@ public class TournamentPlayerMapper implements DtoMapper<TournamentPlayer, Tourn
tournamentPlayerSubstitutionDto.setSubstitutionId(tournamentPlayerSubstitution.getId()); tournamentPlayerSubstitutionDto.setSubstitutionId(tournamentPlayerSubstitution.getId());
tournamentPlayerSubstitutionDto.setEvent(tournamentPlayerSubstitution.getEvent().getType().name()); tournamentPlayerSubstitutionDto.setEvent(tournamentPlayerSubstitution.getEvent().getType().name());
if (tournamentPlayerSubstitution.getSubstitute() != null) { if (tournamentPlayerSubstitution.getSubstitute() != null) {
tournamentPlayerSubstitutionDto.setSubstitute(toDto(tournamentPlayerSubstitution.getSubstitute())); // tournamentPlayerSubstitutionDto.setSubstitute(toDto(tournamentPlayerSubstitution.getSubstitute()));
tournamentPlayerSubstitutionDto.setSubstitute(tournamentPlayerSubstitution.getSubstitute().getId());
} }
return tournamentPlayerSubstitutionDto; return tournamentPlayerSubstitutionDto;

12
src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java
View File

@@ -196,7 +196,7 @@ public class TournamentPlayService {
var event = getEventByType(tournament, eventType); var event = getEventByType(tournament, eventType);
playerSubstitution.setEvent(event); playerSubstitution.setEvent(event);
var substitute = getTournamentPlayer(tournament, substitution.getSubstitute().getPlayerId()); var substitute = getTournamentPlayerById(tournament, substitution.getSubstitute());
playerSubstitution.setSubstitute(substitute); playerSubstitution.setSubstitute(substitute);
playerSubstitutions.add(playerSubstitution); playerSubstitutions.add(playerSubstitution);
} }
@@ -298,6 +298,16 @@ public class TournamentPlayService {
return tournament; return tournament;
} }
private TournamentPlayer getTournamentPlayerById(Tournament tournament, Long id) {
for (var tournamentPlayer : tournament.getTournamentPlayers()) {
if (id.equals(tournamentPlayer.getId())) {
return tournamentPlayer;
}
}
return null;
}
private TournamentPlayer getTournamentPlayer(Tournament tournament, Long playerId) { private TournamentPlayer getTournamentPlayer(Tournament tournament, Long playerId) {
for (var tournamentPlayer : tournament.getTournamentPlayers()) { for (var tournamentPlayer : tournament.getTournamentPlayers()) {
if (playerId.equals(tournamentPlayer.getPlayer().getId())) { if (playerId.equals(tournamentPlayer.getPlayer().getId())) {