From 0b9c48be47343116cd6e63f1e77bde0731939db1 Mon Sep 17 00:00:00 2001 From: visoulier Date: Thu, 29 Feb 2024 19:47:38 +0100 Subject: [PATCH] =?UTF-8?q?cr=C3=A9ation=20d'un=20package=20par=20entit?= =?UTF-8?q?=C3=A9DTO=20en=20vu=20de=20l'ajout=20de=20nouveaux=20plus=20res?= =?UTF-8?q?trictifs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/fr/iut/sciencequest/sae/ApplicationConfig.java | 7 +++++++ .../sae/assemblers/DifficulteModelAssembler.java | 2 +- .../sciencequest/sae/assemblers/PartieModelAssembler.java | 2 +- .../sae/assemblers/QuestionModelAssembler.java | 2 +- .../sae/assemblers/ScientifiqueModelAssembler.java | 2 +- .../sae/controllers/DifficulteController.java | 2 +- .../sciencequest/sae/controllers/PartieController.java | 2 +- .../sciencequest/sae/controllers/QuestionController.java | 2 +- .../sae/controllers/ScientifiqueController.java | 8 +------- .../fr/iut/sciencequest/sae/dto/{ => admin}/AdminDTO.java | 3 +-- .../sae/dto/{ => difficulte}/DifficulteDTO.java | 2 +- .../iut/sciencequest/sae/dto/{ => indice}/IndiceDTO.java | 2 +- .../iut/sciencequest/sae/dto/{ => invite}/InviteDTO.java | 4 ++-- .../fr/iut/sciencequest/sae/dto/{ => jeu}/JeuDTO.java | 2 +- .../iut/sciencequest/sae/dto/{ => joueur}/JoueurDTO.java | 5 ++--- .../iut/sciencequest/sae/dto/{ => partie}/PartieDTO.java | 6 +++--- .../sciencequest/sae/dto/{ => question}/QuestionDTO.java | 3 ++- .../sciencequest/sae/dto/{ => reponse}/ReponseDTO.java | 4 +--- .../sae/dto/{ => scientifique}/ScientifiqueDTO.java | 6 +++--- .../sae/dto/{ => thematique}/ThematiqueDTO.java | 2 +- .../sae/dto/{ => utilisateur}/UtilisateurDTO.java | 4 ++-- 21 files changed, 35 insertions(+), 37 deletions(-) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/{ => admin}/AdminDTO.java (88%) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/{ => difficulte}/DifficulteDTO.java (91%) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/{ => indice}/IndiceDTO.java (93%) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/{ => invite}/InviteDTO.java (84%) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/{ => jeu}/JeuDTO.java (93%) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/{ => joueur}/JoueurDTO.java (80%) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/{ => partie}/PartieDTO.java (80%) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/{ => question}/QuestionDTO.java (85%) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/{ => reponse}/ReponseDTO.java (79%) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/{ => scientifique}/ScientifiqueDTO.java (86%) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/{ => thematique}/ThematiqueDTO.java (91%) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/{ => utilisateur}/UtilisateurDTO.java (87%) diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/ApplicationConfig.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/ApplicationConfig.java index fa494fe..68b3c52 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/ApplicationConfig.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/ApplicationConfig.java @@ -1,5 +1,7 @@ package fr.iut.sciencequest.sae; +import org.modelmapper.ModelMapper; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; import org.springframework.web.accept.FixedContentNegotiationStrategy; @@ -12,6 +14,11 @@ import java.util.List; public class ApplicationConfig implements WebMvcConfigurer { public static final int DEFAULT_PAGEABLE_SIZE = 1; + @Bean + public ModelMapper modelMapper() { + return new ModelMapper(); + } + // Permet de forcer l'affichage des erreurs en JSON sans prendre en compte les headers du client @Override public void configureContentNegotiation(ContentNegotiationConfigurer configurer) { diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/DifficulteModelAssembler.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/DifficulteModelAssembler.java index edcff45..a571766 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/DifficulteModelAssembler.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/DifficulteModelAssembler.java @@ -1,6 +1,6 @@ package fr.iut.sciencequest.sae.assemblers; -import fr.iut.sciencequest.sae.dto.DifficulteDTO; +import fr.iut.sciencequest.sae.dto.difficulte.DifficulteDTO; import fr.iut.sciencequest.sae.entities.Difficulte; import jakarta.annotation.Nullable; import org.modelmapper.ModelMapper; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/PartieModelAssembler.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/PartieModelAssembler.java index 614c60a..5159856 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/PartieModelAssembler.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/PartieModelAssembler.java @@ -2,7 +2,7 @@ package fr.iut.sciencequest.sae.assemblers; import fr.iut.sciencequest.sae.controllers.PartieController; import fr.iut.sciencequest.sae.entities.Partie; -import fr.iut.sciencequest.sae.dto.PartieDTO; +import fr.iut.sciencequest.sae.dto.partie.PartieDTO; import jakarta.annotation.Nullable; import org.modelmapper.ModelMapper; import org.springframework.hateoas.server.mvc.RepresentationModelAssemblerSupport; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/QuestionModelAssembler.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/QuestionModelAssembler.java index 11677da..b898ca7 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/QuestionModelAssembler.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/QuestionModelAssembler.java @@ -2,7 +2,7 @@ package fr.iut.sciencequest.sae.assemblers; import fr.iut.sciencequest.sae.controllers.QuestionController; import fr.iut.sciencequest.sae.entities.Question; -import fr.iut.sciencequest.sae.dto.QuestionDTO; +import fr.iut.sciencequest.sae.dto.question.QuestionDTO; import jakarta.annotation.Nullable; import org.modelmapper.ModelMapper; import org.springframework.hateoas.server.mvc.RepresentationModelAssemblerSupport; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/ScientifiqueModelAssembler.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/ScientifiqueModelAssembler.java index 9fd4c7b..1d9f316 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/ScientifiqueModelAssembler.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/assemblers/ScientifiqueModelAssembler.java @@ -1,7 +1,7 @@ package fr.iut.sciencequest.sae.assemblers; import fr.iut.sciencequest.sae.controllers.ScientifiqueController; -import fr.iut.sciencequest.sae.dto.ScientifiqueDTO; +import fr.iut.sciencequest.sae.dto.scientifique.ScientifiqueDTO; import fr.iut.sciencequest.sae.entities.scientifique.Scientifique; import jakarta.annotation.Nullable; import org.modelmapper.ModelMapper; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/DifficulteController.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/DifficulteController.java index 15901b6..7cfe8a8 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/DifficulteController.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/DifficulteController.java @@ -3,7 +3,7 @@ package fr.iut.sciencequest.sae.controllers; import fr.iut.sciencequest.sae.ApplicationConfig; import fr.iut.sciencequest.sae.assemblers.DifficulteModelAssembler; -import fr.iut.sciencequest.sae.dto.DifficulteDTO; +import fr.iut.sciencequest.sae.dto.difficulte.DifficulteDTO; import fr.iut.sciencequest.sae.entities.Difficulte; import fr.iut.sciencequest.sae.services.DifficulteService; import lombok.AllArgsConstructor; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/PartieController.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/PartieController.java index 3d07246..142c378 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/PartieController.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/PartieController.java @@ -1,7 +1,7 @@ package fr.iut.sciencequest.sae.controllers; import fr.iut.sciencequest.sae.assemblers.PartieModelAssembler; -import fr.iut.sciencequest.sae.dto.PartieDTO; +import fr.iut.sciencequest.sae.dto.partie.PartieDTO; import fr.iut.sciencequest.sae.entities.Partie; import fr.iut.sciencequest.sae.services.PartieService; import lombok.AllArgsConstructor; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/QuestionController.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/QuestionController.java index c53310b..246b3f1 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/QuestionController.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/QuestionController.java @@ -4,7 +4,7 @@ import fr.iut.sciencequest.sae.ApplicationConfig; import fr.iut.sciencequest.sae.assemblers.QuestionModelAssembler; import fr.iut.sciencequest.sae.entities.Question; import fr.iut.sciencequest.sae.exceptions.IncorrectPageException; -import fr.iut.sciencequest.sae.dto.QuestionDTO; +import fr.iut.sciencequest.sae.dto.question.QuestionDTO; import fr.iut.sciencequest.sae.services.QuestionService; import lombok.AllArgsConstructor; import org.springframework.data.domain.Page; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/ScientifiqueController.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/ScientifiqueController.java index ce99b69..a8bb205 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/ScientifiqueController.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/ScientifiqueController.java @@ -1,11 +1,8 @@ package fr.iut.sciencequest.sae.controllers; import fr.iut.sciencequest.sae.ApplicationConfig; -import fr.iut.sciencequest.sae.assemblers.QuestionModelAssembler; import fr.iut.sciencequest.sae.assemblers.ScientifiqueModelAssembler; -import fr.iut.sciencequest.sae.dto.QuestionDTO; -import fr.iut.sciencequest.sae.dto.ScientifiqueDTO; -import fr.iut.sciencequest.sae.entities.Question; +import fr.iut.sciencequest.sae.dto.scientifique.ScientifiqueDTO; import fr.iut.sciencequest.sae.entities.scientifique.Scientifique; import fr.iut.sciencequest.sae.entities.indice.IIndiceidAndLibelleAndScientifiqueIdOnlyProjection; import fr.iut.sciencequest.sae.entities.indice.Indice; @@ -14,7 +11,6 @@ import fr.iut.sciencequest.sae.exceptions.IncorrectPageException; import fr.iut.sciencequest.sae.services.IndiceService; import fr.iut.sciencequest.sae.services.interfaces.IScientifiqueService; import lombok.AllArgsConstructor; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; import org.springframework.data.web.PagedResourcesAssembler; @@ -26,8 +22,6 @@ import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.Optional; - @RestController @AllArgsConstructor @RequestMapping("/api/v1/scientifiques") diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/AdminDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/admin/AdminDTO.java similarity index 88% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/AdminDTO.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/admin/AdminDTO.java index 153b0f0..86eeac3 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/AdminDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/admin/AdminDTO.java @@ -1,7 +1,6 @@ -package fr.iut.sciencequest.sae.dto; +package fr.iut.sciencequest.sae.dto.admin; 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; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/DifficulteDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/difficulte/DifficulteDTO.java similarity index 91% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/DifficulteDTO.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/difficulte/DifficulteDTO.java index 0ebbd44..6047d64 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/DifficulteDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/difficulte/DifficulteDTO.java @@ -1,4 +1,4 @@ -package fr.iut.sciencequest.sae.dto; +package fr.iut.sciencequest.sae.dto.difficulte; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.validation.constraints.NotBlank; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/IndiceDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/indice/IndiceDTO.java similarity index 93% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/IndiceDTO.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/indice/IndiceDTO.java index 16b149f..d1a936e 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/IndiceDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/indice/IndiceDTO.java @@ -1,4 +1,4 @@ -package fr.iut.sciencequest.sae.dto; +package fr.iut.sciencequest.sae.dto.indice; import com.fasterxml.jackson.annotation.JsonInclude; import fr.iut.sciencequest.sae.entities.Reponse; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/InviteDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/invite/InviteDTO.java similarity index 84% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/InviteDTO.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/invite/InviteDTO.java index 24d2879..67be490 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/InviteDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/invite/InviteDTO.java @@ -1,7 +1,7 @@ -package fr.iut.sciencequest.sae.dto; +package fr.iut.sciencequest.sae.dto.invite; import com.fasterxml.jackson.annotation.JsonInclude; -import fr.iut.sciencequest.sae.entities.Partie; +import fr.iut.sciencequest.sae.dto.partie.PartieDTO; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JeuDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/jeu/JeuDTO.java similarity index 93% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JeuDTO.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/jeu/JeuDTO.java index 42750b7..2d42b54 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JeuDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/jeu/JeuDTO.java @@ -1,4 +1,4 @@ -package fr.iut.sciencequest.sae.dto; +package fr.iut.sciencequest.sae.dto.jeu; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.validation.constraints.Min; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JoueurDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/joueur/JoueurDTO.java similarity index 80% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JoueurDTO.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/joueur/JoueurDTO.java index 8cbb6fe..63b30db 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/JoueurDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/joueur/JoueurDTO.java @@ -1,8 +1,7 @@ -package fr.iut.sciencequest.sae.dto; +package fr.iut.sciencequest.sae.dto.joueur; import com.fasterxml.jackson.annotation.JsonInclude; -import fr.iut.sciencequest.sae.entities.Partie; -import jakarta.validation.constraints.Email; +import fr.iut.sciencequest.sae.dto.partie.PartieDTO; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/PartieDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partie/PartieDTO.java similarity index 80% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/PartieDTO.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partie/PartieDTO.java index eb44cc7..0587fc9 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/PartieDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partie/PartieDTO.java @@ -1,8 +1,8 @@ -package fr.iut.sciencequest.sae.dto; +package fr.iut.sciencequest.sae.dto.partie; import com.fasterxml.jackson.annotation.JsonInclude; -import fr.iut.sciencequest.sae.entities.Jeu; -import fr.iut.sciencequest.sae.entities.joueur.Joueur; +import fr.iut.sciencequest.sae.dto.jeu.JeuDTO; +import fr.iut.sciencequest.sae.dto.joueur.JoueurDTO; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/QuestionDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/question/QuestionDTO.java similarity index 85% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/QuestionDTO.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/question/QuestionDTO.java index 4233cea..1aa2307 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/QuestionDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/question/QuestionDTO.java @@ -1,6 +1,7 @@ -package fr.iut.sciencequest.sae.dto; +package fr.iut.sciencequest.sae.dto.question; import com.fasterxml.jackson.annotation.JsonInclude; +import fr.iut.sciencequest.sae.dto.reponse.ReponseDTO; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ReponseDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/reponse/ReponseDTO.java similarity index 79% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ReponseDTO.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/reponse/ReponseDTO.java index ea28db2..bde6f6a 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ReponseDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/reponse/ReponseDTO.java @@ -1,9 +1,7 @@ -package fr.iut.sciencequest.sae.dto; +package fr.iut.sciencequest.sae.dto.reponse; 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; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ScientifiqueDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/scientifique/ScientifiqueDTO.java similarity index 86% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ScientifiqueDTO.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/scientifique/ScientifiqueDTO.java index 40ce084..7a80663 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ScientifiqueDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/scientifique/ScientifiqueDTO.java @@ -1,9 +1,9 @@ -package fr.iut.sciencequest.sae.dto; +package fr.iut.sciencequest.sae.dto.scientifique; import com.fasterxml.jackson.annotation.JsonInclude; -import fr.iut.sciencequest.sae.entities.Difficulte; +import fr.iut.sciencequest.sae.dto.thematique.ThematiqueDTO; +import fr.iut.sciencequest.sae.dto.difficulte.DifficulteDTO; import fr.iut.sciencequest.sae.entities.Sexe; -import fr.iut.sciencequest.sae.entities.Thematique; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ThematiqueDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/thematique/ThematiqueDTO.java similarity index 91% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ThematiqueDTO.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/thematique/ThematiqueDTO.java index 5001c37..8b0e21c 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/ThematiqueDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/thematique/ThematiqueDTO.java @@ -1,4 +1,4 @@ -package fr.iut.sciencequest.sae.dto; +package fr.iut.sciencequest.sae.dto.thematique; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.validation.constraints.NotBlank; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/UtilisateurDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/utilisateur/UtilisateurDTO.java similarity index 87% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/UtilisateurDTO.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/utilisateur/UtilisateurDTO.java index 741075d..a1e7d94 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/UtilisateurDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/utilisateur/UtilisateurDTO.java @@ -1,7 +1,7 @@ -package fr.iut.sciencequest.sae.dto; +package fr.iut.sciencequest.sae.dto.utilisateur; import com.fasterxml.jackson.annotation.JsonInclude; -import fr.iut.sciencequest.sae.entities.Partie; +import fr.iut.sciencequest.sae.dto.partie.PartieDTO; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull;