[Fix] Improve match, round, referee, CompetitioTable entity adding lambok notation

src/main/java/cat/udl/eps/softarch/fll/domain/CompetitionTable.java

@@ -9,88 +9,105 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.Size;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 @Entity
 @Table(name = "competition_tables")
+@Getter
+@Setter
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
 public class CompetitionTable extends UriEntity<String> {
 
 	@Id
+	@EqualsAndHashCode.Include
 	private String id;
 
-	@OneToMany(mappedBy = "competitionTable", cascade = CascadeType.ALL)
+	@OneToMany(mappedBy = "competitionTable", cascade = {CascadeType.PERSIST, CascadeType.MERGE})
 	@JsonManagedReference("table-matches")
+	@Setter(lombok.AccessLevel.NONE)
 	private List<Match> matches = new ArrayList<>();
 
 	@OneToMany(mappedBy = "supervisesTable")
 	@Size(max = 3, message = "A table can have a maximum of 3 referees")
 	@JsonManagedReference("table-referees")
+	@Setter(lombok.AccessLevel.NONE)
 	private List<Referee> referees = new ArrayList<>();
 
-
-	@Override
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public List<Match> getMatches() {
-		return matches;
-	}
-
 	public void setMatches(List<Match> matches) {
 		new ArrayList<>(this.matches).forEach(this::removeMatch);
 		if (matches != null) {
 			matches.forEach(this::addMatch);
 		}
 	}
 
-	public List<Referee> getReferees() {
-		return referees;
-	}
+	public void addMatch(Match match) {
+		if (match == null) {
+			return;
+		}
 
-	public void setReferees(List<Referee> referees) {
-		new ArrayList<>(this.referees).forEach(this::removeReferee);
-		if (referees != null) {
-			referees.forEach(this::addReferee);
+		if (this.matches.stream().anyMatch(m -> m == match)) {
+			return;
 		}
-	}
 
-	public void addMatch(Match match) {
 		CompetitionTable previousTable = match.getCompetitionTable();
 		if (previousTable != null && previousTable != this) {
-			previousTable.removeMatch(match);
-		}
-		if (!matches.contains(match)) {
-			matches.add(match);
+			previousTable.getMatches().removeIf(m -> m == match);
 		}
+
+		this.matches.add(match);
 		match.setCompetitionTable(this);
 	}
 
 	public void removeMatch(Match match) {
-		matches.remove(match);
-		match.setCompetitionTable(null);
+		if (match == null) {
+			return;
+		}
+
+		if (this.matches.removeIf(m -> m == match)) {
+			match.setCompetitionTable(null);
+		}
+	}
+
+	public void setReferees(List<Referee> referees) {
+		new ArrayList<>(this.referees).forEach(this::removeReferee);
+		if (referees != null) {
+			referees.forEach(this::addReferee);
+		}
 	}
 
 	public void addReferee(Referee referee) {
-		CompetitionTable previousTable = referee.getSupervisesTable();
-		if (previousTable != null && previousTable != this) {
-			previousTable.removeReferee(referee);
+		if (referee == null) {
+			return;
 		}
-		if (referees.contains(referee)) {
+
+		if (this.referees.stream().anyMatch(r -> r == referee)) {
 			return;
 		}
-		if (referees.size() >= 3) {
+
+		if (this.referees.size() >= 3) {
 			throw new IllegalStateException("A table can have a maximum of 3 referees");
 		}
-		referees.add(referee);
+
+		CompetitionTable previousTable = referee.getSupervisesTable();
+		if (previousTable != null && previousTable != this) {
+			previousTable.getReferees().removeIf(r -> r == referee);
+		}
+
+		this.referees.add(referee);
 		referee.setSupervisesTable(this);
 	}
 
 	public void removeReferee(Referee referee) {
-		referees.remove(referee);
-		referee.setSupervisesTable(null);
+		if (referee == null) {
+			return;
+		}
+
+		if (this.referees.removeIf(r -> r == referee)) {
+			referee.setSupervisesTable(null);
+		}
 	}
 }

src/main/java/cat/udl/eps/softarch/fll/domain/Match.java

@@ -13,28 +13,33 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.NoArgsConstructor;
 
 @Entity
 @Table(name = "matches")
+@Getter
+@Setter
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
 public class Match extends UriEntity<Long> {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@EqualsAndHashCode.Include
 	private Long id;
 
 	private LocalTime startTime;
-
 	private LocalTime endTime;
 
-	@JsonBackReference("round-matches")
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "round_id")
-	private Round round;
+	@Enumerated(EnumType.STRING)
+	private MatchState state = MatchState.SCHEDULED;
 
-	@JsonBackReference("table-matches")
 	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "table_id")
-	private CompetitionTable competitionTable;
+	@JoinColumn(name = "referee_id")
+	private Referee referee;
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "team_a_id")
@@ -47,84 +52,12 @@ public class Match extends UriEntity<Long> {
 	private Team teamB;
 
 	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "referee_id")
-	private Referee referee;
-
-	@Enumerated(EnumType.STRING)
-	private MatchState state = MatchState.SCHEDULED;
-
-	public Match() {}
-
-	@Override
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public LocalTime getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(LocalTime startTime) {
-		this.startTime = startTime;
-	}
-
-	public LocalTime getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(LocalTime endTime) {
-		this.endTime = endTime;
-	}
-
-	public Round getRound() {
-		return round;
-	}
-
-	public void setRound(Round round) {
-		this.round = round;
-	}
-
-	public CompetitionTable getCompetitionTable() {
-		return competitionTable;
-	}
-
-	public void setCompetitionTable(CompetitionTable competitionTable) {
-		this.competitionTable = competitionTable;
-	}
-
-	public Team getTeamA() {
-		return teamA;
-	}
-
-	public void setTeamA(Team teamA) {
-		this.teamA = teamA;
-	}
-
-	public Team getTeamB() {
-		return teamB;
-	}
-
-	public void setTeamB(Team teamB) {
-		this.teamB = teamB;
-	}
-
-	public Referee getReferee() {
-		return referee;
-	}
-
-	public void setReferee(Referee referee) {
-		this.referee = referee;
-	}
-
-	public MatchState getState() {
-		return state;
-	}
+	@JoinColumn(name = "round_id")
+	@JsonBackReference("round-matches")
+	private Round round;
 
-	public void setState(MatchState state) {
-		this.state = state;
-	}
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "table_id")
+	@JsonBackReference("table-matches")
+	private CompetitionTable competitionTable;
 }

src/main/java/cat/udl/eps/softarch/fll/domain/Referee.java

@@ -6,10 +6,18 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 
 @Entity
 @Table(name = "referees")
+@Getter
+@Setter
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true, onlyExplicitlyIncluded = true)
 public class Referee extends Volunteer {
 
 	private boolean expert;
@@ -18,21 +26,4 @@ public class Referee extends Volunteer {
 	@JoinColumn(name = "supervises_table_id")
 	@JsonBackReference("table-referees")
 	private CompetitionTable supervisesTable;
-
-
-	public boolean isExpert() {
-		return expert;
-	}
-
-	public void setExpert(boolean expert) {
-		this.expert = expert;
-	}
-
-	public CompetitionTable getSupervisesTable() {
-		return supervisesTable;
-	}
-
-	public void setSupervisesTable(CompetitionTable supervisesTable) {
-		this.supervisesTable = supervisesTable;
-	}
 }