ajout DTO

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/AdminDTO.java

@@ -0,0 +1,31 @@
+package fr.iut.sciencequest.sae.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import fr.iut.sciencequest.sae.entities.Partie;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import org.springframework.hateoas.RepresentationModel;
+
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class AdminDTO extends RepresentationModel<AdminDTO> {
+    @NotNull
+    private int id;
+
+    @Email
+    @NotNull
+    @NotBlank
+    private String email;
+
+    @NotNull
+    @NotBlank
+    private String password;
+}

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/DifficulteDTO.java

@@ -0,0 +1,23 @@
+package fr.iut.sciencequest.sae.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import org.springframework.hateoas.RepresentationModel;
+
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class DifficulteDTO extends RepresentationModel<DifficulteDTO> {
+    @NotNull
+    private int id;
+
+    @NotBlank
+    private String libelle;
+}

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/IndiceDTO.java

@@ -16,7 +16,7 @@ import java.util.List;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class IndiceDTO extends RepresentationModel<QuestionDTO> {
+public class IndiceDTO extends RepresentationModel<IndiceDTO> {
     @NotNull
     private int id;
     private String question;

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/InviteDTO.java

@@ -0,0 +1,26 @@
+package fr.iut.sciencequest.sae.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import fr.iut.sciencequest.sae.entities.Partie;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import org.springframework.hateoas.RepresentationModel;
+
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class InviteDTO extends RepresentationModel<InviteDTO> {
+    @NotNull
+    private int id;
+
+    @NotBlank
+    private String pseudo;
+
+    private PartieDTO partie;
+}

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JeuDTO.java

@@ -0,0 +1,27 @@
+package fr.iut.sciencequest.sae.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import org.springframework.hateoas.RepresentationModel;
+
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class JeuDTO extends RepresentationModel<JeuDTO> {
+    @NotNull
+    private int id;
+
+    @NotBlank
+    private String nom;
+
+    @Min(0)
+    private int nbrParties = 0;
+}

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JoueurDTO.java

@@ -2,15 +2,13 @@ package fr.iut.sciencequest.sae.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import fr.iut.sciencequest.sae.entities.Partie;
-import fr.iut.sciencequest.sae.entities.Reponse;
+import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import org.springframework.hateoas.RepresentationModel;
 
 
-import java.util.List;
 
 @Data
 @Builder
@@ -25,5 +23,5 @@ public class JoueurDTO extends RepresentationModel<JoueurDTO> {
     @NotBlank
     private String pseudo;
 
-    private Partie partie;
+    private PartieDTO partie;
 }

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/PartieDTO.java

@@ -21,7 +21,7 @@ public class PartieDTO extends RepresentationModel<PartieDTO> {
     @NotEmpty
     private String codeInvitation;
     @NotEmpty
-    private Iterable<Joueur> joueurs;
+    private Iterable<JoueurDTO> joueurs;
     @NotEmpty
-    private Jeu jeu;
+    private JeuDTO jeu;
 }

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/QuestionDTO.java

@@ -1,7 +1,6 @@
 package fr.iut.sciencequest.sae.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import fr.iut.sciencequest.sae.entities.Reponse;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -9,7 +8,6 @@ import lombok.*;
 import org.springframework.hateoas.RepresentationModel;
 
 
-import java.util.List;
 
 @Data
 @Builder
@@ -23,5 +21,5 @@ public class QuestionDTO extends RepresentationModel<QuestionDTO> {
     @NotBlank
     private String question;
     @NotEmpty
-    private Iterable<Reponse> reponses;
+    private Iterable<ReponseDTO> reponses;
 }

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ReponseDTO.java

@@ -0,0 +1,25 @@
+package fr.iut.sciencequest.sae.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import fr.iut.sciencequest.sae.entities.Reponse;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import org.springframework.hateoas.RepresentationModel;
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ReponseDTO extends RepresentationModel<ReponseDTO> {
+    @NotNull
+    private int id;
+
+    @NotNull
+    @NotBlank
+    private String reponse;
+}

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ScientifiqueDTO.java

@@ -26,10 +26,10 @@ public class ScientifiqueDTO extends RepresentationModel<ScientifiqueDTO> {
     private int id;
     
     @NotNull
-    private Difficulte difficulte;
+    private DifficulteDTO difficulte;
 
     @NotNull
-    private Thematique thematique;
+    private ThematiqueDTO thematique;
 
     @URL
     private String pathToPhoto;

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ThematiqueDTO.java

@@ -0,0 +1,23 @@
+package fr.iut.sciencequest.sae.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import org.springframework.hateoas.RepresentationModel;
+
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ThematiqueDTO extends RepresentationModel<ThematiqueDTO> {
+    @NotNull
+    private int id;
+
+    @NotBlank
+    private String libelle;
+}

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/UtilisateurDTO.java

@@ -0,0 +1,34 @@
+package fr.iut.sciencequest.sae.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import fr.iut.sciencequest.sae.entities.Partie;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import org.springframework.hateoas.RepresentationModel;
+
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class UtilisateurDTO extends RepresentationModel<UtilisateurDTO> {
+    @NotNull
+    private int id;
+
+    @Email
+    @NotNull
+    private String email;
+
+    @NotBlank
+    private String motDePasse;
+
+    @NotBlank
+    private String pseudo;
+
+    private PartieDTO partie;
+}

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Admin.java

@@ -17,18 +17,12 @@ import lombok.NoArgsConstructor;
 @Table(name="admin")
 public class Admin extends BaseEntity {
     @Id
-    @NotNull
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
 
-    @Email(message="Veuillez fournir une adresse mail valide")
-    @NotNull
-    @NotBlank
     @Column(unique = true)
     private String email;
 
-    @NotNull
-    @NotBlank
-    @Column()
+    @Column
     private String password;
 }

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Difficulte.java

@@ -18,11 +18,9 @@ import org.modelmapper.internal.bytebuddy.implementation.bind.annotation.Super;
 @Table(name="difficulte")
 public class Difficulte extends BaseEntity  {
     @Id
-    @NotNull
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
 
-    @NotBlank
     @Column(unique = true)
     private String libelle;
 }

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Jeu.java

@@ -17,15 +17,12 @@ import lombok.NoArgsConstructor;
 @Table(name="jeu")
 public class Jeu extends BaseEntity {
     @Id
-    //@NotNull
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
 
-    //@NotBlank
     @Column(unique = true)
     private String nom;
 
     @Column(name = "nbrparties")
-    //@Min(0)
     private int nbrParties = 0;
 }

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Reponse.java

@@ -15,11 +15,9 @@ import lombok.NoArgsConstructor;
 @Table(name="reponse")
 public class Reponse extends BaseEntity {
     @Id
-    @NotNull
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
 
-    @NotNull
     private String reponse;
 
 }

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Thematique.java

@@ -20,7 +20,6 @@ public class Thematique extends BaseEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
 
-    @NotBlank
     @Column(unique = true)
     private String libelle;
 }

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Utilisateur.java

@@ -19,12 +19,9 @@ import lombok.NoArgsConstructor;
 @Table(name="utilisateur")
 @PrimaryKeyJoinColumn(name = "idjoueur")
 public class Utilisateur extends Joueur {
-    @Email(message="Veuillez fournir une adresse mail valide")
-    @NotNull
     @Column(unique = true)
     private String email;
 
-    @NotBlank
     @Column(name = "password")
     private String motDePasse;
 }