From 28eee91e47beae349ed7eed248b2fbd3b94b7750 Mon Sep 17 00:00:00 2001 From: Arimihanta Date: Sat, 6 Nov 2021 10:30:30 +0300 Subject: [PATCH] =?UTF-8?q?fixer=20probl=C3=A8me=20sur=20User=20et=20Team?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/fr/lirmm/aren/model/Team.java | 22 --------------------- src/main/java/fr/lirmm/aren/model/User.java | 12 ----------- 2 files changed, 34 deletions(-) diff --git a/src/main/java/fr/lirmm/aren/model/Team.java b/src/main/java/fr/lirmm/aren/model/Team.java index 65cfbf0..cc5a8f8 100644 --- a/src/main/java/fr/lirmm/aren/model/Team.java +++ b/src/main/java/fr/lirmm/aren/model/Team.java @@ -16,7 +16,6 @@ import javax.xml.bind.annotation.XmlTransient; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import fr.lirmm.aren.model.carto.CDebate; import org.hibernate.annotations.SortNatural; import org.hibernate.annotations.Where; @@ -50,10 +49,6 @@ public class Team extends AbstractEntEntity implements Serializable { @SortNatural private SortedSet debates = new TreeSet<>(); - @ManyToMany(mappedBy = "teams") - @SortNatural - private SortedSet debatesCarto = new TreeSet<>(); - @ManyToMany(mappedBy = "teams") @Where(clause = "is_active = true") @SortNatural @@ -136,23 +131,6 @@ public class Team extends AbstractEntEntity implements Serializable { this.debates = debates; } - /** - * - * @return - */ - @XmlTransient - public SortedSet getDebatesCarto() { - return debatesCarto; - } - - /** - * - * @param debatesCarto - */ - public void setDebatesCarto(SortedSet debatesCarto) { - this.debatesCarto = debatesCarto; - } - /** * * @return diff --git a/src/main/java/fr/lirmm/aren/model/User.java b/src/main/java/fr/lirmm/aren/model/User.java index e35760a..2b1188e 100644 --- a/src/main/java/fr/lirmm/aren/model/User.java +++ b/src/main/java/fr/lirmm/aren/model/User.java @@ -26,7 +26,6 @@ import java.time.temporal.ChronoUnit; import javax.persistence.JoinTable; -import fr.lirmm.aren.model.carto.CDebate; import fr.lirmm.aren.model.vm.VMTeam; import org.hibernate.annotations.Filter; import org.hibernate.annotations.Filters; @@ -117,10 +116,6 @@ public class User extends AbstractEntEntity implements Serializable { @SortNatural private SortedSet invitedDebates = new TreeSet<>(); - @ManyToMany(mappedBy = "guests") - @SortNatural - private SortedSet invitedDebatesCarto = new TreeSet<>(); - @OneToMany(mappedBy = "owner") @SortNatural private SortedSet comments = new TreeSet<>(); @@ -295,13 +290,6 @@ public class User extends AbstractEntEntity implements Serializable { this.invitedDebates = invitedDebates; } - public SortedSet getInvitedDebatesCarto() { - return invitedDebatesCarto; - } - - public void setInvitedDebatesCarto(SortedSet invitedDebatesCarto) { - this.invitedDebatesCarto = invitedDebatesCarto; - } /** *