From 5b9d2050c2cf34c76d461d897af6dcd443332382 Mon Sep 17 00:00:00 2001
From: tuanvu <tuan-minh.vu@univ-rennes1.fr>
Date: Fri, 19 Sep 2025 10:53:03 +0200
Subject: [PATCH] update DAO with annotation

---
 src/main/java/metier/Choix.java         |  4 ++++
 src/main/java/metier/Question.java      |  1 +
 src/main/java/metier/Quizz.java         |  7 +++----
 src/main/java/metier/Reponse.java       | 11 ++++++-----
 src/main/java/metier/ReponseCourte.java |  4 ++++
 src/main/java/metier/Utilisateur.java   | 13 ++++++++++---
 6 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/main/java/metier/Choix.java b/src/main/java/metier/Choix.java
index 020baf2..d207cd8 100644
--- a/src/main/java/metier/Choix.java
+++ b/src/main/java/metier/Choix.java
@@ -2,7 +2,11 @@ package metier;
 
 import java.util.ArrayList;
 
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
+@Entity
+@DiscriminatorValue("Choix")
 public class Choix extends Reponse{
     ArrayList<String> choix;
 
diff --git a/src/main/java/metier/Question.java b/src/main/java/metier/Question.java
index 1a8789e..3584dc9 100644
--- a/src/main/java/metier/Question.java
+++ b/src/main/java/metier/Question.java
@@ -4,6 +4,7 @@ import jakarta.persistence.*;
 
 import java.io.Serializable;
 
+@Entity
 public class Question implements Serializable {
     private int id;
 
diff --git a/src/main/java/metier/Quizz.java b/src/main/java/metier/Quizz.java
index 0e5e144..462bbfe 100644
--- a/src/main/java/metier/Quizz.java
+++ b/src/main/java/metier/Quizz.java
@@ -1,11 +1,10 @@
 package metier;
 
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
+
 import java.io.Serializable;
 
+@Entity
 public class Quizz implements Serializable {
 
     public int id;
diff --git a/src/main/java/metier/Reponse.java b/src/main/java/metier/Reponse.java
index 2a98738..6debcc7 100644
--- a/src/main/java/metier/Reponse.java
+++ b/src/main/java/metier/Reponse.java
@@ -3,10 +3,12 @@ package metier;
 import java.io.Serializable;
 import java.util.ArrayList;
 
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 
+@Entity
+@Inheritance(strategy=InheritanceType.JOINED)
+@DiscriminatorColumn(name="Type_reponse")
+@DiscriminatorValue("Reponse")
 public abstract class Reponse implements Serializable {
     private int id;
     private ArrayList<String> reponses;
@@ -14,7 +16,7 @@ public abstract class Reponse implements Serializable {
     public Reponse(){}
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     public int getId() {
         return id;
     }
@@ -23,7 +25,6 @@ public abstract class Reponse implements Serializable {
         this.id = id;
     }
 
-
     public void setReponses(ArrayList<String> reponses){
         this.reponses=reponses;
     }
diff --git a/src/main/java/metier/ReponseCourte.java b/src/main/java/metier/ReponseCourte.java
index a178f48..582160e 100644
--- a/src/main/java/metier/ReponseCourte.java
+++ b/src/main/java/metier/ReponseCourte.java
@@ -1,6 +1,10 @@
 package metier;
 
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
+@Entity
+@DiscriminatorValue("RCourte")
 public class ReponseCourte extends Reponse{
     String value;
 
diff --git a/src/main/java/metier/Utilisateur.java b/src/main/java/metier/Utilisateur.java
index 93de3f0..4eee4a7 100644
--- a/src/main/java/metier/Utilisateur.java
+++ b/src/main/java/metier/Utilisateur.java
@@ -14,9 +14,7 @@ public class Utilisateur implements Serializable {
     private List<Session> session;
     private String email;
     private String password;
-
-    @OneToMany(mappedBy = "utilisateur")
-    private List<Quizz> activities;
+    private List<Quizz> quizzs;
 
     public Utilisateur() {}
 
@@ -68,4 +66,13 @@ public class Utilisateur implements Serializable {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    @OneToMany(mappedBy = "utilisateur")
+    public List<Quizz> getQuizzs() {
+        return quizzs;
+    }
+
+    public void setQuizzs(List<Quizz> quizzs) {
+        this.quizzs = quizzs;
+    }
 }
\ No newline at end of file