le-village-du-possible/ArenMg
2
0
Fork 0
mirror of https://github.com/ArenMg/aren.git synced 2025-01-24 06:50:49 +00:00
Code Issues Projects Releases Wiki Activity

fixer problème sur User et Team

Browse source
This commit is contained in:
Arimihanta 2021-11-06 10:30:30 +03:00
parent 6c2d66a4e6
commit 28eee91e47
2 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/fr/lirmm/aren/model/Team.java
View file

@ -16,7 +16,6 @@ import javax.xml.bind.annotation.XmlTransient;
import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIdentityInfo;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.ObjectIdGenerators; import com.fasterxml.jackson.annotation.ObjectIdGenerators;
import fr.lirmm.aren.model.carto.CDebate;
import org.hibernate.annotations.SortNatural; import org.hibernate.annotations.SortNatural;
import org.hibernate.annotations.Where; import org.hibernate.annotations.Where;
@ -50,10 +49,6 @@ public class Team extends AbstractEntEntity implements Serializable {
@SortNatural @SortNatural
private SortedSet<Debate> debates = new TreeSet<>(); private SortedSet<Debate> debates = new TreeSet<>();
@ManyToMany(mappedBy = "teams")
@SortNatural
private SortedSet<CDebate> debatesCarto = new TreeSet<>();
@ManyToMany(mappedBy = "teams") @ManyToMany(mappedBy = "teams")
@Where(clause = "is_active = true") @Where(clause = "is_active = true")
@SortNatural @SortNatural
@ -136,23 +131,6 @@ public class Team extends AbstractEntEntity implements Serializable {
this.debates = debates; this.debates = debates;
} }
/**
*
* @return
*/
@XmlTransient
public SortedSet<CDebate> getDebatesCarto() {
return debatesCarto;
}
/**
*
* @param debatesCarto
*/
public void setDebatesCarto(SortedSet<CDebate> debatesCarto) {
this.debatesCarto = debatesCarto;
}
/** /**
* *
* @return * @return

12
src/main/java/fr/lirmm/aren/model/User.java
View file

@ -26,7 +26,6 @@ import java.time.temporal.ChronoUnit;
import javax.persistence.JoinTable; import javax.persistence.JoinTable;
import fr.lirmm.aren.model.carto.CDebate;
import fr.lirmm.aren.model.vm.VMTeam; import fr.lirmm.aren.model.vm.VMTeam;
import org.hibernate.annotations.Filter; import org.hibernate.annotations.Filter;
import org.hibernate.annotations.Filters; import org.hibernate.annotations.Filters;
@ -117,10 +116,6 @@ public class User extends AbstractEntEntity implements Serializable {
@SortNatural @SortNatural
private SortedSet<Debate> invitedDebates = new TreeSet<>(); private SortedSet<Debate> invitedDebates = new TreeSet<>();
@ManyToMany(mappedBy = "guests")
@SortNatural
private SortedSet<CDebate> invitedDebatesCarto = new TreeSet<>();
@OneToMany(mappedBy = "owner") @OneToMany(mappedBy = "owner")
@SortNatural @SortNatural
private SortedSet<Comment> comments = new TreeSet<>(); private SortedSet<Comment> comments = new TreeSet<>();
@ -295,13 +290,6 @@ public class User extends AbstractEntEntity implements Serializable {
this.invitedDebates = invitedDebates; this.invitedDebates = invitedDebates;
} }
public SortedSet<CDebate> getInvitedDebatesCarto() {
return invitedDebatesCarto;
}
public void setInvitedDebatesCarto(SortedSet<CDebate> invitedDebatesCarto) {
this.invitedDebatesCarto = invitedDebatesCarto;
}
/** /**
* *