From e031a2f4d8a240b79ea5f1933c835625938a6968 Mon Sep 17 00:00:00 2001 From: visoulier Date: Thu, 28 Mar 2024 09:23:27 +0100 Subject: [PATCH] ajout status dans dto + correction nom enum --- .../java/fr/iut/sciencequest/sae/dto/partie/PartieDTO.java | 3 +++ .../main/java/fr/iut/sciencequest/sae/entities/Partie.java | 4 +--- .../iut/sciencequest/sae/entities/{Etat.java => Status.java} | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) rename SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/{Etat.java => Status.java} (73%) diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partie/PartieDTO.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partie/PartieDTO.java index d04628e..e80811f 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partie/PartieDTO.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/dto/partie/PartieDTO.java @@ -4,6 +4,7 @@ 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.Status; import fr.iut.sciencequest.sae.entities.Thematique; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; @@ -32,4 +33,6 @@ public class PartieDTO extends RepresentationModel { private List thematiques; @NotNull private DifficulteSimpleDTO difficulte; + @NotNull + private Status status; } diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Partie.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Partie.java index 0b5b125..10de5b2 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Partie.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Partie.java @@ -1,10 +1,8 @@ package fr.iut.sciencequest.sae.entities; -import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonManagedReference; import jakarta.persistence.*; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -50,5 +48,5 @@ public class Partie { @Column(name = "status", nullable = false) @Enumerated(EnumType.STRING) - private Etat status = Etat.Pending; + private Status status = Status.Pending; } diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Etat.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Status.java similarity index 73% rename from SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Etat.java rename to SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Status.java index 2c3bfeb..38c2b7e 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Etat.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Status.java @@ -1,5 +1,5 @@ package fr.iut.sciencequest.sae.entities; -public enum Etat { +public enum Status { Pending, }