From 54f7d242c1016cefbb68ac6a482ecfb58673ab85 Mon Sep 17 00:00:00 2001 From: visoulier Date: Thu, 29 Feb 2024 17:25:01 +0100 Subject: [PATCH] ajout DTO --- .../fr/iut/sciencequest/sae/dto/AdminDTO.java | 31 +++++++++++++++++ .../sciencequest/sae/dto/DifficulteDTO.java | 23 +++++++++++++ .../iut/sciencequest/sae/dto/IndiceDTO.java | 2 +- .../iut/sciencequest/sae/dto/InviteDTO.java | 26 ++++++++++++++ .../fr/iut/sciencequest/sae/dto/JeuDTO.java | 27 +++++++++++++++ .../iut/sciencequest/sae/dto/JoueurDTO.java | 6 ++-- .../iut/sciencequest/sae/dto/PartieDTO.java | 4 +-- .../iut/sciencequest/sae/dto/QuestionDTO.java | 4 +-- .../iut/sciencequest/sae/dto/ReponseDTO.java | 25 ++++++++++++++ .../sciencequest/sae/dto/ScientifiqueDTO.java | 4 +-- .../sciencequest/sae/dto/ThematiqueDTO.java | 23 +++++++++++++ .../sciencequest/sae/dto/UtilisateurDTO.java | 34 +++++++++++++++++++ .../iut/sciencequest/sae/entities/Admin.java | 8 +---- .../sciencequest/sae/entities/Difficulte.java | 2 -- .../fr/iut/sciencequest/sae/entities/Jeu.java | 3 -- .../sciencequest/sae/entities/Reponse.java | 2 -- .../sciencequest/sae/entities/Thematique.java | 1 - .../sae/entities/Utilisateur.java | 3 -- 18 files changed, 198 insertions(+), 30 deletions(-) create mode 100644 SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/AdminDTO.java create mode 100644 SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/DifficulteDTO.java create mode 100644 SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/InviteDTO.java create mode 100644 SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JeuDTO.java create mode 100644 SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ReponseDTO.java create mode 100644 SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ThematiqueDTO.java create mode 100644 SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/UtilisateurDTO.java diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/AdminDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/AdminDTO.java new file mode 100644 index 0000000..153b0f0 --- /dev/null +++ b/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 { + @NotNull + private int id; + + @Email + @NotNull + @NotBlank + private String email; + + @NotNull + @NotBlank + private String password; +} diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/DifficulteDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/DifficulteDTO.java new file mode 100644 index 0000000..0ebbd44 --- /dev/null +++ b/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 { + @NotNull + private int id; + + @NotBlank + private String libelle; +} diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/IndiceDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/IndiceDTO.java index 66b0856..16b149f 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/IndiceDTO.java +++ b/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 { +public class IndiceDTO extends RepresentationModel { @NotNull private int id; private String question; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/InviteDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/InviteDTO.java new file mode 100644 index 0000000..24d2879 --- /dev/null +++ b/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 { + @NotNull + private int id; + + @NotBlank + private String pseudo; + + private PartieDTO partie; +} diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JeuDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JeuDTO.java new file mode 100644 index 0000000..42750b7 --- /dev/null +++ b/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 { + @NotNull + private int id; + + @NotBlank + private String nom; + + @Min(0) + private int nbrParties = 0; +} diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JoueurDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JoueurDTO.java index 7b7f2fb..8cbb6fe 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JoueurDTO.java +++ b/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 { @NotBlank private String pseudo; - private Partie partie; + private PartieDTO partie; } diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/PartieDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/PartieDTO.java index 33b4b70..eb44cc7 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/PartieDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/PartieDTO.java @@ -21,7 +21,7 @@ public class PartieDTO extends RepresentationModel { @NotEmpty private String codeInvitation; @NotEmpty - private Iterable joueurs; + private Iterable joueurs; @NotEmpty - private Jeu jeu; + private JeuDTO jeu; } diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/QuestionDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/QuestionDTO.java index 89c99e8..4233cea 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/QuestionDTO.java +++ b/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 { @NotBlank private String question; @NotEmpty - private Iterable reponses; + private Iterable reponses; } diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ReponseDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ReponseDTO.java new file mode 100644 index 0000000..ea28db2 --- /dev/null +++ b/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 { + @NotNull + private int id; + + @NotNull + @NotBlank + private String reponse; +} diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ScientifiqueDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ScientifiqueDTO.java index 430bda3..851cdf0 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ScientifiqueDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ScientifiqueDTO.java @@ -26,10 +26,10 @@ public class ScientifiqueDTO extends RepresentationModel { private int id; @NotNull - private Difficulte difficulte; + private DifficulteDTO difficulte; @NotNull - private Thematique thematique; + private ThematiqueDTO thematique; @URL private String pathToPhoto; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ThematiqueDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ThematiqueDTO.java new file mode 100644 index 0000000..5001c37 --- /dev/null +++ b/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 { + @NotNull + private int id; + + @NotBlank + private String libelle; +} diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/UtilisateurDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/UtilisateurDTO.java new file mode 100644 index 0000000..741075d --- /dev/null +++ b/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 { + @NotNull + private int id; + + @Email + @NotNull + private String email; + + @NotBlank + private String motDePasse; + + @NotBlank + private String pseudo; + + private PartieDTO partie; +} diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Admin.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Admin.java index 4771b71..3fbcd5a 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Admin.java +++ b/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; } diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Difficulte.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Difficulte.java index dfb62c7..e04637e 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Difficulte.java +++ b/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; } diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Jeu.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Jeu.java index 2d96ad3..7f5500b 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Jeu.java +++ b/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; } diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Reponse.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Reponse.java index 640b4b7..320a414 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Reponse.java +++ b/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; } diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Thematique.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Thematique.java index 749c9a0..08a0c63 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Thematique.java +++ b/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; } diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Utilisateur.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Utilisateur.java index 04bfa80..b51340f 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Utilisateur.java +++ b/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; }