diff --git a/src/main/java/metier/Activity.java b/src/main/java/metier/Activity.java index d82eeba..c725218 100644 --- a/src/main/java/metier/Activity.java +++ b/src/main/java/metier/Activity.java @@ -1,5 +1,5 @@ package metier; public abstract class Activity { - + private long id_utilisateur_created; } diff --git a/src/main/java/metier/Reponse.java b/src/main/java/metier/Reponse.java index e60e1d0..23865a9 100644 --- a/src/main/java/metier/Reponse.java +++ b/src/main/java/metier/Reponse.java @@ -4,9 +4,9 @@ import jakarta.persistence.Id; public abstract class Reponse { @Id - int id; - String value; - Boolean correct; + private int id; + private String value; + private Boolean correct; public Reponse(){ } diff --git a/src/main/java/metier/Session.java b/src/main/java/metier/Session.java index d53f022..c1ac826 100644 --- a/src/main/java/metier/Session.java +++ b/src/main/java/metier/Session.java @@ -10,10 +10,10 @@ import jakarta.persistence.OneToMany; public class Session { @Id - protected int codePIN; + private int codePIN; @OneToMany - ArrayList activities; + private ArrayList activities; public Session(){ } diff --git a/src/main/java/metier/Utilisateur.java b/src/main/java/metier/Utilisateur.java index 64d7941..a59063e 100644 --- a/src/main/java/metier/Utilisateur.java +++ b/src/main/java/metier/Utilisateur.java @@ -2,15 +2,27 @@ package metier; import jakarta.persistence.*; +import java.util.List; + @Entity public class Utilisateur{ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private long id; private String name; + @ManyToMany private Session session; + @Column(unique=true) + private String email; + private String password; + + @OneToMany(mappedBy = "utilisateur") + private List activities; + + public Utilisateur() {} + public Long getId() { return id; }