diff --git a/src/main/java/metier/Question.java b/src/main/java/metier/Question.java index 3584dc9..f095ab4 100644 --- a/src/main/java/metier/Question.java +++ b/src/main/java/metier/Question.java @@ -7,8 +7,6 @@ import java.io.Serializable; @Entity public class Question implements Serializable { private int id; - - @OneToMany(mappedBy ="reponse", cascade = CascadeType.DETACH) private Reponse reponse; @Id @@ -20,6 +18,8 @@ public class Question implements Serializable { this.id = id; } + @OneToOne(cascade = CascadeType.ALL) + @JoinColumn(name ="bonne_reponse", referencedColumnName = "id") public Reponse getReponse() { return reponse; } diff --git a/src/main/java/metier/Reponse.java b/src/main/java/metier/Reponse.java index 6debcc7..0a4e7d2 100644 --- a/src/main/java/metier/Reponse.java +++ b/src/main/java/metier/Reponse.java @@ -11,7 +11,7 @@ import jakarta.persistence.*; @DiscriminatorValue("Reponse") public abstract class Reponse implements Serializable { private int id; - private ArrayList reponses; + private Question question; public Reponse(){} @@ -25,12 +25,12 @@ public abstract class Reponse implements Serializable { this.id = id; } - public void setReponses(ArrayList reponses){ - this.reponses=reponses; - } - - public ArrayList getReponses(){ - return this.reponses; + @OneToOne + public Question getQuestion(){ + return this.question; } + public void setQuestion(Question question){ + this.question=question; + } } \ No newline at end of file diff --git a/src/main/java/metier/ReponseCourte.java b/src/main/java/metier/ReponseCourte.java index 582160e..227c484 100644 --- a/src/main/java/metier/ReponseCourte.java +++ b/src/main/java/metier/ReponseCourte.java @@ -1,10 +1,10 @@ package metier; -import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; @Entity -@DiscriminatorValue("RCourte") +@PrimaryKeyJoinColumn(name = "RC_Id") public class ReponseCourte extends Reponse{ String value;