Compare commits

..

3 Commits

Author SHA1 Message Date
cca133d67c Fix when no groups
All checks were successful
Gitea/swiss-backend/pipeline/head This commit looks good
2025-10-25 15:27:19 +02:00
1385dc56a1 Revert "Hibernate warning fixes"
This reverts commit dd653cb525.
2025-10-25 15:22:03 +02:00
1d0cc270e3 Fix when no substitutions 2025-10-25 15:22:00 +02:00
8 changed files with 18 additions and 15 deletions

View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.7</version> <version>3.5.6</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>nl.connected-it</groupId> <groupId>nl.connected-it</groupId>
@@ -50,7 +50,10 @@
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>

View File

@@ -26,7 +26,7 @@ public class Event extends AbstractEntity {
@ManyToOne @ManyToOne
private Tournament tournament; private Tournament tournament;
@OneToMany(mappedBy = "event", cascade = CascadeType.MERGE, fetch = FetchType.LAZY) @OneToMany(cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
private List<Registration> registrations; private List<Registration> registrations;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)

View File

@@ -30,11 +30,9 @@ public class Match extends AbstractEntity {
private Round round; private Round round;
@ManyToOne @ManyToOne
@JoinColumn(name = "team1_id")
private Team team1; private Team team1;
@ManyToOne @ManyToOne
@JoinColumn(name = "team2_id")
private Team team2; private Team team2;
private Boolean played; private Boolean played;

View File

@@ -58,11 +58,11 @@ public class Player extends AbstractEntity {
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private PlayerStrength strength; private PlayerStrength strength;
@OneToMany(mappedBy = "player", cascade = CascadeType.ALL, fetch = FetchType.LAZY) @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private List<Registration> registrations; private List<Registration> registrations;// = new ArrayList<>();
@OneToMany(mappedBy = "partner", cascade = CascadeType.ALL, fetch = FetchType.LAZY) @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private List<Registration> partnerRegistrations; private List<Registration> partnerRegistrations;// = new ArrayList<>();
public String getFullName() { public String getFullName() {
return hasLength(middleName) ? return hasLength(middleName) ?

View File

@@ -20,8 +20,8 @@ public class Registration extends AbstractEntity {
@ManyToOne @ManyToOne
private Event event; private Event event;
// @ManyToOne @ManyToOne
// private Tournament tournament; private Tournament tournament;
@ManyToOne @ManyToOne
@JoinColumn(name = "player_id") @JoinColumn(name = "player_id")

View File

@@ -27,7 +27,7 @@ public class Round extends AbstractEntity {
private Status status; private Status status;
@OneToMany(mappedBy = "round", cascade = CascadeType.MERGE, fetch = FetchType.LAZY) @OneToMany(cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
@OrderBy("id") @OrderBy("id")
private List<Match> matches; private List<Match> matches;

View File

@@ -35,7 +35,7 @@ public class Tournament extends AbstractEntity {
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private TournamentStatus status; private TournamentStatus status;
@OneToMany(mappedBy = "tournament", cascade = CascadeType.ALL, fetch = FetchType.LAZY) @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private List<Event> events; private List<Event> events;
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)

View File

@@ -27,7 +27,7 @@ public class RegistrationService {
.findAny(); .findAny();
if (optionalExistingPlayerRegistration.isEmpty()) { // no previous registration for this event if (optionalExistingPlayerRegistration.isEmpty()) { // no previous registration for this event
var newRegistration = new Registration(); var newRegistration = new Registration();
// newRegistration.setTournament(tournament); newRegistration.setTournament(tournament);
newRegistration.setEvent(event); newRegistration.setEvent(event);
newRegistration.setPlayer(player); newRegistration.setPlayer(player);
if (eventRegistration.getPartner() != null) { if (eventRegistration.getPartner() != null) {
@@ -53,7 +53,9 @@ public class RegistrationService {
private void removeEventFromTournamentPlayer(Tournament tournament, Player player, Event event) { private void removeEventFromTournamentPlayer(Tournament tournament, Player player, Event event) {
var tournamentPlayer = findOrAddTournamentPlayer(tournament, player); var tournamentPlayer = findOrAddTournamentPlayer(tournament, player);
tournamentPlayer.getEvents().removeIf(eventType -> eventType.equals(event.getType().name())); tournamentPlayer.getEvents().removeIf(eventType -> eventType.equals(event.getType().name()));
tournamentPlayer.getSubstitutions().removeIf(substitution -> substitution.getEvent().equals(event)); if (tournamentPlayer.getSubstitutions() != null) {
tournamentPlayer.getSubstitutions().removeIf(substitution -> substitution.getEvent().equals(event));
}
} }
private void addEventToTournamentPlayer(Tournament tournament, Player player, Event event) { private void addEventToTournamentPlayer(Tournament tournament, Player player, Event event) {