banquise/intra-back
13
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

update ji and user

Browse Source
This commit is contained in:
Arthur Wambst 2025-10-16 00:02:29 +02:00
parent 1699603853
commit 7e12f6a838
No known key found for this signature in database
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/fr/la_banquise/backend/data/model/Ji.java
View File

@ -12,6 +12,8 @@ import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany; import jakarta.persistence.OneToMany;
import jakarta.persistence.SequenceGenerator; import jakarta.persistence.SequenceGenerator;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -35,6 +37,14 @@ public class Ji {
joinColumns = @JoinColumn(name = "ji_id"), joinColumns = @JoinColumn(name = "ji_id"),
inverseJoinColumns = @JoinColumn(name = "user_id")) inverseJoinColumns = @JoinColumn(name = "user_id"))
public List<User> respos; public List<User> respos;
@JsonIgnore
@ManyToMany
@JoinTable(name = "ji_participants", // Table de liaison
joinColumns = @JoinColumn(name = "ji_id"),
inverseJoinColumns = @JoinColumn(name = "user_id"))
public List<User> participants;
public String date; public String date;
@ManyToOne @ManyToOne
@ -50,5 +60,6 @@ public class Ji {
this.respos = respos; this.respos = respos;
this.date = date; this.date = date;
this.site = site; this.site = site;
this.participants = new ArrayList<User>();
} }
} }

23
src/main/java/fr/la_banquise/backend/data/model/User.java
View File

@ -48,21 +48,26 @@ public class User {
public Long id; public Long id;
@Username public String name; @Username public String name;
@Password public String password; @Password public String password;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
@ElementCollection(fetch = FetchType.EAGER) @ElementCollection(fetch = FetchType.EAGER)
@CollectionTable(name = "user_roles") @CollectionTable(name = "user_roles")
public Set<RolesAsso> role; public Set<RolesAsso> role;
//@JsonManagedReference ///////////////////////////////////////////////////////////////////////////
@OneToMany(mappedBy = "owner", cascade = CascadeType.ALL) // Dans l'ordre d'affichage dans le dashboard :
public List<Instance> instances;
@ManyToMany(mappedBy = "respos", cascade = CascadeType.ALL)
public List<Sujet> sujetRespo;
@ManyToMany(mappedBy = "respos", cascade = CascadeType.ALL) @ManyToMany(mappedBy = "respos", cascade = CascadeType.ALL)
public List<Ji> jiRespo; public List<Ji> jiRespo;
@ManyToMany(mappedBy = "participants", cascade = CascadeType.ALL)
public List<Ji> jiParticipant;
@OneToMany(mappedBy = "owner", cascade = CascadeType.ALL)
public List<Instance> instances;
@ManyToMany(mappedBy = "respos", cascade = CascadeType.ALL)
public List<Sujet> sujetRespo;
///////////////////////////////////////////////////////////////////////////
// Méthode pour Quarkus Security - conversion simple // Méthode pour Quarkus Security - conversion simple
@RolesValue @RolesValue