feat: categorie on CM

src/main/java/fr/titionfire/ffsaf/data/model/CardboardModel.java

@@ -0,0 +1,42 @@
+package fr.titionfire.ffsaf.data.model;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@RegisterForReflection
+
+@Entity
+@Table(name = "cardboard")
+public class CardboardModel {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "comb", referencedColumnName = "id")
+    MembreModel comb;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "guest_comb", referencedColumnName = "id")
+    CompetitionGuestModel guestComb;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "match", referencedColumnName = "id")
+    MatchModel match;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "compet", referencedColumnName = "id")
+    CompetitionModel compet;
+
+    int red;
+    int yellow;
+}

src/main/java/fr/titionfire/ffsaf/data/model/CategoryModel.java

@@ -42,4 +42,6 @@ public class CategoryModel {
     List<TreeModel> tree;
 
     Integer type;
+
+    String liceName = "1";
 }

src/main/java/fr/titionfire/ffsaf/data/model/CompetitionGuestModel.java

@@ -0,0 +1,48 @@
+package fr.titionfire.ffsaf.data.model;
+
+import fr.titionfire.ffsaf.utils.Categorie;
+import fr.titionfire.ffsaf.utils.Genre;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@RegisterForReflection
+
+@Entity
+@Table(name = "cardboard")
+public class CompetitionGuestModel {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "competition", referencedColumnName = "id")
+    CompetitionModel competition;
+
+    String lname = "";
+    String fname = "";
+
+    Categorie categorie = null;
+
+    String club = null;
+
+    Genre genre = null;
+
+    String country = "fr";
+
+    public CompetitionGuestModel(String s) {
+        this.fname = s.substring(0, s.indexOf(" "));
+        this.lname = s.substring(s.indexOf(" ") + 1);
+    }
+
+    public String getName() {
+        return fname + " " + lname;
+    }
+}

src/main/java/fr/titionfire/ffsaf/data/model/CompetitionModel.java

@@ -55,6 +55,10 @@ public class CompetitionModel {
     @OneToMany(mappedBy = "competition", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     List<RegisterModel> insc;
 
+    @OneToMany(mappedBy = "competition", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+    List<CompetitionGuestModel> guests = new ArrayList<>();
+
+
     List<Long> banMembre = new ArrayList<>();
 
     String owner;

src/main/java/fr/titionfire/ffsaf/data/model/MatchModel.java

@@ -7,6 +7,7 @@ import jakarta.persistence.*;
 import lombok.*;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Getter
@@ -32,13 +33,17 @@ public class MatchModel {
     @JoinColumn(name = "c1", referencedColumnName = "id")
     MembreModel c1_id = null;
 
-    String c1_str = null;
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name = "c1_guest", referencedColumnName = "id")
+    CompetitionGuestModel c1_guest = null;
 
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "c2", referencedColumnName = "id")
     MembreModel c2_id = null;
 
-    String c2_str = null;
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name = "c2_guest", referencedColumnName = "id")
+    CompetitionGuestModel c2_guest = null;
 
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "id_category", referencedColumnName = "id")
@@ -48,22 +53,27 @@ public class MatchModel {
 
     boolean isEnd = true;
 
+    Date date = null;
+
     @ElementCollection(fetch = FetchType.EAGER)
     @CollectionTable(name = "score", joinColumns = @JoinColumn(name = "id_match"))
     List<ScoreEmbeddable> scores = new ArrayList<>();
 
     char poule = 'A';
 
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @JoinColumn(name = "match", referencedColumnName = "id")
+    List<CardboardModel> cardboard;
 
     public String getC1Name() {
         if (c1_id == null)
-            return c1_str;
+            return c1_guest.fname + " " + c1_guest.lname;
         return c1_id.fname + " " + c1_id.lname;
     }
 
     public String getC2Name() {
         if (c2_id == null)
-            return c2_str;
+            return c2_guest.fname + " " + c2_guest.lname;
         return c2_id.fname + " " + c2_id.lname;
     }