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 851cdf0..40ce084 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 @@ -12,6 +12,7 @@ import lombok.*; import org.hibernate.validator.constraints.URL; import org.springframework.hateoas.RepresentationModel; +import java.math.BigDecimal; import java.util.Date; @@ -49,6 +50,6 @@ public class ScientifiqueDTO extends RepresentationModel { @NotBlank private Sexe sexe; - @Size(min=0, max=1) - private double ratioTrouvee; + @Size(max=1) + private BigDecimal ratioTrouve = BigDecimal.ZERO; } diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/scientifique/Scientifique.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/scientifique/Scientifique.java index a66fbc1..7b2059e 100644 --- a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/scientifique/Scientifique.java +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/scientifique/Scientifique.java @@ -15,6 +15,7 @@ import lombok.RequiredArgsConstructor; import org.hibernate.validator.constraints.URL; import org.springframework.hateoas.server.core.Relation; +import java.math.BigDecimal; import java.util.Date; @AllArgsConstructor @@ -53,5 +54,5 @@ public class Scientifique extends BaseEntity { private Sexe sexe; @Column(name = "ratiotrouvee") - private double ratioTrouve = 0.0; + private BigDecimal ratioTrouve = BigDecimal.ZERO; } diff --git a/SpringBootProject/src/main/resources/schema.sql b/SpringBootProject/src/main/resources/schema.sql index b5a3de4..815185d 100644 --- a/SpringBootProject/src/main/resources/schema.sql +++ b/SpringBootProject/src/main/resources/schema.sql @@ -139,9 +139,9 @@ INSERT INTO Difficulte(libelle) VALUES ('Facile'),('Intermédiaire'),('Difficile INSERT INTO Thematique(libelle) VALUES ('Nucléaire'),('Mathématiques'); INSERT INTO Scientifique(nom, prenom, photo, dateNaissance, descriptif, ratioTrouvee, idThematique, idDifficulte, sexe) VALUES - ('Marie', 'Curie', '', CURRENT_DATE, 'desc', 0, 1, 1, 'F'), - ('Albert', 'Einstein', '', CURRENT_DATE, 'desc', 0, 2, 1, 'H'), - ('Sophie', 'Germain', '', CURRENT_DATE, 'desc', 0, 2, 2, 'F'); + ('Marie', 'Curie', '', CURRENT_DATE, 'desc', 0.50, 1, 1, 'F'), + ('Albert', 'Einstein', '', CURRENT_DATE, 'desc', 0.7540, 2, 1, 'H'), + ('Sophie', 'Germain', '', CURRENT_DATE, 'desc', 0.1432, 2, 2, 'F'); -- Jeu INSERT INTO Jeu(nom) VALUES ('Qui-est-ce ?'),('Science Quizz'), ('Pendu');