diff --git a/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Etat.java b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Etat.java new file mode 100644 index 0000000..2c3bfeb --- /dev/null +++ b/SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/Etat.java @@ -0,0 +1,5 @@ +package fr.iut.sciencequest.sae.entities; + +public enum Etat { + Pending, +} 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 513a56f..0b5b125 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 @@ -4,6 +4,7 @@ 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; @@ -32,9 +33,6 @@ public class Partie { @JoinColumn(name="idjeu", nullable = false) private Jeu jeu; - @Column(name = "status") //default value : see Schema.sql - private String status; - @Column(name = "datecreation") //default value : see Schema.sql private Date dateCreation; @@ -49,4 +47,8 @@ public class Partie { @ManyToOne @JoinColumn(name="iddifficulte", nullable = false) private Difficulte difficulte; + + @Column(name = "status", nullable = false) + @Enumerated(EnumType.STRING) + private Etat status = Etat.Pending; } diff --git a/SpringBootProject/src/main/resources/schema.sql b/SpringBootProject/src/main/resources/schema.sql index 7c1568d..010c7b1 100644 --- a/SpringBootProject/src/main/resources/schema.sql +++ b/SpringBootProject/src/main/resources/schema.sql @@ -115,7 +115,7 @@ CREATE TABLE Partie( codeInvitation varchar(5) UNIQUE DEFAULT make_uid(), idJeu integer REFERENCES Jeu(id), idDifficulte integer REFERENCES Difficulte(id), - status varchar(128) DEFAULT 'pending', + status varchar(128), dateCreation timestamp DEFAULT CURRENT_TIMESTAMP ); @@ -172,9 +172,6 @@ AS ' IF OLD.codeInvitation IS NULL THEN NEW.codeInvitation = make_uid(); END IF; - IF OLD.status IS NULL THEN - NEW.status = ''pending''; - END IF; IF OLD.dateCreation IS NULL THEN NEW.dateCreation = CURRENT_TIMESTAMP; END IF;