diff --git a/src/main/java/DAO/ReponseDAO.java b/src/main/java/DAO/ReponseDAO.java index 83df8a9..5305289 100644 --- a/src/main/java/DAO/ReponseDAO.java +++ b/src/main/java/DAO/ReponseDAO.java @@ -24,6 +24,4 @@ public class ReponseDAO extends AbstractJpaDao { t.commit(); em.refresh(q); } - - } diff --git a/src/main/java/DTO/QuestionDTO.java b/src/main/java/DTO/QuestionDTO.java index 85f1b18..de9a842 100644 --- a/src/main/java/DTO/QuestionDTO.java +++ b/src/main/java/DTO/QuestionDTO.java @@ -1,13 +1,11 @@ package DTO; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; +import java.util.List; @Data public class QuestionDTO { private int id; private String question; - private String reponse; - + private List reponses_string; } diff --git a/src/main/java/DTO/QuizzDTO.java b/src/main/java/DTO/QuizzDTO.java index 84859c5..861e4fa 100644 --- a/src/main/java/DTO/QuizzDTO.java +++ b/src/main/java/DTO/QuizzDTO.java @@ -1,12 +1,12 @@ package DTO; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; +import java.util.List; @Data - public class QuizzDTO { private int id; - + private Integer sessionId; + private Integer utilisateurId; + private List questionsId; } diff --git a/src/main/java/DTO/ReponseDTO.java b/src/main/java/DTO/ReponseDTO.java deleted file mode 100644 index c4e78be..0000000 --- a/src/main/java/DTO/ReponseDTO.java +++ /dev/null @@ -1,10 +0,0 @@ -package DTO; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data - -public class ReponseDTO { -} diff --git a/src/main/java/DTO/SessionDTO.java b/src/main/java/DTO/SessionDTO.java index 1947e1b..0a6dfbd 100644 --- a/src/main/java/DTO/SessionDTO.java +++ b/src/main/java/DTO/SessionDTO.java @@ -1,10 +1,14 @@ package DTO; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; +import java.util.List; @Data - public class SessionDTO { + private String theme; + private int codePIN; + private int id; + + private List quizzsId; + private List utilisateursId; } diff --git a/src/main/java/DTO/UtilisateurDTO.java b/src/main/java/DTO/UtilisateurDTO.java index e5e998f..e8b91d0 100644 --- a/src/main/java/DTO/UtilisateurDTO.java +++ b/src/main/java/DTO/UtilisateurDTO.java @@ -1,14 +1,12 @@ package DTO; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; @Data - public class UtilisateurDTO { private int id; private String name; private String email; private String password; } + diff --git a/src/main/java/Mapper/ReponseMapper.java b/src/main/java/Mapper/ReponseMapper.java deleted file mode 100644 index d89cedc..0000000 --- a/src/main/java/Mapper/ReponseMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package Mapper; - -import DTO.ReponseDTO; -import metier.Reponse; -import org.mapstruct.factory.Mappers; - -public interface ReponseMapper { - ReponseMapper INSTANCE = Mappers.getMapper( ReponseMapper.class ); - - Reponse toEntity(ReponseDTO reponseDTO); - ReponseDTO toDTO(Reponse reponse); -} diff --git a/src/main/java/jpa/JpaTest.java b/src/main/java/jpa/JpaTest.java index 4990383..ef0b9fb 100644 --- a/src/main/java/jpa/JpaTest.java +++ b/src/main/java/jpa/JpaTest.java @@ -30,8 +30,8 @@ public class JpaTest { test.create_user_test(); test.create_session_test(); test.create_quizz_test(1,1); - //test.list_utilisateur(); - //test.list_session(); + test.list_utilisateur(); + test.list_session(); test.list_quizz(); } catch (Exception e) { e.printStackTrace();