From 504204e892496ddc3bba47a113dee9b0829339bc Mon Sep 17 00:00:00 2001 From: visoulier Date: Sun, 31 Mar 2024 00:53:50 +0100 Subject: [PATCH] fix package name --- .../controllers/PartieKahootController.java | 5 ++-- .../{partie => }/PartieKahootDTO.java | 2 +- .../partieKahoot/PartieKahootStatusDTO.java | 17 +++++++++++++ .../partie/PartieKahootStatusDTO.java | 25 ------------------- 4 files changed, 20 insertions(+), 29 deletions(-) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/{partie => }/PartieKahootDTO.java (95%) create mode 100644 SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/PartieKahootStatusDTO.java delete mode 100644 SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/partie/PartieKahootStatusDTO.java diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/PartieKahootController.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/PartieKahootController.java index cc0e235..2954a8a 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/PartieKahootController.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/PartieKahootController.java @@ -3,9 +3,8 @@ package fr.iut.sciencequest.sae.controllers; import fr.iut.sciencequest.sae.assemblers.PartieModelAssembler; import fr.iut.sciencequest.sae.controllers.request.PartieAddJoueurRequest; import fr.iut.sciencequest.sae.controllers.request.PartieRequest; -import fr.iut.sciencequest.sae.dto.partie.PartieDTO; -import fr.iut.sciencequest.sae.dto.partieKahoot.partie.PartieKahootDTO; -import fr.iut.sciencequest.sae.dto.partieKahoot.partie.PartieKahootStatusDTO; +import fr.iut.sciencequest.sae.dto.partieKahoot.PartieKahootDTO; +import fr.iut.sciencequest.sae.dto.partieKahoot.PartieKahootStatusDTO; import fr.iut.sciencequest.sae.entities.*; import fr.iut.sciencequest.sae.exceptions.partie.PartyAlreadyStartedException; import fr.iut.sciencequest.sae.services.*; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/partie/PartieKahootDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/PartieKahootDTO.java similarity index 95% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/partie/PartieKahootDTO.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/PartieKahootDTO.java index 8b5960c..1d88a67 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/partie/PartieKahootDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/PartieKahootDTO.java @@ -1,4 +1,4 @@ -package fr.iut.sciencequest.sae.dto.partieKahoot.partie; +package fr.iut.sciencequest.sae.dto.partieKahoot; import fr.iut.sciencequest.sae.dto.difficulte.DifficulteSimpleDTO; import fr.iut.sciencequest.sae.dto.jeu.JeuDTO; diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/PartieKahootStatusDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/PartieKahootStatusDTO.java new file mode 100644 index 0000000..3f74324 --- /dev/null +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/PartieKahootStatusDTO.java @@ -0,0 +1,17 @@ +package fr.iut.sciencequest.sae.dto.partieKahoot; + +import fr.iut.sciencequest.sae.entities.Status; +import jakarta.validation.constraints.NotNull; +import lombok.*; +import org.springframework.hateoas.RepresentationModel; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class PartieKahootStatusDTO extends RepresentationModel { + @NotNull + private Status status; +} diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/partie/PartieKahootStatusDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/partie/PartieKahootStatusDTO.java deleted file mode 100644 index 7f37871..0000000 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partieKahoot/partie/PartieKahootStatusDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package fr.iut.sciencequest.sae.dto.partieKahoot.partie; - -import fr.iut.sciencequest.sae.dto.difficulte.DifficulteSimpleDTO; -import fr.iut.sciencequest.sae.dto.jeu.JeuDTO; -import fr.iut.sciencequest.sae.dto.joueur.JoueurSimpleDTO; -import fr.iut.sciencequest.sae.dto.thematique.ThematiqueSimpleDTO; -import fr.iut.sciencequest.sae.entities.Question; -import fr.iut.sciencequest.sae.entities.Status; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.*; -import org.springframework.hateoas.RepresentationModel; - -import java.util.List; - - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -public class PartieKahootStatusDTO extends RepresentationModel { - @NotNull - private Status status; -}