feat: rework competition perm, naming, competition data

src/main/java/fr/titionfire/ffsaf/rest/data/CategoryData.java

@@ -1,6 +1,6 @@
 package fr.titionfire.ffsaf.rest.data;
 
-import fr.titionfire.ffsaf.data.model.PouleModel;
+import fr.titionfire.ffsaf.data.model.CategoryModel;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -8,16 +8,16 @@ import lombok.Data;
 @Data
 @AllArgsConstructor
 @RegisterForReflection
-public class PouleData {
+public class CategoryData {
     private Long id;
     private String name;
     private Long compet;
     private Integer type;
 
-    public static PouleData fromModel(PouleModel model) {
+    public static CategoryData fromModel(CategoryModel model) {
         if (model == null)
             return null;
 
-        return new PouleData(model.getSystemId(), model.getName(), model.getCompet().getId(), model.getType());
+        return new CategoryData(model.getSystemId(), model.getName(), model.getCompet().getId(), model.getType());
     }
 }

src/main/java/fr/titionfire/ffsaf/rest/data/CategoryFullData.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 @Data
 @AllArgsConstructor
-public class PouleFullData {
+public class CategoryFullData {
     private Long id;
     private String name;
     private Long compet;

src/main/java/fr/titionfire/ffsaf/rest/data/CompetitionData.java

@@ -1,9 +1,10 @@
 package fr.titionfire.ffsaf.rest.data;
 
 import fr.titionfire.ffsaf.data.model.CompetitionModel;
+import fr.titionfire.ffsaf.data.model.RegisterModel;
 import fr.titionfire.ffsaf.utils.Categorie;
 import fr.titionfire.ffsaf.utils.CompetitionSystem;
-import fr.titionfire.ffsaf.data.model.RegisterModel;
+import fr.titionfire.ffsaf.utils.RegisterMode;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -17,20 +18,53 @@ import java.util.List;
 public class CompetitionData {
     private Long id;
     private String name;
+    private String description;
+    private String adresse;
     private String uuid;
     private Date date;
+    private Date toDate;
     private CompetitionSystem system;
+    private RegisterMode registerMode;
+    private Date startRegister;
+    private Date endRegister;
+    private boolean publicVisible;
     private Long club;
     private String clubName;
     private String owner;
     private List<SimpleRegister> registers;
+    private boolean canEdit;
+    private String data1;
+    private String data2;
+    private String data3;
+    private String data4;
 
     public static CompetitionData fromModel(CompetitionModel model) {
         if (model == null)
             return null;
 
-        return new CompetitionData(model.getId(), model.getName(), model.getUuid(), model.getDate(), model.getSystem(),
-                model.getClub().getId(), model.getClub().getName(), model.getOwner(), null);
+        return new CompetitionData(model.getId(), model.getName(), model.getDescription(), model.getAdresse(),
+                model.getUuid(), model.getDate(), model.getTodate(), model.getSystem(),
+                model.getRegisterMode(), model.getStartRegister(), model.getEndRegister(), model.isPublicVisible(),
+                model.getClub().getId(), model.getClub().getName(), model.getOwner(), null, false,
+                model.getData1(), model.getData2(), model.getData3(), model.getData4());
+    }
+
+    public static CompetitionData fromModelLight(CompetitionModel model) {
+        if (model == null)
+            return null;
+
+        CompetitionData out = new CompetitionData(model.getId(), model.getName(), model.getDescription(),
+                model.getAdresse(), "", model.getDate(), model.getTodate(), null,
+                model.getRegisterMode(), model.getStartRegister(), model.getEndRegister(), model.isPublicVisible(),
+                null, model.getClub().getName(), "", null, false,
+                "","", "","");
+
+        if (model.getRegisterMode() == RegisterMode.HELLOASSO){
+            out.setData1(model.getData1());
+            out.setData2(model.getData2());
+        }
+
+        return out;
     }
 
     public CompetitionData addInsc(List<RegisterModel> insc) {

src/main/java/fr/titionfire/ffsaf/rest/data/MatchData.java

@@ -17,10 +17,10 @@ public class MatchData {
     private String c1_str;
     private Long c2_id;
     private String c2_str;
-    private Long poule;
-    private long poule_ord;
+    private Long category;
+    private long category_ord;
     private boolean isEnd = true;
-    private char groupe;
+    private char poule;
     private List<ScoreEmbeddable> scores;
 
     public static MatchData fromModel(MatchModel model) {
@@ -30,7 +30,7 @@ public class MatchData {
         return new MatchData(model.getSystemId(),
                 (model.getC1_id() == null) ? null : model.getC1_id().getId(), model.getC1_str(),
                 (model.getC2_id() == null) ? null : model.getC2_id().getId(), model.getC2_str(),
-                model.getPoule().getId(), model.getPoule_ord(), model.isEnd(), model.getGroupe(),
+                model.getCategory().getId(), model.getCategory_ord(), model.isEnd(), model.getPoule(),
                 model.getScores());
     }
 }

src/main/java/fr/titionfire/ffsaf/rest/data/TreeData.java

@@ -10,7 +10,7 @@ import lombok.Data;
 @RegisterForReflection
 public class TreeData {
     private Long id;
-    private Long poule;
+    private Long category;
     private Integer level;
     private Long match;
     private TreeData left;
@@ -20,7 +20,7 @@ public class TreeData {
         if (model == null)
             return null;
 
-        return new TreeData(model.getId(), model.getPoule(), model.getLevel(), model.getMatch().getId(),
+        return new TreeData(model.getId(), model.getCategory(), model.getLevel(), model.getMatch().getId(),
                 fromModel(model.getLeft()), fromModel(model.getRight()));
     }
 }