Merge pull request 'dev' (#124) from dev into master

Reviewed-on: #124

.gitea/workflows/deploy_in_prod.yml

@@ -17,17 +17,38 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Cache Maven packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Cache node modules
+        id: cache-npm
+        uses: actions/cache@v4
+        env:
+          cache-name: cache-node-modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '17.0.12'
+          java-version: '21'
           distribution: 'graalvm'
-          cache: 'maven'
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '22'
           cache: 'npm'
           cache-dependency-path: src/main/webapp/package-lock.json
 

.gitignore

@@ -50,3 +50,4 @@ nb-configuration.xml
 /media/
 /media-ext/
 /sign.jpg
+/.gitea/workflows/test.yml

docker-compose.yml

@@ -20,6 +20,11 @@ services:
       - default
       - intra
       - nginx
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "https://intra.ffsaf.fr/api" ]
+      interval: 30s
+      timeout: 5s
+      retries: 3
 
   ffsaf-db:
     image: public.ecr.aws/docker/library/postgres:17.2

pom.xml

@@ -11,7 +11,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>3.16.4</quarkus.platform.version>
+        <quarkus.platform.version>3.30.5</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.2.3</surefire-plugin.version>
     </properties>
@@ -56,19 +56,15 @@
             <artifactId>quarkus-rest-client-jackson</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-mssql-client</artifactId>
-            <version>4.4.1</version>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>io.quarkiverse.tika</groupId>
+            <groupId>io.quarkiverse.antivirus</groupId>
-            <artifactId>quarkus-tika</artifactId>
+            <artifactId>quarkus-antivirus</artifactId>
-            <version>2.0.4</version>
+            <version>1.3.0</version>
         </dependency>
 
         <dependency>
@@ -96,7 +92,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
+            <version>1.18.42</version>
             <scope>provided</scope>
         </dependency>
 
@@ -127,12 +123,17 @@
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>fop</artifactId>
-            <version>2.6</version>
+            <version>2.11</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-mailer</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-websockets-next</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/fr/titionfire/ffsaf/FrontendForwardingFilter.java

@@ -44,7 +44,9 @@ public class FrontendForwardingFilter implements ContainerResponseFilter {
         final String path = info.getPath();
         final String address = request.remoteAddress().toString();
 
+        if (!path.equals("/api")) {
             LOG.infof("Request %s %s from IP %s", method, path, address);
+        }
 
         int status = responseContext.getStatus();
         if (status != 404 && !(status == 405 && "GET".equals(requestContext.getMethod()))) {

src/main/java/fr/titionfire/ffsaf/UserInfoProvider.java

@@ -0,0 +1,48 @@
+package fr.titionfire.ffsaf;
+
+import fr.titionfire.ffsaf.domain.service.TradService;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.PreMatching;
+import jakarta.ws.rs.ext.Provider;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
+@Provider
+@PreMatching
+public class UserInfoProvider implements ContainerRequestFilter {
+
+    private static final List<Locale> SUPPORTED_LANGUAGES = Arrays.asList(
+            Locale.FRENCH,
+            Locale.ENGLISH
+    );
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) {
+        List<Locale> acceptableLanguages = requestContext.getAcceptableLanguages();
+        Locale selectedLocale = findFirstSupportedLanguage(acceptableLanguages);
+
+        if (selectedLocale == null)
+            selectedLocale = TradService.fallbackLocale;
+        requestContext.setProperty("userLocale", selectedLocale);
+    }
+
+    private Locale findFirstSupportedLanguage(List<Locale> acceptableLanguages) {
+        for (Locale acceptableLanguage : acceptableLanguages) {
+            // Vérifie si la langue est dans la liste des langues supportées
+            if (SUPPORTED_LANGUAGES.contains(acceptableLanguage)) {
+                return acceptableLanguage;
+            }
+            // Vérifie aussi par tag de langue (ex: "fr-FR" -> "fr")
+            String languageTag = acceptableLanguage.getLanguage();
+            for (Locale supportedLanguage : SUPPORTED_LANGUAGES) {
+                if (supportedLanguage.getLanguage().equals(languageTag)) {
+                    return supportedLanguage;
+                }
+            }
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,64 @@
+package fr.titionfire.ffsaf.data.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import jakarta.persistence.*;
+import lombok.*;
+import org.hibernate.annotations.CreationTimestamp;
+
+import java.util.Date;
+import java.util.Objects;
+
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@RegisterForReflection
+
+@Entity
+@Table(name = "card")
+public class CardModel {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    Long id;
+
+    Long comb;
+    Long match;
+    Long category;
+
+    @JsonIgnore
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "competition", referencedColumnName = "id")
+    CompetitionModel competition;
+
+    @JsonProperty("competition")
+    Long competitionId;
+
+    CardType type;
+    String reason;
+    @CreationTimestamp
+    Date date;
+
+    @Column(nullable = false, columnDefinition = "boolean default false")
+    boolean teamCard = false;
+
+    public boolean hasEffect(MatchModel match) {
+        return switch (this.type) {
+            case BLUE -> false;
+            case YELLOW -> Objects.equals(this.match, match.getId());
+            case RED -> Objects.equals(this.category, match.getCategory().getId())
+                    || Objects.equals(this.match, match.getId());
+            case BLACK -> true;
+        };
+    }
+
+    public enum CardType {
+        BLUE,
+        YELLOW,
+        RED,
+        BLACK
+    }
+}

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

@@ -0,0 +1,89 @@
+package fr.titionfire.ffsaf.data.model;
+
+import fr.titionfire.ffsaf.utils.Categorie;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@RegisterForReflection
+
+@Entity
+@Table(name = "category_preset")
+public class CatPresetModel {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "competition", referencedColumnName = "id")
+    CompetitionModel competition;
+
+    String name = "";
+
+    @ElementCollection(fetch = FetchType.EAGER)
+    @CollectionTable(name = "category_preset_catconfig", joinColumns = @JoinColumn(name = "id_preset"))
+    List<CategorieEmbeddable> categories;
+
+    SwordType swordType = SwordType.NONE;
+    ShieldType shieldType = ShieldType.NONE;
+
+    /*
+     * 1 - 1 - Casque
+     * 2 - 2 - Gorgerin
+     * 3 - 4 - Coquille et Protection pelvienne
+     * 4 - 8 - Gant main(s) armée(s)
+     * 5 - 16 - Gant main bouclier
+     * 6 - 32 - Plastron
+     * 7 - 64 - Protection de bras armé(s)
+     * 8 - 128 - Protection de bras de bouclier
+     * 9 - 256 - Protection de jambes
+     * 10 - 512 - Protection de genoux
+     * 11 - 1024 - Protection de coudes
+     * 12 - 2048 - Protection dorsale
+     * 13 - 4096 - Protection de pieds
+     */
+    int mandatoryProtection1 = 0;
+    int mandatoryProtection2 = 0;
+
+    @ManyToMany(mappedBy = "categoriesInscrites", fetch = FetchType.LAZY)
+    private List<RegisterModel> registers = new ArrayList<>();
+
+    @ManyToMany(mappedBy = "categoriesInscrites", fetch = FetchType.LAZY)
+    private List<CompetitionGuestModel> guest = new ArrayList<>();
+
+    public enum SwordType {
+        NONE,
+        ONE_HAND,
+        TWO_HAND,
+        SABER
+    }
+
+    public enum ShieldType {
+        NONE,
+        STANDARD,
+        ROUND,
+        TEARDROP,
+        BUCKLER
+    }
+
+    @Getter
+    @Setter
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @RegisterForReflection
+
+    @Embeddable
+    public static class CategorieEmbeddable {
+        Categorie categorie;
+        long roundDuration;
+        long pauseDuration;
+    }
+}

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

@@ -42,4 +42,16 @@ public class CategoryModel {
     List<TreeModel> tree;
 
     Integer type;
+
+    String liceName = "1";
+
+    @Column(nullable = false, columnDefinition = "boolean default false")
+    boolean treeAreClassement = false;
+
+    @Column(nullable = false, columnDefinition = "boolean default false")
+    boolean fullClassement = false;
+
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name = "id_preset", referencedColumnName = "id")
+    CatPresetModel preset;
 }

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

@@ -0,0 +1,38 @@
+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;
+import org.hibernate.annotations.CreationTimestamp;
+
+import java.util.Date;
+import java.util.List;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@RegisterForReflection
+
+@Entity
+@Table(name = "card_team")
+public class ClubCardModel {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    Long id;
+
+    Long competition;
+    String teamUuid;
+    String teamName;
+
+    CardModel.CardType type;
+    String reason;
+    @CreationTimestamp
+    Date date;
+
+    List<Long> cardIds;
+}

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

@@ -0,0 +1,11 @@
+package fr.titionfire.ffsaf.data.model;
+
+import fr.titionfire.ffsaf.utils.Categorie;
+import fr.titionfire.ffsaf.utils.ResultPrivacy;
+
+public interface CombModel {
+    Long getCombId();
+    String getName();
+    String getName(MembreModel model, ResultPrivacy privacy);
+    Categorie getCategorie();
+}

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

@@ -0,0 +1,115 @@
+package fr.titionfire.ffsaf.data.model;
+
+import fr.titionfire.ffsaf.utils.Categorie;
+import fr.titionfire.ffsaf.utils.Genre;
+import fr.titionfire.ffsaf.utils.ResultPrivacy;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@RegisterForReflection
+
+@Entity
+@Table(name = "competition_guest")
+public class CompetitionGuestModel implements CombModel {
+    @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";
+
+    Float weight = null;
+    Float weightReal = null;
+
+    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
+    @JoinTable(
+            name = "groupe_membre",
+            joinColumns = @JoinColumn(name = "groupe_id"),
+            inverseJoinColumns = @JoinColumn(name = "membre_id")
+    )
+    List<MembreModel> comb = new ArrayList<>();
+
+    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
+    @JoinTable(
+            name = "groupe_guest",
+            joinColumns = @JoinColumn(name = "groupe_id"),
+            inverseJoinColumns = @JoinColumn(name = "guest_id")
+    )
+    List<CompetitionGuestModel> guest = new ArrayList<>();
+
+    @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    @JoinTable(
+            name = "categories_insc_guest",
+            joinColumns = @JoinColumn(name = "guest_id"),
+            inverseJoinColumns = @JoinColumn(name = "category_id")
+    )
+    List<CatPresetModel> categoriesInscrites = new ArrayList<>();
+
+    public CompetitionGuestModel(String s) {
+        this.fname = s.substring(0, s.indexOf(" "));
+        this.lname = s.substring(s.indexOf(" ") + 1);
+    }
+
+    @Override
+    public Long getCombId() {
+        return this.id * -1;
+    }
+
+    @Override
+    public String getName() {
+        if (this.isTeam())
+            return this.fname;
+        return this.fname + " " + this.lname;
+    }
+
+    @Override
+    public String getName(MembreModel model, ResultPrivacy privacy) {
+        return getName();
+    }
+
+    public boolean isTeam() {
+        return "__team".equals(this.lname);
+    }
+
+    public boolean isInTeam(Object comb_) {
+        if (!this.isTeam())
+            return false;
+
+        if (comb_ instanceof Long id_) {
+            if (id_ >= 0)
+                return comb.stream().anyMatch(membre -> Objects.equals(membre.getId(), id_));
+            else
+                return guest.stream().anyMatch(guestModel -> Objects.equals(guestModel.getId(), -id_));
+        }
+        return Stream.concat(comb.stream(), guest.stream()).anyMatch(c -> Objects.equals(c, comb_));
+    }
+
+    public Float getWeight2() {
+        return (this.weightReal != null) ? this.weightReal : this.weight;
+    }
+}

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

@@ -1,5 +1,6 @@
 package fr.titionfire.ffsaf.data.model;
 
+import fr.titionfire.ffsaf.utils.Categorie;
 import fr.titionfire.ffsaf.utils.CompetitionSystem;
 import fr.titionfire.ffsaf.utils.RegisterMode;
 import io.quarkus.runtime.annotations.RegisterForReflection;
@@ -55,12 +56,31 @@ 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<>();
+
+    @OneToMany(mappedBy = "competition", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    List<CatPresetModel> catPreset = new ArrayList<>();
+
+    List<Categorie> requiredWeight = new ArrayList<>();
+
     List<Long> banMembre = new ArrayList<>();
 
     String owner;
 
+    List<String> admin = new ArrayList<>();
+    @Column(name = "table_")
+    List<String> table = new ArrayList<>();
+
+    @Column(columnDefinition = "TEXT")
     String data1;
+    @Column(columnDefinition = "TEXT")
     String data2;
+    @Column(columnDefinition = "TEXT")
     String data3;
+    @Column(columnDefinition = "TEXT")
     String data4;
+
+    @Column(columnDefinition = "TEXT")
+    String config;
 }

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

@@ -41,7 +41,7 @@ public class LogModel {
     }
 
     public enum ObjectType {
-        Membre, Affiliation, Licence, Club, Competition, Register
+        Membre, Affiliation, Licence, Club, Competition, Register, Selection
     }
 
 }

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

@@ -1,13 +1,16 @@
 package fr.titionfire.ffsaf.data.model;
 
 import fr.titionfire.ffsaf.utils.CompetitionSystem;
+import fr.titionfire.ffsaf.utils.ResultPrivacy;
 import fr.titionfire.ffsaf.utils.ScoreEmbeddable;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.persistence.*;
 import lombok.*;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Getter
 @Setter
@@ -32,13 +35,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,9 +55,99 @@ 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';
+
+    public String getC1Name(MembreModel model, ResultPrivacy privacy) {
+        if (c1_id != null)
+            return c1_id.getName(model, privacy);
+        if (c1_guest != null)
+            return c1_guest.getName(model, privacy);
+        return "";
+    }
+
+    public String getC2Name(MembreModel model, ResultPrivacy privacy) {
+        if (c2_id != null)
+            return c2_id.getName(model, privacy);
+        if (c2_guest != null)
+            return c2_guest.getName(model, privacy);
+        return "";
+    }
+
+    public String getC1Name() {
+        if (c1_id != null)
+            return c1_id.getName();
+        if (c1_guest != null)
+            return c1_guest.getName();
+        return "";
+    }
+
+    public String getC2Name() {
+        if (c2_id != null)
+            return c2_id.getName();
+        if (c2_guest != null)
+            return c2_guest.getName();
+        return "";
+    }
+
+    public int win() {
+        int sum = 0;
+        for (ScoreEmbeddable score : this.getScores()) {
+            if (score.getS1() == -1000 || score.getS2() == -1000)
+                continue;
+
+            if (score.getS1() > score.getS2())
+                sum++;
+            else if (score.getS1() < score.getS2())
+                sum--;
+        }
+        return sum;
+    }
+
+    public CombModel getC1() {
+        if (this.c1_id != null)
+            return this.c1_id;
+        if (this.c1_guest != null)
+            return this.c1_guest;
+        return null;
+    }
+
+    public CombModel getC2() {
+        if (this.c2_id != null)
+            return this.c2_id;
+        if (this.c2_guest != null)
+            return this.c2_guest;
+        return null;
+    }
+
+    public boolean isC1(Object comb) {
+        if (this.c1_guest != null && this.c1_guest.isInTeam(comb))
+            return true;
+
+        if (comb instanceof Long id_) {
+            if (id_ >= 0)
+                return Objects.equals(this.c1_id != null ? this.c1_id.getId() : null, id_);
+            else
+                return Objects.equals(this.c1_guest != null ? this.c1_guest.getId() : null, -id_);
+        }
+        return Objects.equals(this.c1_id, comb) || Objects.equals(this.c1_guest, comb);
+    }
+
+    public boolean isC2(Object comb) {
+        if (this.c2_guest != null && this.c2_guest.isInTeam(comb))
+            return true;
+
+        if (comb instanceof Long id_) {
+            if (id_ >= 0)
+                return Objects.equals(this.c2_id != null ? this.c2_id.getId() : null, id_);
+            else
+                return Objects.equals(this.c2_guest != null ? this.c2_guest.getId() : null, -id_);
+        }
+        return Objects.equals(this.c2_id, comb) || Objects.equals(this.c2_guest, comb);
+    }
 }

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

@@ -1,9 +1,6 @@
 package fr.titionfire.ffsaf.data.model;
 
-import fr.titionfire.ffsaf.utils.Categorie;
+import fr.titionfire.ffsaf.utils.*;
-import fr.titionfire.ffsaf.utils.Genre;
-import fr.titionfire.ffsaf.utils.GradeArbitrage;
-import fr.titionfire.ffsaf.utils.RoleAsso;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.persistence.*;
 import lombok.*;
@@ -11,6 +8,7 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Getter
 @Setter
@@ -21,23 +19,23 @@ import java.util.List;
 
 @Entity
 @Table(name = "membre")
-public class MembreModel implements LoggableModel {
+public class MembreModel implements LoggableModel, CombModel {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Access(AccessType.PROPERTY)
-    @Schema(description = "L'identifiant du membre.", example = "1")
+    @Schema(description = "L'identifiant du membre.", examples = "1")
     Long id;
 
-    @Schema(description = "L'identifiant long du membre (userID).", example = "e81d1d35-d897-421e-8086-6c5e74d13c6e")
+    @Schema(description = "L'identifiant long du membre (userID).", examples = "e81d1d35-d897-421e-8086-6c5e74d13c6e")
     String userId;
 
-    @Schema(description = "Le nom du membre.", example = "Dupont")
+    @Schema(description = "Le nom du membre.", examples = "Dupont")
     String lname;
-    @Schema(description = "Le prénom du membre.", example = "Jean")
+    @Schema(description = "Le prénom du membre.", examples = "Jean")
     String fname;
 
-    @Schema(description = "La catégorie du membre.", example = "SENIOR")
+    @Schema(description = "La catégorie du membre.", examples = "SENIOR")
     Categorie categorie;
 
     @ManyToOne(fetch = FetchType.EAGER)
@@ -45,34 +43,39 @@ public class MembreModel implements LoggableModel {
     @Schema(description = "Le club du membre.")
     ClubModel club;
 
-    @Schema(description = "Le genre du membre.", example = "H")
+    @Schema(description = "Le genre du membre.", examples = "H")
     Genre genre;
 
-    @Schema(description = "Le numéro de licence du membre.", example = "12345")
+    @Schema(description = "Le numéro de licence du membre.", examples = "12345")
     Integer licence;
 
-    @Schema(description = "Le pays du membre.", example = "FR")
+    @Schema(description = "Le pays du membre.", examples = "FR")
     String country;
 
     @Schema(description = "La date de naissance du membre.")
     Date birth_date;
 
-    @Schema(description = "L'adresse e-mail du membre.", example = "jean.dupont@example.com")
+    @Schema(description = "L'adresse e-mail du membre.", examples = "jean.dupont@examples.com")
     String email;
 
-    @Schema(description = "Le rôle du membre dans l'association.", example = "MEMBRE")
+    @Schema(description = "Le rôle du membre dans l'association.", examples = "MEMBRE")
     RoleAsso role;
 
-    @Schema(description = "Le grade d'arbitrage du membre.", example = "NA")
+    @Schema(description = "Le grade d'arbitrage du membre.", examples = "NA")
     GradeArbitrage grade_arbitrage;
 
-    @Schema(hidden = true)
+    @Schema(description = "La confidentialité de ces résultats", examples = "PUBLIC")
-    String url_photo;
+    @Column(nullable = false, columnDefinition = "smallint default 0")
+    ResultPrivacy resultPrivacy = ResultPrivacy.PUBLIC;
 
     @OneToMany(mappedBy = "membre", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @Schema(description = "Les licences du membre. (optionnel)")
     List<LicenceModel> licences;
 
+    @OneToMany(mappedBy = "membre", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+    @Schema(description = "Les séléctions du membre. (optionnel)")
+    List<SelectionModel> selections;
+
     @Override
     public String getObjectName() {
         return fname + " " + lname;
@@ -100,4 +103,25 @@ public class MembreModel implements LoggableModel {
                 ", grade_arbitrage=" + grade_arbitrage +
                 '}';
     }
+
+    @Override
+    public Long getCombId() {
+        return this.id;
+    }
+
+    @Override
+    public String getName() {
+        return this.fname + " " + this.lname;
+    }
+
+    @Override
+    public String getName(MembreModel model, ResultPrivacy privacy) {
+        if (model == null || !Objects.equals(this.getId(), model.getId())) {
+            if (model == null && this.getResultPrivacy() != ResultPrivacy.PUBLIC)
+                return "Anonyme";
+            if (this.getResultPrivacy().ordinal() > privacy.ordinal())
+                return "Anonyme";
+        }
+        return getName();
+    }
 }

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

@@ -11,6 +11,9 @@ import lombok.Setter;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Getter
 @Setter
 @AllArgsConstructor
@@ -34,7 +37,8 @@ public class RegisterModel {
     @JoinColumn(name = "id_membre")
     MembreModel membre;
 
-    Integer weight;
+    Float weight;
+    Float weightReal;
     int overCategory = 0;
     Categorie categorie;
 
@@ -46,7 +50,18 @@ public class RegisterModel {
     @Column(nullable = false, columnDefinition = "boolean default false")
     boolean lockEdit = false;
 
-    public RegisterModel(CompetitionModel competition, MembreModel membre, Integer weight, int overCategory,
+    @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    @JoinTable(
+            name = "categories_insc_comb",
+            joinColumns = {
+                    @JoinColumn(name = "id_competition", referencedColumnName = "id_competition"),
+                    @JoinColumn(name = "id_membre", referencedColumnName = "id_membre")
+            },
+            inverseJoinColumns = @JoinColumn(name = "category_id")
+    )
+    List<CatPresetModel> categoriesInscrites = new ArrayList<>();
+
+    public RegisterModel(CompetitionModel competition, MembreModel membre, Float weight, int overCategory,
                          Categorie categorie, ClubModel club) {
         this.id = new RegisterId(competition.getId(), membre.getId());
         this.competition = competition;
@@ -56,4 +71,29 @@ public class RegisterModel {
         this.categorie = categorie;
         this.club = club;
     }
+
+    public String getName() {
+        return membre.fname + " " + membre.lname;
+    }
+
+    public ClubModel getClub2() {
+        if (club == null)
+            return membre.club;
+        return club;
+    }
+
+    public Categorie getCategorie2() {
+        Categorie tmp = this.categorie;
+        if (tmp == null)
+            tmp = membre.getCategorie();
+        if (tmp == null)
+            return null;
+        return Categorie.values()[Math.min(tmp.ordinal() + this.overCategory, Categorie.values().length - 1)];
+    }
+
+    public Float getWeight2() {
+        if (weightReal != null)
+            return weightReal;
+        return weight;
+    }
 }

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

@@ -0,0 +1,44 @@
+package fr.titionfire.ffsaf.data.model;
+
+import fr.titionfire.ffsaf.utils.Categorie;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import jakarta.persistence.*;
+import lombok.*;
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@RegisterForReflection
+
+@Entity
+@Table(name = "selection")
+public class SelectionModel implements LoggableModel  {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Schema(description = "L'identifiant de la séléction.")
+    Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "membre", referencedColumnName = "id")
+    @Schema(description = "Le membre de la séléction. (optionnel)")
+    MembreModel membre;
+
+    @Schema(description = "La saison de la séléction.", examples = "2025")
+    int saison;
+
+    @Schema(description = "Catégorie de la séléction.")
+    Categorie categorie;
+
+    @Override
+    public String getObjectName() {
+        return "selection " + id.toString();
+    }
+
+    @Override
+    public LogModel.ObjectType getObjectType() {
+        return LogModel.ObjectType.Selection;
+    }
+}

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

@@ -7,6 +7,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Getter
 @Setter
 @AllArgsConstructor
@@ -36,4 +39,68 @@ public class TreeModel {
     @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
     @JoinColumn(referencedColumnName = "id")
     TreeModel right;
+
+    public TreeModel(Long category, Integer level, MatchModel match) {
+        this.category = category;
+        this.level = level;
+        this.match = match;
+        this.left = null;
+        this.right = null;
+    }
+
+    public List<TreeModel> flat() {
+        List<TreeModel> out = new ArrayList<>();
+        this.flat(out);
+        return out;
+    }
+
+    private void flat(List<TreeModel> out) {
+        out.add(this);
+
+        if (this.right != null)
+            this.right.flat(out);
+
+        if (this.left != null)
+            this.left.flat(out);
+    }
+
+    public int death() {
+        int dg = 0;
+        int dd = 0;
+
+        if (this.right != null)
+            dg = this.right.death();
+
+        if (this.left != null)
+            dg = this.left.death();
+
+        return 1 + Math.max(dg, dd);
+    }
+
+    public int getMaxChildrenAtDepth(int death, int current) {
+        if (current == death)
+            return 1;
+
+        int tmp = 0;
+        if (this.right != null)
+            tmp += this.right.getMaxChildrenAtDepth(death, current + 1);
+
+        if (this.left != null)
+            tmp += this.left.getMaxChildrenAtDepth(death, current + 1);
+
+        return tmp;
+    }
+
+    public void getChildrenAtDepth (int death, int current, List<TreeModel> out) {
+        if (current == death) {
+            out.add(this);
+            return;
+        }
+
+        if (this.right != null)
+            this.right.getChildrenAtDepth(death, current + 1, out);
+
+        if (this.left != null)
+            this.left.getChildrenAtDepth(death, current + 1, out);
+    }
 }

src/main/java/fr/titionfire/ffsaf/data/repository/CardRepository.java

@@ -0,0 +1,10 @@
+package fr.titionfire.ffsaf.data.repository;
+
+import fr.titionfire.ffsaf.data.model.CardModel;
+import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+import jakarta.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class CardRepository  implements PanacheRepositoryBase<CardModel, Long> {
+
+}

src/main/java/fr/titionfire/ffsaf/data/repository/CatPresetRepository.java

@@ -0,0 +1,9 @@
+package fr.titionfire.ffsaf.data.repository;
+
+import fr.titionfire.ffsaf.data.model.CatPresetModel;
+import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+import jakarta.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class CatPresetRepository implements PanacheRepositoryBase<CatPresetModel, Long> {
+}

src/main/java/fr/titionfire/ffsaf/data/repository/CategoryRepository.java

@@ -1,9 +1,19 @@
 package fr.titionfire.ffsaf.data.repository;
 
 import fr.titionfire.ffsaf.data.model.CategoryModel;
+import fr.titionfire.ffsaf.utils.CompetitionSystem;
+import io.quarkus.hibernate.reactive.panache.Panache;
 import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+import io.smallrye.mutiny.Uni;
 import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class CategoryRepository implements PanacheRepositoryBase<CategoryModel, Long> {
+
+    public Uni<CategoryModel> create(CategoryModel categoryModel) {
+        categoryModel.setSystem(CompetitionSystem.INTERNAL);
+        return Panache.withTransaction(() -> this.persist(categoryModel)
+                .invoke(categoryModel1 -> categoryModel1.setSystemId(categoryModel1.getId())))
+                .chain(this::persist);
+    }
 }

src/main/java/fr/titionfire/ffsaf/data/repository/CheckoutRepository.java

@@ -2,8 +2,17 @@ package fr.titionfire.ffsaf.data.repository;
 
 import fr.titionfire.ffsaf.data.model.CheckoutModel;
 import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+import io.smallrye.mutiny.Uni;
 import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class CheckoutRepository implements PanacheRepositoryBase<CheckoutModel, Long> {
+
+    public Uni<Long> countByLicenseId(long id) {
+        return getSession()
+                .chain(s -> s
+                        .createNativeQuery("SELECT COUNT(*) FROM ffsaf__checkout WHERE ?1 = ANY(license_ids)", Long.class)
+                        .setParameter(1, id)
+                        .getSingleResult());
+    }
 }

src/main/java/fr/titionfire/ffsaf/data/repository/ClubCardRepository.java

@@ -0,0 +1,10 @@
+package fr.titionfire.ffsaf.data.repository;
+
+import fr.titionfire.ffsaf.data.model.ClubCardModel;
+import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+import jakarta.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class ClubCardRepository implements PanacheRepositoryBase<ClubCardModel, Long> {
+
+}

src/main/java/fr/titionfire/ffsaf/data/repository/CompetitionGuestRepository.java

@@ -0,0 +1,9 @@
+package fr.titionfire.ffsaf.data.repository;
+
+import fr.titionfire.ffsaf.data.model.CompetitionGuestModel;
+import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+import jakarta.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class CompetitionGuestRepository implements PanacheRepositoryBase<CompetitionGuestModel, Long> {
+}

src/main/java/fr/titionfire/ffsaf/data/repository/MatchRepository.java

@@ -1,9 +1,33 @@
 package fr.titionfire.ffsaf.data.repository;
 
 import fr.titionfire.ffsaf.data.model.MatchModel;
+import fr.titionfire.ffsaf.utils.CompetitionSystem;
+import io.quarkus.hibernate.reactive.panache.Panache;
 import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+import io.smallrye.mutiny.Uni;
 import jakarta.enterprise.context.ApplicationScoped;
 
+import java.util.List;
+
 @ApplicationScoped
 public class MatchRepository implements PanacheRepositoryBase<MatchModel, Long> {
+
+    public Uni<MatchModel> create(MatchModel matchModel) {
+        matchModel.setSystem(CompetitionSystem.INTERNAL);
+        return Panache.withTransaction(() -> this.persistAndFlush(matchModel)
+                        .invoke(matchModel1 -> matchModel1.setSystemId(matchModel1.getId())))
+                .chain(this::persist);
+    }
+
+    public Uni<Void> create(List<MatchModel> matchModel) {
+        if (matchModel.isEmpty())
+            return Uni.createFrom().voidItem();
+
+        matchModel.forEach(model -> model.setSystem(CompetitionSystem.INTERNAL));
+        return Panache.withTransaction(() -> this.persist(matchModel)
+                        .call(__ -> this.flush())
+                        .invoke(__ -> matchModel.forEach(model -> model.setSystemId(model.getId())))
+                        .map(__ -> matchModel))
+                .chain(this::persist);
+    }
 }

src/main/java/fr/titionfire/ffsaf/data/repository/SelectionRepository.java

@@ -0,0 +1,9 @@
+package fr.titionfire.ffsaf.data.repository;
+
+import fr.titionfire.ffsaf.data.model.SelectionModel;
+import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+import jakarta.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class SelectionRepository implements PanacheRepositoryBase<SelectionModel, Long> {
+}

src/main/java/fr/titionfire/ffsaf/data/repository/TreeRepository.java

@@ -2,8 +2,22 @@ package fr.titionfire.ffsaf.data.repository;
 
 import fr.titionfire.ffsaf.data.model.TreeModel;
 import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+import io.quarkus.hibernate.reactive.panache.common.WithTransaction;
+import io.smallrye.mutiny.Uni;
 import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class TreeRepository implements PanacheRepositoryBase<TreeModel, Long> {
+
+    @WithTransaction
+    public Uni<Boolean> deleteTree(TreeModel entity) {
+        Uni<Boolean> uni = Uni.createFrom().item(false);
+        if (entity == null)
+            return uni;
+        if (entity.getLeft() != null)
+            uni = uni.chain(__ -> this.deleteTree(entity.getLeft()));
+        if (entity.getRight() != null)
+            uni = uni.chain(__ -> this.deleteTree(entity.getRight()));
+        return uni.chain(__ -> this.deleteById(entity.getId()));
+    }
 }

src/main/java/fr/titionfire/ffsaf/domain/entity/CombEntity.java

@@ -0,0 +1,76 @@
+package fr.titionfire.ffsaf.domain.entity;
+
+import fr.titionfire.ffsaf.data.model.CatPresetModel;
+import fr.titionfire.ffsaf.data.model.CompetitionGuestModel;
+import fr.titionfire.ffsaf.data.model.MembreModel;
+import fr.titionfire.ffsaf.data.model.RegisterModel;
+import fr.titionfire.ffsaf.utils.Categorie;
+import fr.titionfire.ffsaf.utils.Genre;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+@Data
+@AllArgsConstructor
+@RegisterForReflection
+public class CombEntity {
+    private long id;
+    private String lname;
+    private String fname;
+    Categorie categorie;
+    String club_uuid;
+    String club_str;
+    Genre genre;
+    String country;
+    int overCategory;
+    Float weight;
+    List<CombEntity> teamMembers;
+    List<Long> categoriesInscrites;
+
+    public static CombEntity fromModel(MembreModel model) {
+        if (model == null)
+            return null;
+
+        return new CombEntity(model.getId(), model.getLname(), model.getFname(), model.getCategorie(),
+                model.getClub() == null ? null : model.getClub().getClubId(),
+                model.getClub() == null ? "Sans club" : model.getClub().getName(), model.getGenre(), model.getCountry(),
+                0, null, new ArrayList<>(), new ArrayList<>());
+    }
+
+
+    public static CombEntity fromModel(CompetitionGuestModel model) {
+        if (model == null)
+            return null;
+
+        return new CombEntity(model.getId() * -1, model.getLname(), model.getFname(), model.getCategorie(), null,
+                model.getClub(), model.getGenre(), model.getCountry(), 0,
+                model.getWeight2() != null ? model.getWeight2() : model.getWeight(),
+                Stream.concat(model.getComb().stream().map(CombEntity::fromModel),
+                        model.getGuest().stream().map(CombEntity::fromModel)).toList(),
+                new ArrayList<>());
+    }
+
+    public CombEntity addCategoriesInscrites(List<CatPresetModel> categoriesInscrites) {
+        if (categoriesInscrites == null)
+            return this;
+        this.categoriesInscrites = categoriesInscrites.stream().map(CatPresetModel::getId).toList();
+        return this;
+    }
+
+    public static CombEntity fromModel(RegisterModel registerModel) {
+        if (registerModel == null || registerModel.getMembre() == null)
+            return null;
+        MembreModel model = registerModel.getMembre();
+
+        return new CombEntity(model.getId(), model.getLname(), model.getFname(), registerModel.getCategorie(),
+                registerModel.getClub2() == null ? null : registerModel.getClub2().getClubId(),
+                registerModel.getClub2() == null ? "Sans club" : registerModel.getClub2().getName(), model.getGenre(),
+                model.getCountry(), registerModel.getOverCategory(),
+                registerModel.getWeight2() != null ? registerModel.getWeight2() : registerModel.getWeight(),
+                new ArrayList<>(), new ArrayList<>());
+    }
+}

src/main/java/fr/titionfire/ffsaf/domain/entity/MatchEntity.java

@@ -0,0 +1,38 @@
+package fr.titionfire.ffsaf.domain.entity;
+
+import fr.titionfire.ffsaf.data.model.MatchModel;
+import fr.titionfire.ffsaf.utils.ScoreEmbeddable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@RegisterForReflection
+public class MatchEntity {
+    private long id;
+    private CombEntity c1;
+    private CombEntity c2;
+    private long categorie_ord = 0;
+    private boolean isEnd;
+    private long categorie;
+    private Date date;
+    private List<ScoreEmbeddable> scores;
+    private char poule;
+
+    public static MatchEntity fromModel(MatchModel model) {
+        if (model == null)
+            return null;
+        return new MatchEntity(model.getId(),
+                (model.getC1_id() == null) ? CombEntity.fromModel(model.getC1_guest()) : CombEntity.fromModel(
+                        model.getC1_id()),
+                (model.getC2_id() == null) ? CombEntity.fromModel(model.getC2_guest()) : CombEntity.fromModel(
+                        model.getC2_id()),
+                model.getCategory_ord(), model.isEnd(), model.getCategory().getId(), model.getDate(),
+                model.getScores(),
+                model.getPoule());
+    }
+}

src/main/java/fr/titionfire/ffsaf/domain/entity/MatchModelExtend.java

@@ -0,0 +1,184 @@
+package fr.titionfire.ffsaf.domain.entity;
+
+import fr.titionfire.ffsaf.data.model.*;
+import fr.titionfire.ffsaf.utils.ResultPrivacy;
+import fr.titionfire.ffsaf.utils.ScoreEmbeddable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import lombok.Getter;
+
+import java.util.*;
+
+@RegisterForReflection
+public class MatchModelExtend {
+    final MatchModel match;
+
+    @Getter
+    boolean isEnd = false;
+    @Getter
+    List<ScoreEmbeddable> scoresToPrint = new ArrayList<>();
+    @Getter
+    List<ScoreEmbeddable> scoresToCompute = new ArrayList<>();
+    @Getter
+    int win = 0;
+
+
+    public MatchModelExtend(MatchModel match, List<CardModel> cards) {
+        this.match = match;
+
+        List<Long> combIds = extractCombIds(match);
+        List<CardModel> cards2 = cards.stream().filter(c -> combIds.contains(c.getComb()) && c.hasEffect(match))
+                .sorted(Comparator.comparing(CardModel::getType).reversed()).toList();
+
+
+        for (ScoreEmbeddable score : match.getScores()) {
+            if (score.getS1() == -1000 || score.getS2() == -1000)
+                continue;
+            this.scoresToCompute.add(virtualScore(score, cards2, false));
+        }
+
+        calc_win_end(cards2);
+
+        for (ScoreEmbeddable score : match.getScores()) {
+            if (score.getS1() == -1000 || score.getS2() == -1000)
+                continue;
+            this.scoresToPrint.add(virtualScore(score, cards2, true));
+        }
+        if (this.isEnd && this.scoresToPrint.isEmpty()) {
+            this.scoresToPrint.add(virtualScore(new ScoreEmbeddable(0, 0, 0), cards2, true));
+        }
+    }
+
+    private ScoreEmbeddable virtualScore(ScoreEmbeddable score, List<CardModel> cards2, boolean toPrint) {
+        if (cards2.size() > 1) {
+            if (!Objects.equals(cards2.get(0).getComb(), cards2.get(1).getComb()))
+                return new ScoreEmbeddable(score.getN_round(), toPrint ? -997 : 0, toPrint ? -997 : 0);
+        }
+        if (!cards2.isEmpty()) {
+            if (isC1(cards2.get(0).getComb()))
+                return new ScoreEmbeddable(score.getN_round(), toPrint ? -997 : 0, 10);
+            else
+                return new ScoreEmbeddable(score.getN_round(), 10, toPrint ? -997 : 0);
+        }
+
+        if (score.getS1() < -900 && score.getS2() < -900)
+            return new ScoreEmbeddable(score.getN_round(), toPrint ? score.getS1() : 0, toPrint ? score.getS2() : 0);
+        else if (score.getS1() < -900)
+            return new ScoreEmbeddable(score.getN_round(), toPrint ? score.getS1() : 0, 10);
+        else if (score.getS2() < -900)
+            return new ScoreEmbeddable(score.getN_round(), 10, toPrint ? score.getS2() : 0);
+
+        return new ScoreEmbeddable(score.getN_round(), score.getS1(), score.getS2());
+    }
+
+    private void calc_win_end(List<CardModel> cards2) {
+        if (cards2.size() > 1) {
+            if (!Objects.equals(cards2.get(0).getComb(), cards2.get(1).getComb())) {
+                this.win = 0;
+                this.isEnd = true;
+                return;
+            }
+        }
+
+        if (!cards2.isEmpty()) {
+            if (match.isC1(cards2.get(0).getComb())) {
+                this.win = -1;
+            } else if (match.isC2(cards2.get(0).getComb())) {
+                this.win = 1;
+            }
+            this.isEnd = true;
+            return;
+        }
+
+        for (ScoreEmbeddable score : this.scoresToCompute) {
+            if (score.getS1() > score.getS2())
+                win++;
+            else if (score.getS1() < score.getS2())
+                win--;
+        }
+        this.isEnd = match.isEnd();
+    }
+
+
+    private List<Long> extractCombIds(MatchModel match) {
+        List<Long> ids = new ArrayList<>();
+        if (match.getC1_id() != null)
+            ids.add(match.getC1_id().getId());
+        if (match.getC2_id() != null)
+            ids.add(match.getC2_id().getId());
+        if (match.getC1_guest() != null)
+            ids.add(match.getC1_guest().getId() * -1);
+        if (match.getC2_guest() != null)
+            ids.add(match.getC2_guest().getId() * -1);
+        return ids;
+    }
+
+    //--------------- Delegation methods to MatchModel ---------------
+
+    public Long getId() {
+        return match.getId();
+    }
+
+    public MembreModel getC1_id() {
+        return match.getC1_id();
+    }
+
+    public CompetitionGuestModel getC1_guest() {
+        return match.getC1_guest();
+    }
+
+    public MembreModel getC2_id() {
+        return match.getC2_id();
+    }
+
+    public CompetitionGuestModel getC2_guest() {
+        return match.getC2_guest();
+    }
+
+    public CategoryModel getCategory() {
+        return match.getCategory();
+    }
+
+    public long getCategory_ord() {
+        return match.getCategory_ord();
+    }
+
+    public Date getDate() {
+        return match.getDate();
+    }
+
+    public char getPoule() {
+        return match.getPoule();
+    }
+
+    public String getC1Name(MembreModel model, ResultPrivacy privacy) {
+        return match.getC1Name(model, privacy);
+    }
+
+    public String getC2Name(MembreModel model, ResultPrivacy privacy) {
+        return match.getC2Name(model, privacy);
+    }
+
+    public String getC2Name() {
+        return match.getC2Name();
+    }
+
+    public String getC1Name() {
+        return match.getC1Name();
+    }
+
+    public boolean isC1(Object comb) {
+        return match.isC1(comb);
+    }
+
+    public boolean isC2(Object comb) {
+        return match.isC2(comb);
+    }
+
+    public CombModel getC1() {
+        return match.getC1();
+    }
+
+    public CombModel getC2() {
+        return match.getC2();
+    }
+}

src/main/java/fr/titionfire/ffsaf/domain/entity/MembreEntity.java

@@ -1,64 +0,0 @@
-package fr.titionfire.ffsaf.domain.entity;
-
-import fr.titionfire.ffsaf.data.model.MembreModel;
-import fr.titionfire.ffsaf.utils.Categorie;
-import fr.titionfire.ffsaf.utils.Genre;
-import fr.titionfire.ffsaf.utils.GradeArbitrage;
-import fr.titionfire.ffsaf.utils.RoleAsso;
-import io.quarkus.runtime.annotations.RegisterForReflection;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@Builder
-@AllArgsConstructor
-@RegisterForReflection
-public class MembreEntity {
-    private long id;
-    private String lname = "";
-    private String fname = "";
-    private Categorie categorie;
-    private ClubEntity club;
-    private Genre genre;
-    private Integer licence;
-    private String country;
-    private Date birth_date;
-    private String email;
-    private RoleAsso role;
-    private GradeArbitrage grade_arbitrage;
-    private String url_photo;
-
-
-    public static MembreEntity fromModel(MembreModel model) {
-        if (model == null)
-            return null;
-
-        return new MembreEntityBuilder()
-                .id(model.getId())
-                .lname(model.getLname())
-                .fname(model.getFname())
-                .categorie(model.getCategorie())
-                .club(ClubEntity.fromModel(model.getClub()))
-                .genre(model.getGenre())
-                .licence(model.getLicence())
-                .country(model.getCountry())
-                .birth_date(model.getBirth_date())
-                .email(model.getEmail())
-                .role(model.getRole())
-                .grade_arbitrage(model.getGrade_arbitrage())
-                .url_photo(model.getUrl_photo())
-                .build();
-    }
-
-    public static String getFullName(MembreModel model) {
-        return model.getFname() + " " + model.getLname();
-    }
-    public String getFullName() {
-        return this.fname + " " + this.lname;
-    }
-
-
-}

src/main/java/fr/titionfire/ffsaf/domain/entity/TreeEntity.java

@@ -0,0 +1,71 @@
+package fr.titionfire.ffsaf.domain.entity;
+
+import fr.titionfire.ffsaf.data.model.TreeModel;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+@RegisterForReflection
+public class TreeEntity {
+    private Long id;
+    private Long categorie;
+    private Integer level;
+    private MatchEntity match;
+    private TreeEntity left;
+    private TreeEntity right;
+    private TreeEntity associatedNode;
+
+    public static TreeEntity fromModel(TreeModel model) {
+        if (model == null)
+            return null;
+
+        return new TreeEntity(model.getId(), model.getCategory(), model.getLevel(), MatchEntity.fromModel(model.getMatch()), fromModel(model.getLeft()),
+                fromModel(model.getRight()), null);
+    }
+
+    public TreeEntity getMatchNode(Long matchId) {
+        if (this.match != null && this.match.getId() == matchId) {
+            return this;
+        } else {
+            if (this.left != null) {
+                TreeEntity left = this.left.getMatchNode(matchId);
+                if (left != null) {
+                    return left;
+                }
+            }
+            if (this.right != null) {
+                TreeEntity right = this.right.getMatchNode(matchId);
+                if (right != null) {
+                    return right;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static TreeEntity getParent(TreeEntity current, TreeEntity target) {
+        if (current == null) {
+            return null;
+        } else if (current.equals(target)) {
+            return null;
+        } else if (target.equals(current.left) || target.equals(current.right)) {
+            return current;
+        } else {
+            TreeEntity left = getParent(current.left, target);
+            if (left != null)
+                return left;
+            return getParent(current.right, target);
+        }
+    }
+
+    public static void setAssociated(TreeEntity current, TreeEntity next) {
+        if (current == null || next == null) {
+            return;
+        }
+        current.setAssociatedNode(next);
+        setAssociated(current.getLeft(), next.getLeft());
+        setAssociated(current.getRight(), next.getRight());
+    }
+}

src/main/java/fr/titionfire/ffsaf/domain/service/AffiliationService.java

@@ -64,6 +64,9 @@ public class AffiliationService {
     @Inject
     LoggerService ls;
 
+    @Inject
+    VirusScannerService scanner;
+
     @RestClient
     StateIdService stateIdService;
 
@@ -76,6 +79,9 @@ public class AffiliationService {
     @ConfigProperty(name = "notif.affRequest.mail")
     List<String> mails;
 
+    @Inject
+    TradService trad;
+
     public Uni<List<AffiliationRequestModel>> getAllReq() {
         return repositoryRequest.listAll();
     }
@@ -89,7 +95,7 @@ public class AffiliationService {
         return Uni.createFrom().item(affModel)
                 .invoke(Unchecked.consumer(model -> {
                     if (model.getSaison() != currentSaison && model.getSaison() != currentSaison + 1) {
-                        throw new DBadRequestException("Saison non valid");
+                        throw new DBadRequestException(trad.t("saison.non.valid"));
                     }
                 }))
                 .chain(() -> ((affModel.getState_id().charAt(0) == 'W') ? stateIdService.get_rna(
@@ -107,7 +113,7 @@ public class AffiliationService {
                                         out, affModel.getSaison()))
                                 .onItem().invoke(Unchecked.consumer(count -> {
                                     if (count != 0 && unique) {
-                                        throw new DBadRequestException("Demande d'affiliation déjà existante");
+                                        throw new DBadRequestException(trad.t("demande.d.affiliation.deja.existante"));
                                     }
                                 }))
                 )
@@ -115,28 +121,28 @@ public class AffiliationService {
                         repository.count("club = ?1 and saison = ?2", club, affModel.getSaison())))
                 .onItem().invoke(Unchecked.consumer(count -> {
                     if (count != 0) {
-                        throw new DBadRequestException("Affiliation déjà existante");
+                        throw new DBadRequestException(trad.t("affiliation.deja.existante"));
                     }
                 }))
                 .map(o -> affModel)
                 .call(model -> ((model.getM1_lincence() != -1) ? combRepository.find("licence",
                                 model.getM1_lincence()).count().invoke(Unchecked.consumer(count -> {
                             if (count == 0) {
-                                throw new DBadRequestException("Licence membre n°1 inconnue");
+                                throw new DBadRequestException(trad.t("licence.membre.n.1.inconnue"));
                             }
                         })) : Uni.createFrom().nullItem())
                 )
                 .call(model -> ((model.getM2_lincence() != -1) ? combRepository.find("licence",
                                 model.getM2_lincence()).count().invoke(Unchecked.consumer(count -> {
                             if (count == 0) {
-                                throw new DBadRequestException("Licence membre n°2 inconnue");
+                                throw new DBadRequestException(trad.t("licence.membre.n.2.inconnue"));
                             }
                         })) : Uni.createFrom().nullItem())
                 )
                 .call(model -> ((model.getM3_lincence() != -1) ? combRepository.find("licence",
                                 model.getM3_lincence()).count().invoke(Unchecked.consumer(count -> {
                             if (count == 0) {
-                                throw new DBadRequestException("Licence membre n°3 inconnue");
+                                throw new DBadRequestException(trad.t("licence.membre.n.3.inconnue"));
                             }
                         })) : Uni.createFrom().nullItem())
                 );
@@ -145,7 +151,7 @@ public class AffiliationService {
     public Uni<?> saveEdit(AffiliationRequestForm form) {
         return pre_save(form, false)
                 .chain(model -> repositoryRequest.findById(form.getId())
-                        .onItem().ifNull().failWith(new DNotFoundException("Demande d'affiliation non trouvé"))
+                        .onItem().ifNull().failWith(new DNotFoundException(trad.t("demande.d.affiliation.non.trouve")))
                         .chain(origine -> {
                             origine.setName(model.getName());
                             origine.setAddress(model.getAddress());
@@ -174,15 +180,12 @@ public class AffiliationService {
         LOGGER.debug("Affiliation Request Created");
         LOGGER.debug(form.toString());
 
-        // noinspection ResultOfMethodCallIgnored,ReactiveStreamsUnusedPublisher
+        // noinspection ReactiveStreamsUnusedPublisher
         return pre_save(form, true)
                 .chain(model -> Panache.withTransaction(() -> repositoryRequest.persist(model)))
                 .onItem()
-                .invoke(model -> Uni.createFrom().future(Utils.replacePhoto(model.getId(), form.getLogo(), media,
+                .invoke(m -> Utils.uploadFile(scanner, form.getLogo(), m.getId(), media, "aff_request/logo"))
-                        "aff_request/logo")))
+                .invoke(m -> Utils.uploadFile(scanner, form.getStatus(), m.getId(), media, "aff_request/status"))
-                .onItem()
-                .invoke(model -> Uni.createFrom().future(Utils.replacePhoto(model.getId(), form.getStatus(), media,
-                        "aff_request/status")))
                 .call(model -> reactiveMailer.send(
                         Mail.withText("no-reply@ffsaf.fr",
                                         "[NOTIF] FFSAF - Nouvelle demande d'affiliation",
@@ -201,7 +204,7 @@ public class AffiliationService {
         LOGGER.debug(form.toString());
 
         return repositoryRequest.findById(form.getId())
-                .onItem().ifNull().failWith(new DNotFoundException("Demande d'affiliation non trouvé"))
+                .onItem().ifNull().failWith(new DNotFoundException(trad.t("demande.d.affiliation.non.trouve")))
                 .map(model -> {
                     model.setName(form.getName());
                     model.setState_id(form.getState_id());
@@ -245,11 +248,8 @@ public class AffiliationService {
                 })
                 .chain(model -> Panache.withTransaction(() -> repositoryRequest.persist(model)))
                 .onItem()
-                .invoke(model -> Uni.createFrom().future(Utils.replacePhoto(model.getId(), form.getLogo(), media,
+                .invoke(m -> Utils.uploadFile(scanner, form.getLogo(), m.getId(), media, "aff_request/logo"))
-                        "aff_request/logo")))
+                .invoke(m -> Utils.uploadFile(scanner, form.getStatus(), m.getId(), media, "aff_request/status"))
-                .onItem()
-                .invoke(model -> Uni.createFrom().future(Utils.replacePhoto(model.getId(), form.getStatus(), media,
-                        "aff_request/status")))
                 .map(__ -> "Ok");
     }
 
@@ -309,7 +309,7 @@ public class AffiliationService {
         LOGGER.debug(form.toString());
 
         return repositoryRequest.findById(form.getId())
-                .onItem().ifNull().failWith(new DNotFoundException("Demande d'affiliation non trouvé"))
+                .onItem().ifNull().failWith(new DNotFoundException(trad.t("demande.d.affiliation.non.trouve")))
                 .chain(req ->
                         clubRepository.find("StateId = ?1", form.getState_id()).firstResult()
                                 .chain(model -> (model == null) ? acceptNew(form, req) : acceptOld(form, req, model))
@@ -319,13 +319,11 @@ public class AffiliationService {
                                                 .recoverWithNull()
                                                 .call(___ -> setMembre(form.new Member(3), club, req.getSaison()))))
                                 .onItem()
-                                .invoke(model -> Uni.createFrom()
+                                .invoke(model -> Utils.uploadFile(scanner, form.getLogo(), form.getId(), media,
-                                        .future(Utils.replacePhoto(form.getId(), form.getLogo(), media,
+                                        "aff_request/logo"))
-                                                "aff_request/logo")))
+                                .invoke(model -> Utils.uploadFile(scanner, form.getStatus(), form.getId(), media,
+                                        "aff_request/status"))
                                 .onItem()
-                                .invoke(model -> Uni.createFrom()
-                                        .future(Utils.replacePhoto(form.getId(), form.getStatus(), media,
-                                                "aff_request/status")))
                                 .call(model -> Utils.moveMedia(form.getId(), model.getId(), media, "aff_request/logo",
                                         "ppClub"))
                                 .call(model -> Utils.moveMedia(form.getId(), model.getId(), media, "aff_request/status",
@@ -355,10 +353,16 @@ public class AffiliationService {
                             .map(c -> club));
                 })
                 .call(club -> reactiveMailer.send(
-                        Mail.withText(form.getM1_email(),
+                        Mail.withHtml(form.getM1_email(), "FFSAF - Creation de votre compte sur l'intranet",
-                                        "FFSAF - Acceptation de votre demande d'affiliation",
+                                        String.format(Utils.HTML_HEADER, "FFSAF - Creation de votre compte sur l'intranet") +
-                                        String.format(
+                                                String.format("""
-                                                """
+                                                                <p>Votre demande d'affiliation pour le club <span class="highlight">%s</span> a été acceptée.</p>
+                                                                <p>LLe numéro d'affiliation de votre club est le <span class="highlight">%d</span>.</p>
+                                                                """,
+                                                        club.getName(), club.getNo_affiliation()) +
+                                                Utils.HTML_FOOTER
+                                )
+                                .setText(String.format("""
                                         Bonjour,
                                         
                                         Votre demande d'affiliation pour le club %s a été acceptée.
@@ -366,8 +370,8 @@ public class AffiliationService {
                                         
                                         Cordialement,
                                         L'équipe de la FFSAF
-                                                        """, club.getName(), club.getNo_affiliation())
+                                        """, club.getName(), club.getNo_affiliation()))
-                                ).setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("contact@ffsaf.fr")
+                                .setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("contact@ffsaf.fr")
                                 .addTo(form.getM2_email(), form.getM3_email())
                 ));
     }
@@ -397,7 +401,7 @@ public class AffiliationService {
 
     public Uni<SimpleReqAffiliation> getRequest(long id) {
         return repositoryRequest.findById(id).map(SimpleReqAffiliation::fromModel)
-                .onItem().ifNull().failWith(new DNotFoundException("Demande d'affiliation non trouvé"))
+                .onItem().ifNull().failWith(new DNotFoundException(trad.t("demande.d.affiliation.non.trouve")))
                 .call(out -> clubRepository.find("StateId = ?1", out.getStateId()).firstResult().invoke(c -> {
                             if (c != null) {
                                 out.setClub(c.getId());
@@ -421,7 +425,7 @@ public class AffiliationService {
 
     public Uni<List<SimpleAffiliation>> getAffiliation(long id) {
         return clubRepository.findById(id)
-                .onItem().ifNull().failWith(new DNotFoundException("Club non trouvé"))
+                .onItem().ifNull().failWith(new DNotFoundException(trad.t("club.non.trouve")))
                 .call(model -> Mutiny.fetch(model.getAffiliations()))
                 .chain(model -> repositoryRequest.list("state_id = ?1", model.getStateId())
                         .map(reqs -> reqs.stream().map(req ->
@@ -433,11 +437,11 @@ public class AffiliationService {
 
     public Uni<SimpleAffiliation> setAffiliation(long id, int saison) {
         return clubRepository.findById(id)
-                .onItem().ifNull().failWith(new DNotFoundException("Club non trouvé"))
+                .onItem().ifNull().failWith(new DNotFoundException(trad.t("club.non.trouve")))
                 .call(model -> Mutiny.fetch(model.getAffiliations()))
                 .invoke(Unchecked.consumer(club -> {
                     if (club.getAffiliations().stream().anyMatch(affiliation -> affiliation.getSaison() == saison)) {
-                        throw new DBadRequestException("Affiliation déjà existante");
+                        throw new DBadRequestException(trad.t("affiliation.deja.existante"));
                     }
                 }))
                 .chain(club ->
@@ -458,10 +462,16 @@ public class AffiliationService {
     public Uni<?> deleteReqAffiliation(long id, String reason, boolean federationAdmin) {
         return repositoryRequest.findById(id)
                 .call(aff -> federationAdmin ? reactiveMailer.send(
-                        Mail.withText(aff.getM1_email(),
+                        Mail.withHtml(aff.getM1_email(), "FFSAF - Votre demande d'affiliation a été rejetée.",
-                                        "FFSAF - Votre demande d'affiliation a été rejetée.",
+                                        String.format(Utils.HTML_HEADER, "FFSAF - Votre demande d'affiliation a été rejetée.") +
-                                        String.format(
+                                                String.format("""
-                                                """
+                                                                <p>Votre demande d'affiliation pour le club %s a été rejetée pour la/les raison(s) suivante(s):<br/>%s</p>
+                                                                <p>Si vous rencontrez un problème ou si vous avez des questions, n'hésitez pas à nous contacter à l'adresse <a href="mailto:contact@ffsaf.fr">contact@ffsaf.fr</a>.</p>
+                                                                """,
+                                                        aff.getName(), reason) +
+                                                Utils.HTML_FOOTER
+                                )
+                                .setText(String.format("""
                                         Bonjour,
                                         
                                         Votre demande d'affiliation pour le club %s a été rejetée pour la/les raison(s) suivante(s):
@@ -471,8 +481,8 @@ public class AffiliationService {
                                         
                                         Cordialement,
                                         L'équipe de la FFSAF
-                                                        """, aff.getName(), reason)
+                                        """, aff.getName(), reason))
-                                ).setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("contact@ffsaf.fr")
+                                .setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("contact@ffsaf.fr")
                                 .addTo(aff.getM2_email(), aff.getM3_email())
                 ) : Uni.createFrom().nullItem())
                 .chain(aff -> Panache.withTransaction(() -> repositoryRequest.delete(aff)))

src/main/java/fr/titionfire/ffsaf/domain/service/CardService.java

@@ -0,0 +1,227 @@
+package fr.titionfire.ffsaf.domain.service;
+
+import fr.titionfire.ffsaf.data.model.CardModel;
+import fr.titionfire.ffsaf.data.model.ClubCardModel;
+import fr.titionfire.ffsaf.data.model.CompetitionModel;
+import fr.titionfire.ffsaf.data.model.MatchModel;
+import fr.titionfire.ffsaf.data.repository.*;
+import fr.titionfire.ffsaf.rest.exception.DBadRequestException;
+import fr.titionfire.ffsaf.ws.recv.RCard;
+import io.quarkus.hibernate.reactive.panache.Panache;
+import io.quarkus.hibernate.reactive.panache.common.WithSession;
+import io.quarkus.panache.common.Sort;
+import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+@WithSession
+@ApplicationScoped
+public class CardService {
+    @Inject
+    CardRepository cardRepository;
+
+    @Inject
+    ClubCardRepository clubCardRepository;
+
+    @Inject
+    RegisterRepository registerRepository;
+
+    @Inject
+    CompetitionGuestRepository competitionGuestRepository;
+
+    @Inject
+    MatchRepository matchRepository;
+
+    @Inject
+    TradService trad;
+
+    private static final List<CardModel.CardType> COMPETITION_LEVEL_CARDS = List.of(
+            CardModel.CardType.YELLOW,
+            CardModel.CardType.RED,
+            CardModel.CardType.BLACK
+    );
+
+    private List<Long> extractCombIds(MatchModel match) {
+        List<Long> ids = new ArrayList<>();
+        if (match.getC1_id() != null)
+            ids.add(match.getC1_id().getId());
+        if (match.getC2_id() != null)
+            ids.add(match.getC2_id().getId());
+        if (match.getC1_guest() != null)
+            ids.add(match.getC1_guest().getId() * -1);
+        if (match.getC2_guest() != null)
+            ids.add(match.getC2_guest().getId() * -1);
+        return ids;
+    }
+
+    public Uni<List<CardModel>> getForMatch(MatchModel match) {
+        return cardRepository.list(
+                "competition = ?1 AND (type IN ?2 OR (type = CardType.BLUE AND category = ?4)) AND comb IN ?3",
+                match.getCategory().getCompet(), COMPETITION_LEVEL_CARDS,
+                extractCombIds(match), match.getCategory().getId());
+    }
+
+    public Uni<List<CardModel>> getAll(CompetitionModel competition) {
+        return cardRepository.list("competition = ?1", competition);
+    }
+
+    public Uni<RCard.SendCardAdd> checkCanBeAdded(RCard.SendCardAdd card, MatchModel matchModel) {
+        return cardRepository.find("competition = ?1 AND comb = ?2",
+                        Sort.descending("type"),
+                        matchModel.getCategory().getCompet(), card.combId())
+                .firstResult()
+                .map(card_ -> {
+                    if (card.type() == CardModel.CardType.BLUE) {
+                        return card_ == null || (card_.getType() == CardModel.CardType.BLUE
+                                && !Objects.equals(card_.getCategory(), matchModel.getCategory().getId()));
+                    }
+                    if (card.type() == CardModel.CardType.BLACK) {
+                        return card_ != null && card_.getType() == CardModel.CardType.RED;
+                    }
+
+                    return card_ == null || card_.getType().ordinal() < card.type().ordinal();
+                })
+                .chain(b -> {
+                    if (b)
+                        return Uni.createFrom().item(card);
+                    else
+                        return Uni.createFrom().failure(new DBadRequestException(trad.t("card.cannot.be.added")));
+                });
+    }
+
+    public Uni<List<CardModel>> addTeamCartToNewComb(Long combId, String teamUuid, String teamName,
+                                                     CompetitionModel competition) {
+        return clubCardRepository.list("competition = ?1 AND (teamUuid = ?2 OR teamName = ?3)",
+                        Sort.ascending("type"), competition.getId(), teamUuid, teamName)
+                .chain(clubCards -> {
+                    Uni<?> queue = Uni.createFrom().voidItem();
+                    List<CardModel> addCards = new ArrayList<>();
+                    for (ClubCardModel clubCard : clubCards) {
+                        CardModel model = new CardModel();
+                        model.setCompetition(competition);
+                        model.setCompetitionId(competition.getId());
+                        model.setComb(combId);
+                        model.setTeamCard(true);
+                        model.setType(clubCard.getType());
+                        model.setDate(clubCard.getDate());
+
+                        queue = queue.call(__ -> Panache.withTransaction(() -> cardRepository.persist(model))
+                                .invoke(addCards::add)
+                                .call(() -> {
+                                    clubCard.getCardIds().add(model.getId());
+                                    return Panache.withTransaction(() -> clubCardRepository.persist(clubCard));
+                                }));
+                    }
+                    return queue.replaceWith(addCards);
+                });
+    }
+
+    public Uni<Void> rmTeamCardFromComb(Long combId, String uuid) {
+        return cardRepository.delete("comb = ?1 AND competition.uuid = ?2 AND teamCard = True", combId, uuid)
+                .replaceWithVoid();
+    }
+
+    public Uni<List<CardModel>> addTeamCard(CompetitionModel competition, String teamUuid, String teamName,
+                                            CardModel.CardType type, String reason) {
+        return clubCardRepository.find("competition = ?1 AND (teamUuid = ?2 OR teamName = ?3)",
+                        Sort.descending("type"), competition.getId(), teamUuid, teamName)
+                .firstResult()
+                .map(card_ -> {
+                    if (type == CardModel.CardType.BLACK) {
+                        return card_ != null && card_.getType() == CardModel.CardType.RED;
+                    }
+
+                    return card_ == null || card_.getType().ordinal() < type.ordinal();
+                })
+                .chain(b -> {
+                    if (!b)
+                        return Uni.createFrom().failure(new DBadRequestException(trad.t("card.cannot.be.added")));
+
+                    if (teamUuid != null) {
+                        return registerRepository.list("competition = ?1 AND club.clubId = ?2", competition, teamUuid)
+                                .map(l -> l.stream().map(r -> r.getMembre().getId()).toList());
+                    } else {
+                        return competitionGuestRepository.list("competition = ?1 AND club = ?2", competition,
+                                        teamName)
+                                .map(l -> l.stream().map(r -> r.getId() * -1).toList());
+                    }
+                })
+                .chain(combIds -> cardRepository.list("competition = ?1 AND comb IN ?2", competition, combIds)
+                        .map(cards -> {
+                            List<CardModel> newCards = new ArrayList<>();
+                            for (Long id : combIds) {
+                                Optional<CardModel> optional = cards.stream()
+                                        .filter(c -> id.equals(c.getComb()) && c.getType() == type).findAny();
+
+                                CardModel model = new CardModel();
+                                model.setCompetition(competition);
+                                model.setCompetitionId(competition.getId());
+                                model.setComb(id);
+                                model.setTeamCard(true);
+
+                                if (optional.isEmpty()) {
+                                    model.setType(type);
+                                } else {
+                                    model.setType(
+                                            CardModel.CardType.values()[Math.min(optional.get().getType().ordinal() + 1,
+                                                    CardModel.CardType.BLACK.ordinal())]);
+                                }
+                                newCards.add(model);
+                            }
+                            return newCards;
+                        })
+                )
+                .call(newCards -> Panache.withTransaction(() -> cardRepository.persist(newCards)))
+                .call(newCards -> {
+                    ClubCardModel model = new ClubCardModel();
+                    model.setCompetition(competition.getId());
+                    model.setTeamUuid(teamUuid);
+                    model.setTeamName(teamName);
+                    model.setType(type);
+                    model.setReason(reason);
+                    model.setCardIds(newCards.stream().map(CardModel::getId).toList());
+
+                    return Panache.withTransaction(() -> clubCardRepository.persist(model));
+                });
+    }
+
+    public Uni<List<CardModel>> recvReturnState(CompetitionModel competition, RCard.SendTeamCardReturnState state) {
+        return clubCardRepository.find("competition = ?1 AND (teamUuid = ?2 OR teamName = ?3) AND type = ?4",
+                        competition.getId(), state.teamUuid(), state.teamName(), state.type())
+                .firstResult()
+                .chain(o -> cardRepository.list("id IN ?1", o.getCardIds()))
+                .call(cards -> matchRepository.list("category.compet = ?1 AND category.id IN ?2", competition,
+                                state.selectedCategory())
+                        .invoke(matches -> {
+                            for (CardModel card : cards) {
+                                for (MatchModel m : matches.stream()
+                                        .filter(m -> extractCombIds(m).contains(card.getComb())).toList()) {
+
+                                    if (state.state() == 1) {
+                                        card.setCategory(m.getCategory().getId());
+                                    } else if (state.state() == 2) {
+                                        card.setCategory(m.getCategory().getId());
+                                        if (Objects.equals(m.getId(), state.selectedMatch()))
+                                            card.setMatch(m.getId());
+                                    }
+                                }
+                            }
+                        })
+                        .chain(() -> Panache.withTransaction(() -> cardRepository.persist(cards))));
+    }
+
+    public Uni<List<Long>> rmTeamCard(CompetitionModel competition, String teamUuid, String teamName,
+                                      CardModel.CardType type) {
+        return clubCardRepository.find("competition = ?1 AND (teamUuid = ?2 OR teamName = ?3) AND type = ?4",
+                        competition.getId(), teamUuid, teamName, type)
+                .firstResult()
+                .chain(card -> Uni.createFrom().item(card.getCardIds())
+                        .call(() -> Panache.withTransaction(() -> cardRepository.delete("id IN ?1", card.getCardIds())))
+                        .call(() -> Panache.withTransaction(() -> clubCardRepository.delete(card))));
+    }
+}

src/main/java/fr/titionfire/ffsaf/domain/service/CategoryService.java

@@ -1,9 +1,6 @@
 package fr.titionfire.ffsaf.domain.service;
 
-import fr.titionfire.ffsaf.data.model.MatchModel;
+import fr.titionfire.ffsaf.data.model.*;
-import fr.titionfire.ffsaf.data.model.MembreModel;
-import fr.titionfire.ffsaf.data.model.CategoryModel;
-import fr.titionfire.ffsaf.data.model.TreeModel;
 import fr.titionfire.ffsaf.data.repository.*;
 import fr.titionfire.ffsaf.rest.data.CategoryData;
 import fr.titionfire.ffsaf.rest.data.CategoryFullData;
@@ -45,10 +42,16 @@ public class CategoryService {
     @Inject
     CompetPermService permService;
 
+    @Inject
+    CompetitionGuestRepository competitionGuestRepository;
+
+    @Inject
+    TradService trad;
+
     public Uni<CategoryData> getByIdAdmin(SecurityCtx securityCtx, CompetitionSystem system, Long id) {
         return repository.find("systemId = ?1 AND system = ?2", id, system)
                 .firstResult()
-                .onItem().ifNull().failWith(() -> new RuntimeException("Poule not found"))
+                .onItem().ifNull().failWith(() -> new RuntimeException(trad.t("categorie.non.trouver")))
                 .call(data -> permService.hasAdminViewPerm(securityCtx, data.getCompet()))
                 .map(CategoryData::fromModel);
     }
@@ -64,7 +67,7 @@ public class CategoryService {
                 .chain(o -> {
                     if (o == null) {
                         return competRepository.findById(data.getCompet())
-                                .onItem().ifNull().failWith(() -> new RuntimeException("Competition not found"))
+                                .onItem().ifNull().failWith(() -> new RuntimeException(trad.t("competition.not.found")))
                                 .call(o2 -> permService.hasEditPerm(securityCtx, o2))
                                 .chain(competitionModel -> {
                                     CategoryModel model = new CategoryModel();
@@ -139,7 +142,7 @@ public class CategoryService {
                 .onItem().ifNotNull().call(o2 -> permService.hasEditPerm(securityCtx, o2.getCompet()))
                 .onItem().ifNull().switchTo(
                         () -> competRepository.findById(data.getCompet())
-                                .onItem().ifNull().failWith(() -> new RuntimeException("Compet not found"))
+                                .onItem().ifNull().failWith(() -> new RuntimeException(trad.t("competition.not.found")))
                                 .call(o -> permService.hasEditPerm(securityCtx, o))
                                 .map(o -> {
                                     CategoryModel model = new CategoryModel();
@@ -171,6 +174,15 @@ public class CategoryService {
                                         .invoke(o2 -> o2.forEach(m -> o.membres.put(m.getId(), m)))
                                 )
                 )
+                .call(o -> Mutiny.fetch(o.category.getCompet().getGuests())
+                        .invoke(o2 -> o2.forEach(m -> o.guest.put(m.getFname() + " " + m.getLname(), m)))
+                        .map(o2 -> data.getMatches().stream().flatMap(m -> Stream.of(m.getC1_str(), m.getC2_str())
+                                .filter(Objects::nonNull)).distinct().filter(s -> !o.guest.containsKey(s)).map(
+                                CompetitionGuestModel::new).toList())
+                        .call(o3 -> o3.isEmpty() ? Uni.createFrom().nullItem() :
+                                Uni.join().all(o3.stream().map(o4 -> competitionGuestRepository.persist(o4)).toList())
+                                        .andFailFast())
+                        .invoke(o2 -> o2.forEach(m -> o.guest.put(m.getFname() + " " + m.getLname(), m))))
                 .invoke(in -> {
                     ArrayList<TreeModel> node = new ArrayList<>();
                     for (TreeModel treeModel : in.category.getTree())
@@ -214,8 +226,8 @@ public class CategoryService {
                                             }
                                             mm.setCategory(in.category);
                                             mm.setCategory_ord(m.getCategory_ord());
-                                            mm.setC1_str(m.getC1_str());
+                                            mm.setC1_guest(in.guest.getOrDefault(m.getC1_str(), null));
-                                            mm.setC2_str(m.getC2_str());
+                                            mm.setC2_guest(in.guest.getOrDefault(m.getC2_str(), null));
                                             mm.setC1_id(in.membres.getOrDefault(m.getC1_id(), null));
                                             mm.setC2_id(in.membres.getOrDefault(m.getC2_id(), null));
                                             mm.setEnd(m.isEnd());
@@ -238,6 +250,7 @@ public class CategoryService {
     private static class WorkData {
         CategoryModel category;
         HashMap<Long, MembreModel> membres = new HashMap<>();
+        HashMap<String, CompetitionGuestModel> guest = new HashMap<>();
         List<MatchModel> match = new ArrayList<>();
         List<Long> toRmMatch;
         List<TreeModel> unlinkNode;
@@ -246,7 +259,7 @@ public class CategoryService {
 
     public Uni<?> delete(SecurityCtx securityCtx, CompetitionSystem system, Long id) {
         return repository.find("systemId = ?1 AND system = ?2", id, system).firstResult()
-                .onItem().ifNull().failWith(() -> new RuntimeException("Poule not found"))
+                .onItem().ifNull().failWith(() -> new RuntimeException(trad.t("categorie.non.trouver")))
                 .call(o -> permService.hasEditPerm(securityCtx, o.getCompet()))
                 .call(o -> Mutiny.fetch(o.getTree())
                         .call(o2 -> o2.isEmpty() ? Uni.createFrom().nullItem() :
@@ -260,7 +273,7 @@ public class CategoryService {
                                                 Panache.withTransaction(() -> treeRepository.delete("id IN ?1", in)))
                         )
                 )
-                .call(o -> matchRepository.delete("poule.id = ?1", o.getId()))
+                .call(o -> matchRepository.delete("category.id = ?1", o.getId()))
                 .chain(model -> Panache.withTransaction(() -> repository.delete("id", model.getId())));
     }
 }

src/main/java/fr/titionfire/ffsaf/domain/service/CheckoutService.java

@@ -58,7 +58,7 @@ public class CheckoutService {
     String organizationSlug;
 
     public Uni<Boolean> canDeleteLicence(long id) {
-        return repository.find("?1 IN licenseIds", id).count().map(count -> count == 0);
+        return repository.countByLicenseId(id).invoke(c -> System.out.println(c)).map(count -> count == 0);
     }
 
     public Uni<String> create(List<Long> ids, SecurityCtx securityCtx) {

src/main/java/fr/titionfire/ffsaf/domain/service/ClubService.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import fr.titionfire.ffsaf.data.model.AffiliationModel;
 import fr.titionfire.ffsaf.data.model.ClubModel;
 import fr.titionfire.ffsaf.data.model.MembreModel;
+import fr.titionfire.ffsaf.data.repository.AffiliationRepository;
 import fr.titionfire.ffsaf.data.repository.ClubRepository;
 import fr.titionfire.ffsaf.data.repository.CombRepository;
 import fr.titionfire.ffsaf.net2.ServerCustom;
@@ -44,6 +45,9 @@ public class ClubService {
     @Inject
     ClubRepository repository;
 
+    @Inject
+    AffiliationRepository affiliationRepository;
+
     @Inject
     ServerCustom serverCustom;
 
@@ -59,6 +63,9 @@ public class ClubService {
     @Inject
     LoggerService ls;
 
+    @Inject
+    TradService trad;
+
     public SimpleClubModel findByIdOptionalClub(long id) throws Throwable {
         return VertxContextSupport.subscribeAndAwait(
                 () -> Panache.withTransaction(() -> repository.findById(id).map(SimpleClubModel::fromModel)));
@@ -126,7 +133,7 @@ public class ClubService {
         return combRepository.find("userId = ?1", securityCtx.getSubject()).firstResult()
                 .invoke(Unchecked.consumer(m -> {
                     if (m == null || m.getClub() == null)
-                        throw new DNotFoundException("Club non trouvé");
+                        throw new DNotFoundException(trad.t("club.non.trouve"));
                 }))
                 .map(MembreModel::getClub)
                 .call(club -> Mutiny.fetch(club.getContact()));
@@ -146,7 +153,7 @@ public class ClubService {
         return combRepository.find("userId = ?1", securityCtx.getSubject()).firstResult()
                 .invoke(Unchecked.consumer(m -> {
                     if (m == null || m.getClub() == null)
-                        throw new DNotFoundException("Club non trouvé");
+                        throw new DNotFoundException(trad.t("club.non.trouve"));
                     if (!securityCtx.isInClubGroup(m.getClub().getId()))
                         throw new DForbiddenException();
                 }))
@@ -162,7 +169,7 @@ public class ClubService {
         return combRepository.find("userId = ?1", securityCtx.getSubject()).firstResult()
                 .invoke(Unchecked.consumer(m -> {
                     if (m == null || m.getClub() == null)
-                        throw new DNotFoundException("Club non trouvé");
+                        throw new DNotFoundException(trad.t("club.non.trouve"));
                     if (!securityCtx.isInClubGroup(m.getClub().getId()))
                         throw new DForbiddenException();
                 }))
@@ -179,7 +186,7 @@ public class ClubService {
                             ls.logUpdate("Contact(s)...", club);
                         club.setContact(MAPPER.readValue(form.getContact(), typeRef));
                     } catch (JsonProcessingException e) {
-                        throw new DBadRequestException("Erreur de format des contacts");
+                        throw new DBadRequestException(trad.t("erreur.de.format.des.contacts"));
                     }
 
                     ls.logChange("Lieux d'entrainements", club.getTraining_location(), form.getTraining_location(),
@@ -229,12 +236,13 @@ public class ClubService {
                                 ls.logUpdate("Contact(s)...", m);
                             m.setContact(MAPPER.readValue(input.getContact(), typeRef));
                         } catch (JsonProcessingException e) {
-                            throw new DBadRequestException("Erreur de format des contacts");
+                            throw new DBadRequestException(trad.t("erreur.de.format.des.contacts"));
                         }
                     }
                     return Panache.withTransaction(() -> repository.persist(m)).call(() -> ls.append());
                 }))
-                .call(clubModel -> nameChange.get() ? keycloakService.updateGroupFromClub(clubModel) // update group in keycloak
+                .call(clubModel -> nameChange.get() ? keycloakService.updateGroupFromClub(
+                        clubModel) // update group in keycloak
                         : Uni.createFrom().nullItem())
                 .invoke(membreModel -> SReqClub.sendIfNeed(serverCustom.clients,
                         SimpleClubModel.fromModel(membreModel)))
@@ -282,11 +290,13 @@ public class ClubService {
                             combModel.setClub(null);
                             combModel.setRole(RoleAsso.MEMBRE);
                         }).toList())
-                        .call(list -> (list.isEmpty()) ? Uni.createFrom().voidItem() :
+                        .call(list -> list.stream().noneMatch(m -> m.getUserId() != null) ?
+                                Uni.createFrom().voidItem() :
                                 Uni.join().all(list.stream().filter(m -> m.getUserId() != null)
                                                 .map(m -> keycloakService.clearUser(m.getUserId())).toList())
                                         .andCollectFailures())
-                        .chain(list -> Panache.withTransaction(() -> combRepository.persist(list)))
+                        .chain(list -> list.isEmpty() ? Uni.createFrom().voidItem() :
+                                Panache.withTransaction(() -> combRepository.persist(list)))
                         .map(o -> club)
                 )
                 .call(clubModel -> (clubModel.getClubId() == null) ? Uni.createFrom()
@@ -323,9 +333,11 @@ public class ClubService {
     }
 
     public Uni<List<ClubMapData>> getMapData() {
-        return repository.list("international", false).toMulti().flatMap(list -> Multi.createFrom().iterable(list))
+        return affiliationRepository.list("saison >= ?1 AND club.international = ?2", Utils.getSaison() - 1, false)
-                .call(clubModel -> Mutiny.fetch(clubModel.getContact()))
+                .toMulti().flatMap(list -> Multi.createFrom().iterable(list))
-                .map(clubModel -> {
+                .call(affiliationModel -> Mutiny.fetch(affiliationModel.getClub().getContact()))
+                .map(affiliationModel -> {
+                    ClubModel clubModel = affiliationModel.getClub();
                     ClubMapData data = new ClubMapData();
 
                     data.setName(clubModel.getName());

src/main/java/fr/titionfire/ffsaf/domain/service/CompetPermService.java

@@ -56,7 +56,7 @@ public class CompetPermService {
             CompletableFuture<SimpleCompet> f = new CompletableFuture<>();
             SReqCompet.getConfig(serverCustom.clients, id, f);
             try {
-                return f.get(1500, TimeUnit.MILLISECONDS);
+                return f.get(500, TimeUnit.MILLISECONDS);
             } catch (InterruptedException | ExecutionException | TimeoutException e) {
                 throw new RuntimeException(e);
             }
@@ -71,7 +71,8 @@ public class CompetPermService {
                                 .chain(competitionModels -> {
                                     CompletableFuture<HashMap<String, String>> f = new CompletableFuture<>();
                                     SReqCompet.getAllHaveAccess(serverCustom.clients, securityCtx.getSubject(), f);
-                                    return Uni.createFrom().future(f, Duration.ofMillis(1500))
+                                    return Uni.createFrom().future(f, Duration.ofMillis(500))
+                                            .onFailure().recoverWithItem(new HashMap<>())
                                             .map(map_ -> {
                                                 HashMap<Long, String> map = new HashMap<>();
                                                 map_.forEach((key, value) -> map.put(Long.parseLong(key), value));
@@ -89,7 +90,7 @@ public class CompetPermService {
                 .onFailure().call(throwable -> cacheAccess.invalidate(securityCtx.getSubject()));
 
         Uni<HashMap<Long, String>> none = cacheNoneAccess.getAsync(securityCtx.getSubject(),
-                k -> competitionRepository.list("system = ?1", CompetitionSystem.NONE)
+                k -> competitionRepository.list("system = ?1", CompetitionSystem.INTERNAL)
                         .map(competitionModels -> {
                             HashMap<Long, String> map = new HashMap<>();
                             for (CompetitionModel model : competitionModels) {
@@ -97,12 +98,14 @@ public class CompetPermService {
                                     map.putIfAbsent(model.getId(), "owner");
                                 else if (securityCtx.roleHas("federation_admin"))
                                     map.putIfAbsent(model.getId(), "admin");
-                                else if (securityCtx.isInClubGroup(model.getClub().getId()) && (securityCtx.roleHas(
+                                else if (securityCtx.isInClubGroup(
-                                        "club_president")
+                                        model.getClub().getId()) && (securityCtx.isClubAdmin()))
-                                        || securityCtx.roleHas("club_respo_intra") || securityCtx.roleHas(
-                                        "club_secretaire")
-                                        || securityCtx.roleHas("club_tresorier")))
                                     map.putIfAbsent(model.getId(), "admin");
+                                else if (model.getAdmin().contains(securityCtx.getSubject()))
+                                    map.putIfAbsent(model.getId(), "admin");
+                                else if (model.getTable().contains(securityCtx.getSubject()))
+                                    map.putIfAbsent(model.getId(), "table");
+
                             }
                             return map;
                         }));
@@ -181,12 +184,14 @@ public class CompetPermService {
                     if (o.getSystem() == CompetitionSystem.SAFCA)
                         return hasSafcaViewPerm(securityCtx, o.getId());
 
+                    if (o.getAdmin().contains(securityCtx.getSubject()))
+                        return Uni.createFrom().nullItem();
+
                     if (!securityCtx.isInClubGroup(o.getClub().getId())) // Only membre club pass here
                         throw new DForbiddenException();
 
-                    if (o.getSystem() == CompetitionSystem.NONE)
+                    if (o.getSystem() == CompetitionSystem.INTERNAL)
-                        if (securityCtx.roleHas("club_president") || securityCtx.roleHas("club_respo_intra")
+                        if (securityCtx.isClubAdmin())
-                                || securityCtx.roleHas("club_secretaire") || securityCtx.roleHas("club_tresorier"))
                             return Uni.createFrom().nullItem();
 
                     throw new DForbiddenException();
@@ -219,13 +224,58 @@ public class CompetPermService {
                     if (o.getSystem() == CompetitionSystem.SAFCA)
                         return hasSafcaEditPerm(securityCtx, o.getId());
 
-                    if (!securityCtx.isInClubGroup(o.getClub().getId())) // Only membre club pass here
+                    if (o.getSystem() == CompetitionSystem.INTERNAL) {
-                        throw new DForbiddenException();
+                        if (securityCtx.isInClubGroup(o.getClub().getId()) && securityCtx.isClubAdmin())
-
-                    if (o.getSystem() == CompetitionSystem.NONE)
-                        if (securityCtx.isClubAdmin())
                             return Uni.createFrom().nullItem();
 
+                        if (o.getAdmin().contains(securityCtx.getSubject()))
+                            return Uni.createFrom().nullItem();
+
+                        throw new DForbiddenException();
+                    }
+
+                    throw new DForbiddenException();
+                })
+        );
+    }
+
+    /**
+     * @return {@link fr.titionfire.ffsaf.data.model.CompetitionModel} if securityCtx has edit perm
+     */
+    public Uni<CompetitionModel> hasTablePerm(SecurityCtx securityCtx, CompetitionModel competitionModel) {
+        return hasTablePerm(securityCtx, Uni.createFrom().item(competitionModel));
+    }
+
+    /**
+     * @return {@link fr.titionfire.ffsaf.data.model.CompetitionModel} if securityCtx has edit perm
+     */
+    public Uni<CompetitionModel> hasTablePerm(SecurityCtx securityCtx, long id) {
+        return hasTablePerm(securityCtx, competitionRepository.findById(id));
+    }
+
+    /**
+     * @return {@link fr.titionfire.ffsaf.data.model.CompetitionModel} if securityCtx has edit perm
+     */
+    public Uni<CompetitionModel> hasTablePerm(SecurityCtx securityCtx, Uni<CompetitionModel> in) {
+        return in.call(Unchecked.function(o -> {
+                    if (securityCtx.getSubject().equals(o.getOwner()) || securityCtx.roleHas("federation_admin"))
+                        return Uni.createFrom().nullItem();
+
+                    if (o.getSystem() == CompetitionSystem.SAFCA)
+                        return hasSafcaTablePerm(securityCtx, o.getId());
+
+                    if (o.getSystem() == CompetitionSystem.INTERNAL) {
+                        if (securityCtx.isInClubGroup(o.getClub().getId()) && securityCtx.isClubAdmin())
+                            return Uni.createFrom().nullItem();
+
+                        if (o.getAdmin().contains(securityCtx.getSubject()))
+                            return Uni.createFrom().nullItem();
+                        if (o.getTable().contains(securityCtx.getSubject()))
+                            return Uni.createFrom().nullItem();
+
+                        throw new DForbiddenException();
+                    }
+
                     throw new DForbiddenException();
                 })
         );
@@ -236,8 +286,8 @@ public class CompetPermService {
                 Uni.createFrom().nullItem()
                 :
                 getSafcaConfig(id).chain(Unchecked.function(o -> {
-                    if (!o.admin().contains(UUID.fromString(securityCtx.getSubject())) && !o.table()
+                    if (!o.admin().contains(UUID.fromString(securityCtx.getSubject()))
-                            .contains(UUID.fromString(securityCtx.getSubject())))
+                            && !o.table().contains(UUID.fromString(securityCtx.getSubject())))
                         throw new DForbiddenException();
                     return Uni.createFrom().nullItem();
                 }));
@@ -253,4 +303,16 @@ public class CompetPermService {
                     return Uni.createFrom().nullItem();
                 }));
     }
+
+    private Uni<?> hasSafcaTablePerm(SecurityCtx securityCtx, long id) {
+        return securityCtx.roleHas("safca_super_admin") ?
+                Uni.createFrom().nullItem()
+                :
+                getSafcaConfig(id).chain(Unchecked.function(o -> {
+                    if (!o.admin().contains(UUID.fromString(securityCtx.getSubject()))
+                            && !o.table().contains(UUID.fromString(securityCtx.getSubject())))
+                        throw new DForbiddenException();
+                    return Uni.createFrom().nullItem();
+                }));
+    }
 }

src/main/java/fr/titionfire/ffsaf/domain/service/CompetitionService.java

@@ -1,25 +1,18 @@
 package fr.titionfire.ffsaf.domain.service;
 
-import fr.titionfire.ffsaf.data.model.CompetitionModel;
+import fr.titionfire.ffsaf.data.model.*;
-import fr.titionfire.ffsaf.data.model.HelloAssoRegisterModel;
-import fr.titionfire.ffsaf.data.model.MembreModel;
-import fr.titionfire.ffsaf.data.model.RegisterModel;
 import fr.titionfire.ffsaf.data.repository.*;
 import fr.titionfire.ffsaf.net2.ServerCustom;
 import fr.titionfire.ffsaf.net2.data.SimpleCompet;
 import fr.titionfire.ffsaf.net2.request.SReqCompet;
 import fr.titionfire.ffsaf.net2.request.SReqRegister;
 import fr.titionfire.ffsaf.rest.client.dto.NotificationData;
-import fr.titionfire.ffsaf.rest.data.CompetitionData;
+import fr.titionfire.ffsaf.rest.data.*;
-import fr.titionfire.ffsaf.rest.data.RegisterRequestData;
-import fr.titionfire.ffsaf.rest.data.SimpleCompetData;
-import fr.titionfire.ffsaf.rest.data.SimpleRegisterComb;
 import fr.titionfire.ffsaf.rest.exception.DBadRequestException;
 import fr.titionfire.ffsaf.rest.exception.DForbiddenException;
-import fr.titionfire.ffsaf.utils.CompetitionSystem;
+import fr.titionfire.ffsaf.rest.exception.DNotFoundException;
-import fr.titionfire.ffsaf.utils.RegisterMode;
+import fr.titionfire.ffsaf.utils.*;
-import fr.titionfire.ffsaf.utils.SecurityCtx;
+import fr.titionfire.ffsaf.ws.send.SRegister;
-import fr.titionfire.ffsaf.utils.Utils;
 import io.quarkus.cache.Cache;
 import io.quarkus.cache.CacheName;
 import io.quarkus.hibernate.reactive.panache.Panache;
@@ -64,6 +57,12 @@ public class CompetitionService {
     @Inject
     CombRepository combRepository;
 
+    @Inject
+    CompetitionGuestRepository competitionGuestRepository;
+
+    @Inject
+    CatPresetRepository catPresetRepository;
+
     @Inject
     ServerCustom serverCustom;
 
@@ -83,6 +82,9 @@ public class CompetitionService {
     @Inject
     Vertx vertx;
 
+    @Inject
+    SRegister sRegister;
+
     @Inject
     @CacheName("safca-config")
     Cache cache;
@@ -95,20 +97,29 @@ public class CompetitionService {
     @CacheName("have-access")
     Cache cacheNoneAccess;
 
+    @Inject
+    TradService trad;
+
     public Uni<CompetitionData> getById(SecurityCtx securityCtx, Long id) {
-        return permService.hasViewPerm(securityCtx, id).map(CompetitionData::fromModelLight);
+        return permService.hasViewPerm(securityCtx, id).map(cm -> {
+            CompetitionData out = CompetitionData.fromModelLight(cm);
+            if (cm.getAdmin() != null) {
+                out.setCanEditRegisters(cm.getAdmin().stream().anyMatch(u -> u.equals(securityCtx.getSubject())));
+            }
+            return out;
+        });
     }
 
     public Uni<CompetitionData> getByIdAdmin(SecurityCtx securityCtx, Long id) {
         if (id == 0) {
-            return Uni.createFrom()
+            return Uni.createFrom().item(new CompetitionData());
-                    .item(new CompetitionData(null, "", "", "", "", new Date(), new Date(),
-                            CompetitionSystem.NONE, RegisterMode.FREE, new Date(), new Date(), true,
-                            null, "", "", null, true, "", "", "", ""));
         }
         return permService.hasAdminViewPerm(securityCtx, id)
+                .call(competitionModel -> Mutiny.fetch(competitionModel.getCatPreset()))
                 .chain(competitionModel -> Mutiny.fetch(competitionModel.getInsc())
-                        .map(insc -> CompetitionData.fromModel(competitionModel).addInsc(insc)))
+                        .chain(insc -> Mutiny.fetch(competitionModel.getGuests())
+                                .map(guest -> CompetitionData.fromModel(competitionModel).addInsc(insc, guest)
+                                        .addPresets(competitionModel.getCatPreset()))))
                 .chain(data ->
                         vertx.getOrCreateContext().executeBlocking(() -> {
                             keycloakService.getUser(UUID.fromString(data.getOwner()))
@@ -126,6 +137,14 @@ public class CompetitionService {
                             out.addAll(cm.stream().map(CompetitionData::fromModelLight).toList());
                             out.forEach(competition -> competition.setCanEdit(true));
                         }))
+                .chain(ids -> repository.list("id NOT IN ?1 AND ?2 IN admin", ids, securityCtx.getSubject())
+                        .map(cm -> {
+                            out.addAll(cm.stream().map(CompetitionData::fromModelLight).toList());
+                            out.forEach(competition -> competition.setCanEditRegisters(true));
+                            List<Long> ids2 = new ArrayList<>(ids);
+                            ids2.addAll(cm.stream().map(CompetitionModel::getId).toList());
+                            return ids2;
+                        }))
                 .call(ids ->
                         repository.list("id NOT IN ?1 AND (publicVisible = TRUE OR registerMode IN ?2)", ids,
                                         securityCtx.isClubAdmin() ? List.of(RegisterMode.FREE, RegisterMode.HELLOASSO,
@@ -159,13 +178,22 @@ public class CompetitionService {
                 .map(pouleModels -> pouleModels.stream().map(CompetitionData::fromModel).toList());
     }
 
+    public Uni<List<CompetitionData>> getAllSystemTable(SecurityCtx securityCtx,
+                                                        CompetitionSystem system) {
+        return repository.list("system = ?1", system)
+                .chain(l -> Uni.join().all(l.stream().map(cm ->
+                        permService.hasTablePerm(securityCtx, cm).onFailure().recoverWithNull()
+                ).toList()).andCollectFailures())
+                .map(l -> l.stream().filter(Objects::nonNull).map(CompetitionData::fromModel).toList());
+    }
+
     public Uni<CompetitionData> addOrUpdate(SecurityCtx securityCtx, CompetitionData data) {
         if (data.getId() == null) {
             return combRepository.find("userId = ?1", securityCtx.getSubject()).firstResult()
                     .invoke(Unchecked.consumer(combModel -> {
                         if (!securityCtx.getRoles().contains("create_compet") && !securityCtx.getRoles()
                                 .contains("federation_admin"))
-                            throw new DForbiddenException("Vous ne pouvez pas créer de compétition");
+                            throw new DForbiddenException(trad.t("vous.ne.pouvez.pas.creer.de.competition"));
                     }))
                     .map(MembreModel::getClub)
                     .chain(clubModel -> {
@@ -175,19 +203,24 @@ public class CompetitionService {
                         model.setSystem(data.getSystem());
                         model.setClub(clubModel);
                         model.setInsc(new ArrayList<>());
+                        model.setGuests(new ArrayList<>());
                         model.setUuid(UUID.randomUUID().toString());
                         model.setOwner(securityCtx.getSubject());
+                        model.setCatPreset(new ArrayList<>());
 
                         copyData(data, model);
 
                         return Panache.withTransaction(() -> repository.persist(model));
-                    }).map(CompetitionData::fromModel)
+                    })
+                    .call(model -> syncPreset(data, model))
+                    .map(CompetitionData::fromModel)
                     .call(c -> (c.getSystem() == CompetitionSystem.SAFCA) ? cacheAccess.invalidate(
                             securityCtx.getSubject()) : Uni.createFrom().nullItem())
-                    .call(c -> (c.getSystem() == CompetitionSystem.NONE) ? cacheNoneAccess.invalidate(
+                    .call(c -> (c.getSystem() == CompetitionSystem.INTERNAL) ? cacheNoneAccess.invalidate(
                             securityCtx.getSubject()) : Uni.createFrom().nullItem());
         } else {
             return permService.hasEditPerm(securityCtx, data.getId())
+                    .call(model -> Mutiny.fetch(model.getCatPreset()))
                     .chain(model -> {
                         copyData(data, model);
 
@@ -195,7 +228,8 @@ public class CompetitionService {
                                         keycloakService.getUser(data.getOwner()).map(UserRepresentation::getId).orElse(null))
                                 .invoke(Unchecked.consumer(newOwner -> {
                                     if (newOwner == null)
-                                        throw new DBadRequestException("User " + data.getOwner() + " not found");
+                                        throw new DBadRequestException(
+                                                String.format(trad.t("user.not.found"), data.getOwner()));
                                     if (!newOwner.equals(model.getOwner())) {
                                         if (!securityCtx.roleHas("federation_admin")
                                                 && !securityCtx.roleHas("safca_super_admin")
@@ -205,14 +239,55 @@ public class CompetitionService {
                                     }
                                 }))
                                 .chain(__ -> Panache.withTransaction(() -> repository.persist(model)));
-                    }).map(CompetitionData::fromModel)
+                    })
+                    .call(model -> syncPreset(data, model))
+                    .map(model -> CompetitionData.fromModel(model).addPresets(model.getCatPreset()))
                     .call(c -> (c.getSystem() == CompetitionSystem.SAFCA) ? cacheAccess.invalidate(
                             securityCtx.getSubject()) : Uni.createFrom().nullItem())
-                    .call(c -> (c.getSystem() == CompetitionSystem.NONE) ? cacheNoneAccess.invalidate(
+                    .call(c -> (c.getSystem() == CompetitionSystem.INTERNAL) ? cacheNoneAccess.invalidate(
                             securityCtx.getSubject()) : Uni.createFrom().nullItem());
         }
     }
 
+    private Uni<?> syncPreset(CompetitionData data, CompetitionModel model) {
+        List<Long> toRemoveId = model.getCatPreset().stream()
+                .map(CatPresetModel::getId)
+                .filter(id -> data.getPresets().stream().noneMatch(preset -> Objects.equals(preset.getId(), id)))
+                .toList();
+
+        for (PresetData preset : data.getPresets()) {
+            CatPresetModel presetModel;
+            if (preset.getId() != null && preset.getId() > 0) {
+                presetModel = model.getCatPreset().stream()
+                        .filter(p -> p.getId().equals(preset.getId()))
+                        .findFirst()
+                        .orElse(new CatPresetModel());
+            } else {
+                presetModel = new CatPresetModel();
+                model.getCatPreset().add(presetModel);
+            }
+
+            presetModel.setCompetition(model);
+            presetModel.setName(preset.getName());
+            presetModel.setSwordType(preset.getSword());
+            presetModel.setShieldType(preset.getShield());
+            presetModel.setCategories(preset.getCategories());
+            presetModel.setMandatoryProtection1(preset.getMandatoryProtection1());
+            presetModel.setMandatoryProtection2(preset.getMandatoryProtection2());
+        }
+
+        // Remove deleted presets
+        model.getCatPreset().removeIf(presetModel -> toRemoveId.contains(presetModel.getId()));
+
+        return Panache.withTransaction(() -> repository.persist(model)
+                .call(__ -> {
+                    if (!toRemoveId.isEmpty()) {
+                        return catPresetRepository.delete("id IN ?1", toRemoveId);
+                    }
+                    return Uni.createFrom().nullItem();
+                }));
+    }
+
     private void copyData(CompetitionData data, CompetitionModel model) {
         if (model.getBanMembre() == null)
             model.setBanMembre(new ArrayList<>());
@@ -226,6 +301,7 @@ public class CompetitionService {
         model.setStartRegister(data.getStartRegister());
         model.setEndRegister(data.getEndRegister());
         model.setRegisterMode(data.getRegisterMode());
+        model.setRequiredWeight(data.getRequiredWeight());
         model.setData1(data.getData1());
         model.setData2(data.getData2());
         model.setData3(data.getData3());
@@ -235,11 +311,25 @@ public class CompetitionService {
     public Uni<List<SimpleRegisterComb>> getRegister(SecurityCtx securityCtx, Long id, String source) {
         if ("admin".equals(source))
             return permService.hasEditPerm(securityCtx, id)
-                    .chain(c -> Mutiny.fetch(c.getInsc()))
+                    .chain(c -> {
+                        Uni<List<SimpleRegisterComb>> uni = Mutiny.fetch(c.getInsc())
                                 .onItem().transformToMulti(Multi.createFrom()::iterable)
                                 .onItem().call(combModel -> Mutiny.fetch(combModel.getMembre().getLicences()))
-                    .map(combModel -> SimpleRegisterComb.fromModel(combModel, combModel.getMembre().getLicences()))
+                                .onItem().call(combModel -> Mutiny.fetch(combModel.getCategoriesInscrites()))
+                                .map(cm -> SimpleRegisterComb.fromModel(cm, cm.getMembre().getLicences())
+                                        .setCategorieInscrite(cm.getCategoriesInscrites()))
                                 .collect().asList();
+                        return uni
+                                .call(l -> Mutiny.fetch(c.getGuests())
+                                        .onItem().transformToMulti(Multi.createFrom()::iterable)
+                                        .filter(g -> !g.isTeam())
+                                        .onItem().call(guest -> Mutiny.fetch(guest.getCategoriesInscrites()))
+                                        .map(guest -> SimpleRegisterComb.fromModel(guest)
+                                                .setCategorieInscrite(guest.getCategoriesInscrites()))
+                                        .collect().asList()
+                                        .invoke(l::addAll));
+                    });
+
         if ("club".equals(source))
             return Uni.createFrom().nullItem()
                     .invoke(Unchecked.consumer(__ -> {
@@ -251,28 +341,78 @@ public class CompetitionService {
                             model.getClub()))
                     .onItem().transformToMulti(Multi.createFrom()::iterable)
                     .onItem().call(combModel -> Mutiny.fetch(combModel.getMembre().getLicences()))
-                    .map(combModel -> SimpleRegisterComb.fromModel(combModel, combModel.getMembre().getLicences()))
+                    .onItem().call(combModel -> Mutiny.fetch(combModel.getCategoriesInscrites()))
+                    .map(combModel -> SimpleRegisterComb.fromModel(combModel, combModel.getMembre().getLicences())
+                            .setCategorieInscrite(combModel.getCategoriesInscrites()))
                     .collect().asList();
 
         return membreService.getByAccountId(securityCtx.getSubject())
                 .chain(model -> registerRepository.find("competition.id = ?1 AND membre = ?2", id, model).firstResult()
-                        .map(rm -> rm == null ? List.of() : List.of(SimpleRegisterComb.fromModel(rm, List.of()))));
+                        .call(rm -> rm == null ? Uni.createFrom().voidItem() :
+                                Mutiny.fetch(rm.getCategoriesInscrites()))
+                        .map(rm -> rm == null ? List.of() : List.of(SimpleRegisterComb.fromModel(rm, List.of())
+                                .setCategorieInscrite(rm.getCategoriesInscrites()))));
     }
 
     public Uni<SimpleRegisterComb> addRegisterComb(SecurityCtx securityCtx, Long id, RegisterRequestData data,
                                                    String source) {
         if ("admin".equals(source))
+            if (data.getLicence() == null || data.getLicence() != -1) { // not a guest
                 return permService.hasEditPerm(securityCtx, id)
                         .chain(c -> findComb(data.getLicence(), data.getFname(), data.getLname())
+                                .call(combModel -> Mutiny.fetch(combModel.getLicences()))
                                 .call(combModel -> {
                                     if (c.getBanMembre() == null)
                                         c.setBanMembre(new ArrayList<>());
                                     c.getBanMembre().remove(combModel.getId());
                                     return Panache.withTransaction(() -> repository.persist(c));
                                 })
-                            .chain(combModel -> updateRegister(data, c, combModel, true)))
+                                .chain(combModel -> updateRegister(data, c, combModel, true, false)))
-                    .chain(r -> Mutiny.fetch(r.getMembre().getLicences())
+                        .call(r -> r.getCompetition().getSystem() == CompetitionSystem.INTERNAL ?
-                            .map(licences -> SimpleRegisterComb.fromModel(r, licences)));
+                                sRegister.sendRegisterNoFetch(r.getCompetition().getUuid(), r) : Uni.createFrom()
+                                .voidItem())
+                        .map(r -> SimpleRegisterComb.fromModel(r, r.getMembre().getLicences())
+                                .setCategorieInscrite(r.getCategoriesInscrites()));
+            } else {
+                return permService.hasEditPerm(securityCtx, id)
+                        .chain(c -> competitionGuestRepository.findById(data.getId() * -1)
+                                .map(g -> {
+                                    if (g != null)
+                                        return g;
+                                    CompetitionGuestModel model = new CompetitionGuestModel();
+                                    model.setCompetition(c);
+                                    return model;
+                                }))
+                        .invoke(model -> {
+                            model.setFname(data.getFname());
+                            if (data.getLname().equals("__team"))
+                                model.setLname("_team");
+                            else
+                                model.setLname(data.getLname());
+                            model.setGenre(data.getGenre());
+                            model.setClub(data.getClub());
+                            model.setCountry(data.getCountry());
+                            model.setWeightReal(data.getWeightReal());
+                            model.setCategorie(data.getCategorie());
+                            if (model.getCompetition().getRequiredWeight().contains(model.getCategorie()))
+                                model.setWeight(data.getWeight());
+                        })
+                        .call(g -> Mutiny.fetch(g.getCategoriesInscrites()))
+                        .call(g -> catPresetRepository.list("competition = ?1 AND id IN ?2", g.getCompetition(),
+                                        data.getCategoriesInscrites())
+                                .invoke(cats -> {
+                                    g.getCategoriesInscrites().clear();
+                                    g.getCategoriesInscrites().addAll(cats);
+                                    g.getCategoriesInscrites()
+                                            .removeIf(cat -> cat.getCategories().stream()
+                                                    .noneMatch(e -> e.getCategorie().equals(g.getCategorie())));
+                                }))
+                        .chain(model -> Panache.withTransaction(() -> competitionGuestRepository.persist(model))
+                                .call(r -> model.getCompetition().getSystem() == CompetitionSystem.INTERNAL ?
+                                        sRegister.sendRegisterNoFetch(model.getCompetition().getUuid(), r)
+                                        : Uni.createFrom().voidItem()))
+                        .map(g -> SimpleRegisterComb.fromModel(g).setCategorieInscrite(g.getCategoriesInscrites()));
+            }
         if ("club".equals(source))
             return repository.findById(id)
                     .invoke(Unchecked.consumer(cm -> {
@@ -280,47 +420,130 @@ public class CompetitionService {
                                 || !securityCtx.isClubAdmin())
                             throw new DForbiddenException();
                         if (new Date().before(cm.getStartRegister()) || new Date().after(cm.getEndRegister()))
-                            throw new DBadRequestException("Inscription fermée");
+                            throw new DBadRequestException(trad.t("inscription.fermee"));
                     }))
                     .chain(c -> findComb(data.getLicence(), data.getFname(), data.getLname())
+                            .call(combModel -> Mutiny.fetch(combModel.getLicences()))
                             .invoke(Unchecked.consumer(model -> {
                                 if (!securityCtx.isInClubGroup(model.getClub().getId()))
                                     throw new DForbiddenException();
                                 if (c.getBanMembre().contains(model.getId()))
-                                    throw new DForbiddenException(
+                                    throw new DForbiddenException(trad.t("insc.err1"));
-                                            "Vous n'avez pas le droit d'inscrire ce membre (par décision de l'administrateur de la compétition)");
                             }))
-                            .chain(combModel -> updateRegister(data, c, combModel, false)))
+                            .chain(combModel -> updateRegister(data, c, combModel, false, false)))
-                    .chain(r -> Mutiny.fetch(r.getMembre().getLicences())
+                    .call(r -> r.getCompetition().getSystem() == CompetitionSystem.INTERNAL ?
-                            .map(licences -> SimpleRegisterComb.fromModel(r, licences)));
+                            sRegister.sendRegisterNoFetch(r.getCompetition().getUuid(), r) : Uni.createFrom()
+                            .voidItem())
+                    .map(r -> SimpleRegisterComb.fromModel(r, r.getMembre().getLicences())
+                            .setCategorieInscrite(r.getCategoriesInscrites()));
 
         return repository.findById(id)
                 .invoke(Unchecked.consumer(cm -> {
                     if (cm.getRegisterMode() != RegisterMode.FREE)
                         throw new DForbiddenException();
                     if (new Date().before(cm.getStartRegister()) || new Date().after(cm.getEndRegister()))
-                        throw new DBadRequestException("Inscription fermée");
+                        throw new DBadRequestException(trad.t("inscription.fermee"));
                 }))
                 .chain(c -> membreService.getByAccountId(securityCtx.getSubject())
                         .invoke(Unchecked.consumer(model -> {
                             if (c.getBanMembre().contains(model.getId()))
-                                throw new DForbiddenException(
+                                throw new DForbiddenException(trad.t("insc.err2"));
-                                        "Vous n'avez pas le droit de vous inscrire (par décision de l'administrateur de la compétition)");
                         }))
-                        .chain(combModel -> updateRegister(data, c, combModel, false)))
+                        .chain(combModel -> updateRegister(data, c, combModel, false, false)))
-                .map(r -> SimpleRegisterComb.fromModel(r, List.of()));
+                .call(r -> r.getCompetition().getSystem() == CompetitionSystem.INTERNAL ?
+                        sRegister.sendRegisterNoFetch(r.getCompetition().getUuid(), r) : Uni.createFrom().voidItem())
+                .map(r -> SimpleRegisterComb.fromModel(r, List.of()).setCategorieInscrite(r.getCategoriesInscrites()));
+    }
+
+    public Uni<List<SimpleRegisterComb>> addRegistersComb(SecurityCtx securityCtx, Long id,
+                                                          List<RegisterRequestData> datas,
+                                                          String source) {
+        if (!"admin".equals(source))
+            return Uni.createFrom().failure(new DForbiddenException());
+
+        return permService.hasEditPerm(securityCtx, id)
+                .chain(cm -> Multi.createFrom().iterable(datas).onItem().transformToUni(data ->
+                        makeImportUpdate(cm, data).onFailure().recoverWithItem(t -> {
+                            SimpleRegisterComb errorComb = new SimpleRegisterComb();
+                            errorComb.setLicence(-42);
+                            errorComb.setFname("ERROR");
+                            errorComb.setLname(t.getMessage());
+                            return errorComb;
+                        })).concatenate().collect().asList());
+    }
+
+    @WithSession
+    public Uni<SimpleRegisterComb> makeImportUpdate(CompetitionModel c, RegisterRequestData data) {
+        if (data.getLicence() == null || data.getLicence() != -1) { // not a guest
+            return findComb(data.getLicence(), data.getFname(), data.getLname())
+                    .call(combModel -> Mutiny.fetch(combModel.getLicences()))
+                    .call(combModel -> {
+                        if (c.getBanMembre() == null)
+                            c.setBanMembre(new ArrayList<>());
+                        c.getBanMembre().remove(combModel.getId());
+                        return Panache.withTransaction(() -> repository.persist(c));
+                    })
+                    .chain(combModel -> updateRegister(data, c, combModel, true, true))
+                    .map(r -> SimpleRegisterComb.fromModel(r, r.getMembre().getLicences())
+                            .setCategorieInscrite(r.getCategoriesInscrites()));
+        } else {
+            return findGuestOrInit(data.getFname(), data.getLname(), c)
+                    .invoke(Unchecked.consumer(model -> {
+                        if (data.getCategorie() == null)
+                            throw new DBadRequestException(trad.t("categorie.requise"));
+                        model.setCategorie(data.getCategorie());
+
+                        if (data.getGenre() == null) {
+                            if (model.getGenre() == null)
+                                data.setGenre(Genre.NA);
+                        } else
+                            model.setGenre(data.getGenre());
+
+                        if (data.getClub() == null) {
+                            if (model.getClub() == null)
+                                data.setClub("");
+                        } else
+                            model.setClub(data.getClub());
+
+                        if (data.getCountry() == null) {
+                            if (model.getCountry() == null)
+                                data.setCountry("FR");
+                        } else
+                            model.setCountry(data.getCountry());
+
+                        if (c.getRequiredWeight().contains(model.getCategorie())) {
+                            if (data.getCountry() != null)
+                                model.setWeight(data.getWeight());
+                        }
+                    }))
+                    .call(g -> Mutiny.fetch(g.getCategoriesInscrites()))
+                    .call(g -> catPresetRepository.list("competition = ?1 AND id IN ?2", c,
+                                    data.getCategoriesInscrites())
+                            .invoke(cats -> {
+                                g.getCategoriesInscrites().clear();
+                                g.getCategoriesInscrites().addAll(cats);
+                                g.getCategoriesInscrites().removeIf(cat -> cat.getCategories().stream()
+                                        .noneMatch(e -> e.getCategorie().equals(g.getCategorie())));
+                            }))
+                    .chain(model -> Panache.withTransaction(() -> competitionGuestRepository.persist(model))
+                            .call(r -> c.getSystem() == CompetitionSystem.INTERNAL ?
+                                    sRegister.sendRegister(c.getUuid(), r) : Uni.createFrom().voidItem()))
+                    .map(g -> SimpleRegisterComb.fromModel(g).setCategorieInscrite(g.getCategoriesInscrites()));
+        }
     }
 
     private Uni<RegisterModel> updateRegister(RegisterRequestData data, CompetitionModel c,
-                                              MembreModel combModel, boolean admin) {
+                                              MembreModel combModel, boolean admin, boolean append) {
         return registerRepository.find("competition = ?1 AND membre = ?2", c, combModel).firstResult()
                 .onFailure().recoverWithNull()
                 .map(Unchecked.function(r -> {
                     if (r != null) {
                         if (!admin && r.isLockEdit())
-                            throw new DForbiddenException(
+                            throw new DForbiddenException(trad.t("insc.err3"));
-                                    "Modification bloquée par l'administrateur de la compétition");
+                        if (data.getOverCategory() != null || !append)
-                        r.setWeight(data.getWeight());
+                            if (data.getOverCategory() == null)
+                                r.setOverCategory(0);
+                            else
                                 r.setOverCategory(data.getOverCategory());
                         r.setCategorie(
                                 (combModel.getBirth_date() == null) ? combModel.getCategorie() :
@@ -329,47 +552,91 @@ public class CompetitionService {
                         int days = Utils.getDaysBeforeCompetition(c.getDate());
                         if (days > -7)
                             r.setClub(combModel.getClub());
-                        if (admin)
+                        if (c.getRequiredWeight().contains(r.getCategorie2()))
+                            if (data.getCountry() != null || !append)
+                                r.setWeight(data.getWeight());
+                        if (admin) {
+                            r.setWeightReal(data.getWeightReal());
                             r.setLockEdit(data.isLockEdit());
+                        }
                     } else {
                         r = new RegisterModel(c, combModel, data.getWeight(), data.getOverCategory(),
                                 (combModel.getBirth_date() == null) ? combModel.getCategorie() :
                                         Utils.getCategoryFormBirthDate(combModel.getBirth_date(),
                                                 c.getDate()),
                                 (combModel.getClub() == null) ? null : combModel.getClub());
-                        if (admin)
+                        if (admin) {
+                            r.setWeightReal(data.getWeightReal());
                             r.setLockEdit(data.isLockEdit());
-                        else
+                        } else
                             r.setLockEdit(false);
                     }
 
                     if (c.getSystem() == CompetitionSystem.SAFCA) {
                         SReqRegister.sendIfNeed(serverCustom.clients,
                                 new CompetitionData.SimpleRegister(r.getMembre().getId(),
-                                        r.getOverCategory(), r.getWeight(), r.getCategorie(),
+                                        r.getOverCategory(), r.getWeight2(), r.getCategorie(),
-                                        (r.getClub() == null) ? null : r.getClub().getId()), c.getId());
+                                        (r.getClub() == null) ? null : r.getClub().getId(),
+                                        (r.getClub() == null) ? null : r.getClub().getName()), c.getId());
                     }
                     return r;
                 }))
-                .chain(r -> Panache.withTransaction(() -> registerRepository.persist(r)));
+                .call(r -> Mutiny.fetch(r.getCategoriesInscrites()).chain(__ ->
+                        catPresetRepository.list("competition = ?1 AND id IN ?2", c, data.getCategoriesInscrites())
+                                .invoke(cats -> {
+                                    if (data.isQuick()) {
+                                        cats.removeIf(cat -> r.getCategoriesInscrites().stream()
+                                                .anyMatch(cp -> cp.equals(cat)));
+                                    } else {
+                                        r.getCategoriesInscrites().clear();
+                                    }
+                                    r.getCategoriesInscrites().addAll(cats);
+                                    r.getCategoriesInscrites()
+                                            .removeIf(cat -> cat.getCategories().stream()
+                                                    .noneMatch(e -> e.getCategorie().equals(r.getCategorie2())));
+                                })))
+                .chain(r -> Panache.withTransaction(() -> registerRepository.persist(r)))
+                .call(r -> c.getSystem() == CompetitionSystem.INTERNAL ?
+                        sRegister.sendRegister(c.getUuid(), r) : Uni.createFrom().voidItem());
+    }
+
+    private Uni<CompetitionGuestModel> findGuestOrInit(String fname, String lname, CompetitionModel competition) {
+        if (fname == null || lname == null)
+            return Uni.createFrom().failure(new DBadRequestException(trad.t("nom.et.prenom.requis")));
+        return competitionGuestRepository.find(
+                        "unaccent(lname) ILIKE unaccent(?1) AND unaccent(fname) ILIKE unaccent(?2) AND competition = ?3",
+                        lname, fname, competition).firstResult()
+                .map(guestModel -> {
+                    if (guestModel == null) {
+                        CompetitionGuestModel model = new CompetitionGuestModel();
+                        model.setFname(fname);
+                        if (lname.equals("__team"))
+                            model.setLname("_team");
+                        else
+                            model.setLname(lname);
+                        model.setCompetition(competition);
+                        return model;
+                    }
+                    return guestModel;
+                });
     }
 
     private Uni<MembreModel> findComb(Long licence, String fname, String lname) {
-        if (licence != null && licence != 0) {
+        if (licence != null && licence > 0) {
             return combRepository.find("licence = ?1", licence).firstResult()
                     .invoke(Unchecked.consumer(combModel -> {
                         if (combModel == null)
-                            throw new DForbiddenException("Licence " + licence + " non trouvé");
+                            throw new DForbiddenException(String.format(trad.t("licence.non.trouve"), licence));
                     }));
         } else {
             if (fname == null || lname == null)
-                return Uni.createFrom().failure(new DBadRequestException("Nom et prénom requis"));
+                return Uni.createFrom().failure(new DBadRequestException(trad.t("nom.et.prenom.requis")));
             return combRepository.find("unaccent(lname) ILIKE unaccent(?1) AND unaccent(fname) ILIKE unaccent(?2)",
                             lname,
                             fname).firstResult()
                     .invoke(Unchecked.consumer(combModel -> {
                         if (combModel == null)
-                            throw new DForbiddenException("Combattant " + fname + " " + lname + " non trouvé");
+                            throw new DForbiddenException(String.format(trad.t("combattant.non.trouve"), fname, lname));
                     }));
         }
     }
@@ -396,32 +663,48 @@ public class CompetitionService {
                                 || !securityCtx.isClubAdmin())
                             throw new DForbiddenException();
                         if (new Date().before(cm.getStartRegister()) || new Date().after(cm.getEndRegister()))
-                            throw new DBadRequestException("Inscription fermée");
+                            throw new DBadRequestException(trad.t("inscription.fermee"));
                     }))
-                    .call(cm -> membreService.getByAccountId(securityCtx.getSubject())
+                    .call(cm -> membreService.getById(combId)
                             .invoke(Unchecked.consumer(model -> {
+                                if (model == null)
+                                    throw new DNotFoundException(
+                                            String.format(trad.t("le.membre.n.existe.pas"), combId));
                                 if (!securityCtx.isInClubGroup(model.getClub().getId()))
                                     throw new DForbiddenException();
                             })))
                     .chain(c -> deleteRegister(combId, c, false));
 
         return repository.findById(id)
-                .invoke(Unchecked.consumer(cm -> {
+                .call(cm -> membreService.getByAccountId(securityCtx.getSubject())
-                    if (cm.getRegisterMode() != RegisterMode.FREE)
+                        .invoke(Unchecked.consumer(model -> {
+                            if (cm.getRegisterMode() != RegisterMode.FREE || !Objects.equals(model.getId(), combId))
                                 throw new DForbiddenException();
                             if (new Date().before(cm.getStartRegister()) || new Date().after(cm.getEndRegister()))
-                        throw new DBadRequestException("Inscription fermée");
+                                throw new DBadRequestException(trad.t("inscription.fermee"));
-                }))
+                        })))
                 .chain(c -> deleteRegister(combId, c, false));
     }
 
     private Uni<Void> deleteRegister(Long combId, CompetitionModel c, boolean admin) {
+        if (admin && combId < 0) {
+            return competitionGuestRepository.find("competition = ?1 AND id = ?2", c, combId * -1).firstResult()
+                    .onFailure().transform(t -> new DBadRequestException(trad.t("combattant.non.inscrit")))
+                    .call(Unchecked.function(
+                            model -> Panache.withTransaction(() -> competitionGuestRepository.delete(model))
+                                    .call(r -> c.getSystem() == CompetitionSystem.INTERNAL ?
+                                            sRegister.sendRegisterRemove(c.getUuid(), combId) : Uni.createFrom()
+                                            .voidItem())))
+                    .replaceWithVoid();
+        }
         return registerRepository.find("competition = ?1 AND membre.id = ?2", c, combId).firstResult()
-                .onFailure().transform(t -> new DBadRequestException("Combattant non inscrit"))
+                .onFailure().transform(t -> new DBadRequestException(trad.t("combattant.non.inscrit")))
                 .call(Unchecked.function(registerModel -> {
                     if (!admin && registerModel.isLockEdit())
-                        throw new DForbiddenException("Modification bloquée par l'administrateur de la compétition");
+                        throw new DForbiddenException(trad.t("insc.err3"));
-                    return Panache.withTransaction(() -> registerRepository.delete(registerModel));
+                    return Panache.withTransaction(() -> registerRepository.delete(registerModel))
+                            .call(r -> c.getSystem() == CompetitionSystem.INTERNAL ?
+                                    sRegister.sendRegisterRemove(c.getUuid(), combId) : Uni.createFrom().voidItem());
                 }))
                 .replaceWithVoid();
     }
@@ -440,11 +723,73 @@ public class CompetitionService {
                                         .andCollectFailures()))
                 .call(competitionModel -> Panache.withTransaction(
                         () -> categoryRepository.delete("compet = ?1", competitionModel)))
+                .call(competitionModel -> Panache.withTransaction(
+                        () -> registerRepository.delete("competition = ?1", competitionModel)))
+                .call(competitionModel -> Panache.withTransaction(
+                        () -> competitionGuestRepository.delete("competition = ?1", competitionModel)))
                 .chain(model -> Panache.withTransaction(() -> repository.delete("id", model.getId())))
                 .invoke(o -> SReqCompet.rmCompet(serverCustom.clients, id))
                 .call(__ -> cache.invalidate(id));
     }
 
+    public Uni<SimpleCompetData> getInternalData(SecurityCtx securityCtx, Long id) {
+        return permService.hasEditPerm(securityCtx, id)
+                .invoke(Unchecked.consumer(cm -> {
+                    if (cm.getSystem() != CompetitionSystem.INTERNAL)
+                        throw new DBadRequestException(trad.t("competition.is.not.internal"));
+                }))
+                .chain(competitionModel -> {
+                    SimpleCompetData data = SimpleCompetData.fromModel(competitionModel);
+                    return vertx.getOrCreateContext().executeBlocking(() -> {
+                        if (competitionModel.getAdmin() != null)
+                            data.setAdmin(
+                                    competitionModel.getAdmin().stream().map(uuid -> keycloakService.getUserById(uuid))
+                                            .filter(Optional::isPresent)
+                                            .map(user -> user.get().getUsername())
+                                            .toList());
+                        if (competitionModel.getTable() != null)
+                            data.setTable(
+                                    competitionModel.getTable().stream().map(uuid -> keycloakService.getUserById(uuid))
+                                            .filter(Optional::isPresent)
+                                            .map(user -> user.get().getUsername())
+                                            .toList());
+                        return data;
+                    });
+                });
+    }
+
+    public Uni<Void> setInternalData(SecurityCtx securityCtx, SimpleCompetData data) {
+        return permService.hasEditPerm(securityCtx, data.getId())
+                .invoke(Unchecked.consumer(cm -> {
+                    if (cm.getSystem() != CompetitionSystem.INTERNAL)
+                        throw new DBadRequestException(trad.t("competition.is.not.internal"));
+                }))
+                .chain(cm -> vertx.getOrCreateContext().executeBlocking(() -> {
+                    ArrayList<String> admin = new ArrayList<>();
+                    ArrayList<String> table = new ArrayList<>();
+                    for (String username : data.getAdmin()) {
+                        Optional<UserRepresentation> opt = keycloakService.getUser(username);
+                        if (opt.isEmpty())
+                            throw new DBadRequestException(String.format(trad.t("user.not.found"), username));
+                        admin.add(opt.get().getId());
+                    }
+                    for (String username : data.getTable()) {
+                        Optional<UserRepresentation> opt = keycloakService.getUser(username);
+                        if (opt.isEmpty())
+                            throw new DBadRequestException(String.format(trad.t("user.not.found"), username));
+                        table.add(opt.get().getId());
+                    }
+
+                    cm.setAdmin(admin);
+                    cm.setTable(table);
+                    cm.setConfig(data.getConfigForInternal());
+
+                    return cm;
+                }))
+                .chain(cm -> Panache.withTransaction(() -> repository.persist(cm)))
+                .replaceWithVoid();
+    }
+
     public Uni<SimpleCompetData> getSafcaData(SecurityCtx securityCtx, Long id) {
         return permService.getSafcaConfig(id)
                 .call(Unchecked.function(o -> {
@@ -481,13 +826,13 @@ public class CompetitionService {
                     for (String username : data.getAdmin()) {
                         Optional<UserRepresentation> opt = keycloakService.getUser(username);
                         if (opt.isEmpty())
-                            throw new DBadRequestException("User " + username + " not found");
+                            throw new DBadRequestException(String.format(trad.t("user.not.found"), username));
                         admin.add(UUID.fromString(opt.get().getId()));
                     }
                     for (String username : data.getTable()) {
                         Optional<UserRepresentation> opt = keycloakService.getUser(username);
                         if (opt.isEmpty())
-                            throw new DBadRequestException("User " + username + " not found");
+                            throw new DBadRequestException(String.format(trad.t("user.not.found"), username));
                         table.add(UUID.fromString(opt.get().getId()));
                     }
 
@@ -513,6 +858,12 @@ public class CompetitionService {
                 .call(__ -> cache.invalidate(data.getId()));
     }
 
+    public Uni<List<PresetData>> getPresetsForCompetition(SecurityCtx securityCtx, Long id) {
+        return permService.hasViewPerm(securityCtx, id)
+                .chain(cm -> Mutiny.fetch(cm.getCatPreset()))
+                .map(p -> p.stream().map(PresetData::fromModel).toList());
+    }
+
     public Uni<Response> unregisterHelloAsso(NotificationData data) {
         if (!data.getState().equals("Refunded"))
             return Uni.createFrom().item(Response.ok().build());
@@ -529,7 +880,12 @@ public class CompetitionService {
 
                         uni = uni.call(__ -> Panache.withTransaction(
                                         () -> registerRepository.delete("competition = ?1 AND membre = ?2",
-                                        reg.getCompetition(), reg.getMembre())));
+                                                reg.getCompetition(), reg.getMembre())))
+                                .call(r -> reg.getCompetition().getSystem() == CompetitionSystem.INTERNAL ?
+                                        sRegister.sendRegisterRemove(reg.getCompetition().getUuid(),
+                                                reg.getMembre().getId()) : Uni.createFrom().voidItem()).onFailure()
+                                .recoverWithNull()
+                        ;
                     }
 
                     return uni;
@@ -541,7 +897,8 @@ public class CompetitionService {
     public Uni<Response> registerHelloAsso(NotificationData data) {
         String organizationSlug = data.getOrganizationSlug();
         String formSlug = data.getFormSlug();
-        RegisterRequestData req = new RegisterRequestData(null, "", "", null, 0, false);
+        RegisterRequestData req = new RegisterRequestData(null, "", "", null, null, 0, false, new ArrayList<>(), null,
+                Categorie.CADET, Genre.NA, null, "fr", false);
 
         return repository.find("data1 = ?1 AND data2 = ?2", organizationSlug, formSlug).firstResult()
                 .onFailure().recoverWithNull()
@@ -575,7 +932,7 @@ public class CompetitionService {
                                             .call(m -> Panache.withTransaction(() ->
                                                     helloAssoRepository.persist(
                                                             new HelloAssoRegisterModel(cm, m, data.getId()))))
-                                            .chain(m -> updateRegister(req, cm, m, true)))
+                                            .chain(m -> updateRegister(req, cm, m, true, true)))
                                     .onFailure().recoverWithItem(throwable -> {
                                         fail.add("%s %s - licence n°%d".formatted(item.getUser().getLastName(),
                                                 item.getUser().getFirstName(), optional.get()));

src/main/java/fr/titionfire/ffsaf/domain/service/HelloAssoTokenService.java

@@ -4,7 +4,6 @@ import fr.titionfire.ffsaf.rest.client.HelloAssoAuthClient;
 import fr.titionfire.ffsaf.rest.client.dto.TokenResponse;
 import io.smallrye.mutiny.Uni;
 import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.jboss.logging.Logger;
@@ -13,7 +12,6 @@ import org.jboss.logging.Logger;
 public class HelloAssoTokenService {
     private static final Logger LOG = Logger.getLogger(HelloAssoTokenService.class);
 
-    @Inject
     @RestClient
     HelloAssoAuthClient authClient;
 
@@ -27,6 +25,11 @@ public class HelloAssoTokenService {
 
     // Récupère un token valide (en le rafraîchissant si nécessaire)
     public Uni<String> getValidAccessToken() {
+        if (clientId == null || clientSecret == null || clientId.isEmpty() || clientSecret.isEmpty() || clientId.equalsIgnoreCase(
+                "null") || clientSecret.equalsIgnoreCase("null")) {
+            LOG.error("Client ID ou Client Secret non configuré pour HelloAsso");
+            return Uni.createFrom().failure(new IllegalStateException("HelloAsso client credentials not configured"));
+        }
         if (currentToken == null || currentToken.isExpired()) {
             return fetchNewToken(clientId, clientSecret);
         }

src/main/java/fr/titionfire/ffsaf/domain/service/KeycloakService.java

@@ -156,10 +156,18 @@ public class KeycloakService {
             return oldEmail;
         }).call(oldEmail -> oldEmail == null || !enabled_email ? Uni.createFrom().item("") :
                 reactiveMailer.send(
-                        Mail.withText(oldEmail,
+                        Mail.withHtml(oldEmail, "FFSAF - Changement de votre adresse email",
-                                "FFSAF - Changement de votre adresse email",
+                                        String.format(Utils.HTML_HEADER, "FFSAF - Changement de votre adresse email") +
-                                String.format(
+                                                String.format("""
-                                        """
+                                                                <p>Suite à la modification de votre adresse email fournie lors de votre (ré)inscription à la FFSAF,<br/>
+                                                                    vous allez recevoir dans les prochaines minutes un email de vérification de votre nouvelle adresse sur celle-ci.</p>
+                                                                <p>Ancienne adresse email : <span class="highlight">%s</span><br/>Nouvelle adresse email : <span class="highlight">%s</span></p>
+                                                                <p>Si vous n'avez pas demandé cette modification, veuillez contacter le support à l'adresse <a href="mailto:support@ffsaf.fr">support@ffsaf.fr</a>.</p>
+                                                                """,
+                                                        oldEmail, email) +
+                                                Utils.HTML_FOOTER
+                                )
+                                .setText(String.format("""
                                         Bonjour,
                                         
                                         Suite à la modification de votre adresse email fournie lors de votre (ré)inscription à la FFSAF,
@@ -172,8 +180,8 @@ public class KeycloakService {
                                         
                                         Cordialement,
                                         L'équipe de la FFSAF
-                                                """, oldEmail, email)
+                                        """, oldEmail, email))
-                        ).setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("support@ffsaf.fr")
+                                .setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("support@ffsaf.fr")
                 ).onFailure().invoke(e -> LOGGER.error("Fail to send email", e)));
     }
 
@@ -270,13 +278,33 @@ public class KeycloakService {
                 .invoke(user -> membreModel.setUserId(user.getId()))
                 .call(user -> updateRole(user.getId(), List.of("safca_user"), List.of()))
                 .call(user -> enabled_email ? reactiveMailer.send(
-                        Mail.withText(user.getEmail(),
+                        Mail.withHtml(user.getEmail(), "FFSAF - Creation de votre compte sur l'intranet",
-                                "FFSAF - Creation de votre compte sur l'intranet",
+                                        String.format(Utils.HTML_HEADER, "Création de votre compte intranet FFSAF") +
                                                 String.format(
+                                                        """
+                                                                <p>Suite &agrave; votre premi&egrave;re inscription <span class="highlight">%s</span> &agrave; la <strong>F&eacute;d&eacute;ration France Soft Armored Fighting (FFSAF)</strong>, votre compte intranet a &eacute;t&eacute; cr&eacute;&eacute;.</p>
+                                                                <p>Ce compte vous permettra de :</p>
+                                                                <ul>
+                                                                    <li>Consulter vos informations personnelles,</li>
+                                                                    <li>Vous inscrire aux comp&eacute;titions (bient&ocirc;t disponible),</li>
+                                                                    <li>Consulter les r&eacute;sultats des comp&eacute;titions.</li>
+                                                                </ul>
+                                                                <p>L&rsquo;intranet est accessible &agrave; l&rsquo;adresse suivante :</p>
+                                                                <p style="text-align: center;"><a href="https://intra.ffsaf.fr" class="button">Acc&eacute;der &agrave; l&apos;intranet</a></p>
+                                                                <p>Votre nom d&rsquo;utilisateur est : <span class="highlight">%s</span></p>
+                                                                <p>Pour d&eacute;finir votre mot de passe, rendez-vous sur l&rsquo;intranet : <strong>Connexion &gt; Mot de passe oubli&eacute; ?</strong></p>
+                                                                <p>Si vous n&rsquo;avez pas demand&eacute; cette inscription, veuillez contacter le support &agrave; l&rsquo;adresse : <a href="mailto:support@ffsaf.fr">support@ffsaf.fr</a>.</p>
+                                                                <p class="footer">(Pas de panique, nous ne vous enverrons pas de message autre que ceux concernant votre compte.)</p>
+                                                                """,
+                                                        membreModel.getRole() == RoleAsso.MEMBRE ? "par votre club (" + membreModel.getClub()
+                                                                .getName() + ") " : "", user.getUsername()) +
+                                                Utils.HTML_FOOTER
+                                )
+                                .setText(String.format(
                                         """
                                                 Bonjour,
                                                 
-                                                Suite à votre première inscription %sà la Fédération Française de Soft Armored Fighting (FFSAF), votre compte intranet a été créé.
+                                                Suite à votre première inscription %sà la Fédération France Soft Armored Fighting (FFSAF), votre compte intranet a été créé.
                                                 Ce compte vous permettra de consulter vos informations et, dans un futur proche, de vous inscrire aux compétitions ainsi que d'en consulter les résultats.
                                                 
                                                 L'intranet est accessible à l'adresse suivante : https://intra.ffsaf.fr
@@ -291,8 +319,8 @@ public class KeycloakService {
                                                 L'équipe de la FFSAF
                                                 """,
                                         membreModel.getRole() == RoleAsso.MEMBRE ? "par votre club (" + membreModel.getClub()
-                                                .getName() + ") " : "", user.getUsername())
+                                                .getName() + ") " : "", user.getUsername()))
-                        ).setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("support@ffsaf.fr")
+                                .setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("support@ffsaf.fr")
                 ) : Uni.createFrom().nullItem())
                 .call(user -> membreService.setUserId(membreModel.getId(), user.getId()))
                 .call(user -> setClubGroupMembre(membreModel, membreModel.getClub()));
@@ -349,11 +377,19 @@ public class KeycloakService {
 
 
     public Optional<UserRepresentation> getUser(UUID userId) {
-        UserResource user = keycloak.realm(realm).users().get(userId.toString());
+        return getUserById(userId.toString());
+    }
+
+    public Optional<UserRepresentation> getUserById(String userId) {
+        try {
+            UserResource user = keycloak.realm(realm).users().get(userId);
             if (user == null)
                 return Optional.empty();
             else
                 return Optional.of(user.toRepresentation());
+        } catch (Exception e) {
+            return Optional.empty();
+        }
     }
 
     private String makeLogin(MembreModel model) {

src/main/java/fr/titionfire/ffsaf/domain/service/LicenceService.java

@@ -47,6 +47,9 @@ public class LicenceService {
     @Inject
     CheckoutService checkoutService;
 
+    @Inject
+    TradService trad;
+
     public Uni<List<LicenceModel>> getLicence(long id, Consumer<MembreModel> checkPerm) {
         return combRepository.findById(id).invoke(checkPerm)
                 .chain(combRepository -> Mutiny.fetch(combRepository.getLicences()));
@@ -84,6 +87,26 @@ public class LicenceService {
                 ));
     }
 
+    public Uni<?> validePaymentLicences(List<Long> ids) {
+        Uni<String> uni = Uni.createFrom().nullItem();
+
+        for (Long id : ids) {
+            uni = uni.chain(__ -> repository.find("membre.id = ?1 AND saison = ?2", id, Utils.getSaison()).firstResult()
+                            .chain(model -> {
+                                if (!model.isPay())
+                                    ls.logUpdate("payment (admin) de la licence", model);
+                                return validatePayLicences(model);
+                            }))
+                    .map(__ -> "OK");
+        }
+        return uni.call(__ -> ls.append());
+    }
+
+    protected Uni<LicenceModel> validatePayLicences(LicenceModel model) {
+        model.setPay(true);
+        return Panache.withTransaction(() -> repository.persist(model));
+    }
+
     public Uni<LicenceModel> setLicence(long id, LicenceForm form) {
         if (form.getId() == -1) {
             return combRepository.findById(id).chain(membreModel -> {
@@ -99,7 +122,9 @@ public class LicenceService {
                                         .call(genLicenceNumberAndAccountIfNeed())
                                         : Uni.createFrom().nullItem()
                                 ))
-                        .call(licenceModel -> ls.logA(LogModel.ActionType.ADD, membreModel.getObjectName(),
+                        .call(licenceModel -> ls.logA(LogModel.ActionType.ADD,
+                                "%s (valid=%b, pay=%b, %s)" .formatted(membreModel.getObjectName(), model.isValidate(),
+                                        model.isPay(), model.getCertificate()),
                                 licenceModel));
             });
         } else {
@@ -121,7 +146,7 @@ public class LicenceService {
     }
 
     private Function<MembreModel, Uni<?>> genLicenceNumberAndAccountIfNeed() {
-        return membreModel -> ((membreModel.getLicence() <= 0) ?
+        return membreModel -> ((membreModel.getLicence() == null || membreModel.getLicence() <= 0) ?
                 sequenceRepository.getNextValueInTransaction(SequenceType.Licence)
                         .invoke(i -> membreModel.setLicence(Math.toIntExact(i)))
                         .chain(() -> combRepository.persist(membreModel))
@@ -137,7 +162,7 @@ public class LicenceService {
         return repository.list("membre.id IN ?1 AND saison = ?2 AND pay = FALSE", ids, Utils.getSaison())
                 .invoke(Unchecked.consumer(models -> {
                     if (models.size() != ids.size())
-                        throw new DBadRequestException("Erreur lors de la sélection des membres");
+                        throw new DBadRequestException(trad.t("erreur.lors.de.la.selection.des.membres"));
                 }))
                 .call(models -> {
                     Uni<?> uni = Uni.createFrom().nullItem();
@@ -154,10 +179,10 @@ public class LicenceService {
                 .call(__ -> checkoutService.canDeleteLicence(id)
                         .invoke(Unchecked.consumer(b -> {
                             if (!b) throw new DBadRequestException(
-                                    "Impossible de supprimer une licence pour laquelle un paiement est en cours");
+                                    trad.t("licence.rm.err1"));
                         })))
                 .call(model -> ls.logADelete(model))
-                .chain(model -> repository.delete(model));
+                .chain(model -> Panache.withTransaction(() -> repository.delete(model)));
     }
 
     public Uni<LicenceModel> askLicence(long id, LicenceForm form, Consumer<MembreModel> checkPerm) {
@@ -166,7 +191,7 @@ public class LicenceService {
                 return repository.find("saison = ?1 AND membre = ?2", Utils.getSaison(), membreModel).count()
                         .invoke(Unchecked.consumer(count -> {
                             if (count > 0)
-                                throw new DBadRequestException("Licence déjà demandée");
+                                throw new DBadRequestException(trad.t("licence.deja.demandee"));
                         })).chain(__ -> combRepository.findById(id).chain(membreModel2 -> {
                             LicenceModel model = new LicenceModel();
                             model.setClub_id((membreModel2.getClub() == null) ? null : membreModel2.getClub().getId());
@@ -195,13 +220,13 @@ public class LicenceService {
                 .call(__ -> checkoutService.canDeleteLicence(id)
                         .invoke(Unchecked.consumer(b -> {
                             if (!b) throw new DBadRequestException(
-                                    "Impossible de supprimer une licence pour laquelle un paiement est en cours");
+                                    trad.t("licence.rm.err1"));
                         })))
                 .invoke(Unchecked.consumer(licenceModel -> {
                     if (licenceModel.isValidate())
-                        throw new DBadRequestException("Impossible de supprimer une licence déjà validée");
+                        throw new DBadRequestException(trad.t("impossible.de.supprimer.une.licence.deja.validee"));
                     if (licenceModel.isPay())
-                        throw new DBadRequestException("Impossible de supprimer une licence déjà payée");
+                        throw new DBadRequestException(trad.t("impossible.de.supprimer.une.licence.deja.payee"));
                 }))
                 .call(model -> ls.logADelete(model))
                 .chain(__ -> Panache.withTransaction(() -> repository.deleteById(id)));

src/main/java/fr/titionfire/ffsaf/domain/service/LoggerService.java

@@ -58,6 +58,8 @@ public class LoggerService {
     }
 
     public Uni<?> append() {
+        if (buffer.isEmpty())
+            return Uni.createFrom().voidItem();
         return Panache.withTransaction(() -> repository.persist(buffer))
                 .invoke(__ -> buffer.clear());
     }

src/main/java/fr/titionfire/ffsaf/domain/service/MatchService.java

@@ -1,9 +1,11 @@
 package fr.titionfire.ffsaf.domain.service;
 
+import fr.titionfire.ffsaf.data.model.CompetitionGuestModel;
 import fr.titionfire.ffsaf.data.model.MatchModel;
-import fr.titionfire.ffsaf.data.repository.CombRepository;
-import fr.titionfire.ffsaf.data.repository.MatchRepository;
 import fr.titionfire.ffsaf.data.repository.CategoryRepository;
+import fr.titionfire.ffsaf.data.repository.CombRepository;
+import fr.titionfire.ffsaf.data.repository.CompetitionGuestRepository;
+import fr.titionfire.ffsaf.data.repository.MatchRepository;
 import fr.titionfire.ffsaf.rest.data.MatchData;
 import fr.titionfire.ffsaf.rest.exception.DNotFoundException;
 import fr.titionfire.ffsaf.utils.CompetitionSystem;
@@ -33,6 +35,9 @@ public class MatchService {
     @Inject
     CompetPermService permService;
 
+    @Inject
+    CompetitionGuestRepository competitionGuestRepository;
+
     public Uni<MatchData> getByIdAdmin(SecurityCtx securityCtx, CompetitionSystem system, Long id) {
         return repository.find("systemId = ?1 AND system = ?2", id, system).firstResult()
                 .onItem().ifNull().failWith(() -> new DNotFoundException("Match not found"))
@@ -75,8 +80,6 @@ public class MatchService {
                         }
                 )
                 .chain(o -> {
-                    o.setC1_str(data.getC1_str());
-                    o.setC2_str(data.getC2_str());
                     o.setCategory_ord(data.getCategory_ord());
                     o.getScores().clear();
                     o.getScores().addAll(data.getScores());
@@ -88,6 +91,20 @@ public class MatchService {
                             .chain(() -> (data.getC1_id() == null) ?
                                     Uni.createFrom().nullItem() : combRepository.findById(data.getC2_id()))
                             .invoke(o::setC2_id)
+                            .chain(() -> (data.getC1_str() == null) ?
+                                    Uni.createFrom()
+                                            .item((CompetitionGuestModel) null) : competitionGuestRepository.find(
+                                    "fname = ?1 AND lname = ?2",
+                                    data.getC1_str().substring(0, data.getC1_str().indexOf(" ")),
+                                    data.getC1_str().substring(data.getC1_str().indexOf(" ") + 1)).firstResult())
+                            .invoke(o::setC1_guest)
+                            .chain(() -> (data.getC2_str() == null) ?
+                                    Uni.createFrom()
+                                            .item((CompetitionGuestModel) null) : competitionGuestRepository.find(
+                                    "fname = ?1 AND lname = ?2",
+                                    data.getC2_str().substring(0, data.getC2_str().indexOf(" ")),
+                                    data.getC2_str().substring(data.getC2_str().indexOf(" ") + 1)).firstResult())
+                            .invoke(o::setC2_guest)
                             .chain(() -> Panache.withTransaction(() -> repository.persist(o)));
                 })
                 .map(MatchData::fromModel);

src/main/java/fr/titionfire/ffsaf/domain/service/MembreService.java

@@ -7,14 +7,12 @@ import fr.titionfire.ffsaf.data.repository.*;
 import fr.titionfire.ffsaf.net2.ServerCustom;
 import fr.titionfire.ffsaf.net2.data.SimpleCombModel;
 import fr.titionfire.ffsaf.net2.request.SReqComb;
-import fr.titionfire.ffsaf.rest.data.MeData;
+import fr.titionfire.ffsaf.rest.data.*;
-import fr.titionfire.ffsaf.rest.data.SimpleLicence;
-import fr.titionfire.ffsaf.rest.data.SimpleMembre;
-import fr.titionfire.ffsaf.rest.data.SimpleMembreInOutData;
 import fr.titionfire.ffsaf.rest.exception.DBadRequestException;
 import fr.titionfire.ffsaf.rest.exception.DForbiddenException;
 import fr.titionfire.ffsaf.rest.exception.DInternalError;
 import fr.titionfire.ffsaf.rest.from.FullMemberForm;
+import fr.titionfire.ffsaf.rest.from.UserSettingForm;
 import fr.titionfire.ffsaf.utils.*;
 import io.quarkus.hibernate.reactive.panache.Panache;
 import io.quarkus.hibernate.reactive.panache.PanacheQuery;
@@ -64,6 +62,9 @@ public class MembreService {
     @Inject
     LoggerService ls;
 
+    @Inject
+    TradService trad;
+
     public SimpleCombModel find(int licence, String np) throws Throwable {
         return VertxContextSupport.subscribeAndAwait(() -> Panache.withTransaction(() ->
                 repository.find(
@@ -125,86 +126,75 @@ public class MembreService {
         return sort;
     }
 
-    public Uni<PageResult<SimpleMembre>> searchAdmin(int limit, int page, String search, String club,
-                                                     int licenceRequest, int payState, String order, String categorie) {
-        if (search == null)
-            search = "";
-        search = "%" + search.replaceAll(" ", "% %") + "%";
-
-        String categorieFilter;
-        if (categorie == null || categorie.isBlank())
-            categorieFilter = " True";
-        else
-            categorieFilter = "categorie = " + Categorie.valueOf(categorie).ordinal();
-
-        String finalSearch = search;
-        Uni<List<LicenceModel>> baseUni = getLicenceListe(licenceRequest, payState);
-
-        Sort sort = getSort(order);
-        if (sort == null)
-            return Uni.createFrom().failure(new DInternalError("Erreur lors calcul du trie"));
-
-        return baseUni
-                .map(l -> l.stream().map(l2 -> l2.getMembre().getId()).toList())
-                .chain(ids -> {
-                    PanacheQuery<MembreModel> query;
-
-                    String idf = ((licenceRequest == 0 || licenceRequest == 4) ? "NOT IN" : "IN");
-
-                    if (club == null || club.isBlank()) {
-                        query = repository.find(
-                                        "id " + idf + " ?2 AND (" + FIND_NAME_REQUEST + ") AND " + categorieFilter,
-                                        sort, finalSearch, ids)
-                                .page(Page.ofSize(limit));
-                    } else {
-                        if (club.equals("null")) {
-                            query = repository.find(
-                                    "id " + idf + " ?2 AND club IS NULL AND (" + FIND_NAME_REQUEST + ") AND " + categorieFilter,
-                                    sort, finalSearch, ids).page(Page.ofSize(limit));
-                        } else {
-                            query = repository.find(
-                                            "id " + idf + " ?3 AND LOWER(club.name) LIKE LOWER(?2) AND (" + FIND_NAME_REQUEST + ") AND " + categorieFilter,
-                                            sort, finalSearch, club, ids)
-                                    .page(Page.ofSize(limit));
-                        }
-                    }
-                    return getPageResult(query, limit, page);
-                });
-    }
-
     public Uni<PageResult<SimpleMembre>> search(int limit, int page, String search, int licenceRequest, int payState,
-                                                String order, String categorie, String subject) {
+                                                String order, String categorie, Boolean archive, String subject) {
+        return repository.find("userId = ?1", subject).firstResult()
+                .invoke(Unchecked.consumer(membreModel -> {
+                    if (membreModel == null || membreModel.getClub() == null)
+                        throw new DForbiddenException();
+                }))
+                .chain(membreModel ->
+                        searchAdmin(limit, page, search, membreModel.getClub(), licenceRequest, payState, order,
+                                categorie, archive));
+    }
+
+    public Uni<PageResult<SimpleMembre>> searchAdmin(int limit, int page, String search, Object club,
+                                                     int licenceRequest, int payState, String order, String categorie,
+                                                     Boolean archive) {
         if (search == null)
             search = "";
         search = "%" + search.replaceAll(" ", "% %") + "%";
 
-        String finalSearch = search;
-
-        Uni<List<LicenceModel>> baseUni = getLicenceListe(licenceRequest, payState);
-
         String categorieFilter;
         if (categorie == null || categorie.isBlank())
             categorieFilter = " True";
         else
             categorieFilter = "categorie = " + Categorie.valueOf(categorie).ordinal();
 
+        String archiveFilter;
+        if (archive == null || archive)
+            archiveFilter = "True";
+        else
+            archiveFilter = String.format(
+                    "EXISTS (SELECT 1 FROM LicenceModel l WHERE l.membre.id = m.id AND l.saison >= %s)",
+                    Utils.getSaison() - 1);
+
+        String clubFilter = "(TRUE OR ?3 = ?3)";
+        if (club != null) {
+            if (club instanceof String club_) {
+                if (!club_.isBlank()) {
+                    if (club_.equals("null"))
+                        clubFilter = "club IS NULL AND ?3 = ?3";
+                    else
+                        clubFilter = "LOWER(club.name) LIKE LOWER(?3)";
+                }
+            } else if (club instanceof ClubModel)
+                clubFilter = "club = ?3";
+        }
+
+        String queryStr = String.format(
+                "SELECT m FROM MembreModel m WHERE id %s ?2 AND %s AND (%s) AND %s AND %s",
+                (licenceRequest == 0 || licenceRequest == 4) ? "NOT IN" : "IN", clubFilter, FIND_NAME_REQUEST,
+                categorieFilter,
+                archiveFilter);
+
         Sort sort = getSort(order);
         if (sort == null)
-            return Uni.createFrom().failure(new DInternalError("Erreur lors calcul du trie"));
+            return Uni.createFrom().failure(new DInternalError(trad.t("erreur.lors.calcul.du.trie")));
 
-        return baseUni
+        String finalSearch = search;
-                .map(l -> l.stream().map(l2 -> l2.getMembre().getId()).toList())
+        return getLicenceListe(licenceRequest, payState)
-                .chain(ids -> {
+                .chain(l -> {
-                    String idf = ((licenceRequest == 0 || licenceRequest == 4) ? "NOT IN" : "IN");
+                    PanacheQuery<MembreModel> query;
-
+                    query = repository.find(queryStr, sort, finalSearch,
-                    return repository.find("userId = ?1", subject).firstResult()
+                            l.stream().map(l2 -> l2.getMembre().getId()).toList(), club).page(Page.ofSize(limit));
-                            .chain(membreModel -> {
+                    return getPageResult(query, limit, page)
-                                PanacheQuery<MembreModel> query = repository.find(
+                            .call(r -> (r.getResult().isEmpty() || !l.isEmpty() ?
-                                                "id " + idf + " ?3 AND club = ?2 AND (" + FIND_NAME_REQUEST + ") AND " + categorieFilter,
+                                    Uni.createFrom().item(l) :
-                                                sort, finalSearch, membreModel.getClub(), ids)
+                                    licenceRepository.list("saison = ?1 AND membre.id IN ?2", Utils.getSaison(),
-                                        .page(Page.ofSize(limit));
+                                            r.getResult().stream().map(SimpleMembre::getId).toList()))
-                                return getPageResult(query, limit, page);
+                                    .invoke(l2 -> r.setAdditionalData(l2.stream().map(SimpleLicence::fromModel)))
-                            });
+                            );
                 });
     }
 
@@ -215,7 +205,7 @@ public class MembreService {
                 .call(result -> query.count().invoke(result::setResult_count))
                 .call(result -> query.pageCount()
                         .invoke(Unchecked.consumer(pages -> {
-                            if (page > pages) throw new DBadRequestException("Page out of range");
+                            if (page > pages) throw new DBadRequestException(trad.t("page.out.of.range"));
                         }))
                         .invoke(result::setPage_count))
                 .call(result -> query.page(Page.of(page, limit)).list()
@@ -226,7 +216,7 @@ public class MembreService {
     public Uni<List<SimpleMembreInOutData>> getAllExport(String subject) {
         return repository.find("userId = ?1", subject).firstResult()
                 .chain(membreModel -> repository.list("club = ?1", membreModel.getClub()))
-                .chain(membres -> licenceRepository.list("saison = ?1 AND membre IN ?2", Utils.getSaison(), membres)
+                .chain(membres -> licenceRepository.list("membre IN ?1", membres)
                         .map(l -> membres.stream().map(m -> SimpleMembreInOutData.fromModel(m, l)).toList()));
     }
 
@@ -260,8 +250,8 @@ public class MembreService {
                     for (MembreModel membreModel : membres) {
                         if (!Objects.equals(membreModel.getClub(), clubModel.get())) {
                             LOGGER.info("Similar membres found: " + membreModel);
-                            throw new DForbiddenException(
+                            throw new DForbiddenException(String.format(trad.t("le.membre.appartient.pas.a.votre.club"),
-                                    "Le membre n°" + membreModel.getLicence() + " n'appartient pas à votre club");
+                                    membreModel.getLicence()));
                         }
                     }
                     Uni<Void> uniResult = Uni.createFrom().voidItem();
@@ -287,14 +277,18 @@ public class MembreService {
                         if (model.getEmail() != null && !model.getEmail().isBlank()) {
                             if (model.getLicence() != null && !model.getLicence().equals(dataIn.getLicence())) {
                                 LOGGER.info("Similar membres found: " + model);
-                                throw new DBadRequestException("Email '" + model.getEmail() + "' déja utiliser");
+                                throw new DBadRequestException(
+                                        String.format(trad.t("email.deja.utilise.par"), model.getEmail(),
+                                                model.getFname(), model.getLname()));
                             }
 
                             if (StringSimilarity.similarity(model.getLname().toUpperCase(),
                                     dataIn.getNom().toUpperCase()) > 3 || StringSimilarity.similarity(
                                     model.getFname().toUpperCase(), dataIn.getPrenom().toUpperCase()) > 3) {
                                 LOGGER.info("Similar membres found: " + model);
-                                throw new DBadRequestException("Email '" + model.getEmail() + "' déja utiliser");
+                                throw new DBadRequestException(
+                                        String.format(trad.t("email.deja.utilise.par"), model.getEmail(),
+                                                model.getFname(), model.getLname()));
                             }
                         }
 
@@ -305,7 +299,8 @@ public class MembreService {
                                 model.getFname().toUpperCase(), dataIn.getPrenom().toUpperCase()) > 3)) {
                             LOGGER.info("Similar membres found: " + model);
                             throw new DBadRequestException(
-                                    "Pour enregistrer un nouveau membre, veuillez laisser le champ licence vide.");
+                                    String.format(trad.t("try.edit.licence"), model.getLicence(), model.getFname(),
+                                            model.getFname()));
                         }
 
                         ls.logChange("Nom", model.getLname(), dataIn.getNom().toUpperCase(), model);
@@ -313,8 +308,7 @@ public class MembreService {
                                 dataIn.getPrenom().toUpperCase().charAt(0) + dataIn.getPrenom().substring(1), model);
 
                         model.setLname(dataIn.getNom().toUpperCase());
-                        model.setFname(dataIn.getPrenom().toUpperCase().charAt(0) + dataIn.getPrenom().substring(1));
+                        model.setFname(Utils.formatPrenom(dataIn.getPrenom()));
-
 
                         if (dataIn.getEmail() != null && !dataIn.getEmail().isBlank()) {
                             ls.logChange("Email", model.getEmail(), dataIn.getEmail(), model);
@@ -380,7 +374,7 @@ public class MembreService {
                 .call(__ -> repository.count("email LIKE ?1 AND id != ?2", membre.getEmail(), id)
                         .invoke(Unchecked.consumer(c -> {
                             if (c > 0 && !membre.getEmail().isBlank())
-                                throw new DBadRequestException("Email déjà utiliser");
+                                throw new DBadRequestException(trad.t("email.deja.utilise"));
                         })))
                 .chain(membreModel -> clubRepository.findById(membre.getClub())
                         .map(club -> new Pair<>(membreModel, club)))
@@ -402,7 +396,7 @@ public class MembreService {
                 .call(__ -> repository.count("email LIKE ?1 AND id != ?2", membre.getEmail(), id)
                         .invoke(Unchecked.consumer(c -> {
                             if (c > 0 && !membre.getEmail().isBlank())
-                                throw new DBadRequestException("Email déjà utiliser");
+                                throw new DBadRequestException(trad.t("email.deja.utilise"));
                         })))
                 .invoke(Unchecked.consumer(membreModel -> {
                     if (!securityCtx.isInClubGroup(membreModel.getClub().getId()))
@@ -411,7 +405,7 @@ public class MembreService {
                             membre.getLname().toUpperCase()) > 3 || StringSimilarity.similarity(
                             membreModel.getFname().toUpperCase(), membre.getFname().toUpperCase()) > 3) {
                         throw new DBadRequestException(
-                                "Pour enregistrer un nouveau membre, veuillez utilisez le bouton prévue a cette effet.");
+                                trad.t("regiter.new.membre"));
                     }
                 }))
                 .invoke(Unchecked.consumer(membreModel -> {
@@ -420,7 +414,7 @@ public class MembreService {
                     else if (securityCtx.roleHas("club_secretaire")) source = RoleAsso.SECRETAIRE;
                     else if (securityCtx.roleHas("club_respo_intra")) source = RoleAsso.MEMBREBUREAU;
                     if (!membre.getRole().equals(membreModel.getRole()) && membre.getRole().level >= source.level)
-                        throw new DForbiddenException("Permission insuffisante");
+                        throw new DForbiddenException(trad.t("permission.insuffisante"));
                 }))
                 .onItem().transform(target -> {
                     if (!securityCtx.getSubject().equals(target.getUserId())) {
@@ -434,7 +428,7 @@ public class MembreService {
     private Uni<String> update(Uni<MembreModel> uni, FullMemberForm membre, boolean admin) {
         return uni.chain(target -> {
                     ls.logChange("Prénom", target.getFname(), membre.getFname(), target);
-                    target.setFname(membre.getFname());
+                    target.setFname(Utils.formatPrenom(membre.getFname()));
                     ls.logChange("Nom", target.getLname(), membre.getLname(), target);
                     target.setLname(membre.getLname().toUpperCase());
                     ls.logChange("Pays", target.getCountry(), membre.getCountry(), target);
@@ -482,7 +476,8 @@ public class MembreService {
                 .call(membreModel -> licenceRepository.update("club_id = ?1 where membre = ?2 AND saison = ?3",
                         (membreModel.getClub() == null) ? null : membreModel.getClub().getId(), membreModel,
                         Utils.getSaison()))
-                .call(membreModel -> membre.getPhoto_data().length > 0 ? ls.logAUpdate("Photo",
+                .call(membreModel -> (membre.getPhoto_data() != null && membre.getPhoto_data()
+                        .size() > 0) ? ls.logAUpdate("Photo",
                         membreModel) : Uni.createFrom().nullItem())
                 .map(__ -> "OK");
     }
@@ -492,7 +487,8 @@ public class MembreService {
         return clubRepository.findById(input.getClub())
                 .call(__ -> repository.count("email LIKE ?1", input.getEmail())
                         .invoke(Unchecked.consumer(c -> {
-                            if (c > 0) throw new DBadRequestException("Email déjà utiliser");
+                            if (c > 0 && input.getEmail() != null && !input.getEmail().isBlank())
+                                throw new DBadRequestException(trad.t("email.deja.utilise"));
                         })))
                 .chain(clubModel -> {
                     MembreModel model = getMembreModel(input, clubModel);
@@ -508,7 +504,7 @@ public class MembreService {
         return repository.find("userId = ?1", subject).firstResult()
                 .call(__ -> repository.count("email LIKE ?1", input.getEmail())
                         .invoke(Unchecked.consumer(c -> {
-                            if (c > 0) throw new DBadRequestException("Email déjà utiliser");
+                            if (c > 0) throw new DBadRequestException(trad.t("email.deja.utilise"));
                         })))
                 .call(membreModel ->
                         repository.count(
@@ -516,7 +512,7 @@ public class MembreService {
                                         input.getLname(), input.getFname(), membreModel.getClub())
                                 .invoke(Unchecked.consumer(c -> {
                                     if (c > 0)
-                                        throw new DBadRequestException("Membre déjà existent");
+                                        throw new DBadRequestException(trad.t("membre.deja.existent"));
                                 })))
                 .chain(membreModel -> {
                     MembreModel model = getMembreModel(input, membreModel.getClub());
@@ -549,13 +545,13 @@ public class MembreService {
                 .invoke(Unchecked.consumer(membreModel -> {
                     if (membreModel.getLicence() != null) {
                         throw new DBadRequestException(
-                                "Impossible de supprimer un membre qui a déjà un numéro de licence");
+                                trad.t("membre.rm.err1"));
                     }
                 }))
                 .call(membreModel -> licenceRepository.find("membre = ?1", membreModel).count()
                         .invoke(Unchecked.consumer(l -> {
                             if (l > 0)
-                                throw new DBadRequestException("Impossible de supprimer un membre avec des licences");
+                                throw new DBadRequestException(trad.t("membre.rm.err2"));
                         })))
                 .call(membreModel -> (membreModel.getUserId() != null) ?
                         keycloakService.removeAccount(membreModel.getUserId()) : Uni.createFrom().nullItem())
@@ -577,8 +573,8 @@ public class MembreService {
 
     private static MembreModel getMembreModel(FullMemberForm input, ClubModel clubModel) {
         MembreModel model = new MembreModel();
-        model.setFname(input.getFname());
+        model.setFname(Utils.formatPrenom(input.getFname()));
-        model.setLname(input.getLname());
+        model.setLname(input.getLname().toUpperCase());
         model.setEmail(input.getEmail());
         model.setLicence(null);
         model.setGenre(input.getGenre());
@@ -601,13 +597,30 @@ public class MembreService {
     public Uni<MeData> getMembre(String subject) {
         MeData meData = new MeData();
         return repository.find("userId = ?1", subject).firstResult()
-                .invoke(meData::setMembre)
+                .invoke(m -> meData.setMembre(m, trad))
-                .chain(membreModel -> Mutiny.fetch(membreModel.getLicences()))
+                .call(membreModel -> Mutiny.fetch(membreModel.getLicences())
                         .map(licences -> licences.stream().map(SimpleLicence::fromModel).toList())
-                .invoke(meData::setLicences)
+                        .invoke(meData::setLicences))
+                .call(membreModel -> Mutiny.fetch(membreModel.getSelections())
+                        .map(licences -> licences.stream().map(SimpleSelection::fromModel).toList())
+                        .invoke(meData::setSelections))
                 .map(__ -> meData);
     }
 
+    public Uni<Void> updateSettings(String subject, UserSettingForm settingForm) {
+        return repository.find("userId = ?1", subject).firstResult()
+                .invoke(Unchecked.consumer(membreModel -> {
+                    if (settingForm.getResultPrivacy() != null) {
+                        ls.logChange("Confidentialité des résultats", membreModel.getResultPrivacy(),
+                                settingForm.getResultPrivacy(), membreModel);
+                        membreModel.setResultPrivacy(settingForm.getResultPrivacy());
+                    }
+                }))
+                .call(membreModel -> Panache.withTransaction(() -> repository.persist(membreModel)))
+                .call(membreModel -> ls.append())
+                .replaceWithVoid();
+    }
+
     @Scheduled(cron = "0 0 1 1 9 ?")
     Uni<Void> everySeason() {
         return repository.list("birth_date IS NOT NULL")
@@ -617,5 +630,4 @@ public class MembreService {
                 }).toList()).andCollectFailures())
                 .map(__ -> null);
     }
-
 }

src/main/java/fr/titionfire/ffsaf/domain/service/PDFService.java

@@ -46,6 +46,9 @@ public class PDFService {
     @ConfigProperty(name = "pdf-maker.sign-file")
     String sign_file;
 
+    @Inject
+    TradService trad;
+
 
     public Uni<Response> getLicencePdf(String subject) {
         return getLicencePdf(combRepository.find("userId = ?1", subject).firstResult()
@@ -58,7 +61,7 @@ public class PDFService {
                     LicenceModel licence = m.getLicences().stream()
                             .filter(licenceModel -> licenceModel.getSaison() == Utils.getSaison() && licenceModel.isValidate())
                             .findFirst()
-                            .orElseThrow(() -> new DNotFoundException("Pas de licence pour la saison en cours"));
+                            .orElseThrow(() -> new DNotFoundException(trad.t("pas.de.licence.pour.la.saison.en.cours")));
 
                     try {
                         byte[] buff = make_pdf(m, licence);
@@ -119,7 +122,7 @@ public class PDFService {
                 combRepository.find("userId = ?1", subject).firstResult()
                         .invoke(Unchecked.consumer(m -> {
                             if (m == null || m.getClub() == null)
-                                throw new DNotFoundException("Club non trouvé");
+                                throw new DNotFoundException(trad.t("club.non.trouve"));
                         }))
                         .map(MembreModel::getClub)
                         .call(m -> Mutiny.fetch(m.getAffiliations())));
@@ -130,7 +133,7 @@ public class PDFService {
                 clubRepository.findById(id)
                         .invoke(Unchecked.consumer(m -> {
                             if (m == null)
-                                throw new DNotFoundException("Club non trouvé");
+                                throw new DNotFoundException(trad.t("club.non.trouve"));
                         }))
                         .call(m -> Mutiny.fetch(m.getAffiliations())));
     }
@@ -141,7 +144,7 @@ public class PDFService {
                 .map(Unchecked.function(m -> {
                     if (m.getAffiliations().stream()
                             .noneMatch(licenceModel -> licenceModel.getSaison() == Utils.getSaison()))
-                        throw new DNotFoundException("Pas d'affiliation pour la saison en cours");
+                        throw new DNotFoundException(trad.t("pas.d.affiliation.pour.la.saison.en.cours"));
 
                     try {
                         byte[] buff = make_pdf(m);

src/main/java/fr/titionfire/ffsaf/domain/service/ResultService.java

@@ -0,0 +1,909 @@
+package fr.titionfire.ffsaf.domain.service;
+
+import fr.titionfire.ffsaf.data.model.*;
+import fr.titionfire.ffsaf.data.repository.*;
+import fr.titionfire.ffsaf.domain.entity.MatchModelExtend;
+import fr.titionfire.ffsaf.rest.data.ResultCategoryData;
+import fr.titionfire.ffsaf.rest.exception.DBadRequestException;
+import fr.titionfire.ffsaf.rest.exception.DForbiddenException;
+import fr.titionfire.ffsaf.utils.*;
+import io.quarkus.cache.Cache;
+import io.quarkus.cache.CacheName;
+import io.quarkus.hibernate.reactive.panache.common.WithSession;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.unchecked.Unchecked;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import lombok.Builder;
+import lombok.Data;
+import org.hibernate.reactive.mutiny.Mutiny;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+@WithSession
+@ApplicationScoped
+public class ResultService {
+
+    @Inject
+    CompetitionRepository compRepository;
+
+    @Inject
+    RegisterRepository registerRepository;
+
+    @Inject
+    MembreService membreService;
+
+    @Inject
+    ClubRepository clubRepository;
+
+    @Inject
+    CompetitionGuestRepository competitionGuestRepository;
+
+    @Inject
+    CategoryRepository categoryRepository;
+
+    @Inject
+    MatchRepository matchRepository;
+
+    @Inject
+    CardRepository cardRepository;
+
+    @Inject
+    TradService trad;
+
+    @Inject
+    @CacheName("club-classement")
+    Cache cacheClubClassement;
+    private static final HashMap<String, Long> cacheClubClassementExp = new HashMap<>();
+
+    private static final HashMap<Long, String> combTempIds = new HashMap<>();
+
+    private static String getCombTempId(Long key) {
+        synchronized (combTempIds) {
+            if (!combTempIds.containsKey(key)) {
+                combTempIds.put(key, UUID.randomUUID().toString());
+            }
+            return combTempIds.get(key);
+        }
+    }
+
+    private static Long getCombTempId(String value) {
+        synchronized (combTempIds) {
+            for (Map.Entry<Long, String> entry : combTempIds.entrySet()) {
+                if (entry.getValue().equals(value)) {
+                    return entry.getKey();
+                }
+            }
+            return null;
+        }
+    }
+
+    private static final HashMap<String, Long> clubTempIds = new HashMap<>();
+
+    private static Long getClubTempId(String key) {
+        synchronized (clubTempIds) {
+            if (!clubTempIds.containsKey(key)) {
+                clubTempIds.put(key, (System.currentTimeMillis() + clubTempIds.size()) * -1);
+            }
+            return clubTempIds.get(key);
+        }
+    }
+
+    private static String getClubTempId(Long value) {
+        synchronized (clubTempIds) {
+            for (Map.Entry<String, Long> entry : clubTempIds.entrySet()) {
+                if (entry.getValue().equals(value)) {
+                    return entry.getKey();
+                }
+            }
+            return null;
+        }
+    }
+
+    public Uni<List<Object[]>> getList(SecurityCtx securityCtx) {
+        return membreService.getByAccountId(securityCtx.getSubject())
+                .chain(m -> registerRepository.list(
+                        "membre = ?1 OR (TRUE = ?2 AND membre.club = ?3)",
+                        m, securityCtx.isClubAdmin(), m.getClub()))
+                .onItem().transformToMulti(Multi.createFrom()::iterable)
+                .onItem().call(r -> Mutiny.fetch(r.getCompetition()))
+                .onItem().transform(RegisterModel::getCompetition)
+                .collect().asList()
+                .chain(l -> compRepository.list("owner = ?1 OR ?1 IN admin", securityCtx.getSubject())
+                        .map(l2 -> Stream.concat(l.stream(), l2.stream()).distinct()
+                                .map(c -> new Object[]{c.getUuid(), c.getName(), c.getDate()}).toList())
+                );
+    }
+
+    public Uni<HashMap<String, Long>> getCategoryList(String uuid, SecurityCtx securityCtx) {
+        return hasAccess(uuid, securityCtx).chain(__ -> getCategoryList(uuid));
+    }
+
+    public Uni<HashMap<String, Long>> getCategoryList(String uuid) {
+        return categoryRepository.list("compet.uuid = ?1", uuid)
+                .map(categoryModels -> {
+                    HashMap<String, Long> map = new HashMap<>();
+                    categoryModels.stream()
+                            .sorted(Comparator.comparing(CategoryModel::getName))
+                            .forEachOrdered(categoryModel -> map.put(categoryModel.getName(), categoryModel.getId()));
+                    return map;
+                });
+    }
+
+    public Uni<ResultCategoryData> getCategory(String uuid, long poule, SecurityCtx securityCtx) {
+        return hasAccess(uuid, securityCtx).chain(membreModel -> getData(uuid, poule, membreModel));
+    }
+
+    public Uni<ResultCategoryData> getCategory(String uuid, long poule) {
+        return getData(uuid, poule, null);
+    }
+
+    private Uni<ResultCategoryData> getData(String uuid, long poule, MembreModel membreModel) {
+        List<CardModel> cards = new ArrayList<>();
+
+        return matchRepository.list("category.compet.uuid = ?1 AND category.id = ?2", uuid, poule)
+                .call(list -> list.isEmpty() ? Uni.createFrom().voidItem() :
+                        Mutiny.fetch(list.get(0).getCategory().getTree()))
+                .chain(list -> cardRepository.list("competition.uuid = ?1", uuid).invoke(cards::addAll)
+                        .map(c -> list.stream().map(m -> new MatchModelExtend(m, c)).toList()))
+                .map(matchModels -> {
+                    ResultCategoryData out = new ResultCategoryData();
+
+                    CategoryModel categoryModel = matchModels.get(0).getCategory();
+                    out.setName(categoryModel.getName());
+                    out.setType(categoryModel.getType());
+                    out.setLiceName(categoryModel.getLiceName() == null ? new String[]{} : categoryModel.getLiceName()
+                            .split(";"));
+                    out.setGenTime(System.currentTimeMillis());
+                    out.setTreeIsClassement(categoryModel.isTreeAreClassement());
+
+                    getArray2(matchModels, membreModel, out);
+                    getTree(categoryModel.getTree(), membreModel, cards, out);
+                    getClassementArray(categoryModel, membreModel, cards, out);
+                    return out;
+                });
+    }
+
+    public void getArray2(List<MatchModelExtend> matchModels_, MembreModel membreModel, ResultCategoryData out) {
+        List<MatchModelExtend> matchModels = matchModels_.stream().filter(o -> o.getCategory_ord() >= 0).toList();
+
+        HashMap<Character, List<MatchModelExtend>> matchMap = new HashMap<>();
+        for (MatchModelExtend model : matchModels) {
+            char g = model.getPoule();
+            if (!matchMap.containsKey(g))
+                matchMap.put(g, new ArrayList<>());
+            matchMap.get(g).add(model);
+        }
+
+        matchMap.forEach((c, matchEntities) -> {
+            List<ResultCategoryData.PouleArrayData> matchs = matchEntities.stream()
+                    .sorted(Comparator.comparing(MatchModelExtend::getCategory_ord))
+                    .map(o -> ResultCategoryData.PouleArrayData.fromModel(o, membreModel,
+                            ResultPrivacy.REGISTERED_ONLY_NO_DETAILS))
+                    .toList();
+
+            List<ResultCategoryData.RankArray> rankArray = matchEntities.stream()
+                    .flatMap(m -> Stream.of(m.getC1_id(), m.getC2_id(), m.getC1_guest(), m.getC2_guest()))
+                    .distinct()
+                    .filter(Objects::nonNull)
+                    .map(comb -> {
+                        CombStat stat = makeStat(matchEntities, comb);
+                        return new ResultCategoryData.RankArray(0, comb,
+                                comb.getName(membreModel, ResultPrivacy.REGISTERED_ONLY_NO_DETAILS), stat.score, stat.w,
+                                stat.pointMake, stat.pointTake, stat.getPointRate());
+                    })
+                    .filter(r -> r.getPointMake() > 0 || r.getPointTake() > 0)
+                    .sorted(Comparator
+                            .comparing(ResultCategoryData.RankArray::getScore)
+                            .thenComparing(ResultCategoryData.RankArray::getWin)
+                            .thenComparing(ResultCategoryData.RankArray::getPointRate).reversed())
+                    .toList();
+            out.getMatchs().put(c, matchs);
+
+            int lastScore = -1;
+            int lastWin = -1;
+            float pointRate = 0;
+            int rank = 0;
+            for (ResultCategoryData.RankArray rankArray1 : rankArray) {
+                if (rankArray1.getScore() != lastScore || rankArray1.getWin() != lastWin || pointRate != rankArray1.getPointRate()) {
+                    lastScore = rankArray1.getScore();
+                    lastWin = rankArray1.getWin();
+                    pointRate = rankArray1.getPointRate();
+                    rank++;
+                }
+                rankArray1.setRank(rank);
+            }
+            out.getRankArray().put(c, rankArray);
+        });
+    }
+
+    public void getClassementArray(CategoryModel categoryModel, MembreModel membreModel, List<CardModel> cards,
+                                   ResultCategoryData out) {
+        if ((categoryModel.getType() & 2) != 0) {
+            AtomicInteger rank = new AtomicInteger(0);
+            categoryModel.getTree().stream()
+                    .filter(t -> t.getLevel() > 0)
+                    .sorted(Comparator.comparing(TreeModel::getLevel))
+                    .forEach(treeModel -> makeClassementRow(membreModel,
+                            new MatchModelExtend(treeModel.getMatch(), cards), out, rank));
+
+            categoryModel.getTree().stream()
+                    .filter(t -> t.getLevel() <= -10)
+                    .sorted(Comparator.comparing(TreeModel::getLevel).reversed())
+                    .forEach(treeModel -> makeClassementRow(membreModel,
+                            new MatchModelExtend(treeModel.getMatch(), cards), out, rank));
+        } else {
+            for (List<ResultCategoryData.RankArray> list : out.getRankArray().values()) {
+                for (ResultCategoryData.RankArray r : list) {
+                    out.getClassement()
+                            .add(new ResultCategoryData.ClassementData(r.getRank(), r.getComb(), r.getName()));
+                }
+            }
+        }
+    }
+
+    private static void makeClassementRow(MembreModel membreModel, MatchModelExtend m, ResultCategoryData out,
+                                          AtomicInteger rank) {
+        if (m.isEnd()) {
+            if (m.getWin() > 0) {
+                out.getClassement()
+                        .add(new ResultCategoryData.ClassementData(rank.incrementAndGet(), m.getC1(),
+                                m.getC1Name(membreModel, ResultPrivacy.REGISTERED_ONLY_NO_DETAILS)));
+                out.getClassement()
+                        .add(new ResultCategoryData.ClassementData(rank.incrementAndGet(), m.getC2(),
+                                m.getC2Name(membreModel, ResultPrivacy.REGISTERED_ONLY_NO_DETAILS)));
+            } else if (m.getWin() < 0) {
+                out.getClassement()
+                        .add(new ResultCategoryData.ClassementData(rank.incrementAndGet(), m.getC2(),
+                                m.getC2Name(membreModel, ResultPrivacy.REGISTERED_ONLY_NO_DETAILS)));
+                out.getClassement()
+                        .add(new ResultCategoryData.ClassementData(rank.incrementAndGet(), m.getC1(),
+                                m.getC1Name(membreModel, ResultPrivacy.REGISTERED_ONLY_NO_DETAILS)));
+            } else {
+                out.getClassement()
+                        .add(new ResultCategoryData.ClassementData(rank.incrementAndGet(), m.getC1(),
+                                m.getC1Name(membreModel, ResultPrivacy.REGISTERED_ONLY_NO_DETAILS)));
+                out.getClassement()
+                        .add(new ResultCategoryData.ClassementData(rank.get(), m.getC2(),
+                                m.getC2Name(membreModel, ResultPrivacy.REGISTERED_ONLY_NO_DETAILS)));
+            }
+        } else {
+            out.getClassement().add(new ResultCategoryData.ClassementData(rank.incrementAndGet(), null, null));
+            out.getClassement().add(new ResultCategoryData.ClassementData(rank.incrementAndGet(), null, null));
+        }
+    }
+
+    private static void convertTree(TreeModel src, TreeNode<ResultCategoryData.TreeData> dst, MembreModel membreModel,
+                                    ResultPrivacy privacy, List<CardModel> cards) {
+        dst.setData(
+                ResultCategoryData.TreeData.from(new MatchModelExtend(src.getMatch(), cards), src.getLevel(),
+                        membreModel, privacy));
+        if (src.getLeft() != null) {
+            dst.setLeft(new TreeNode<>());
+            convertTree(src.getLeft(), dst.getLeft(), membreModel, privacy, cards);
+        }
+        if (src.getRight() != null) {
+            dst.setRight(new TreeNode<>());
+            convertTree(src.getRight(), dst.getRight(), membreModel, privacy, cards);
+        }
+    }
+
+    private void getTree(List<TreeModel> treeModels, MembreModel membreModel, List<CardModel> cards,
+                         ResultCategoryData out) {
+        ArrayList<TreeNode<ResultCategoryData.TreeData>> trees = new ArrayList<>();
+        treeModels.stream()
+                .filter(t -> t.getLevel() != 0)
+                .sorted(Comparator.comparing(TreeModel::getLevel))
+                .forEach(treeModel -> {
+                    TreeNode<ResultCategoryData.TreeData> root = new TreeNode<>();
+                    convertTree(treeModel, root, membreModel, ResultPrivacy.REGISTERED_ONLY_NO_DETAILS, cards);
+                    trees.add(root);
+                });
+        out.setTrees(trees);
+    }
+
+    public Uni<CombsArrayData> getAllCombArray(String uuid, SecurityCtx securityCtx) {
+        return hasAccess(uuid, securityCtx)
+                .chain(membreModel -> getAllCombArray_(uuid, membreModel));
+    }
+
+    public Uni<CombsArrayData> getAllCombArrayPublic(String uuid) {
+        return getAllCombArray_(uuid, null);
+    }
+
+    private Uni<CombsArrayData> getAllCombArray_(String uuid, MembreModel membreModel) {
+        return registerRepository.list("competition.uuid = ?1", uuid)
+                .chain(registers -> matchRepository.list("category.compet.uuid = ?1", uuid)
+                        .chain(matchModels -> cardRepository.list("competition.uuid = ?1", uuid)
+                                .map(cards -> new Pair<>(registers,
+                                        matchModels.stream().map(m -> new MatchModelExtend(m, cards)).toList()))))
+
+                .map(pair -> {
+                    List<RegisterModel> registers = pair.getKey();
+                    List<MatchModelExtend> matchModels = pair.getValue();
+
+                    CombsArrayData.CombsArrayDataBuilder builder = CombsArrayData.builder();
+
+                    List<CombsArrayData.CombsData> combs = matchModels.stream()
+                            .flatMap(m -> Stream.of(m.getC1_id(), m.getC2_id(), m.getC1_guest(), m.getC2_guest()))
+                            .filter(Objects::nonNull)
+                            .distinct()
+                            .map(comb -> {
+                                var builder2 = CombsArrayData.CombsData.builder();
+                                CombStat stat = makeStat(matchModels, comb);
+
+                                Categorie categorie = null;
+                                String clubName = null;
+
+                                Optional<RegisterModel> register = registers.stream()
+                                        .filter(r -> Objects.equals(r.getMembre(), comb)).findFirst();
+                                if (register.isPresent()) {
+                                    categorie = register.get().getCategorie2();
+                                    ClubModel club = register.get().getClub2();
+                                    clubName = (club == null) ? trad.t("no.licence") : club.getName();
+                                } else if (comb instanceof CompetitionGuestModel guestModel) {
+                                    categorie = guestModel.getCategorie();
+                                    clubName = guestModel.getClub();
+                                } else if (comb instanceof MembreModel model) {
+                                    categorie = model.getCategorie();
+                                    clubName = (model.getClub() == null) ? trad.t("no.licence")
+                                            : model.getClub().getName();
+                                }
+
+                                builder2.cat((categorie == null) ? "---" : categorie.getName(trad));
+                                builder2.name(comb.getName(membreModel, ResultPrivacy.REGISTERED_ONLY));
+                                builder2.w(stat.w);
+                                builder2.l(stat.l);
+                                builder2.ratioVictoire((stat.l == 0) ? stat.w : (float) stat.w / stat.l);
+                                builder2.club(clubName);
+                                builder2.pointMake(stat.pointMake);
+                                builder2.pointTake(stat.pointTake);
+                                builder2.ratioPoint(stat.getPointRate());
+
+                                return builder2.build();
+                            })
+                            .sorted(Comparator.comparing(CombsArrayData.CombsData::name))
+                            .toList();
+
+                    builder.nb_insc(combs.size());
+                    builder.tt_match((int) matchModels.stream().filter(MatchModelExtend::isEnd).count());
+                    builder.point(matchModels.stream()
+                            .filter(MatchModelExtend::isEnd)
+                            .flatMap(m -> m.getScoresToCompute().stream())
+                            .mapToInt(s -> s.getS1() + s.getS2()).sum());
+                    builder.combs(combs);
+
+                    return builder.build();
+                });
+    }
+
+    public Uni<HashMap<String, String>> getCombList(String uuid, SecurityCtx securityCtx) {
+        return hasAccess(uuid, securityCtx)
+                .chain(membreModel -> getCombList(uuid, ResultPrivacy.REGISTERED_ONLY));
+    }
+
+    public Uni<HashMap<String, String>> getCombList(String uuid) {
+        return getCombList(uuid, ResultPrivacy.PUBLIC);
+    }
+
+    private Uni<HashMap<String, String>> getCombList(String uuid, ResultPrivacy privacy) {
+        return registerRepository.list("competition.uuid = ?1 AND membre.resultPrivacy <= ?2", uuid, privacy)
+                .map(models -> {
+                    HashMap<String, String> map = new HashMap<>();
+                    models.forEach(
+                            r -> map.put(r.getMembre().getName(), getCombTempId(r.getMembre().getId())));
+                    return map;
+                })
+                .chain(map -> competitionGuestRepository.list("competition.uuid = ?1 AND lname != \"__team\"", uuid)
+                        .map(models -> {
+                            models.forEach(guestModel -> map.put(guestModel.getName(),
+                                    getCombTempId(guestModel.getId() * -1)));
+                            return map;
+                        })
+                );
+    }
+
+    public Uni<?> getCombArrayPublic(String uuid, String combTempId, SecurityCtx securityCtx) {
+        return hasAccess(uuid, securityCtx)
+                .chain(membreModel -> getCombArrayPublic(uuid, combTempId, ResultPrivacy.REGISTERED_ONLY));
+    }
+
+    public Uni<?> getCombArrayPublic(String uuid, String combTempId) {
+        return getCombArrayPublic(uuid, combTempId, ResultPrivacy.PUBLIC);
+    }
+
+    private Uni<?> getCombArrayPublic(String uuid, String combTempId, ResultPrivacy privacy) {
+        CombArrayData.CombArrayDataBuilder builder = CombArrayData.builder();
+
+        Long id = getCombTempId(combTempId);
+        if (id == null) {
+            return Uni.createFrom().failure(new DForbiddenException(trad.t("comb.not.found")));
+        }
+
+        Uni<List<MatchModelExtend>> uni;
+        if (id >= 0) {
+            uni = registerRepository.find("membre.id = ?1 AND competition.uuid = ?2 AND membre.resultPrivacy <= ?3", id,
+                            uuid, privacy).firstResult()
+                    .chain(Unchecked.function(registerModel -> {
+                        if (registerModel == null)
+                            throw new DBadRequestException(trad.t("combattant.non.inscrit"));
+
+                        builder.name(Utils.getFullName(registerModel.getMembre()));
+                        builder.club((registerModel.getClub2() == null) ? trad.t("no.licence") :
+                                registerModel.getClub2().getName());
+                        builder.cat((registerModel.getCategorie2() == null) ? "---" :
+                                registerModel.getCategorie2().getName(trad));
+
+                        return matchRepository.list(
+                                        "SELECT DISTINCT m FROM MatchModel m LEFT JOIN m.c1_guest.comb c1g LEFT JOIN m.c2_guest.comb c2g " +
+                                                "WHERE m.category.compet.uuid = ?1 AND (m.c1_id = ?2 OR m.c2_id = ?2 OR c1g = ?2 OR c2g = ?2)",
+                                        uuid, registerModel.getMembre())
+                                .chain(matchModels -> cardRepository.list("competition.uuid = ?1", uuid)
+                                        .map(cards -> matchModels.stream().map(m -> new MatchModelExtend(m, cards))
+                                                .toList()));
+                    }));
+        } else {
+            uni = competitionGuestRepository.find("id = ?1 AND competition.uuid = ?2", -id, uuid).firstResult()
+                    .chain(guestModel -> {
+                        builder.name(Utils.getFullName(guestModel));
+                        builder.club(guestModel.getClub());
+                        builder.cat(
+                                (guestModel.getCategorie() == null) ? "---" : guestModel.getCategorie().getName(trad));
+
+                        return matchRepository.list(
+                                        "SELECT DISTINCT m FROM MatchModel m LEFT JOIN m.c1_guest.guest c1g LEFT JOIN m.c2_guest.guest c2g " +
+                                                "WHERE m.category.compet.uuid = ?1 AND (m.c1_guest = ?2 OR m.c2_guest = ?2 OR c1g = ?2 OR c2g = ?2)",
+                                        uuid, guestModel)
+                                .chain(matchModels -> cardRepository.list("competition.uuid = ?1", uuid)
+                                        .map(cards -> matchModels.stream().map(m -> new MatchModelExtend(m, cards))
+                                                .toList()));
+                    });
+        }
+
+        return uni.invoke(matchModels -> {
+                    List<CategoryModel> pouleModels = matchModels.stream().map(MatchModelExtend::getCategory).distinct()
+                            .toList();
+                    List<CombArrayData.MatchsData> matchs = new ArrayList<>();
+
+                    AtomicInteger sumW = new AtomicInteger();
+                    AtomicInteger sumPointMake = new AtomicInteger(0);
+                    AtomicInteger sumPointTake = new AtomicInteger(0);
+
+                    for (MatchModelExtend matchModel : matchModels) {
+                        if ((matchModel.getC1_id() == null && matchModel.getC1_guest() == null) ||
+                                (matchModel.getC2_id() == null && matchModel.getC2_guest() == null))
+                            continue;
+
+                        var builder2 = CombArrayData.MatchsData.builder();
+                        builder2.date(matchModel.getDate());
+                        builder2.poule(pouleModels.stream().filter(p -> p.equals(matchModel.getCategory()))
+                                .map(CategoryModel::getName).findFirst().orElse(""));
+                        builder2.end(matchModel.isEnd());
+
+                        AtomicInteger pointMake = new AtomicInteger();
+                        AtomicInteger pointTake = new AtomicInteger();
+
+                        if (matchModel.isC1(id)) {
+                            builder2.adv(matchModel.getC2Name());
+                            if (matchModel.isEnd()) {
+                                matchModel.getScoresToCompute()
+                                        .forEach(scoreEntity -> {
+                                            pointMake.addAndGet(scoreEntity.getS1());
+                                            pointTake.addAndGet(scoreEntity.getS2());
+                                        });
+                                builder2.score(matchModel.getScoresToPrint().stream()
+                                        .map(s -> new Integer[]{s.getS1(), s.getS2()}).toList());
+                            } else {
+                                builder2.score(new ArrayList<>());
+                            }
+                            builder2.win(matchModel.isEnd() && matchModel.getWin() > 0);
+                        } else {
+                            builder2.adv(matchModel.getC1Name());
+                            if (matchModel.isEnd()) {
+                                matchModel.getScoresToCompute()
+                                        .forEach(scoreEntity -> {
+                                            pointMake.addAndGet(scoreEntity.getS2());
+                                            pointTake.addAndGet(scoreEntity.getS1());
+                                        });
+                                builder2.score(matchModel.getScoresToPrint().stream()
+                                        .map(s -> new Integer[]{s.getS2(), s.getS1()}).toList());
+                            } else {
+                                builder2.score(new ArrayList<>());
+                            }
+                            builder2.win(matchModel.isEnd() && matchModel.getWin() < 0);
+                        }
+                        builder2.eq(matchModel.isEnd() && matchModel.getWin() == 0);
+                        builder2.ratio(
+                                (pointTake.get() == 0) ? pointMake.get() : (float) pointMake.get() / pointTake.get());
+
+                        sumPointMake.addAndGet(pointMake.get());
+                        sumPointTake.addAndGet(pointTake.get());
+
+                        matchs.add(builder2.build());
+                        if (builder2.win)
+                            sumW.getAndIncrement();
+                    }
+
+                    builder.totalWin(sumW.get());
+                    builder.pointRatio(
+                            (sumPointTake.get() == 0) ? sumPointMake.get() : (float) sumPointMake.get() / sumPointTake.get());
+                    builder.pointMake(sumPointMake.get());
+                    builder.pointTake(sumPointTake.get());
+
+                    matchs.sort(Comparator.comparing(CombArrayData.MatchsData::poule)
+                            .thenComparing(CombArrayData.MatchsData::adv));
+
+                    builder.matchs(matchs);
+                })
+                .map(__ -> builder.build());
+    }
+
+
+    @Builder
+    @RegisterForReflection
+    public static record CombsArrayData(int nb_insc, int tt_match, long point, List<CombsData> combs) {
+        @Builder
+        @RegisterForReflection
+        public static record CombsData(String cat, String club, String name, int w, int l, float ratioVictoire,
+                                       float ratioPoint, int pointMake, int pointTake) {
+        }
+    }
+
+    @Builder
+    @RegisterForReflection
+    public static record CombArrayData(String name, String club, String cat, int totalWin,
+                                       float pointRatio, int pointMake, int pointTake, List<MatchsData> matchs) {
+        @Builder
+        @RegisterForReflection
+        public static record MatchsData(Date date, String poule, String adv, List<Integer[]> score, float ratio,
+                                        boolean win, boolean eq, boolean end) {
+        }
+    }
+
+    public Uni<HashMap<String, Long>> getClubList(String uuid, SecurityCtx securityCtx) {
+        return hasAccess(uuid, securityCtx).chain(__ -> getClubList(uuid));
+    }
+
+    public Uni<HashMap<String, Long>> getClubList(String uuid) {
+        return registerRepository.list("competition.uuid = ?1", uuid)
+                .map(registers -> {
+                    HashMap<String, Long> registerMap = new HashMap<>();
+                    registers.stream().map(RegisterModel::getClub2).distinct().filter(Objects::nonNull)
+                            .forEach(registerClub -> registerMap.put(registerClub.getName(), registerClub.getId()));
+                    return registerMap;
+                })
+                .chain(map -> competitionGuestRepository.list("competition.uuid = ?1", uuid)
+                        .map(guests -> {
+                            guests.stream().map(CompetitionGuestModel::getClub).distinct()
+                                    .filter(Objects::nonNull)
+                                    .forEach(guestClub -> map.putIfAbsent(guestClub,
+                                            getClubTempId(guestClub)));
+                            return map;
+                        })
+                );
+    }
+
+    public Uni<ClubArrayData> getClubArray(String uuid, Long id, SecurityCtx securityCtx) {
+        return hasAccess(uuid, securityCtx).chain(membreModel -> getClubArray2(uuid, id, membreModel));
+    }
+
+    public Uni<ClubArrayData> getClubArray2(String uuid, Long id, MembreModel membreModel) {
+        if (id < 0) {
+            String clubName = getClubTempId(id);
+            if (clubName == null) {
+                return Uni.createFrom().failure(new DForbiddenException(trad.t("club.not.found")));
+            }
+
+            return competitionGuestRepository.list("competition.uuid = ?1 AND club = ?2", uuid, clubName)
+                    .call(list -> {
+                        if (list.isEmpty())
+                            return Uni.createFrom().failure(new DBadRequestException(trad.t("club.not.found")));
+                        return Uni.createFrom().voidItem();
+                    })
+                    .chain(guests -> matchRepository.list(
+                                    "SELECT DISTINCT m FROM MatchModel m LEFT JOIN m.c1_guest.guest c1g LEFT JOIN m.c2_guest.guest c2g " +
+                                            "WHERE m.category.compet.uuid = ?1 AND (m.c1_guest IN ?2 OR m.c2_guest IN ?2 OR c1g IN ?2 OR c2g IN ?2)",
+                                    uuid, guests)
+
+                            .chain(mm -> cardRepository.list("competition.uuid = ?1", uuid)
+                                    .map(cards ->
+                                            getClubArray2(clubName, guests.stream().map(o -> (CombModel) o).toList(),
+                                                    mm.stream().map(m -> new MatchModelExtend(m, cards)).toList(),
+                                                    new ArrayList<>(), membreModel)
+                                    )));
+        } else {
+            return cardRepository.list("competition.uuid = ?1", uuid)
+                    .chain(cards -> clubRepository.findById(id).chain(clubModel ->
+                            registerRepository.list("competition.uuid = ?1 AND membre.club = ?2", uuid, clubModel)
+                                    .chain(registers -> matchRepository.list(
+                                                    "SELECT DISTINCT m FROM MatchModel m LEFT JOIN m.c1_guest.comb c1g LEFT JOIN m.c2_guest.comb c2g " +
+                                                            "WHERE m.category.compet.uuid = ?1 AND (m.c1_id IN ?2 OR m.c2_id IN ?2 OR c1g IN ?2 OR c2g IN ?2)",
+                                                    uuid, registers.stream().map(RegisterModel::getMembre).toList())
+                                            .map(matchModels -> matchModels.stream()
+                                                    .map(m -> new MatchModelExtend(m, cards)))
+                                            .chain(s -> competitionGuestRepository.list(
+                                                            "competition.uuid = ?1 AND club = ?2", uuid, clubModel.getName())
+                                                    .chain(guests -> matchRepository.list(
+                                                                    "SELECT DISTINCT m FROM MatchModel m LEFT JOIN m.c1_guest.guest c1g LEFT JOIN m.c2_guest.guest c2g " +
+                                                                            "WHERE m.category.compet.uuid = ?1 AND (m.c1_guest IN ?2 OR m.c2_guest IN ?2 OR c1g IN ?2 OR c2g IN ?2)",
+                                                                    uuid, guests)
+                                                            .map(mm -> new Pair<>(guests, Stream.concat(s, mm.stream()
+                                                                            .map(m -> new MatchModelExtend(m, cards)))
+                                                                    .distinct().toList()))
+                                                    ))
+                                            .map(p ->
+                                                    getClubArray2(clubModel.getName(),
+                                                            Stream.concat(
+                                                                    registers.stream().map(RegisterModel::getMembre),
+                                                                    p.getKey().stream()
+                                                            ).toList(),
+                                                            p.getValue(), registers, membreModel)
+                                            ))));
+        }
+    }
+
+    private ClubArrayData getClubArray2(String name, List<CombModel> combs, List<MatchModelExtend> matchModels,
+                                        List<RegisterModel> registers, MembreModel membreModel) {
+        ClubArrayData.ClubArrayDataBuilder builder = ClubArrayData.builder();
+        builder.name(name);
+        builder.nb_insc(combs.size());
+
+        ArrayList<Long> win_ids = new ArrayList<>();
+        ArrayList<Long> match_ids = new ArrayList<>();
+
+        List<ClubArrayData.CombData> combData = combs.stream().map(comb -> {
+                    var builder2 = ClubArrayData.CombData.builder();
+                    CombStat stat = makeStat(matchModels, comb);
+
+                    Categorie categorie = null;
+
+                    Optional<RegisterModel> register = registers.stream()
+                            .filter(r -> Objects.equals(r.getMembre(), comb)).findFirst();
+                    if (register.isPresent()) {
+                        categorie = register.get().getCategorie2();
+                    } else if (comb instanceof CompetitionGuestModel guestModel) {
+                        categorie = guestModel.getCategorie();
+                    } else if (comb instanceof MembreModel model) {
+                        categorie = model.getCategorie();
+                    }
+
+                    builder2.cat((categorie == null) ? "---" : categorie.getName(trad));
+                    builder2.name(comb.getName(membreModel, ResultPrivacy.REGISTERED_ONLY));
+                    builder2.w(stat.w);
+                    builder2.l(stat.l);
+                    builder2.ratioVictoire((stat.l == 0) ? stat.w : (float) stat.w / stat.l);
+                    builder2.pointMake(stat.pointMake);
+                    builder2.pointTake(stat.pointTake);
+                    builder2.ratioPoint(stat.getPointRate());
+
+                    win_ids.addAll(stat.win_ids);
+                    match_ids.addAll(stat.match_ids);
+
+                    return builder2.build();
+                })
+                .sorted(Comparator.comparing(ClubArrayData.CombData::name))
+                .toList();
+
+        builder.nb_match((int) match_ids.stream().distinct().count());
+        builder.match_w((int) win_ids.stream().distinct().count());
+        builder.ratioVictoire((float) combData.stream().filter(c -> c.l + c.w != 0)
+                .mapToDouble(ClubArrayData.CombData::ratioVictoire).average().orElse(0L));
+        builder.pointMake(combData.stream().mapToInt(ClubArrayData.CombData::pointMake).sum());
+        builder.pointTake(combData.stream().mapToInt(ClubArrayData.CombData::pointTake).sum());
+        builder.ratioPoint((float) combData.stream().filter(c -> c.l + c.w != 0)
+                .mapToDouble(ClubArrayData.CombData::ratioPoint).average().orElse(0L));
+        builder.combs(combData);
+
+        return builder.build();
+    }
+
+    private static CombStat makeStat(List<MatchModelExtend> matchModels, CombModel comb) {
+        CombStat stat = new CombStat();
+        matchModels.stream()
+                .filter(m -> m.isEnd() && (m.isC1(comb) || m.isC2(comb)))
+                .forEach(matchModel -> {
+                    stat.match_ids.add(matchModel.getId());
+
+                    int win = matchModel.getWin();
+                    if (win == 0) {
+                        stat.score += 1;
+                    } else if ((matchModel.isC1(comb) && win > 0) || matchModel.isC2(comb) && win < 0) {
+                        stat.w++;
+                        stat.win_ids.add(matchModel.getId());
+                        stat.score += 2;
+                    } else {
+                        stat.l++;
+                    }
+
+                    matchModel.getScoresToCompute()
+                            .forEach(score -> {
+                                if (matchModel.isC1(comb)) {
+                                    stat.pointMake += score.getS1();
+                                    stat.pointTake += score.getS2();
+                                } else {
+                                    stat.pointMake += score.getS2();
+                                    stat.pointTake += score.getS1();
+                                }
+                            });
+                });
+        return stat;
+    }
+
+    @Builder
+    @RegisterForReflection
+    public static record ClubArrayData(String name, int nb_insc, int nb_match, int match_w, float ratioVictoire,
+                                       float ratioPoint, int pointMake, int pointTake, List<CombData> combs) {
+        @Builder
+        @RegisterForReflection
+        public static record CombData(String cat, String name, int w, int l, float ratioVictoire,
+                                      float ratioPoint, int pointMake, int pointTake) {
+        }
+    }
+
+    public Uni<List<ClubClassement>> getAllClubArray(String uuid) {
+        return getAllClubArray(uuid, true);
+    }
+
+    public Uni<List<ClubClassement>> getAllClubArray(String uuid, SecurityCtx securityCtx) {
+        return hasAccess(uuid, securityCtx).chain(membreModel -> getAllClubArray(uuid, true));
+    }
+
+    public Uni<List<ClubClassement>> getAllClubArray(String uuid, boolean cache) {
+        List<CardModel> cards = new java.util.ArrayList<>();
+
+        return (!cache || cacheClubClassementExp.getOrDefault(uuid, 0L) < System.currentTimeMillis() ?
+                cacheClubClassement.invalidate(uuid).invoke(() -> cacheClubClassementExp.remove(uuid)) :
+                Uni.createFrom().voidItem()
+        ).chain(o -> cacheClubClassement.getAsync(uuid, k -> cardRepository.list("competition.uuid = ?1", uuid)
+                .invoke(__ -> System.out.println("Cache miss for club classement with uuid " + uuid))
+                .invoke(cards::addAll)
+                .chain(__ -> matchRepository.list("category.compet.uuid = ?1", uuid))
+                .chain(matchs -> {
+                    HashMap<CategoryModel, List<MatchModel>> map = new HashMap<>();
+                    for (MatchModel match : matchs) {
+                        if (!map.containsKey(match.getCategory()))
+                            map.put(match.getCategory(), new java.util.ArrayList<>());
+                        map.get(match.getCategory()).add(match);
+                    }
+
+                    return Multi.createFrom().iterable(map.entrySet())
+                            .onItem().call(entry -> Mutiny.fetch(entry.getKey().getTree()))
+                            .map(entry -> {
+                                ResultCategoryData tmp = new ResultCategoryData();
+
+                                getArray2(entry.getValue().stream().map(m -> new MatchModelExtend(m, cards))
+                                                .toList(),
+                                        null, tmp);
+                                getClassementArray(entry.getKey(), null, cards, tmp);
+
+                                return tmp;
+                            })
+                            .collect().asList();
+                })
+                .map(categoryData -> {
+                    HashMap<String, ClubClassement> clubMap = new HashMap<>();
+
+                    categoryData.forEach(
+                            c -> c.getClassement().stream().map(ResultCategoryData.ClassementData::comb)
+                                    .filter(Objects::nonNull)
+                                    .distinct()
+                                    .map(comb -> {
+                                        if (comb instanceof MembreModel membreModel2) {
+                                            return (membreModel2.getClub() != null) ? membreModel2.getClub()
+                                                    .getName() : "";
+                                        } else if (comb instanceof CompetitionGuestModel guestModel) {
+                                            return guestModel.getClub();
+                                        }
+                                        return "";
+                                    })
+                                    .filter(s -> s != null && !s.isBlank() && !s.equals("Team"))
+                                    .distinct()
+                                    .forEach(clubName -> clubMap.putIfAbsent(clubName,
+                                            new ClubClassement(clubName))));
+
+                    categoryData.forEach(c -> c.getClassement().forEach(classementData -> {
+                        if (classementData.rank() > 3)
+                            return;
+
+                        if (classementData.comb() != null) {
+                            String clubName = "";
+                            if (classementData.comb() instanceof MembreModel membreModel2) {
+                                clubName = (membreModel2.getClub() != null) ? membreModel2.getClub()
+                                        .getName() : "";
+                            } else if (classementData.comb() instanceof CompetitionGuestModel guestModel) {
+                                clubName = guestModel.getClub();
+                            }
+
+                            if (clubName != null && !clubName.isBlank()
+                                    && !clubName.equals("Team") && clubMap.containsKey(clubName)) {
+                                ClubClassement entity = clubMap.get(clubName);
+                                entity.score[classementData.rank() - 1]++;
+                                entity.tt_score += 4 - classementData.rank();
+                            }
+                        }
+                    }));
+
+                    return clubMap.values().stream()
+                            .sorted(Comparator.comparingInt((ClubClassement c) -> c.tt_score)
+                                    .thenComparingInt(c -> c.score[0])
+                                    .thenComparingInt(c -> c.score[1])
+                                    .thenComparingInt(c -> c.score[2]).reversed())
+                            .toList();
+                })
+                .invoke(__ -> cacheClubClassementExp.put(uuid, System.currentTimeMillis() + 60 * 1000L))
+        ));
+    }
+
+    @Data
+    @RegisterForReflection
+    public static class ClubClassement {
+        String name;
+        Integer[] score = new Integer[]{0, 0, 0};
+        int tt_score = 0;
+
+        public ClubClassement(String name) {
+            this.name = name;
+        }
+    }
+
+    @RegisterForReflection
+    public static class CombStat {
+        public int w;
+        public int l;
+        public int score;
+        public int pointMake;
+        public int pointTake;
+        public ArrayList<Long> win_ids = new ArrayList<>();
+        public ArrayList<Long> match_ids = new ArrayList<>();
+
+        public CombStat() {
+            this.w = 0;
+            this.l = 0;
+            this.score = 0;
+            this.pointMake = 0;
+            this.pointTake = 0;
+        }
+
+        public float getPointRate() {
+            return (pointTake == 0) ? pointMake : (float) pointMake / pointTake;
+        }
+    }
+
+    private Uni<MembreModel> hasAccess(String uuid, SecurityCtx securityCtx) {
+        return registerRepository.find("membre.userId = ?1 AND competition.uuid = ?2", securityCtx.getSubject(), uuid)
+                .firstResult()
+                .chain(Unchecked.function(o -> {
+                    if (o != null)
+                        return Uni.createFrom().item(o.getMembre());
+
+                    return membreService.getByAccountId(securityCtx.getSubject()).chain(m -> {
+                        if (securityCtx.isClubAdmin()) {
+                            return registerRepository.count("membre.club = ?2 AND competition.uuid = ?1",
+                                    uuid, m.getClub()).chain(c -> {
+                                if (c > 0) return Uni.createFrom().item(m);
+
+                                return compRepository.count("uuid = ?1 AND (owner = ?2 OR ?2 IN admin)",
+                                                uuid, securityCtx.getSubject())
+                                        .chain(c2 -> {
+                                            if (c2 > 0) return Uni.createFrom().item(m);
+                                            return Uni.createFrom().failure(new DForbiddenException(
+                                                    trad.t("access.denied")));
+                                        });
+                            });
+                        } else {
+                            return compRepository.count("uuid = ?1 AND (owner = ?2 OR ?2 IN admin)", uuid,
+                                            securityCtx.getSubject())
+                                    .chain(c2 -> {
+                                        if (c2 > 0) return Uni.createFrom().item(m);
+                                        return Uni.createFrom()
+                                                .failure(new DForbiddenException(trad.t("access.denied")));
+                                    });
+                        }
+                    });
+                }));
+    }
+}

src/main/java/fr/titionfire/ffsaf/domain/service/SelectionService.java

@@ -0,0 +1,64 @@
+package fr.titionfire.ffsaf.domain.service;
+
+import fr.titionfire.ffsaf.data.model.LogModel;
+import fr.titionfire.ffsaf.data.model.MembreModel;
+import fr.titionfire.ffsaf.data.model.SelectionModel;
+import fr.titionfire.ffsaf.data.repository.CombRepository;
+import fr.titionfire.ffsaf.data.repository.SelectionRepository;
+import fr.titionfire.ffsaf.rest.data.SimpleSelection;
+import io.quarkus.hibernate.reactive.panache.Panache;
+import io.quarkus.hibernate.reactive.panache.common.WithSession;
+import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import org.hibernate.reactive.mutiny.Mutiny;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+@WithSession
+@ApplicationScoped
+public class SelectionService {
+
+    @Inject
+    CombRepository combRepository;
+
+    @Inject
+    SelectionRepository repository;
+
+    @Inject
+    LoggerService ls;
+
+    public Uni<List<SelectionModel>> getSelection(long id, Consumer<MembreModel> checkPerm) {
+        return combRepository.findById(id).invoke(checkPerm)
+                .chain(combRepository -> Mutiny.fetch(combRepository.getSelections()));
+    }
+
+    public Uni<SelectionModel> setSelection(long id, SimpleSelection data) {
+        if (data.getId() == -1) {
+            return combRepository.findById(id).chain(membreModel -> {
+                SelectionModel model = new SelectionModel();
+
+                model.setMembre(membreModel);
+                model.setSaison(data.getSaison());
+                model.setCategorie(data.getCategorie());
+                return Panache.withTransaction(() -> repository.persist(model))
+                        .call(licenceModel -> ls.logA(LogModel.ActionType.ADD, membreModel.getObjectName(),
+                                licenceModel));
+            });
+        } else {
+            return repository.findById(data.getId()).chain(model -> {
+                ls.logChange("Catégorie", model.getCategorie(), data.getCategorie(), model);
+                model.setCategorie(data.getCategorie());
+                return Panache.withTransaction(() -> repository.persist(model))
+                        .call(__ -> ls.append());
+            });
+        }
+    }
+
+    public Uni<Void> deleteSelection(long id) {
+        return repository.findById(id)
+                .call(model -> ls.logADelete(model))
+                .chain(model -> Panache.withTransaction(() -> repository.delete(model)));
+    }
+}

src/main/java/fr/titionfire/ffsaf/domain/service/StatsService.java

@@ -36,7 +36,7 @@ public class StatsService {
 
                     LicenceStats.YearStats yearStats = stats.getLicences().get(licence.getSaison());
 
-                    System.out.println("stats: " + licence.getMembre().getFname());
+                    // System.out.println("stats: " + licence.getMembre().getFname());
                     if (licence.isValidate()) {
                         if (licence.getMembre().getGenre() == Genre.H)
                             yearStats.addH();

src/main/java/fr/titionfire/ffsaf/domain/service/TradService.java

@@ -0,0 +1,52 @@
+package fr.titionfire.ffsaf.domain.service;
+
+import io.quarkus.websockets.next.WebSocketConnection;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.ContainerRequestContext;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+@RequestScoped
+public class TradService {
+
+    @Inject
+    Instance<ContainerRequestContext> requestContextInstance;
+
+    public static final Locale fallbackLocale = Locale.FRANCE;
+
+    public String t(String key) {
+        return translate(key);
+    }
+
+    public String t(String key, WebSocketConnection connection) {
+        List<String> lang = connection.handshakeRequest().headers().get("Accept-Language");
+        Locale userLocale = lang != null && !lang.isEmpty() ? Locale.forLanguageTag(lang.get(0)) : fallbackLocale;
+        return translate(key, userLocale);
+    }
+
+    public String translate(String key) {
+        ContainerRequestContext requestContext = requestContextInstance.get();
+        Locale userLocale = (Locale) requestContext.getProperty("userLocale");
+
+        return translate(key, userLocale);
+    }
+
+    public String translate(String key, Locale userLocale) {
+        try {
+            ResourceBundle messages = ResourceBundle.getBundle("lang.messages", userLocale);
+            return messages.getString(key);
+        } catch (MissingResourceException e) {
+            try {
+                ResourceBundle fallbackMessages = ResourceBundle.getBundle("lang.messages", fallbackLocale);
+                return fallbackMessages.getString(key);
+            } catch (MissingResourceException ex) {
+                return key;
+            }
+        }
+    }
+}

src/main/java/fr/titionfire/ffsaf/domain/service/UpdateService.java

@@ -0,0 +1,23 @@
+package fr.titionfire.ffsaf.domain.service;
+
+import jakarta.enterprise.context.ApplicationScoped;
+
+import java.util.HashMap;
+
+@ApplicationScoped
+public class UpdateService { // For public result page
+    static HashMap<Long, Long> lastUpdate = new HashMap<>();
+
+    public void setNewData(long id) {
+        lastUpdate.put(id, System.currentTimeMillis());
+    }
+
+    public boolean needUpdate(long id, long last_update) {
+        if (!lastUpdate.containsKey(id)) {
+            lastUpdate.put(id, System.currentTimeMillis() - 5000);
+            return true;
+        }
+
+        return lastUpdate.getOrDefault(id, 0L) > last_update;
+    }
+}

src/main/java/fr/titionfire/ffsaf/domain/service/VirusScannerService.java

@@ -0,0 +1,28 @@
+package fr.titionfire.ffsaf.domain.service;
+
+import io.quarkiverse.antivirus.runtime.Antivirus;
+import io.quarkiverse.antivirus.runtime.AntivirusScanResult;
+import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+import java.io.InputStream;
+import java.util.List;
+
+@ApplicationScoped
+public class VirusScannerService {
+
+    @Inject
+    Antivirus antivirus;
+
+    public Uni<List<AntivirusScanResult>> scanFileReactive(String fileName, InputStream inputStream) {
+        System.out.println("Starting reactive virus scan for file: " + fileName);
+
+        // Wrap the blocking antivirus scan in a reactive context
+        // This moves the blocking operation to a worker thread
+        return Uni.createFrom().item(() -> {
+            System.out.println("Scanning file on worker thread: " + fileName);
+            return antivirus.scan(fileName, inputStream);
+        }).runSubscriptionOn(io.smallrye.mutiny.infrastructure.Infrastructure.getDefaultWorkerPool());
+    }
+}

src/main/java/fr/titionfire/ffsaf/rest/AffiliationEndpoints.java

@@ -49,7 +49,7 @@ public class AffiliationEndpoints {
 
     @GET
     @Path("{id}")
-    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.APPLICATION_JSON)
     @Operation(summary = "Renvoie les affiliations pour un club", description = "Cette méthode renvoie les affiliations pour un club donné. Seuls les administrateurs de la fédération et les présidents, secrétaires et responsables intranet du club peuvent accéder à cette méthode.")
     @APIResponses(value = {

src/main/java/fr/titionfire/ffsaf/rest/AffiliationRequestEndpoints.java

@@ -73,7 +73,7 @@ public class AffiliationRequestEndpoints {
 
     @GET
     @Path("/{id}")
-    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.APPLICATION_JSON)
     @Operation(summary = "Renvoie une demande d'affiliation", description = "Cette méthode renvoie une demande d'affiliation " +
             "pour l'identifiant spécifié.")
@@ -92,7 +92,7 @@ public class AffiliationRequestEndpoints {
 
     @DELETE
     @Path("/{id}")
-    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.APPLICATION_JSON)
     @Operation(summary = "Supprime une demande d'affiliation", description = "Cette méthode supprime une demande " +
             "d'affiliation pour l'identifiant spécifié.")
@@ -128,7 +128,7 @@ public class AffiliationRequestEndpoints {
 
     @PUT
     @Path("/edit")
-    @RolesAllowed({"club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.TEXT_PLAIN)
     @Consumes(MediaType.MULTIPART_FORM_DATA)
     @Operation(summary = "Modifie une demande d'affiliation", description = "Cette méthode modifie une demande " +
@@ -186,6 +186,6 @@ public class AffiliationRequestEndpoints {
     public Uni<Response> getStatus(
             @Parameter(description = "L'identifiant de la demande d'affiliation") @PathParam("id") long id) throws URISyntaxException {
         return Utils.getMediaFile(id, media, "aff_request/status", "affiliation_request_" + id,
-                Uni.createFrom().nullItem());
+                Uni.createFrom().nullItem(), false);
     }
 }

src/main/java/fr/titionfire/ffsaf/rest/AssoEndpoints.java

@@ -1,10 +1,12 @@
 package fr.titionfire.ffsaf.rest;
 
+import fr.titionfire.ffsaf.domain.service.TradService;
 import fr.titionfire.ffsaf.rest.client.SirenService;
 import fr.titionfire.ffsaf.rest.client.StateIdService;
 import fr.titionfire.ffsaf.rest.data.AssoData;
 import fr.titionfire.ffsaf.rest.exception.DNotFoundException;
 import io.smallrye.mutiny.Uni;
+import jakarta.inject.Inject;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
 import org.eclipse.microprofile.openapi.annotations.Operation;
@@ -19,6 +21,9 @@ public class AssoEndpoints {
     @RestClient
     SirenService sirenService;
 
+    @Inject
+    TradService trad;
+
     @GET
     @Path("state_id/{stateId}")
     @Produces(MediaType.APPLICATION_JSON)
@@ -28,9 +33,9 @@ public class AssoEndpoints {
                 stateId).chain(stateIdService::getAssoDataFromUnit)).onFailure().transform(throwable -> {
             if (throwable instanceof WebApplicationException exception) {
                 if (exception.getResponse().getStatus() == 404)
-                    return new DNotFoundException("Service momentanément indisponible");
+                    return new DNotFoundException(trad.t("service.momentanement.indisponible"));
                 if (exception.getResponse().getStatus() == 400)
-                    return new DNotFoundException("Asso introuvable");
+                    return new DNotFoundException(trad.t("asso.introuvable"));
             }
             return throwable;
         });

src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java

@@ -3,10 +3,11 @@ package fr.titionfire.ffsaf.rest;
 import fr.titionfire.ffsaf.data.model.ClubModel;
 import fr.titionfire.ffsaf.domain.service.ClubService;
 import fr.titionfire.ffsaf.domain.service.PDFService;
+import fr.titionfire.ffsaf.domain.service.TradService;
+import fr.titionfire.ffsaf.domain.service.VirusScannerService;
 import fr.titionfire.ffsaf.net2.data.SimpleClubModel;
 import fr.titionfire.ffsaf.rest.data.*;
 import fr.titionfire.ffsaf.rest.exception.DForbiddenException;
-import fr.titionfire.ffsaf.rest.exception.DInternalError;
 import fr.titionfire.ffsaf.rest.from.FullClubForm;
 import fr.titionfire.ffsaf.rest.from.PartClubForm;
 import fr.titionfire.ffsaf.utils.Contact;
@@ -47,9 +48,15 @@ public class ClubEndpoints {
     @Inject
     SecurityCtx securityCtx;
 
+    @Inject
+    VirusScannerService scannerService;
+
     @ConfigProperty(name = "upload_dir")
     String media;
 
+    @Inject
+    TradService trad;
+
     Consumer<ClubModel> checkPerm = Unchecked.consumer(clubModel -> {
         if (!securityCtx.roleHas("federation_admin") && !securityCtx.isInClubGroup(clubModel.getId()))
             throw new DForbiddenException();
@@ -81,7 +88,7 @@ public class ClubEndpoints {
     @Operation(summary = "Renvoie les types de contacts pour les clubs", description = "Renvoie la liste des types de " +
             "contacts possibles pour les clubs")
     public Uni<HashMap<String, String>> getConcatType() {
-        return Uni.createFrom().item(Contact.toSite());
+        return Uni.createFrom().item(Contact.toSite(trad));
     }
 
     @GET
@@ -109,7 +116,7 @@ public class ClubEndpoints {
 
     @GET
     @Path("{id}")
-    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.APPLICATION_JSON)
     @Operation(summary = "Renvoie les détails d'un club en fonction de son identifiant", description = "Renvoie les " +
             "détails d'un club en fonction de son identifiant, y compris les informations sur les membres et les affiliations")
@@ -121,9 +128,8 @@ public class ClubEndpoints {
     })
     public Uni<SimpleClub> getById(
             @Parameter(description = "Identifiant de club") @PathParam("id") long id) {
-        return clubService.getById(id).onItem().invoke(checkPerm).map(SimpleClub::fromModel).invoke(m -> {
+        return clubService.getById(id).onItem().invoke(checkPerm).map(SimpleClub::fromModel)
-            m.setContactMap(Contact.toSite());
+                .invoke(m -> m.setContactMap(Contact.toSite(trad)));
-        });
     }
 
     @PUT
@@ -145,25 +151,9 @@ public class ClubEndpoints {
         return clubService.update(id, input)
                 .invoke(Unchecked.consumer(out -> {
                     if (!out.equals("OK")) throw new InternalError("Fail to update data: " + out);
-                })).chain(() -> {
+                }))
-                    if (input.getLogo().length > 0)
+                .chain(() -> Utils.uploadFile(scannerService, input.getLogo(), id, media, "ppClub"))
-                        return Uni.createFrom().future(Utils.replacePhoto(id, input.getLogo(), media, "ppClub"
+                .chain(() -> Utils.uploadFile(scannerService, input.getStatus(), id, media, "clubStatus"));
-                        )).invoke(Unchecked.consumer(out -> {
-                            if (!out.equals("OK"))
-                                throw new DInternalError("Impossible de reconnaitre le fichier: " + out);
-                        })); // TODO log
-                    else
-                        return Uni.createFrom().nullItem();
-                }).chain(() -> {
-                    if (input.getStatus().length > 0)
-                        return Uni.createFrom().future(Utils.replacePhoto(id, input.getStatus(), media, "clubStatus"
-                        )).invoke(Unchecked.consumer(out -> {
-                            if (!out.equals("OK"))
-                                throw new DInternalError("Impossible de reconnaitre le fichier: " + out);
-                        })); // TODO log
-                    else
-                        return Uni.createFrom().nullItem();
-                });
     }
 
     @PUT
@@ -181,19 +171,9 @@ public class ClubEndpoints {
         return clubService.add(input)
                 .invoke(Unchecked.consumer(id -> {
                     if (id == null) throw new InternalError("Fail to create club data");
-                })).call(id -> {
+                }))
-                    if (input.getLogo().length > 0)
+                .call(id -> Utils.uploadFile(scannerService, input.getLogo(), id, media, "ppClub"))
-                        return Uni.createFrom().future(Utils.replacePhoto(id, input.getLogo(), media, "ppClub"
+                .call(id -> Utils.uploadFile(scannerService, input.getStatus(), id, media, "clubStatus"));
-                        )); // TODO log
-                    else
-                        return Uni.createFrom().nullItem();
-                }).call(id -> {
-                    if (input.getStatus().length > 0)
-                        return Uni.createFrom().future(Utils.replacePhoto(id, input.getStatus(), media, "clubStatus"
-                        )); // TODO log
-                    else
-                        return Uni.createFrom().nullItem();
-                });
     }
 
     @DELETE
@@ -230,7 +210,7 @@ public class ClubEndpoints {
 
     @GET
     @Path("/me")
-    @RolesAllowed({"club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.APPLICATION_JSON)
     @Operation(summary = "Renvoie les informations du club de l'utilisateur connecté", description = "Renvoie les " +
             "informations du club de l'utilisateur connecté")
@@ -242,12 +222,12 @@ public class ClubEndpoints {
     })
     public Uni<SimpleClub> getOfUser() {
         return clubService.getOfUser(securityCtx).map(SimpleClub::fromModel)
-                .invoke(m -> m.setContactMap(Contact.toSite()));
+                .invoke(m -> m.setContactMap(Contact.toSite(trad)));
     }
 
     @PUT
     @Path("/me")
-    @RolesAllowed({"club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.MULTIPART_FORM_DATA)
     @Operation(summary = "Met à jour les informations du club de l'utilisateur connecté", description = "Met à jour les" +
@@ -264,7 +244,7 @@ public class ClubEndpoints {
 
     @GET
     @Path("/me/affiliation")
-    @RolesAllowed({"club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Operation(summary = "Renvoie l'attestation d'affiliation du club de l'utilisateur connecté", description =
             "Renvoie l'attestation d'affiliation du club de l'utilisateur connecté")
     @APIResponses(value = {
@@ -296,7 +276,7 @@ public class ClubEndpoints {
 
     @GET
     @Path("/renew/{id}")
-    @RolesAllowed({"club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.APPLICATION_JSON)
     @Operation(hidden = true)
     public Uni<RenewAffData> getRenew(@PathParam("id") long id, @QueryParam("m1") long m1_id,
@@ -307,7 +287,7 @@ public class ClubEndpoints {
 
     @GET
     @Path("/desk/{id}")
-    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.APPLICATION_JSON)
     @Operation(summary = "Renvoie la liste des membres du bureau du club", description = "Renvoie la liste des membres " +
             "du bureau du club spécifié")
@@ -335,7 +315,7 @@ public class ClubEndpoints {
             @Parameter(description = "Identifiant long (clubId) de club") @PathParam("clubId") String clubId) {
         return clubService.getByClubId(clubId).chain(Unchecked.function(clubModel -> {
             try {
-                return Utils.getMediaFile((clubModel != null) ? clubModel.getId() : -1, media, "ppClub",
+                return Utils.getMediaFileNoDefault((clubModel != null) ? clubModel.getId() : -1, media, "ppClub",
                         Uni.createFrom().nullItem());
             } catch (URISyntaxException e) {
                 throw new InternalError();
@@ -345,7 +325,7 @@ public class ClubEndpoints {
 
     @GET
     @Path("{id}/status")
-    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Operation(summary = "Renvoie le statut du club", description = "Renvoie le statut du club spécifié")
     @APIResponses(value = {
             @APIResponse(responseCode = "200", description = "Le statut du club"),
@@ -358,7 +338,7 @@ public class ClubEndpoints {
         return clubService.getById(id).onItem().invoke(checkPerm).chain(Unchecked.function(clubModel -> {
             try {
                 return Utils.getMediaFile(clubModel.getId(), media, "clubStatus",
-                        "statue-" + clubModel.getName(), Uni.createFrom().nullItem());
+                        "statue-" + clubModel.getName(), Uni.createFrom().nullItem(), false);
             } catch (URISyntaxException e) {
                 throw new InternalError();
             }

src/main/java/fr/titionfire/ffsaf/rest/CompetitionAdminEndpoints.java

@@ -47,4 +47,12 @@ public class CompetitionAdminEndpoints {
     public Uni<List<CompetitionData>> getAllSystemAdmin(@PathParam("system") CompetitionSystem system) {
         return service.getAllSystemAdmin(securityCtx, system);
     }
+
+    @GET
+    @Path("all/{system}/table")
+    @Authenticated
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<List<CompetitionData>> getAllSystemTable(@PathParam("system") CompetitionSystem system) {
+        return service.getAllSystemTable(securityCtx, system);
+    }
 }

src/main/java/fr/titionfire/ffsaf/rest/CompetitionEndpoints.java

@@ -1,10 +1,7 @@
 package fr.titionfire.ffsaf.rest;
 
 import fr.titionfire.ffsaf.domain.service.CompetitionService;
-import fr.titionfire.ffsaf.rest.data.CompetitionData;
+import fr.titionfire.ffsaf.rest.data.*;
-import fr.titionfire.ffsaf.rest.data.RegisterRequestData;
-import fr.titionfire.ffsaf.rest.data.SimpleCompetData;
-import fr.titionfire.ffsaf.rest.data.SimpleRegisterComb;
 import fr.titionfire.ffsaf.utils.SecurityCtx;
 import io.quarkus.security.Authenticated;
 import io.smallrye.mutiny.Uni;
@@ -53,6 +50,16 @@ public class CompetitionEndpoints {
         return service.addRegisterComb(securityCtx, id, data, source);
     }
 
+    @POST
+    @Path("{id}/registers/{source}")
+    @Authenticated
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(hidden = true)
+    public Uni<List<SimpleRegisterComb>> addRegistersComb(@PathParam("id") Long id, @PathParam("source") String source,
+                                                          List<RegisterRequestData> data) {
+        return service.addRegistersComb(securityCtx, id, data, source);
+    }
+
     @DELETE
     @Path("{id}/register/{comb_id}/{source}")
     @Authenticated
@@ -71,6 +78,21 @@ public class CompetitionEndpoints {
         return service.getSafcaData(securityCtx, id);
     }
 
+    @GET
+    @Path("{id}/internalData")
+    @Authenticated
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<SimpleCompetData> getInternalData(@PathParam("id") Long id) {
+        return service.getInternalData(securityCtx, id);
+    }
+
+    @GET
+    @Path("{id}/categories")
+    @Authenticated
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<List<PresetData>> getPresetsForCompetition(@PathParam("id") Long id) {
+        return service.getPresetsForCompetition(securityCtx, id);
+    }
 
     @GET
     @Path("all")
@@ -95,6 +117,14 @@ public class CompetitionEndpoints {
         return service.setSafcaData(securityCtx, data);
     }
 
+    @POST
+    @Path("/internalData")
+    @Authenticated
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<?> setInternalData(SimpleCompetData data) {
+        return service.setInternalData(securityCtx, data);
+    }
+
     @DELETE
     @Path("{id}")
     @Authenticated

src/main/java/fr/titionfire/ffsaf/rest/CompteEndpoints.java

@@ -37,7 +37,7 @@ public class CompteEndpoints {
 
     @GET
     @Path("{id}")
-    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Operation(summary = "Renvoie les informations d'un compte utilisateur", description = "Renvoie les informations d'un" +
             " compte utilisateur en fonction de son identifiant long (UUID)")
     @APIResponses(value = {

src/main/java/fr/titionfire/ffsaf/rest/ExternalResultEndpoints.java

@@ -0,0 +1,92 @@
+package fr.titionfire.ffsaf.rest;
+
+import fr.titionfire.ffsaf.domain.service.ResultService;
+import fr.titionfire.ffsaf.domain.service.UpdateService;
+import io.smallrye.mutiny.Uni;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Path("api/public/result/{id}")
+public class ExternalResultEndpoints {
+
+    @Inject
+    ResultService resultService;
+
+    @Inject
+    UpdateService updateService;
+
+    @PathParam("id")
+    private String id;
+
+    @GET
+    @Path("/poule/list")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<HashMap<String, Long>> list() {
+        return resultService.getCategoryList(id);
+    }
+
+    @GET
+    @Path("/poule/data")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<?> getArray(@QueryParam("poule") long poule, @DefaultValue("-1") @QueryParam("rf") long rf) {
+        if (poule == 0)
+            return Uni.createFrom().voidItem();
+
+        if (updateService.needUpdate(poule, rf)) {
+            return resultService.getCategory(id, poule);
+        } else {
+            return Uni.createFrom().voidItem();
+        }
+    }
+
+    @GET
+    @Path("/comb/list")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<HashMap<String, String>> combList() {
+        return resultService.getCombList(id);
+    }
+
+    @GET
+    @Path("/comb/data")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<?> getArray(@QueryParam("comb") String comb) {
+        if (comb.equals("0"))
+            return Uni.createFrom().item("");
+        return resultService.getCombArrayPublic(id, comb);
+    }
+
+    @GET
+    @Path("/comb/get_all")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<?> getAll() {
+        return resultService.getAllCombArrayPublic(id);
+    }
+
+
+    @GET
+    @Path("/club/list")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<HashMap<String, Long>> clubList() {
+        return resultService.getClubList(id);
+    }
+
+    @GET
+    @Path("/club/classement")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<List<ResultService.ClubClassement>> clubClassement() {
+        return resultService.getAllClubArray(id);
+    }
+
+    @GET
+    @Path("/club/data")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<?> getClubArray(@QueryParam("club") long club) {
+        if (club == 0)
+            return Uni.createFrom().item("");
+        return resultService.getClubArray2(id, club, null);
+    }
+}

src/main/java/fr/titionfire/ffsaf/rest/LicenceEndpoints.java

@@ -36,7 +36,7 @@ public class LicenceEndpoints {
 
     @GET
     @Path("{id}")
-    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.APPLICATION_JSON)
     @Operation(summary = "Renvoie les licences d'un membre", description = "Renvoie les licences d'un membre en fonction " +
             "de son identifiant")
@@ -68,7 +68,7 @@ public class LicenceEndpoints {
 
     @GET
     @Path("current/club")
-    @RolesAllowed({"club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.APPLICATION_JSON)
     @Operation(summary = "Renvoie les licences de la saison en cours (pour les clubs)", description = "Renvoie les " +
             "licences de la saison en cours (pour les clubs)")
@@ -83,7 +83,7 @@ public class LicenceEndpoints {
 
     @POST
     @Path("pay")
-    @RolesAllowed({"club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
     @Operation(summary = "Paiement des licence", description = "Retourne le lien de paiement pour les licence des membre fournie")
@@ -101,7 +101,7 @@ public class LicenceEndpoints {
     @RolesAllowed("federation_admin")
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.MULTIPART_FORM_DATA)
-    @Operation(summary = "Créer une licence", description = "Créer unr licence en fonction de son identifiant et des " +
+    @Operation(summary = "Créer une licence", description = "Créer une licence en fonction de son identifiant et des " +
             "informations fournies dans le formulaire (pour les administrateurs)")
     @APIResponses(value = {
             @APIResponse(responseCode = "200", description = "La licence a été mise à jour avec succès"),
@@ -118,7 +118,7 @@ public class LicenceEndpoints {
     @RolesAllowed("federation_admin")
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
-    @Operation(summary = "Validation licence", description = "Valide en masse les licence de l'année en cours (pour les administrateurs)")
+    @Operation(summary = "Validation licence", description = "Valide en masse les licences de l'année en cours (pour les administrateurs)")
     @APIResponses(value = {
             @APIResponse(responseCode = "200", description = "Les licences ont été mise à jour avec succès"),
             @APIResponse(responseCode = "403", description = "Accès refusé"),
@@ -128,6 +128,21 @@ public class LicenceEndpoints {
         return licenceService.valideLicences(ids);
     }
 
+    @POST
+    @Path("validate-pay")
+    @RolesAllowed("federation_admin")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Operation(summary = "Validation du payment des licences", description = "Valide en masse le payment des licences de l'année en cours (pour les administrateurs)")
+    @APIResponses(value = {
+            @APIResponse(responseCode = "200", description = "Les licences ont été mise à jour avec succès"),
+            @APIResponse(responseCode = "403", description = "Accès refusé"),
+            @APIResponse(responseCode = "500", description = "Erreur interne du serveur")
+    })
+    public Uni<?> validePaymentLicences(@Parameter(description = "Id des membres a valider") List<Long> ids) {
+        return licenceService.validePaymentLicences(ids);
+    }
+
     @DELETE
     @Path("{id}")
     @RolesAllowed("federation_admin")
@@ -146,7 +161,7 @@ public class LicenceEndpoints {
 
     @POST
     @Path("club/{id}")
-    @RolesAllowed({"club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.MULTIPART_FORM_DATA)
     @Operation(summary = "Demande une nouvelle licence", description = "Demande une nouvelle licence en fonction de" +
@@ -163,7 +178,7 @@ public class LicenceEndpoints {
 
     @DELETE
     @Path("club/{id}")
-    @RolesAllowed({"club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.TEXT_PLAIN)
     @Operation(summary = "Supprime une demande de licence", description = "Supprime une demande de licence en fonction " +
             "de son identifiant (pour les clubs)")

src/main/java/fr/titionfire/ffsaf/rest/MembreAdminEndpoints.java

@@ -2,6 +2,7 @@ package fr.titionfire.ffsaf.rest;
 
 import fr.titionfire.ffsaf.data.model.MembreModel;
 import fr.titionfire.ffsaf.domain.service.MembreService;
+import fr.titionfire.ffsaf.domain.service.VirusScannerService;
 import fr.titionfire.ffsaf.rest.data.SimpleMembre;
 import fr.titionfire.ffsaf.rest.exception.DForbiddenException;
 import fr.titionfire.ffsaf.rest.exception.DInternalError;
@@ -21,6 +22,7 @@ import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponses;
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
+import org.jboss.logging.Logger;
 
 import java.util.List;
 import java.util.function.Consumer;
@@ -29,10 +31,14 @@ import java.util.function.Consumer;
 @Path("api/member")
 @RolesAllowed({"federation_admin"})
 public class MembreAdminEndpoints {
+    private static final Logger LOGGER = Logger.getLogger(MembreAdminEndpoints.class);
 
     @Inject
     MembreService membreService;
 
+    @Inject
+    VirusScannerService scannerService;
+
     @ConfigProperty(name = "upload_dir")
     String media;
 
@@ -59,6 +65,7 @@ public class MembreAdminEndpoints {
             @Parameter(description = "Text à rechercher") @QueryParam("search") String search,
             @Parameter(description = "Club à filter") @QueryParam("club") String club,
             @Parameter(description = "Catégorie à filter") @QueryParam("categorie") String categorie,
+            @Parameter(description = "Inclure les archive") @QueryParam("archive") Boolean archive,
             @Parameter(description = "État de la demande de licence: 0 -> sans demande, 1 -> avec demande ou validée, 2 -> toute les demande non validée, 3 -> validée, 4 -> tout, 5 -> demande complete, 6 -> demande incomplete") @QueryParam("licenceRequest") int licenceRequest,
             @Parameter(description = "État du payment: 0 -> non payer, 1 -> payer, 2 -> tout") @QueryParam("payment") int payment,
             @Parameter(description = "Ordre") @QueryParam("order") String order) {
@@ -66,7 +73,8 @@ public class MembreAdminEndpoints {
             limit = 50;
         if (page == null || page < 1)
             page = 1;
-        return membreService.searchAdmin(limit, page - 1, search, club, licenceRequest, payment, order, categorie);
+        return membreService.searchAdmin(limit, page - 1, search, club, licenceRequest, payment, order,
+                categorie, archive);
     }
 
     @GET
@@ -95,16 +103,8 @@ public class MembreAdminEndpoints {
                 .invoke(Unchecked.consumer(out -> {
                     if (!out.equals("OK"))
                         throw new DInternalError("Impossible de reconnaitre le fichier: " + out);
-                })).chain(() -> {
+                }))
-                    if (input.getPhoto_data().length > 0)
+                .call(__ -> Utils.uploadFile(scannerService, input.getPhoto_data(), id, media, "ppMembre"));
-                        return Uni.createFrom().future(Utils.replacePhoto(id, input.getPhoto_data(), media, "ppMembre"
-                        )).invoke(Unchecked.consumer(out -> {
-                            if (!out.equals("OK"))
-                                throw new DInternalError("Impossible de reconnaitre le fichier: " + out);
-                        }));
-                    else
-                        return Uni.createFrom().nullItem();
-                });
     }
 
     @POST
@@ -121,13 +121,8 @@ public class MembreAdminEndpoints {
         return membreService.add(input)
                 .invoke(Unchecked.consumer(id -> {
                     if (id == null) throw new InternalError("Fail to creat member data");
-                })).call(id -> {
+                }))
-                    if (input.getPhoto_data().length > 0)
+                .call(id -> Utils.uploadFile(scannerService, input.getPhoto_data(), id, media, "ppMembre"));
-                        return Uni.createFrom().future(Utils.replacePhoto(id, input.getPhoto_data(), media, "ppMembre"
-                        ));
-                    else
-                        return Uni.createFrom().nullItem();
-                });
     }
 
     @DELETE

src/main/java/fr/titionfire/ffsaf/rest/MembreClubEndpoints.java

@@ -1,9 +1,9 @@
 package fr.titionfire.ffsaf.rest;
 
 import fr.titionfire.ffsaf.domain.service.MembreService;
+import fr.titionfire.ffsaf.domain.service.VirusScannerService;
 import fr.titionfire.ffsaf.rest.data.SimpleMembre;
 import fr.titionfire.ffsaf.rest.data.SimpleMembreInOutData;
-import fr.titionfire.ffsaf.rest.exception.DInternalError;
 import fr.titionfire.ffsaf.rest.from.FullMemberForm;
 import fr.titionfire.ffsaf.utils.PageResult;
 import fr.titionfire.ffsaf.utils.SecurityCtx;
@@ -24,7 +24,7 @@ import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 import java.util.List;
 
 @Tag(name = "Membre club", description = "Gestion des membres (pour les clubs)")
-@RolesAllowed({"club_president", "club_secretaire", "club_respo_intra"})
+@RolesAllowed({"club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
 @Path("api/member")
 public class MembreClubEndpoints {
 
@@ -37,6 +37,9 @@ public class MembreClubEndpoints {
     @Inject
     SecurityCtx securityCtx;
 
+    @Inject
+    VirusScannerService scannerService;
+
     @GET
     @Path("/find/club")
     @Produces(MediaType.APPLICATION_JSON)
@@ -51,6 +54,7 @@ public class MembreClubEndpoints {
             @Parameter(description = "Page à consulter") @QueryParam("page") Integer page,
             @Parameter(description = "Text à rechercher") @QueryParam("search") String search,
             @Parameter(description = "Catégorie à filter") @QueryParam("categorie") String categorie,
+            @Parameter(description = "Inclure les archive") @QueryParam("archive") Boolean archive,
             @Parameter(description = "Etat de la demande de licence: 0 -> sans demande, 1 -> avec demande ou validée, 2 -> toute les demande non validée, 3 -> validée, 4 -> tout, 5 -> demande complete, 6 -> demande incomplete") @QueryParam("licenceRequest") int licenceRequest,
             @Parameter(description = "Etat du payment: 0 -> non payer, 1 -> payer, 2 -> tout") @QueryParam("payment") int payment,
             @Parameter(description = "Ordre") @QueryParam("order") String order) {
@@ -58,7 +62,8 @@ public class MembreClubEndpoints {
             limit = 50;
         if (page == null || page < 1)
             page = 1;
-        return membreService.search(limit, page - 1, search, licenceRequest, payment, order, categorie, securityCtx.getSubject());
+        return membreService.search(limit, page - 1, search, licenceRequest, payment, order, categorie, archive,
+                securityCtx.getSubject());
     }
 
     @GET
@@ -106,16 +111,7 @@ public class MembreClubEndpoints {
         return membreService.update(id, input, securityCtx)
                 .invoke(Unchecked.consumer(out -> {
                     if (!out.equals("OK")) throw new InternalError("Fail to update data: " + out);
-                })).chain(() -> {
+                })).chain(() -> Utils.uploadFile(scannerService, input.getPhoto_data(), id, media, "ppMembre"));
-                    if (input.getPhoto_data().length > 0)
-                        return Uni.createFrom().future(Utils.replacePhoto(id, input.getPhoto_data(), media, "ppMembre"
-                        )).invoke(Unchecked.consumer(out -> {
-                            if (!out.equals("OK"))
-                                throw new DInternalError("Impossible de reconnaitre le fichier: " + out);
-                        }));
-                    else
-                        return Uni.createFrom().nullItem();
-                });
     }
 
     @POST
@@ -133,13 +129,7 @@ public class MembreClubEndpoints {
         return membreService.add(input, securityCtx.getSubject())
                 .invoke(Unchecked.consumer(id -> {
                     if (id == null) throw new InternalError("Fail to creat member data");
-                })).call(id -> {
+                })).call(id -> Utils.uploadFile(scannerService, input.getPhoto_data(), id, media, "ppMembre"));
-                    if (input.getPhoto_data().length > 0)
-                        return Uni.createFrom().future(Utils.replacePhoto(id, input.getPhoto_data(), media, "ppMembre"
-                        ));
-                    else
-                        return Uni.createFrom().nullItem();
-                });
     }
 
     @DELETE

src/main/java/fr/titionfire/ffsaf/rest/MembreEndpoints.java

@@ -6,6 +6,7 @@ import fr.titionfire.ffsaf.domain.service.PDFService;
 import fr.titionfire.ffsaf.rest.data.MeData;
 import fr.titionfire.ffsaf.rest.data.SimpleMembre;
 import fr.titionfire.ffsaf.rest.exception.DForbiddenException;
+import fr.titionfire.ffsaf.rest.from.UserSettingForm;
 import fr.titionfire.ffsaf.utils.SecurityCtx;
 import fr.titionfire.ffsaf.utils.Utils;
 import io.quarkus.security.Authenticated;
@@ -51,7 +52,7 @@ public class MembreEndpoints {
 
     @GET
     @Path("{id}")
-    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Produces(MediaType.APPLICATION_JSON)
     @Operation(summary = "Renvoie les détails d'un membre en fonction de son identifiant", description = "Renvoie les " +
             "détails d'un membre en fonction de son identifiant")
@@ -68,7 +69,7 @@ public class MembreEndpoints {
 
     @GET
     @Path("/find/licence")
-    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Operation(summary = "Renvoie les détails d'un membre en fonction de son numéro de licence", description = "Renvoie " +
             "les détails d'un membre en fonction de son numéro de licence")
     @APIResponses(value = {
@@ -113,6 +114,21 @@ public class MembreEndpoints {
         return pdfService.getLicencePdf(securityCtx.getSubject());
     }
 
+    @PUT
+    @Path("me/setting")
+    @Authenticated
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Produces(MediaType.TEXT_PLAIN)
+    @Operation(summary = "Met à jour les paramètres du membre connecté", description = "Met à jour les paramètres du membre connecté")
+    @APIResponses(value = {
+            @APIResponse(responseCode = "200", description = "Les paramètres ont été mis à jour"),
+            @APIResponse(responseCode = "403", description = "Accès refusé"),
+            @APIResponse(responseCode = "500", description = "Erreur interne du serveur")
+    })
+    public Uni<Void> updateMeSettings(UserSettingForm settingForm) {
+        return membreService.updateSettings(securityCtx.getSubject(), settingForm);
+    }
+
     @GET
     @Path("me/photo")
     @Authenticated
@@ -130,7 +146,7 @@ public class MembreEndpoints {
 
     @GET
     @Path("{id}/photo")
-    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Operation(summary = "Renvoie la photo d'un membre", description = "Renvoie la photo d'un membre en fonction de son identifiant")
     @APIResponses(value = {
             @APIResponse(responseCode = "200", description = "La photo du membre"),
@@ -146,7 +162,7 @@ public class MembreEndpoints {
 
     @GET
     @Path("{id}/licence")
-    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
+    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_tresorier", "club_respo_intra"})
     @Operation(summary = "Renvoie le pdf de la licence d'un membre", description = "Renvoie le pdf de la licence d'un membre en fonction de son identifiant")
     @APIResponses(value = {
             @APIResponse(responseCode = "200", description = "Le pdf de la licence"),

src/main/java/fr/titionfire/ffsaf/rest/ResultEndpoints.java

@@ -0,0 +1,79 @@
+package fr.titionfire.ffsaf.rest;
+
+import fr.titionfire.ffsaf.domain.service.ResultService;
+import fr.titionfire.ffsaf.rest.data.ResultCategoryData;
+import fr.titionfire.ffsaf.utils.SecurityCtx;
+import io.quarkus.security.Authenticated;
+import io.smallrye.mutiny.Uni;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Authenticated
+@Path("api/result")
+public class ResultEndpoints {
+
+    @Inject
+    ResultService resultService;
+
+    @Inject
+    SecurityCtx securityCtx;
+
+    @GET
+    @Path("list")
+    public Uni<List<Object[]>> getList() {
+        return resultService.getList(securityCtx);
+    }
+
+    @GET
+    @Path("{uuid}/category/list")
+    public Uni<HashMap<String, Long>> getCategoryList(@PathParam("uuid") String uuid) {
+        return resultService.getCategoryList(uuid, securityCtx);
+    }
+
+    @GET
+    @Path("{uuid}/category/{id}")
+    public Uni<ResultCategoryData> getCategory(@PathParam("uuid") String uuid, @PathParam("id") long id) {
+        return resultService.getCategory(uuid, id, securityCtx);
+    }
+
+    @GET
+    @Path("{uuid}/club/list")
+    public Uni<HashMap<String, Long>> getClubList(@PathParam("uuid") String uuid) {
+        return resultService.getClubList(uuid, securityCtx);
+    }
+
+    @GET
+    @Path("{uuid}/club/classement")
+    public Uni<List<ResultService.ClubClassement>> getClubClassement(@PathParam("uuid") String uuid) {
+        return resultService.getAllClubArray(uuid, securityCtx);
+    }
+
+    @GET
+    @Path("{uuid}/club/{id}")
+    public Uni<ResultService.ClubArrayData> getClub(@PathParam("uuid") String uuid, @PathParam("id") long id) {
+        return resultService.getClubArray(uuid, id, securityCtx);
+    }
+
+    @GET
+    @Path("{uuid}/comb/list")
+    public Uni<HashMap<String, String>> getCombList(@PathParam("uuid") String uuid) {
+        return resultService.getCombList(uuid, securityCtx);
+    }
+
+    @GET
+    @Path("{uuid}/comb/{id}")
+    public Uni<?> getCombList(@PathParam("uuid") String uuid, @PathParam("id") String id) {
+        return resultService.getCombArrayPublic(uuid, id, securityCtx);
+    }
+
+    @GET
+    @Path("{uuid}/comb")
+    public Uni<ResultService.CombsArrayData> getComb(@PathParam("uuid") String uuid) {
+        return resultService.getAllCombArray(uuid, securityCtx);
+    }
+}

src/main/java/fr/titionfire/ffsaf/rest/SelectionEndpoints.java

@@ -0,0 +1,85 @@
+package fr.titionfire.ffsaf.rest;
+
+import fr.titionfire.ffsaf.data.model.MembreModel;
+import fr.titionfire.ffsaf.domain.service.SelectionService;
+import fr.titionfire.ffsaf.rest.data.SimpleSelection;
+import fr.titionfire.ffsaf.rest.exception.DForbiddenException;
+import fr.titionfire.ffsaf.utils.SecurityCtx;
+import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.unchecked.Unchecked;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import org.eclipse.microprofile.openapi.annotations.Operation;
+import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
+import org.eclipse.microprofile.openapi.annotations.responses.APIResponses;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+@Path("api/selection")
+public class SelectionEndpoints {
+
+    @Inject
+    SelectionService selectionService;
+
+    @Inject
+    SecurityCtx securityCtx;
+
+    Consumer<MembreModel> checkPerm = Unchecked.consumer(membreModel -> {
+        if (!securityCtx.roleHas("federation_admin") && !securityCtx.isInClubGroup(membreModel.getClub().getId()))
+            throw new DForbiddenException();
+    });
+
+    @GET
+    @Path("{id}")
+    @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_tresorier", "club_respo_intra",
+            "ffsaf_selectionneur"})
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(summary = "Renvoie les séléctions d'un membre", description = "Renvoie les séléctions d'un membre en fonction " +
+            "de son identifiant")
+    @APIResponses(value = {
+            @APIResponse(responseCode = "200", description = "La liste des séléctions du membre"),
+            @APIResponse(responseCode = "403", description = "Accès refusé"),
+            @APIResponse(responseCode = "404", description = "Le membre n'existe pas"),
+            @APIResponse(responseCode = "500", description = "Erreur interne du serveur")
+    })
+    public Uni<List<SimpleSelection>> getSelection(@PathParam("id") long id) {
+        return selectionService.getSelection(id, checkPerm)
+                .map(selectionModels -> selectionModels.stream().map(SimpleSelection::fromModel).toList());
+    }
+
+    @POST
+    @Path("{id}")
+    @RolesAllowed({"federation_admin", "ffsaf_selectionneur"})
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Operation(summary = "Créer une séléction", description = "Créer une séléction en fonction de son identifiant et des " +
+            "informations fournies dans le formulaire (pour les administrateurs)")
+    @APIResponses(value = {
+            @APIResponse(responseCode = "200", description = "La séléction a été mise à jour avec succès"),
+            @APIResponse(responseCode = "403", description = "Accès refusé"),
+            @APIResponse(responseCode = "404", description = "La séléction n'existe pas"),
+            @APIResponse(responseCode = "500", description = "Erreur interne du serveur")
+    })
+    public Uni<SimpleSelection> setSelection(@PathParam("id") long id, SimpleSelection data) {
+        return selectionService.setSelection(id, data).map(SimpleSelection::fromModel);
+    }
+
+    @DELETE
+    @Path("{id}")
+    @RolesAllowed({"federation_admin", "ffsaf_selectionneur"})
+    @Produces(MediaType.TEXT_PLAIN)
+    @Operation(summary = "Supprime une séléction", description = "Supprime une séléction en fonction de son identifiant " +
+            "(pour les administrateurs)")
+    @APIResponses(value = {
+            @APIResponse(responseCode = "204", description = "La séléction a été supprimée avec succès"),
+            @APIResponse(responseCode = "403", description = "Accès refusé"),
+            @APIResponse(responseCode = "404", description = "La séléction n'existe pas"),
+            @APIResponse(responseCode = "500", description = "Erreur interne du serveur")
+    })
+    public Uni<?> deleteSelection(@PathParam("id") long id) {
+        return selectionService.deleteSelection(id);
+    }
+}

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

@@ -1,5 +1,7 @@
 package fr.titionfire.ffsaf.rest.data;
 
+import fr.titionfire.ffsaf.data.model.CatPresetModel;
+import fr.titionfire.ffsaf.data.model.CompetitionGuestModel;
 import fr.titionfire.ffsaf.data.model.CompetitionModel;
 import fr.titionfire.ffsaf.data.model.RegisterModel;
 import fr.titionfire.ffsaf.utils.Categorie;
@@ -9,8 +11,10 @@ import io.quarkus.runtime.annotations.RegisterForReflection;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Stream;
 
 @Data
 @AllArgsConstructor
@@ -31,12 +35,23 @@ public class CompetitionData {
     private Long club;
     private String clubName;
     private String owner;
-    private List<SimpleRegister> registers;
+    private List<SimpleRegister> registers; // for SAFCA
     private boolean canEdit;
+    private boolean canEditRegisters;
     private String data1;
     private String data2;
     private String data3;
     private String data4;
+    private String config;
+    private List<PresetData> presets;
+    private List<Categorie> requiredWeight;
+
+    public CompetitionData() {
+        this(null, "", "", "", "", new Date(), new Date(),
+                CompetitionSystem.INTERNAL, RegisterMode.FREE, new Date(), new Date(), true,
+                null, "", "", null, true, true,
+                "", "", "", "", "{}", new ArrayList<>(), new ArrayList<>());
+    }
 
     public static CompetitionData fromModel(CompetitionModel model) {
         if (model == null)
@@ -45,8 +60,9 @@ public class CompetitionData {
         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.getClub().getId(), model.getClub().getName(), model.getOwner(), null, false, false,
-                model.getData1(), model.getData2(), model.getData3(), model.getData4());
+                model.getData1(), model.getData2(), model.getData3(), model.getData4(), model.getConfig(),
+                new ArrayList<>(), model.getRequiredWeight());
     }
 
     public static CompetitionData fromModelLight(CompetitionModel model) {
@@ -56,21 +72,32 @@ public class CompetitionData {
         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,
+                null, model.getClub().getName(), "", null, false, false,
-                "","", "","");
+                "", "", "", "", "{}", new ArrayList<>(), model.getRequiredWeight());
 
-        if (model.getRegisterMode() == RegisterMode.HELLOASSO){
+        if (model.getRegisterMode() == RegisterMode.HELLOASSO) {
             out.setData1(model.getData1());
             out.setData2(model.getData2());
         }
 
+
         return out;
     }
 
-    public CompetitionData addInsc(List<RegisterModel> insc) {
+    public CompetitionData addInsc(List<RegisterModel> insc, List<CompetitionGuestModel> guests) {
-        this.registers = insc.stream()
+        this.registers = Stream.concat(
-                .map(i -> new SimpleRegister(i.getMembre().getId(), i.getOverCategory(), i.getWeight(),
+                insc.stream()
-                        i.getCategorie(), (i.getClub() == null) ? null : i.getClub().getId())).toList();
+                        .map(i -> new SimpleRegister(i.getMembre().getId(), i.getOverCategory(), i.getWeight2(),
+                                i.getCategorie(), (i.getClub() == null) ? null : i.getClub().getId(),
+                                (i.getClub() == null) ? null : i.getClub().getName())),
+                guests.stream()
+                        .map(i -> new SimpleRegister(i.getId() * -1, 0, i.getWeight2(),
+                                i.getCategorie(), null, i.getClub()))).toList();
+        return this;
+    }
+
+    public CompetitionData addPresets(List<CatPresetModel> presets) {
+        this.presets = presets.stream().map(PresetData::fromModel).toList();
         return this;
     }
 
@@ -80,8 +107,9 @@ public class CompetitionData {
     public static class SimpleRegister {
         long id;
         int overCategory;
-        Integer weight;
+        Float weight;
         Categorie categorie;
         Long club;
+        String club_str;
     }
 }

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

@@ -28,8 +28,10 @@ public class MatchData {
             return null;
 
         return new MatchData(model.getSystemId(),
-                (model.getC1_id() == null) ? null : model.getC1_id().getId(), model.getC1_str(),
+                (model.getC1_id() == null) ? null : model.getC1_id().getId(),
-                (model.getC2_id() == null) ? null : model.getC2_id().getId(), model.getC2_str(),
+                (model.getC1_guest() == null) ? null : model.getC1_guest().getName(),
+                (model.getC2_id() == null) ? null : model.getC2_id().getId(),
+                (model.getC2_guest() == null) ? null : model.getC2_guest().getName(),
                 model.getCategory().getId(), model.getCategory_ord(), model.isEnd(), model.getPoule(),
                 model.getScores());
     }

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

@@ -1,6 +1,8 @@
 package fr.titionfire.ffsaf.rest.data;
 
 import fr.titionfire.ffsaf.data.model.MembreModel;
+import fr.titionfire.ffsaf.domain.service.TradService;
+import fr.titionfire.ffsaf.utils.ResultPrivacy;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -15,45 +17,50 @@ import java.util.List;
 @NoArgsConstructor
 @RegisterForReflection
 public class MeData {
-    @Schema(description = "L'identifiant du membre.", example = "1")
+    @Schema(description = "L'identifiant du membre.", examples = "1")
     private long id;
-    @Schema(description = "Le nom du membre.", example = "Dupont")
+    @Schema(description = "Le nom du membre.", examples = "Dupont")
     private String lname = "";
-    @Schema(description = "Le prénom du membre.", example = "Jean")
+    @Schema(description = "Le prénom du membre.", examples = "Jean")
     private String fname = "";
-    @Schema(description = "La catégorie du membre.", example = "SENIOR")
+    @Schema(description = "La catégorie du membre.", examples = "SENIOR")
     private String categorie;
-    @Schema(description = "Le nom du club du membre.", example = "Association sportive")
+    @Schema(description = "Le nom du club du membre.", examples = "Association sportive")
     private String club;
-    @Schema(description = "Le genre du membre.", example = "Homme")
+    @Schema(description = "Le genre du membre.", examples = "Homme")
     private String genre;
-    @Schema(description = "Le numéro de licence du membre.", example = "12345")
+    @Schema(description = "Le numéro de licence du membre.", examples = "12345")
     private int licence;
-    @Schema(description = "Le pays du membre.", example = "FR")
+    @Schema(description = "Le pays du membre.", examples = "FR")
     private String country;
     @Schema(description = "La date de naissance du membre.")
     private Date birth_date;
-    @Schema(description = "L'adresse e-mail du membre.", example = "jean.dupont@example.com")
+    @Schema(description = "L'adresse e-mail du membre.", examples = "jean.dupont@examples.com")
     private String email;
-    @Schema(description = "Le rôle du membre dans l'association.", example = "MEMBRE")
+    @Schema(description = "Le rôle du membre dans l'association.", examples = "MEMBRE")
     private String role;
-    @Schema(description = "Le grade d'arbitrage du membre.", example = "N/A")
+    @Schema(description = "Le grade d'arbitrage du membre.", examples = "N/A")
     private String grade_arbitrage;
+    @Schema(description = "La confidentialité des résultats", examples = "PUBLIC")
+    private ResultPrivacy resultPrivacy;
     @Schema(description = "La liste des licences du membre.")
     private List<SimpleLicence> licences;
+    @Schema(description = "La liste des séléctions du membre.")
+    private List<SimpleSelection> selections;
 
-    public void setMembre(MembreModel membreModel) {
+    public void setMembre(MembreModel membreModel, TradService trad) {
         this.id = membreModel.getId();
         this.lname = membreModel.getLname();
         this.fname = membreModel.getFname();
-        this.categorie = membreModel.getCategorie().getName();
+        this.categorie = membreModel.getCategorie() == null ? trad.t("categorie.inconnue") : membreModel.getCategorie().getName(trad);
-        this.club = membreModel.getClub() == null ? "Sans club" : membreModel.getClub().getName();
+        this.club = membreModel.getClub() == null ? trad.t("sans.club") : membreModel.getClub().getName();
-        this.genre = membreModel.getGenre().str;
+        this.genre = membreModel.getGenre().getString(trad);
         this.licence = membreModel.getLicence();
         this.country = membreModel.getCountry();
         this.birth_date = membreModel.getBirth_date();
         this.email = membreModel.getEmail();
-        this.role = membreModel.getRole().str;
+        this.role = membreModel.getRole().getString(trad);
-        this.grade_arbitrage = membreModel.getGrade_arbitrage().str;
+        this.grade_arbitrage = membreModel.getGrade_arbitrage().getString(trad);
+        this.resultPrivacy = membreModel.getResultPrivacy();
     }
 }

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

@@ -0,0 +1,31 @@
+package fr.titionfire.ffsaf.rest.data;
+
+import fr.titionfire.ffsaf.data.model.CatPresetModel;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@RegisterForReflection
+public class PresetData {
+    private Long id;
+    private String name;
+    private CatPresetModel.SwordType sword;
+    private CatPresetModel.ShieldType shield;
+    private List<CatPresetModel.CategorieEmbeddable> categories;
+    private int mandatoryProtection1;
+    private int mandatoryProtection2;
+
+    public static PresetData fromModel(CatPresetModel model) {
+        if (model == null)
+            return null;
+
+        return new PresetData(model.getId(), model.getName(), model.getSwordType(), model.getShieldType(),
+                model.getCategories(), model.getMandatoryProtection1(), model.getMandatoryProtection2());
+    }
+}

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

@@ -1,10 +1,14 @@
 package fr.titionfire.ffsaf.rest.data;
 
+import fr.titionfire.ffsaf.utils.Categorie;
+import fr.titionfire.ffsaf.utils.Genre;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -14,7 +18,18 @@ public class RegisterRequestData {
     private String fname;
     private String lname;
 
-    private Integer weight;
+    private Float weight;
-    private int overCategory;
+    private Float weightReal;
+    private Integer overCategory;
     private boolean lockEdit = false;
+    private List<Long> categoriesInscrites;
+
+    // for guest registration only
+    private Long id = null;
+    private Categorie categorie = Categorie.CADET;
+    private Genre genre = Genre.NA;
+    private String club = null;
+    private String country = null;
+
+    private boolean quick = false;
 }

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

@@ -0,0 +1,83 @@
+package fr.titionfire.ffsaf.rest.data;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import fr.titionfire.ffsaf.data.model.CombModel;
+import fr.titionfire.ffsaf.data.model.MembreModel;
+import fr.titionfire.ffsaf.domain.entity.MatchModelExtend;
+import fr.titionfire.ffsaf.utils.ResultPrivacy;
+import fr.titionfire.ffsaf.utils.ScoreEmbeddable;
+import fr.titionfire.ffsaf.utils.TreeNode;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@RegisterForReflection
+public class ResultCategoryData {
+    int type;
+    String name;
+    boolean treeIsClassement;
+    HashMap<Character, List<PouleArrayData>> matchs = new HashMap<>();
+    HashMap<Character, List<RankArray>> rankArray = new HashMap<>();
+    ArrayList<TreeNode<TreeData>> trees;
+    List<ClassementData> classement = new ArrayList<>();
+    String[] liceName;
+    long genTime;
+
+    @Data
+    @AllArgsConstructor
+    @RegisterForReflection
+    public static class RankArray {
+        int rank;
+        @JsonIgnore
+        CombModel comb;
+        String name;
+        int score;
+        int win;
+        int pointMake;
+        int pointTake;
+        float pointRate;
+    }
+
+    @RegisterForReflection
+    public record PouleArrayData(String red, boolean red_w, List<Integer[]> score, boolean blue_w, String blue,
+                                 boolean eq, boolean end, Date date) {
+        public static PouleArrayData fromModel(MatchModelExtend matchModel, MembreModel membreModel,
+                                               ResultPrivacy privacy) {
+            return new PouleArrayData(
+                    matchModel.getC1Name(membreModel, privacy),
+                    matchModel.isEnd() && matchModel.getWin() > 0,
+                    matchModel.isEnd() ?
+                            matchModel.getScoresToPrint().stream().map(s -> new Integer[]{s.getS1(), s.getS2()})
+                                    .toList()
+                            : new ArrayList<>(),
+                    matchModel.isEnd() && matchModel.getWin() < 0,
+                    matchModel.getC2Name(membreModel, privacy),
+                    matchModel.isEnd() && matchModel.getWin() == 0,
+                    matchModel.isEnd(),
+                    matchModel.getDate());
+        }
+    }
+
+    @RegisterForReflection
+    public static record TreeData(long id, String c1FullName, String c2FullName, List<ScoreEmbeddable> scores,
+                                  boolean end, int win, int level, Date date) {
+        public static TreeData from(MatchModelExtend match, int level, MembreModel membreModel, ResultPrivacy privacy) {
+            return new TreeData(match.getId(), match.getC1Name(membreModel, privacy),
+                    match.getC2Name(membreModel, privacy), match.getScoresToPrint(), match.isEnd(), match.getWin(),
+                    level, match.getDate());
+        }
+    }
+
+    @RegisterForReflection
+    public static record ClassementData(int rank, @JsonIgnore CombModel comb, String name) {
+
+    }
+}

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

@@ -1,5 +1,9 @@
 package fr.titionfire.ffsaf.rest.data;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import fr.titionfire.ffsaf.data.model.CompetitionModel;
 import fr.titionfire.ffsaf.net2.data.SimpleCompet;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import lombok.AllArgsConstructor;
@@ -25,4 +29,41 @@ public class SimpleCompetData {
         return new SimpleCompetData(compet.id(), compet.show_blason(), compet.show_flag(),
                 new ArrayList<>(), new ArrayList<>());
     }
+
+    public static SimpleCompetData fromModel(CompetitionModel competitionModel) {
+        if (competitionModel == null)
+            return null;
+
+        boolean show_blason = true;
+        boolean show_flag = false;
+
+        if (competitionModel.getConfig() != null) {
+            try {
+                ObjectMapper objectMapper = new ObjectMapper();
+                JsonNode rootNode = objectMapper.readTree(competitionModel.getConfig());
+
+                if (rootNode.has("show_blason"))
+                    show_blason = rootNode.get("show_blason").asBoolean();
+                if (rootNode.has("show_flag"))
+                    show_flag = rootNode.get("show_flag").asBoolean();
+
+            } catch (JsonProcessingException ignored) {
+            }
+        }
+
+        return new SimpleCompetData(competitionModel.getId(), show_blason, show_flag,
+                new ArrayList<>(), new ArrayList<>());
+    }
+
+    public String getConfigForInternal(){
+        ObjectMapper objectMapper = new ObjectMapper();
+        JsonNode rootNode = objectMapper.createObjectNode()
+                .put("show_blason", this.show_blason)
+                .put("show_flag", this.show_flag);
+        try {
+            return objectMapper.writeValueAsString(rootNode);
+        } catch (JsonProcessingException e) {
+            return "{}";
+        }
+    }
 }

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

@@ -19,34 +19,32 @@ import java.util.Date;
 @AllArgsConstructor
 @RegisterForReflection
 public class SimpleMembre {
-    @Schema(description = "L'identifiant du membre.", example = "1")
+    @Schema(description = "L'identifiant du membre.", examples = "1")
     private long id;
-    @Schema(description = "L'identifiant long du membre (userID).", example = "e81d1d35-d897-421e-8086-6c5e74d13c6e")
+    @Schema(description = "L'identifiant long du membre (userID).", examples = "e81d1d35-d897-421e-8086-6c5e74d13c6e")
     private String userId;
-    @Schema(description = "Le nom du membre.", example = "Dupont")
+    @Schema(description = "Le nom du membre.", examples = "Dupont")
     private String lname = "";
-    @Schema(description = "Le prénom du membre.", example = "Jean")
+    @Schema(description = "Le prénom du membre.", examples = "Jean")
     private String fname = "";
-    @Schema(description = "La catégorie du membre.", example = "SENIOR")
+    @Schema(description = "La catégorie du membre.", examples = "SENIOR")
     private Categorie categorie;
     @Schema(description = "Le club du membre.")
     private SimpleClubModel club;
-    @Schema(description = "Le genre du membre.", example = "H")
+    @Schema(description = "Le genre du membre.", examples = "H")
     private Genre genre;
-    @Schema(description = "Le numéro de licence du membre.", example = "12345")
+    @Schema(description = "Le numéro de licence du membre.", examples = "12345")
     private Integer licence;
-    @Schema(description = "Le pays du membre.", example = "FR")
+    @Schema(description = "Le pays du membre.", examples = "FR")
     private String country;
     @Schema(description = "La date de naissance du membre.")
     private Date birth_date;
-    @Schema(description = "L'adresse e-mail du membre.", example = "jean.dupont@example.com")
+    @Schema(description = "L'adresse e-mail du membre.", examples = "jean.dupont@examples.com")
     private String email;
-    @Schema(description = "Le rôle du membre dans l'association.", example = "MEMBRE")
+    @Schema(description = "Le rôle du membre dans l'association.", examples = "MEMBRE")
     private RoleAsso role;
-    @Schema(description = "Le grade d'arbitrage du membre.", example = "N/A")
+    @Schema(description = "Le grade d'arbitrage du membre.", examples = "N/A")
     private GradeArbitrage grade_arbitrage;
-    @Schema(hidden = true)
-    private String url_photo;
 
     public static SimpleMembre fromModel(MembreModel model) {
         if (model == null)
@@ -66,7 +64,6 @@ public class SimpleMembre {
                 .email(model.getEmail())
                 .role(model.getRole())
                 .grade_arbitrage(model.getGrade_arbitrage())
-                .url_photo(model.getUrl_photo())
                 .build();
     }
 }

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

@@ -2,10 +2,14 @@ package fr.titionfire.ffsaf.rest.data;
 
 import fr.titionfire.ffsaf.data.model.LicenceModel;
 import fr.titionfire.ffsaf.data.model.MembreModel;
+import fr.titionfire.ffsaf.utils.Utils;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 
@@ -24,7 +28,27 @@ public class SimpleMembreInOutData {
 
     public static SimpleMembreInOutData fromModel(MembreModel membreModel, List<LicenceModel> lc) {
         LicenceModel currentLicence = lc.stream().filter(l -> l.getMembre().getId().equals(membreModel.getId()))
-                .findFirst().orElse(null);
+                .max(Comparator.comparingInt(LicenceModel::getSaison)).orElse(null);
+
+        String certif = null;
+        if (currentLicence != null && currentLicence.getCertificate() != null) {
+            String[] strings = currentLicence.getCertificate().split("¤");
+            if (currentLicence.getSaison() == Utils.getSaison()) {
+                certif = currentLicence.getCertificate();
+            } else if (strings.length > 1) {
+                try {
+                    Date date = new SimpleDateFormat("yyyy-MM-dd").parse(strings[1]);
+                    Calendar max = Utils.getFirstDateOfSaison();
+                    max.add(Calendar.YEAR, -2);
+
+                    if (max.getTime().compareTo(date) < 0) {
+                        certif = currentLicence.getCertificate();
+                    }
+                } catch (Exception ignored) {
+                }
+            }
+
+        }
 
         return new SimpleMembreInOutData(
                 membreModel.getLicence(),
@@ -33,8 +57,8 @@ public class SimpleMembreInOutData {
                 membreModel.getEmail(),
                 membreModel.getGenre().str,
                 membreModel.getBirth_date(),
-                currentLicence != null,
+                currentLicence != null && currentLicence.getSaison() == Utils.getSaison(),
-                currentLicence == null ? null : currentLicence.getCertificate()
+                certif
         );
     }
 }

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

@@ -1,40 +1,59 @@
 package fr.titionfire.ffsaf.rest.data;
 
-import fr.titionfire.ffsaf.data.model.LicenceModel;
+import fr.titionfire.ffsaf.data.model.*;
-import fr.titionfire.ffsaf.data.model.MembreModel;
-import fr.titionfire.ffsaf.data.model.RegisterModel;
 import fr.titionfire.ffsaf.net2.data.SimpleClubModel;
+import fr.titionfire.ffsaf.utils.Categorie;
+import fr.titionfire.ffsaf.utils.Genre;
 import fr.titionfire.ffsaf.utils.Utils;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 @RegisterForReflection
 public class SimpleRegisterComb {
     private long id;
     private String fname;
     private String lname;
-    private String genre;
+    private Genre genre;
-    private String categorie;
+    private String country;
+    private Categorie categorie;
     private SimpleClubModel club;
     private Integer licence;
-    private Integer weight;
+    private Float weight;
+    private Float weightReal;
     private int overCategory;
     private boolean hasLicenceActive;
     private boolean lockEdit;
+    private List<Long> categoriesInscrites;
 
     public static SimpleRegisterComb fromModel(RegisterModel register, List<LicenceModel> licences) {
         MembreModel membreModel = register.getMembre();
         return new SimpleRegisterComb(membreModel.getId(), membreModel.getFname(), membreModel.getLname(),
-                membreModel.getGenre().name(),
+                membreModel.getGenre(), membreModel.getCountry(),
-                (register.getCategorie() == null) ? "Catégorie inconnue" : register.getCategorie().getName(),
+                (register.getCategorie() == null) ? null : register.getCategorie(),
                 SimpleClubModel.fromModel(register.getClub()), membreModel.getLicence(), register.getWeight(),
-                register.getOverCategory(),
+                register.getWeightReal(), register.getOverCategory(),
                 licences.stream().anyMatch(l -> l.isValidate() && l.getSaison() == Utils.getSaison()),
-                register.isLockEdit());
+                register.isLockEdit(), new ArrayList<>());
+    }
+
+    public static SimpleRegisterComb fromModel(CompetitionGuestModel guest) {
+        return new SimpleRegisterComb(guest.getId() * -1, guest.getFname(), guest.getLname(),
+                guest.getGenre(), guest.getCountry(), guest.getCategorie(),
+                new SimpleClubModel(null, guest.getClub(), "fr", null),
+                null, guest.getWeight(), guest.getWeightReal(), 0, false, false,
+                new ArrayList<>());
+    }
+
+    public SimpleRegisterComb setCategorieInscrite(List<CatPresetModel> presets) {
+        this.categoriesInscrites = presets.stream().map(CatPresetModel::getId).toList();
+        return this;
     }
 }

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

@@ -0,0 +1,36 @@
+package fr.titionfire.ffsaf.rest.data;
+
+import fr.titionfire.ffsaf.data.model.SelectionModel;
+import fr.titionfire.ffsaf.utils.Categorie;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+
+@Data
+@Builder
+@AllArgsConstructor
+@RegisterForReflection
+public class SimpleSelection {
+    @Schema(description = "ID de la séléction", examples = "1")
+    Long id;
+    @Schema(description = "ID du membre", examples = "1")
+    Long membre;
+    @Schema(description = "Saison de la séléction", examples = "2024")
+    int saison;
+    @Schema(description = "Catégorie de la séléction", examples = "JUNIOR")
+    Categorie categorie;
+
+    public static SimpleSelection fromModel(SelectionModel model) {
+        if (model == null)
+            return null;
+
+        return new SimpleSelection.SimpleSelectionBuilder()
+                .id(model.getId())
+                .membre(model.getMembre().getId())
+                .saison(model.getSaison())
+                .categorie(model.getCategorie())
+                .build();
+    }
+}

src/main/java/fr/titionfire/ffsaf/rest/from/AffiliationRequestForm.java

@@ -9,6 +9,7 @@ import lombok.ToString;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.jboss.resteasy.reactive.PartType;
+import org.jboss.resteasy.reactive.multipart.FileUpload;
 
 @Getter
 @ToString(exclude = {"status", "logo"})
@@ -17,85 +18,85 @@ public class AffiliationRequestForm {
     @FormParam("id")
     private Long id = null;
 
-    @Schema(description = "Le nom de l'association.", example = "Association sportive", required = true)
+    @Schema(description = "Le nom de l'association.", examples = "Association sportive", required = true)
     @FormParam("name")
     private String name = null;
 
-    @Schema(description = "Le numéro SIRET/RNA de l'association.", example = "12345678901234", required = true)
+    @Schema(description = "Le numéro SIRET/RNA de l'association.", examples = "12345678901234", required = true)
     @FormParam("state_id")
     private String state_id = null;
 
-    @Schema(description = "L'adresse de l'association.", example = "1 rue de l'exemple, 75000 Paris", required = true)
+    @Schema(description = "L'adresse de l'association.", examples = "1 rue de l'exemple, 75000 Paris", required = true)
     @FormParam("adresse")
     private String adresse = null;
 
-    @Schema(description = "Email de contact de l'association", example = "test@test.fr")
+    @Schema(description = "Email de contact de l'association", examples = "test@test.fr")
     @FormParam("contact")
     private String contact = null;
 
-    @Schema(description = "La saison de l'affiliation.", example = "2025", required = true)
+    @Schema(description = "La saison de l'affiliation.", examples = "2025", required = true)
     @FormParam("saison")
     private int saison = -1;
 
-    @Schema(description = "Le statut de l'association.", type = SchemaType.ARRAY, implementation = byte.class)
+    @Schema(description = "Le statut de l'association.", type = SchemaType.ARRAY)
     @FormParam("status")
     @PartType(MediaType.APPLICATION_OCTET_STREAM)
-    private byte[] status = new byte[0];
+    private FileUpload status = null;
 
-    @Schema(description = "Le logo de l'association.", type = SchemaType.ARRAY, implementation = byte.class)
+    @Schema(description = "Le logo de l'association.", type = SchemaType.ARRAY)
     @FormParam("logo")
     @PartType(MediaType.APPLICATION_OCTET_STREAM)
-    private byte[] logo = new byte[0];
+    private FileUpload logo = null;
 
-    @Schema(description = "Le nom du premier membre de l'association.", example = "Doe", required = true)
+    @Schema(description = "Le nom du premier membre de l'association.", examples = "Doe", required = true)
     @FormParam("m1_nom")
     private String m1_lname = null;
 
-    @Schema(description = "Le prénom du premier membre de l'association.", example = "John", required = true)
+    @Schema(description = "Le prénom du premier membre de l'association.", examples = "John", required = true)
     @FormParam("m1_prenom")
     private String m1_fname = null;
 
-    @Schema(description = "L'adresse e-mail du premier membre de l'association.", example = "john.doe@test.com", required = true)
+    @Schema(description = "L'adresse e-mail du premier membre de l'association.", examples = "john.doe@test.com", required = true)
     @FormParam("m1_mail")
     private String m1_email = null;
 
-    @Schema(description = "Le numéro de licence du premier membre de l'association. (null si non licencié)", example = "12345")
+    @Schema(description = "Le numéro de licence du premier membre de l'association. (null si non licencié)", examples = "12345")
     @FormParam("m1_licence")
     private String m1_lincence = null;
 
-    @Schema(description = "Le rôle du premier membre de l'association. (doit être PRESIDENT)", example = "PRESIDENT", required = true)
+    @Schema(description = "Le rôle du premier membre de l'association. (doit être PRESIDENT)", examples = "PRESIDENT", required = true)
     @FormParam("m1_role")
     private RoleAsso m1_role = null;
 
-    @Schema(description = "Le nom du deuxième membre de l'association.", example = "Xavier", required = true)
+    @Schema(description = "Le nom du deuxième membre de l'association.", examples = "Xavier", required = true)
     @FormParam("m2_nom")
     private String m2_lname = null;
 
-    @Schema(description = "Le prénom du deuxième membre de l'association.", example = "Login", required = true)
+    @Schema(description = "Le prénom du deuxième membre de l'association.", examples = "Login", required = true)
     @FormParam("m2_prenom")
     private String m2_fname = null;
 
-    @Schema(description = "L'adresse e-mail du deuxième membre de l'association.", example = "xavier.login@test.com", required = true)
+    @Schema(description = "L'adresse e-mail du deuxième membre de l'association.", examples = "xavier.login@test.com", required = true)
     @FormParam("m2_mail")
     private String m2_email = null;
 
-    @Schema(description = "Le numéro de licence du deuxième membre de l'association. (null si non licencié)", example = "04242")
+    @Schema(description = "Le numéro de licence du deuxième membre de l'association. (null si non licencié)", examples = "04242")
     @FormParam("m2_licence")
     private String m2_lincence = null;
 
-    @Schema(description = "Le rôle du deuxième membre de l'association.", example = "SECRETAIRE", required = true)
+    @Schema(description = "Le rôle du deuxième membre de l'association.", examples = "SECRETAIRE", required = true)
     @FormParam("m2_role")
     private RoleAsso m2_role = null;
 
-    @Schema(description = "Le nom du troisième membre de l'association.", example = "Doe2", required = true)
+    @Schema(description = "Le nom du troisième membre de l'association.", examples = "Doe2", required = true)
     @FormParam("m3_nom")
     private String m3_lname = null;
 
-    @Schema(description = "Le prénom du troisième membre de l'association.", example = "John2", required = true)
+    @Schema(description = "Le prénom du troisième membre de l'association.", examples = "John2", required = true)
     @FormParam("m3_prenom")
     private String m3_fname = null;
 
-    @Schema(description = "L'adresse e-mail du troisième membre de l'association.", example = "john.doe22@test.com", required = true)
+    @Schema(description = "L'adresse e-mail du troisième membre de l'association.", examples = "john.doe22@test.com", required = true)
     @FormParam("m3_mail")
     private String m3_email = null;
 
@@ -103,7 +104,7 @@ public class AffiliationRequestForm {
     @FormParam("m3_licence")
     private String m3_lincence = null;
 
-    @Schema(description = "Le rôle du troisième membre de l'association.", example = "MEMBREBUREAU", required = true)
+    @Schema(description = "Le rôle du troisième membre de l'association.", examples = "MEMBREBUREAU", required = true)
     @FormParam("m3_role")
     private RoleAsso m3_role = null;
 

src/main/java/fr/titionfire/ffsaf/rest/from/AffiliationRequestSaveForm.java

@@ -6,123 +6,124 @@ import jakarta.ws.rs.core.MediaType;
 import lombok.Getter;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.jboss.resteasy.reactive.PartType;
+import org.jboss.resteasy.reactive.multipart.FileUpload;
 
 @Getter
 public class AffiliationRequestSaveForm {
-    @Schema(description = "L'identifiant de l'affiliation.", example = "1", required = true)
+    @Schema(description = "L'identifiant de l'affiliation.", examples = "1", required = true)
     @FormParam("id")
     private Long id = null;
 
-    @Schema(description = "Le nom de l'association.", example = "Association sportive", required = true)
+    @Schema(description = "Le nom de l'association.", examples = "Association sportive", required = true)
     @FormParam("name")
     private String name = null;
 
-    @Schema(description = "Le numéro SIRET ou RNA de l'association.", example = "12345678901234", required = true)
+    @Schema(description = "Le numéro SIRET ou RNA de l'association.", examples = "12345678901234", required = true)
     @FormParam("state_id")
     private String state_id = null;
 
-    @Schema(description = "L'adresse de l'association.", example = "1 rue de l'exemple, 75000 Paris", required = true)
+    @Schema(description = "L'adresse de l'association.", examples = "1 rue de l'exemple, 75000 Paris", required = true)
     @FormParam("address")
     private String address = null;
 
-    @Schema(description = "Email de contact de l'association", example = "test@test.fr")
+    @Schema(description = "Email de contact de l'association", examples = "test@test.fr")
     @FormParam("contact")
     private String contact = null;
 
     @Schema(description = "Le statut de l'association.")
     @FormParam("status")
     @PartType(MediaType.APPLICATION_OCTET_STREAM)
-    private byte[] status = new byte[0];
+    private FileUpload status = null;
 
     @Schema(description = "Le logo de l'association.")
     @FormParam("logo")
     @PartType(MediaType.APPLICATION_OCTET_STREAM)
-    private byte[] logo = new byte[0];
+    private FileUpload logo = null;
 
-    @Schema(description = "Mode utiliser pour la sauvegarde du membre 1 (0 = licence mode, 2 = nom, prénom)", example = "0", required = true)
+    @Schema(description = "Mode utiliser pour la sauvegarde du membre 1 (0 = licence mode, 2 = nom, prénom)", examples = "0", required = true)
     @FormParam("m1_mode")
     private Integer m1_mode = null;
 
-    @Schema(description = "Le rôle du premier membre de l'association.", example = "PRÉSIDENT", required = true)
+    @Schema(description = "Le rôle du premier membre de l'association.", examples = "PRÉSIDENT", required = true)
     @FormParam("m1_role")
     private RoleAsso m1_role = null;
 
-    @Schema(description = "Le numéro de licence du premier membre de l'association. (null si non licencié)", example = "1234567", required = true)
+    @Schema(description = "Le numéro de licence du premier membre de l'association. (null si non licencié)", examples = "1234567", required = true)
     @FormParam("m1_licence")
     private String m1_lincence = null;
 
-    @Schema(description = "Le nom du premier membre de l'association.", example = "Dupont", required = true)
+    @Schema(description = "Le nom du premier membre de l'association.", examples = "Dupont", required = true)
     @FormParam("m1_lname")
     private String m1_lname = null;
 
-    @Schema(description = "Le prénom du premier membre de l'association.", example = "Jean", required = true)
+    @Schema(description = "Le prénom du premier membre de l'association.", examples = "Jean", required = true)
     @FormParam("m1_fname")
     private String m1_fname = null;
 
-    @Schema(description = "L'adresse e-mail du premier membre de l'association.", example = "jean.dupont@example.com", required = true)
+    @Schema(description = "L'adresse e-mail du premier membre de l'association.", examples = "jean.dupont@examples.com", required = true)
     @FormParam("m1_email")
     private String m1_email = null;
 
     @Schema(name = "keep_email",
-            description = "Conserver l'email de la base de donner (1 = conserve, 0 = replacer par 'm1_email')", example = "1", required = true)
+            description = "Conserver l'email de la base de donner (1 = conserve, 0 = replacer par 'm1_email')", examples = "1", required = true)
     @FormParam("m1_email_mode")
     private Integer m1_email_mode = null;
 
-    @Schema(description = "Mode utiliser pour la sauvegarde du membre 2 (0 = licence mode, 2 = nom, prénom)", example = "0", required = true)
+    @Schema(description = "Mode utiliser pour la sauvegarde du membre 2 (0 = licence mode, 2 = nom, prénom)", examples = "0", required = true)
     @FormParam("m2_mode")
     private Integer m2_mode = null;
 
-    @Schema(description = "Le rôle du deuxième membre de l'association.", example = "TRÉSORIER", required = true)
+    @Schema(description = "Le rôle du deuxième membre de l'association.", examples = "TRÉSORIER", required = true)
     @FormParam("m2_role")
     private RoleAsso m2_role = null;
 
-    @Schema(description = "Le numéro de licence du deuxième membre de l'association. (null si non licencié)", example = "2345678", required = true)
+    @Schema(description = "Le numéro de licence du deuxième membre de l'association. (null si non licencié)", examples = "2345678", required = true)
     @FormParam("m2_licence")
     private String m2_lincence = null;
 
-    @Schema(description = "Le nom du deuxième membre de l'association.", example = "Durand", required = true)
+    @Schema(description = "Le nom du deuxième membre de l'association.", examples = "Durand", required = true)
     @FormParam("m2_lname")
     private String m2_lname = null;
 
-    @Schema(description = "Le prénom du deuxième membre de l'association.", example = "Paul", required = true)
+    @Schema(description = "Le prénom du deuxième membre de l'association.", examples = "Paul", required = true)
     @FormParam("m2_fname")
     private String m2_fname = null;
 
-    @Schema(description = "L'adresse e-mail du deuxième membre de l'association.", example = "paul.durand@example.com", required = true)
+    @Schema(description = "L'adresse e-mail du deuxième membre de l'association.", examples = "paul.durand@examples.com", required = true)
     @FormParam("m2_email")
     private String m2_email = null;
 
     @Schema(name = "keep_email",
-            description = "Conserver l'email de la base de donner (1 = conserve, 0 = replacer par 'm2_email')", example = "1", required = true)
+            description = "Conserver l'email de la base de donner (1 = conserve, 0 = replacer par 'm2_email')", examples = "1", required = true)
     @FormParam("m2_email_mode")
     private Integer m2_email_mode = null;
 
-    @Schema(description = "Mode utiliser pour la sauvegarde du membre 3 (0 = licence mode, 2 = nom, prénom)", example = "0", required = true)
+    @Schema(description = "Mode utiliser pour la sauvegarde du membre 3 (0 = licence mode, 2 = nom, prénom)", examples = "0", required = true)
     @FormParam("m3_mode")
     private Integer m3_mode = null;
 
-    @Schema(description = "Le rôle du troisième membre de l'association.", example = "SECRÉTAIRE", required = true)
+    @Schema(description = "Le rôle du troisième membre de l'association.", examples = "SECRÉTAIRE", required = true)
     @FormParam("m3_role")
     private RoleAsso m3_role = null;
 
-    @Schema(description = "Le numéro de licence du troisième membre de l'association. (null si non licencié)", example = "3456789", required = true)
+    @Schema(description = "Le numéro de licence du troisième membre de l'association. (null si non licencié)", examples = "3456789", required = true)
     @FormParam("m3_licence")
     private String m3_lincence = null;
 
-    @Schema(description = "Le nom du troisième membre de l'association.", example = "Martin", required = true)
+    @Schema(description = "Le nom du troisième membre de l'association.", examples = "Martin", required = true)
     @FormParam("m3_lname")
     private String m3_lname = null;
 
-    @Schema(description = "Le prénom du troisième membre de l'association.", example = "Pierre", required = true)
+    @Schema(description = "Le prénom du troisième membre de l'association.", examples = "Pierre", required = true)
     @FormParam("m3_fname")
     private String m3_fname = null;
 
-    @Schema(description = "L'adresse e-mail du troisième membre de l'association.", example = "pierre.martin@example.com", required = true)
+    @Schema(description = "L'adresse e-mail du troisième membre de l'association.", examples = "pierre.martin@examples.com", required = true)
     @FormParam("m3_email")
     private String m3_email = null;
 
     @Schema(name = "keep_email",
-            description = "Conserver l'email de la base de donner (1 = conserve, 0 = replacer par 'm3_email')", example = "1", required = true)
+            description = "Conserver l'email de la base de donner (1 = conserve, 0 = replacer par 'm3_email')", examples = "1", required = true)
     @FormParam("m3_email_mode")
     private Integer m3_email_mode = null;
 
@@ -174,8 +175,6 @@ public class AffiliationRequestSaveForm {
                 ", state_id=" + state_id +
                 ", address='" + address + '\'' +
                 ", contact='" + contact + '\'' +
-                ", status_len=" + status.length +
-                ", logo_len=" + logo.length +
                 ", m1_mode=" + m1_mode +
                 ", m1_role=" + m1_role +
                 ", m1_lincence='" + m1_lincence + '\'' +

src/main/java/fr/titionfire/ffsaf/rest/from/FullClubForm.java

@@ -7,57 +7,58 @@ import lombok.ToString;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.jboss.resteasy.reactive.PartType;
+import org.jboss.resteasy.reactive.multipart.FileUpload;
 
 @ToString
 @Getter
 public class FullClubForm {
     @FormParam("id")
-    @Schema(description = "Identifiant du club", example = "1", required = true)
+    @Schema(description = "Identifiant du club", examples = "1", required = true)
     private String id = null;
 
     @FormParam("name")
-    @Schema(description = "Nom du club", example = "Association sportive", required = true)
+    @Schema(description = "Nom du club", examples = "Association sportive", required = true)
     private String name = null;
 
     @FormParam("country")
-    @Schema(description = "Pays du club", example = "FR", required = true)
+    @Schema(description = "Pays du club", examples = "FR", required = true)
     private String country = null;
 
     @FormParam("contact")
-    @Schema(description = "Les contacts du club", example = "{\"SITE\": \"www.test.com\", \"COURRIEL\": \"test@test.com\"}", required = true)
+    @Schema(description = "Les contacts du club", examples = "{\"SITE\": \"www.test.com\", \"COURRIEL\": \"test@test.com\"}", required = true)
     private String contact = null;
 
     @FormParam("training_location")
-    @Schema(description = "Liste des lieux d'entraînement", example = "[{\"text\":\"addr 1\",\"lng\":2.24654,\"lat\":52.4868658},{\"text\":\"addr 2\",\"lng\":2.88654,\"lat\":52.7865456}]", required = true)
+    @Schema(description = "Liste des lieux d'entraînement", examples = "[{\"text\":\"addr 1\",\"lng\":2.24654,\"lat\":52.4868658},{\"text\":\"addr 2\",\"lng\":2.88654,\"lat\":52.7865456}]", required = true)
     private String training_location = null;
 
     @FormParam("training_day_time")
-    @Schema(description = "Liste des jours et horaires d'entraînement (jours 0-6, 0=>lundi) (temps en minute depuis 00:00, 122=>2h02)", example = "[{\"day\":0,\"time_start\":164,\"time_end\":240},{\"day\":3,\"time_start\":124,\"time_end\":250}]", required = true)
+    @Schema(description = "Liste des jours et horaires d'entraînement (jours 0-6, 0=>lundi) (temps en minute depuis 00:00, 122=>2h02)", examples = "[{\"day\":0,\"time_start\":164,\"time_end\":240},{\"day\":3,\"time_start\":124,\"time_end\":250}]", required = true)
     private String training_day_time = null;
 
     @FormParam("contact_intern")
-    @Schema(description = "Contact interne du club", example = "john.doe@test.com")
+    @Schema(description = "Contact interne du club", examples = "john.doe@test.com")
     private String contact_intern = null;
 
     @FormParam("address")
-    @Schema(description = "Adresse postale du club", example = "1 rue de l'exemple, 75000 Paris", required = true)
+    @Schema(description = "Adresse postale du club", examples = "1 rue de l'exemple, 75000 Paris", required = true)
     private String address = null;
 
     @FormParam("state_id")
-    @Schema(description = "Numéro SIRET ou RNA du club", example = "12345678901234", required = true)
+    @Schema(description = "Numéro SIRET ou RNA du club", examples = "12345678901234", required = true)
     private String state_id = null;
 
     @FormParam("international")
-    @Schema(description = "Club international", example = "false", required = true)
+    @Schema(description = "Club international", examples = "false", required = true)
     private boolean international = false;
 
     @FormParam("status")
     @PartType(MediaType.APPLICATION_OCTET_STREAM)
-    @Schema(description = "Le statut de l'association.", type = SchemaType.ARRAY, implementation = byte.class)
+    @Schema(description = "Le statut de l'association.", type = SchemaType.ARRAY)
-    private byte[] status = new byte[0];
+    private FileUpload status = null;
 
     @FormParam("logo")
     @PartType(MediaType.APPLICATION_OCTET_STREAM)
-    @Schema(description = "Le logo de l'association.", type = SchemaType.ARRAY, implementation = byte.class)
+    @Schema(description = "Le logo de l'association.", type = SchemaType.ARRAY)
-    private byte[] logo = new byte[0];
+    private FileUpload logo = null;
 }

src/main/java/fr/titionfire/ffsaf/rest/from/FullMemberForm.java

@@ -8,32 +8,33 @@ import jakarta.ws.rs.core.MediaType;
 import lombok.Getter;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.jboss.resteasy.reactive.PartType;
+import org.jboss.resteasy.reactive.multipart.FileUpload;
 
 import java.util.Date;
 
 @Getter
 public class FullMemberForm {
-    @Schema(description = "L'identifiant du membre.", example = "1")
+    @Schema(description = "L'identifiant du membre.", examples = "1")
     @FormParam("id")
     private String id = null;
 
-    @Schema(description = "Le nom du membre.", example = "Dupont")
+    @Schema(description = "Le nom du membre.", examples = "Dupont")
     @FormParam("lname")
     private String lname = null;
 
-    @Schema(description = "Le prénom du membre.", example = "Jean")
+    @Schema(description = "Le prénom du membre.", examples = "Jean")
     @FormParam("fname")
     private String fname = null;
 
-    @Schema(description = "L'identifiant du club du membre.", example = "1")
+    @Schema(description = "L'identifiant du club du membre.", examples = "1")
     @FormParam("club")
     private Long club = null;
 
-    @Schema(description = "Le genre du membre.", example = "H")
+    @Schema(description = "Le genre du membre.", examples = "H")
     @FormParam("genre")
     private Genre genre;
 
-    @Schema(description = "Le pays du membre.", example = "FR")
+    @Schema(description = "Le pays du membre.", examples = "FR")
     @FormParam("country")
     private String country;
 
@@ -41,22 +42,22 @@ public class FullMemberForm {
     @FormParam("birth_date")
     private Date birth_date = null;
 
-    @Schema(description = "L'adresse e-mail du membre.", example = "jean.dupont@example.com")
+    @Schema(description = "L'adresse e-mail du membre.", examples = "jean.dupont@example.com")
     @FormParam("email")
     private String email;
 
-    @Schema(description = "Le rôle du membre dans l'association.", example = "MEMBRE")
+    @Schema(description = "Le rôle du membre dans l'association.", examples = "MEMBRE")
     @FormParam("role")
     private RoleAsso role;
 
-    @Schema(description = "Le grade d'arbitrage du membre.", example = "ASSESSEUR")
+    @Schema(description = "Le grade d'arbitrage du membre.", examples = "ASSESSEUR")
     @FormParam("grade_arbitrage")
     private GradeArbitrage grade_arbitrage = GradeArbitrage.NA;
 
     @Schema(description = "La photo du membre.")
     @FormParam("photo_data")
     @PartType(MediaType.APPLICATION_OCTET_STREAM)
-    private byte[] photo_data = new byte[0];
+    private FileUpload photo_data = null;
 
     @Override
     public String toString() {
@@ -70,7 +71,6 @@ public class FullMemberForm {
                 ", email='" + email + '\'' +
                 ", role=" + role +
                 ", grade_arbitrage=" + grade_arbitrage +
-                ", url_photo=" + photo_data.length +
                 '}';
     }
 }

src/main/java/fr/titionfire/ffsaf/rest/from/UserSettingForm.java

@@ -0,0 +1,15 @@
+package fr.titionfire.ffsaf.rest.from;
+
+import fr.titionfire.ffsaf.utils.ResultPrivacy;
+import jakarta.ws.rs.FormParam;
+import lombok.Getter;
+import lombok.ToString;
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+
+@ToString
+@Getter
+public class UserSettingForm {
+    @FormParam("resultPrivacy")
+    @Schema(description = "La confidentialité des résultats", examples = "PUBLIC", defaultValue = "PUBLIC", required = true)
+    private ResultPrivacy resultPrivacy;
+}

src/main/java/fr/titionfire/ffsaf/utils/Categorie.java

@@ -1,5 +1,6 @@
 package fr.titionfire.ffsaf.utils;
 
+import fr.titionfire.ffsaf.domain.service.TradService;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
 import java.util.ResourceBundle;
@@ -19,7 +20,7 @@ public enum Categorie {
     VETERAN2;
 
     public String getName(ResourceBundle BUNDLE) {
-        return switch (this){
+        return switch (this) {
             case SUPER_MINI -> BUNDLE.getString("Cat.SUPER_MINI");
             case MINI_POUSSIN -> BUNDLE.getString("Cat.MINI_POUSSIN");
             case POUSSIN -> BUNDLE.getString("Cat.POUSSIN");
@@ -34,8 +35,24 @@ public enum Categorie {
         };
     }
 
+    public String getName(TradService tradService) {
+        return switch (this) {
+            case SUPER_MINI -> tradService.translate("Cat.SUPER_MINI");
+            case MINI_POUSSIN -> tradService.translate("Cat.MINI_POUSSIN");
+            case POUSSIN -> tradService.translate("Cat.POUSSIN");
+            case BENJAMIN -> tradService.translate("Cat.BENJAMIN");
+            case MINIME -> tradService.translate("Cat.MINIME");
+            case CADET -> tradService.translate("Cat.CADET");
+            case JUNIOR -> tradService.translate("Cat.JUNIOR");
+            case SENIOR1 -> tradService.translate("Cat.SENIOR1");
+            case SENIOR2 -> tradService.translate("Cat.SENIOR2");
+            case VETERAN1 -> tradService.translate("Cat.VETERAN1");
+            case VETERAN2 -> tradService.translate("Cat.VETERAN2");
+        };
+    }
+
     public String getName() {
-        return switch (this){
+        return switch (this) {
             case SUPER_MINI -> "Super Mini";
             case MINI_POUSSIN -> "Mini Poussin";
             case POUSSIN -> "Poussin";

src/main/java/fr/titionfire/ffsaf/utils/CompetitionSystem.java

@@ -1,5 +1,5 @@
 package fr.titionfire.ffsaf.utils;
 
 public enum CompetitionSystem {
-    SAFCA, NONE
+    SAFCA, INTERNAL
 }

src/main/java/fr/titionfire/ffsaf/utils/Contact.java

@@ -1,32 +1,34 @@
 package fr.titionfire.ffsaf.utils;
 
+import fr.titionfire.ffsaf.domain.service.TradService;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
 import java.util.HashMap;
 
 @RegisterForReflection
 public enum Contact {
-    COURRIEL("Courriel"),
+    COURRIEL,
-    TELEPHONE("Téléphone"),
+    TELEPHONE,
-    SITE("Site web"),
+    SITE,
-    FACEBOOK("Facebook"),
+    FACEBOOK,
-    INSTAGRAM("Instagram"),
+    INSTAGRAM,
-    AUTRE("Autre");
+    AUTRE;
 
-    public String name;
+    public String getName(TradService trad) {
-
+        return switch (this) {
-    Contact(String name) {
+            case COURRIEL -> trad.translate("Contact.COURRIEL");
-        this.name = name;
+            case TELEPHONE -> trad.translate("Contact.TELEPHONE");
+            case SITE -> trad.translate("Contact.SITE");
+            case FACEBOOK -> trad.translate("Contact.FACEBOOK");
+            case INSTAGRAM -> trad.translate("Contact.INSTAGRAM");
+            case AUTRE -> trad.translate("Contact.AUTRE");
+        };
     }
 
-    public void setName(String name) {
+    public static HashMap<String, String> toSite(TradService trad) {
-        this.name = name;
-    }
-
-    public static HashMap<String, String> toSite() {
         HashMap<String, String> map = new HashMap<>();
         for (Contact contact : Contact.values()) {
-            map.put(contact.toString(), contact.name);
+            map.put(contact.toString(), contact.getName(trad));
         }
         return map;
     }

src/main/java/fr/titionfire/ffsaf/utils/Genre.java

@@ -1,5 +1,6 @@
 package fr.titionfire.ffsaf.utils;
 
+import fr.titionfire.ffsaf.domain.service.TradService;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
 @RegisterForReflection
@@ -27,8 +28,17 @@ public enum Genre {
         }
     }
 
+    public String getString(TradService trad) {
+        return switch (this) {
+            case H -> trad.translate("Genre.Homme");
+            case F -> trad.translate("Genre.Femme");
+            case NA -> trad.translate("Genre.NA");
+        };
+    }
+
     @Override
     public String toString() {
         return str;
     }
+
 }

src/main/java/fr/titionfire/ffsaf/utils/GradeArbitrage.java

@@ -1,5 +1,6 @@
 package fr.titionfire.ffsaf.utils;
 
+import fr.titionfire.ffsaf.domain.service.TradService;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
 @RegisterForReflection
@@ -14,6 +15,14 @@ public enum GradeArbitrage {
         this.str = name;
     }
 
+    public String getString(TradService trad) {
+        return switch (this) {
+            case NA -> trad.translate("GradeArbitrage.NA");
+            case ASSESSEUR -> trad.translate("GradeArbitrage.ASSESSEUR");
+            case ARBITRE -> trad.translate("GradeArbitrage.ARBITRE");
+        };
+    }
+
     @Override
     public String toString() {
         return str;

src/main/java/fr/titionfire/ffsaf/utils/PageResult.java

@@ -10,13 +10,14 @@ import java.util.List;
 @Data
 @RegisterForReflection
 public class PageResult<T> {
-    @Schema(description = "Le numéro de la page courante.", example = "1")
+    @Schema(description = "Le numéro de la page courante.", examples = "1")
     private int page;
-    @Schema(description = "Le nombre d'éléments par page.", example = "10")
+    @Schema(description = "Le nombre d'éléments par page.", examples = "10")
     private int page_size;
-    @Schema(description = "Le nombre total de pages.", example = "5")
+    @Schema(description = "Le nombre total de pages.", examples = "5")
     private int page_count;
-    @Schema(description = "Le nombre total d'éléments.", example = "47")
+    @Schema(description = "Le nombre total d'éléments.", examples = "47")
     private long result_count;
     private List<T> result = new ArrayList<>();
+    private Object additionalData;
 }

src/main/java/fr/titionfire/ffsaf/utils/ResultPrivacy.java

@@ -0,0 +1,8 @@
+package fr.titionfire.ffsaf.utils;
+
+public enum ResultPrivacy {
+    PUBLIC,
+    REGISTERED_ONLY,
+    REGISTERED_ONLY_NO_DETAILS,
+    PRIVATE;
+}

src/main/java/fr/titionfire/ffsaf/utils/RoleAsso.java

@@ -1,5 +1,6 @@
 package fr.titionfire.ffsaf.utils;
 
+import fr.titionfire.ffsaf.domain.service.TradService;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
 @RegisterForReflection
@@ -21,6 +22,19 @@ public enum RoleAsso {
         this.level = level;
     }
 
+    public String getString(TradService trad) {
+        return switch (this){
+            case MEMBRE -> trad.translate("RoleAsso.MEMBRE");
+            case PRESIDENT -> trad.translate("RoleAsso.PRESIDENT");
+            case VPRESIDENT -> trad.translate("RoleAsso.VPRESIDENT");
+            case SECRETAIRE -> trad.translate("RoleAsso.SECRETAIRE");
+            case VSECRETAIRE -> trad.translate("RoleAsso.VSECRETAIRE");
+            case TRESORIER -> trad.translate("RoleAsso.TRESORIER");
+            case VTRESORIER -> trad.translate("RoleAsso.VTRESORIER");
+            case MEMBREBUREAU -> trad.translate("RoleAsso.MEMBREBUREAU");
+        };
+    }
+
     @Override
     public String toString() {
         return str;

src/main/java/fr/titionfire/ffsaf/utils/TreeNode.java

@@ -0,0 +1,35 @@
+package fr.titionfire.ffsaf.utils;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@RegisterForReflection
+public class TreeNode<T> {
+    private T data;
+    private TreeNode<T> left;
+    private TreeNode<T> right;
+
+    public TreeNode(T data) {
+        this(data, null, null);
+    }
+
+    public int death() {
+        int dg = 0;
+        int dd = 0;
+
+        if (this.right != null)
+            dg = this.right.death();
+
+        if (this.left != null)
+            dg = this.left.death();
+
+        return 1 + Math.max(dg, dd);
+    }
+}

src/main/java/fr/titionfire/ffsaf/utils/Utils.java

@@ -1,17 +1,27 @@
 package fr.titionfire.ffsaf.utils;
 
+import fr.titionfire.ffsaf.data.model.CompetitionGuestModel;
+import fr.titionfire.ffsaf.data.model.MembreModel;
+import fr.titionfire.ffsaf.domain.service.VirusScannerService;
+import fr.titionfire.ffsaf.rest.exception.DBadRequestException;
+import fr.titionfire.ffsaf.rest.exception.DInternalError;
+import fr.titionfire.ffsaf.rest.exception.DetailException;
+import io.quarkiverse.antivirus.runtime.AntivirusScanResult;
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.unchecked.Unchecked;
 import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jodd.net.MimeTypes;
-import org.apache.tika.Tika;
 import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.multipart.FileUpload;
 
 import java.io.*;
 import java.net.URISyntaxException;
 import java.net.URLConnection;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.concurrent.CompletableFuture;
@@ -21,6 +31,79 @@ import java.util.concurrent.Future;
 public class Utils {
     private static final Logger LOGGER = Logger.getLogger(Utils.class);
 
+    public static String HTML_HEADER = """
+            <!DOCTYPE html>
+            <html data-lt-installed="true">
+            
+            <head>
+                <meta charset="UTF-8">
+                <title>%s</title>
+                <style>
+                    body {
+                        font-family: Arial, sans-serif;
+                        line-height: 1.6;
+                        color: #333;
+                        max-width: 600px;
+                        margin: 0 auto;
+                        padding: 20px;
+                    }
+            
+                    .header {
+                        background-color: #003366;
+                        color: white;
+                        padding: 20px;
+                        text-align: center;
+                        border-radius: 5px 5px 0 0;
+                    }
+            
+                    .content {
+                        padding: 20px;
+                        background-color: #f9f9f9;
+                        border-radius: 0 0 5px 5px;
+                        border: 1px solid #ddd;
+                        border-top: none;
+                    }
+            
+                    .button {
+                        display: inline-block;
+                        padding: 10px 20px;
+                        background-color: #003366;
+                        color: white !important;
+                        text-decoration: none;
+                        border-radius: 5px;
+                        margin: 15px 0;
+                    }
+            
+                    .footer {
+                        margin-top: 20px;
+                        font-size: 0.9em;
+                        color: #666;
+                        text-align: center;
+                    }
+            
+                    .highlight {
+                        font-weight: bold;
+                        color: #003366;
+                    }
+                </style>
+            </head>
+            
+            <body data-gramm="false" data-lt-tmp-id="lt-957854">
+                <div class="header">
+                    <div><img src="https://intra.ffsaf.fr/Logo-FFSAF-2023.png" alt="ffsaf" height="128">
+                        <h1>F&eacute;d&eacute;ration France Soft Armored Fighting</h1>
+                    </div>
+                </div>
+                <div class="content">
+                    <p>Bonjour,</p>
+            """;
+    public static String HTML_FOOTER = """
+                <p>Cordialement,<br>L&rsquo;&eacute;quipe de la FFSAF</p>
+                </div>
+            </body>
+            </html>
+            """;
+
     public static int getSaison() {
         return getSaison(new Date());
     }
@@ -36,6 +119,15 @@ public class Utils {
         }
     }
 
+    public static Calendar getFirstDateOfSaison() {
+        Calendar calendar = Calendar.getInstance();
+
+        calendar.set(getSaison(), Calendar.SEPTEMBER, 1, 0, 0, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
+        return calendar;
+    }
+
     public static Calendar toCalendar(Date date) {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
@@ -108,53 +200,87 @@ public class Utils {
         });
     }
 
-    public static Future<String> replacePhoto(long id, byte[] input, String media, String dir) {
+    public static Uni<String> uploadFile(VirusScannerService ss, FileUpload file, long id, String media, String dir) {
-        return CompletableFuture.supplyAsync(() -> {
+        if (file == null || file.size() == 0)
-            if (input == null || input.length == 0)
+            return Uni.createFrom().item("Ok");
-                return "OK";
 
-            try (InputStream is = new BufferedInputStream(new ByteArrayInputStream(input))) {
+        LOGGER.infof("Received file upload request for: %s (size: %d bytes)", file.fileName(), file.size());
-                String mimeType;
+        return Uni.createFrom().<InputStream>item(() -> {
                     try {
-                    Tika tika = new Tika();
+                        // Read the entire file into memory for virus scanning
-                    mimeType = tika.detect(is);// Magic.getMagicMatch(input, false).getMimeType();
+                        // ByteArrayInputStream fully supports mark/reset operations required by ClamAV
+                        // This ensures we can scan the file content before any filesystem storage
+                        InputStream fileStream = java.nio.file.Files.newInputStream(file.uploadedFile());
+                        byte[] fileBytes = fileStream.readAllBytes();
+                        fileStream.close(); // Close the file stream immediately
+                        return new ByteArrayInputStream(fileBytes);
                     } catch (IOException e) {
-                    mimeType = URLConnection.guessContentTypeFromStream(is);
+                        throw new RuntimeException("Failed to read uploaded file: " + e.getMessage(), e);
                     }
-                String[] detectedExtensions = MimeTypes.findExtensionsByMimeTypes(mimeType, false);
+                }).runSubscriptionOn(io.smallrye.mutiny.infrastructure.Infrastructure.getDefaultWorkerPool()).onItem()
+                .transformToUni(inputStream -> {
+                    // Perform virus scanning reactively using the input stream
+                    return ss.scanFileReactive(file.fileName(), inputStream).onItem().invoke(() -> {
+                        try {
+                            inputStream.close();
+                        } catch (IOException e) {
+                            LOGGER.warn("Warning: Failed to close input stream: " + e.getMessage());
+                        }
+                    });
+                })
+                .onItem().transformToUni(scanResults -> Uni.createFrom().item(Unchecked.supplier(() -> {
+                    // Check if any scanner found a threat
+                    for (AntivirusScanResult result : scanResults) {
+                        if (result.getStatus() != Response.Status.OK.getStatusCode()) {
+                            LOGGER.warnf("THREAT DETECTED in %s: %s", file.fileName(), result.getMessage());
+                            throw new DetailException(Response.Status.fromStatusCode(result.getStatus()),
+                                    "THREAT_DETECTED on File " + file.fileName() + " is infected: " + result.getMessage());
+                        }
+                    }
+
+                    // File is clean - now we can safely process it
+                    LOGGER.infof("File is clean: %s (size=%d) (contentType=%s)", file.fileName(), file.size(),
+                            file.contentType());
+
+                    String[] detectedExtensions = MimeTypes.findExtensionsByMimeTypes(file.contentType(), false);
                     if (detectedExtensions.length == 0)
-                    throw new IOException("Fail to detect file extension for MIME type " + mimeType);
+                        throw new DBadRequestException(
+                                "Fail to detect file extension for MIME type " + file.contentType());
 
                     File dirFile = new File(media, dir);
                     if (!dirFile.exists())
                         if (!dirFile.mkdirs())
-                        throw new IOException("Fail to create directory " + dir);
+                            throw new DInternalError("Fail to create directory " + dir);
 
                     FilenameFilter filter = (directory, filename) -> filename.startsWith(id + ".");
                     File[] files = dirFile.listFiles(filter);
                     if (files != null) {
-                    for (File file : files) {
+                        for (File f2 : files) {
                             //noinspection ResultOfMethodCallIgnored
-                        file.delete();
+                            f2.delete();
                         }
                     }
 
-                String extension = "." + detectedExtensions[0];
+                    Path f = file.filePath();
-                Files.write(new File(dirFile, id + extension).toPath(), input);
+                    System.out.println(f + " -> " + new File(dirFile, id + "." + detectedExtensions[0]));
-                return "OK";
+                    Files.copy(f, new File(dirFile, id + "." + detectedExtensions[0]).toPath(),
-            } catch (IOException e) {
+                            StandardCopyOption.REPLACE_EXISTING);
-                return e.getMessage();
+                    return "ok";
-            }
+                })));
-        });
     }
 
     public static Uni<Response> getMediaFile(long id, String media, String dirname,
                                              Uni<?> uniBase) throws URISyntaxException {
-        return getMediaFile(id, media, dirname, null, uniBase);
+        return getMediaFile(id, media, dirname, null, uniBase, true);
+    }
+
+    public static Uni<Response> getMediaFileNoDefault(long id, String media, String dirname,
+                                                      Uni<?> uniBase) throws URISyntaxException {
+        return getMediaFile(id, media, dirname, null, uniBase, false);
     }
 
     public static Uni<Response> getMediaFile(long id, String media, String dirname, String out_filename,
-                                             Uni<?> uniBase) throws URISyntaxException {
+                                             Uni<?> uniBase, boolean default_) throws URISyntaxException {
         Future<Pair<File, byte[]>> future = CompletableFuture.supplyAsync(() -> {
             FilenameFilter filter = (directory, filename) -> filename.startsWith(id + ".");
             File[] files = new File(media, dirname).listFiles(filter);
@@ -182,6 +308,7 @@ public class Utils {
         return uniBase.chain(__ -> Uni.createFrom().future(future)
                 .chain(filePair -> {
                     if (filePair == null) {
+                        if (default_) {
                             return Uni.createFrom().future(future2).map(data -> {
                                 if (data == null)
                                     return Response.noContent().build();
@@ -195,6 +322,11 @@ public class Utils {
                                         "inline; " + ((out_filename == null) ? "" : "filename=\"" + out_filename + "\""));
                                 return resp.build();
                             });
+                        } else {
+                            Response.ResponseBuilder resp = Response.status(404);
+                            resp.header(HttpHeaders.CACHE_CONTROL, "max-age=600");
+                            return Uni.createFrom().item(resp.build());
+                        }
                     } else {
                         return Uni.createFrom().item(() -> {
                             String mimeType = URLConnection.guessContentTypeFromName(filePair.getKey().getName());
@@ -251,4 +383,46 @@ public class Utils {
 
         return (int) ((calendar.getTimeInMillis() - now.getTimeInMillis()) / (1000 * 60 * 60 * 24));
     }
+
+    public static String formatPrenom(String input) {
+        if (input == null || input.isEmpty()) {
+            return input;
+        }
+
+        StringBuilder result = new StringBuilder();
+        String[] mots = input.split(" ");
+
+        for (String mot : mots) {
+            if (!mot.isEmpty()) {
+                String[] parties = mot.split("[-']");
+                StringBuilder motFormate = new StringBuilder();
+
+                for (int i = 0; i < parties.length; i++) {
+                    if (!parties[i].isEmpty()) {
+                        String premiereLettre = parties[i].substring(0, 1).toUpperCase();
+                        String reste = parties[i].substring(1).toLowerCase();
+                        motFormate.append(premiereLettre).append(reste);
+                    }
+
+                    if (i < parties.length - 1) {
+                        motFormate.append(mot.charAt(mot.indexOf(parties[i]) + parties[i].length()));
+                    }
+                }
+                result.append(motFormate).append(" ");
+            }
+        }
+        return result.toString().trim();
+    }
+
+    public static String getFullName(Object... models) {
+        for (Object model : models) {
+            if (model == null)
+                continue;
+            if (model instanceof MembreModel membreModel)
+                return membreModel.getFname() + " " + membreModel.getLname();
+            if (model instanceof CompetitionGuestModel guestModel)
+                return guestModel.getFname() + " " + guestModel.getLname();
+        }
+        return "";
+    }
 }

src/main/java/fr/titionfire/ffsaf/ws/CompetitionWS.java

@@ -0,0 +1,271 @@
+package fr.titionfire.ffsaf.ws;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import fr.titionfire.ffsaf.data.repository.CompetitionRepository;
+import fr.titionfire.ffsaf.domain.service.CompetPermService;
+import fr.titionfire.ffsaf.net2.MessageType;
+import fr.titionfire.ffsaf.rest.data.SimpleCompetData;
+import fr.titionfire.ffsaf.utils.SecurityCtx;
+import fr.titionfire.ffsaf.ws.data.WelcomeInfo;
+import fr.titionfire.ffsaf.ws.recv.*;
+import fr.titionfire.ffsaf.ws.send.JsonUni;
+import io.quarkus.hibernate.reactive.panache.common.WithSession;
+import io.quarkus.security.Authenticated;
+import io.quarkus.websockets.next.*;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.unchecked.Unchecked;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.ForbiddenException;
+import org.jboss.logging.Logger;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.Executor;
+
+import static fr.titionfire.ffsaf.net2.Client_Thread.MAPPER;
+
+@Authenticated
+@WebSocket(path = "api/ws/competition/{uuid}")
+public class CompetitionWS {
+    private static final Logger LOGGER = Logger.getLogger(CompetitionWS.class);
+
+    private static final HashMap<WebSocketConnection, HashMap<UUID, JsonUni<?>>> waitingResponse = new HashMap<>();
+
+    @Inject
+    RMatch rMatch;
+
+    @Inject
+    RCategorie rCategorie;
+
+    @Inject
+    RRegister rRegister;
+
+    @Inject
+    RCard rCard;
+
+    @Inject
+    RTeam rTeam;
+
+    @Inject
+    RState rState;
+
+    @Inject
+    RPDF rpdf;
+
+    @Inject
+    SecurityCtx securityCtx;
+
+    @Inject
+    CompetPermService competPermService;
+
+    @SuppressWarnings("CdiInjectionPointsInspection")
+    @Inject
+    OpenConnections connections;
+
+    @Inject
+    @Named("notify-executor")
+    Executor notifyExecutor;
+    private static Executor executor;
+
+    @Inject
+    CompetitionRepository competitionRepository;
+
+    HashMap<Method, Object> wsMethods = new HashMap<>();
+
+    public void getWSReceiverMethods(Class<?> clazz, Object object) {
+        for (Method method : clazz.getDeclaredMethods()) {
+            if (method.isAnnotationPresent(WSReceiver.class)) {
+                if (method.getParameterCount() <= 1) {
+                    LOGGER.warnf("@WSReceiver has no parameters for method %s", method.getName());
+                    continue;
+                }
+                if (!method.getReturnType().equals(Uni.class)) {
+                    LOGGER.warnf("@WSReceiver has returned unexpected type %s", method.getReturnType());
+                    continue;
+                }
+                // method.setAccessible(true);
+                wsMethods.put(method, object);
+            }
+        }
+    }
+
+    @PostConstruct
+    void init() {
+        getWSReceiverMethods(RMatch.class, rMatch);
+        getWSReceiverMethods(RCategorie.class, rCategorie);
+        getWSReceiverMethods(RRegister.class, rRegister);
+        getWSReceiverMethods(RCard.class, rCard);
+        getWSReceiverMethods(RTeam.class, rTeam);
+        getWSReceiverMethods(RState.class, rState);
+        getWSReceiverMethods(RPDF.class, rpdf);
+
+        executor = notifyExecutor;
+    }
+
+    @OnOpen
+    @WithSession
+    Uni<MessageOut> open(WebSocketConnection connection) {
+        LOGGER.infof("Opening CompetitionWS for %s", connection.pathParam("uuid"));
+        LOGGER.debugf("Active connections: %d", connection.getOpenConnections().size());
+
+        return competitionRepository.find("uuid", connection.pathParam("uuid")).firstResult()
+                .invoke(Unchecked.consumer(cm -> {
+                    if (cm == null)
+                        throw new ForbiddenException();
+                }))
+                .call(cm -> competPermService.hasEditPerm(securityCtx, cm).map(__ -> PermLevel.ADMIN)
+                        .onFailure()
+                        .recoverWithUni(competPermService.hasTablePerm(securityCtx, cm).map(__ -> PermLevel.TABLE))
+                        //.onFailure()
+                        //.recoverWithUni(competPermService.hasViewPerm(securityCtx, cm).map(__ -> PermLevel.VIEW))
+                        .invoke(prem -> connection.userData().put(UserData.TypedKey.forString("prem"), prem.toString()))
+                        .invoke(prem -> LOGGER.infof("Connection permission: %s", prem))
+                        .onFailure().transform(t -> new ForbiddenException()))
+                .invoke(__ -> {
+                    connection.userData().put(UserData.TypedKey.forString("subject"), securityCtx.getSubject());
+                    waitingResponse.put(connection, new HashMap<>());
+                })
+                .map(cm -> {
+                    SimpleCompetData data = SimpleCompetData.fromModel(cm);
+                    WelcomeInfo welcomeInfo = new WelcomeInfo();
+
+                    welcomeInfo.setName(cm.getName());
+                    welcomeInfo.setPerm(connection.userData().get(UserData.TypedKey.forString("prem")));
+                    welcomeInfo.setShow_blason(data.isShow_blason());
+                    welcomeInfo.setShow_flag(data.isShow_flag());
+
+                    return new MessageOut(UUID.randomUUID(), "welcomeInfo", MessageType.NOTIFY, welcomeInfo);
+                });
+    }
+
+    @OnClose
+    void close(WebSocketConnection connection) {
+        LOGGER.infof("Closing CompetitionWS for %s ", connection.pathParam("uuid"));
+        LOGGER.debugf("Active connections: %d", connection.getOpenConnections().size());
+
+        waitingResponse.remove(connection);
+        rState.removeConnection(connection);
+    }
+
+    private MessageOut makeReply(MessageIn message, Object data) {
+        return new MessageOut(message.uuid(), message.code(), MessageType.REPLY, data);
+    }
+
+    private MessageOut makeError(MessageIn message, Object data) {
+        return new MessageOut(message.uuid(), message.code(), MessageType.ERROR, data);
+    }
+
+    @OnTextMessage
+    Multi<MessageOut> processAsync(WebSocketConnection connection, MessageIn message) {
+        System.out.println(message);
+        if (message.type() == MessageType.REPLY || message.type() == MessageType.ERROR) {
+            try {
+                JsonUni<?> jsonUni = waitingResponse.get(connection).get(message.uuid());
+                if (jsonUni == null) {
+                    LOGGER.debugf("No JsonUni found for %s", message.uuid());
+                    if (message.type() == MessageType.ERROR)
+                        LOGGER.errorf("request %s make error %s", message.uuid(), message.data());
+                    return null;
+                }
+                waitingResponse.get(connection).remove(message.uuid());
+
+                if (message.type() == MessageType.ERROR)
+                    return jsonUni.castAndError(message.data()).onFailure()
+                            .invoke(t -> LOGGER.error(t.getMessage(), t))
+                            .replaceWith((MessageOut) null).toMulti().filter(__ -> false);
+
+                return jsonUni.castAndChain(message.data()).onFailure()
+                        .invoke(t -> LOGGER.error(t.getMessage(), t))
+                        .replaceWith((MessageOut) null).toMulti().filter(__ -> false);
+            } catch (JsonProcessingException e) {
+                LOGGER.warn(e.getMessage(), e);
+            }
+        }
+
+        try {
+            for (Map.Entry<Method, Object> entry : wsMethods.entrySet()) {
+                Method method = entry.getKey();
+                WSReceiver wsReceiver = method.getAnnotation(WSReceiver.class);
+                PermLevel perm = PermLevel.valueOf(connection.userData().get(UserData.TypedKey.forString("prem")));
+                if (wsReceiver.code().equalsIgnoreCase(message.code())) {
+                    if (wsReceiver.permission().ordinal() > perm.ordinal())
+                        return Uni.createFrom().item(makeError(message, "Permission denied")).toMulti();
+                    return ((Uni<?>) method.invoke(entry.getValue(), connection,
+                            MAPPER.treeToValue(message.data(), method.getParameterTypes()[1])))
+                            .ifNoItem().after(Duration.ofSeconds(5)).fail()
+                            .map(o -> makeReply(message, o))
+                            .onFailure()
+                            .recoverWithItem(t -> {
+                                LOGGER.error(t.getMessage(), t);
+                                return makeError(message, t.getMessage());
+                            }).toMulti()
+                            .filter(__ -> message.type() == MessageType.REQUEST);
+                }
+            }
+            return Uni.createFrom().item(makeError(message, "No receiver method found")).toMulti();
+        } catch (IllegalAccessException | InvocationTargetException | JsonProcessingException e) {
+            LOGGER.warn(e.getMessage(), e);
+            return Uni.createFrom().item(makeError(message, e.getMessage())).toMulti();
+        }
+
+        // return Uni.createFrom().item(new Message<>(message.uuid(), message.code(), MessageType.REPLY, "ko"));
+    }
+
+    public static void sendNotifyToOtherEditor(WebSocketConnection connection, String code, Object data) {
+        String uuid = connection.pathParam("uuid");
+
+        List<Uni<Void>> queue = new ArrayList<>();
+        queue.add(Uni.createFrom().voidItem()); // For avoid empty queue
+
+        connection.getOpenConnections().forEach(c -> {
+            if (uuid.equals(c.pathParam("uuid"))) {
+                queue.add(c.sendText(new MessageOut(UUID.randomUUID(), code, MessageType.NOTIFY, data)));
+            }
+        });
+
+        Uni.join().all(queue)
+                .andCollectFailures()
+                .runSubscriptionOn(executor)
+                .subscribeAsCompletionStage()
+                .whenComplete((v, t) -> {
+                    if (t != null) {
+                        LOGGER.error("Error sending ws_out message", t);
+                    }
+                });
+    }
+
+    public static void sendNotifyState(WebSocketConnection connection, String code, Object data) {
+        String uuid = connection.pathParam("uuid");
+
+        List<Uni<Void>> queue = new ArrayList<>();
+        queue.add(Uni.createFrom().voidItem()); // For avoid empty queue
+
+        connection.getOpenConnections().forEach(c -> {
+            Boolean s = c.userData().get(UserData.TypedKey.forBoolean("needState"));
+            if (uuid.equals(c.pathParam("uuid")) && s != null && s) {
+                queue.add(c.sendText(new MessageOut(UUID.randomUUID(), code, MessageType.NOTIFY, data)));
+            }
+        });
+
+        Uni.join().all(queue)
+                .andCollectFailures()
+                .runSubscriptionOn(executor)
+                .subscribeAsCompletionStage()
+                .whenComplete((v, t) -> {
+                    if (t != null) {
+                        LOGGER.error("Error sending ws_out message", t);
+                    }
+                });
+    }
+
+    @OnError
+    Uni<Void> error(WebSocketConnection connection, ForbiddenException t) {
+        return connection.close(CloseReason.INTERNAL_SERVER_ERROR);
+        //return "forbidden: " + securityCtx.getSubject();
+    }
+}

src/main/java/fr/titionfire/ffsaf/ws/ExecutorProducer.java

@@ -0,0 +1,19 @@
+package fr.titionfire.ffsaf.ws;
+
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+@Singleton
+public class ExecutorProducer {
+
+    @Produces
+    @Named("notify-executor")
+    public Executor produceNotifyExecutor() {
+        // Créez un pool de threads avec une taille fixe (par exemple, 10 threads)
+        return Executors.newFixedThreadPool(10);
+    }
+}

src/main/java/fr/titionfire/ffsaf/ws/MessageIn.java

@@ -0,0 +1,12 @@
+package fr.titionfire.ffsaf.ws;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import fr.titionfire.ffsaf.net2.MessageType;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+import java.util.UUID;
+
+@RegisterForReflection
+public record MessageIn (UUID uuid, String code, MessageType type, JsonNode data){
+
+}

src/main/java/fr/titionfire/ffsaf/ws/MessageOut.java

@@ -0,0 +1,11 @@
+package fr.titionfire.ffsaf.ws;
+
+import fr.titionfire.ffsaf.net2.MessageType;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+import java.util.UUID;
+
+@RegisterForReflection
+public record MessageOut(UUID uuid, String code, MessageType type, Object data){
+
+}

src/main/java/fr/titionfire/ffsaf/ws/PermLevel.java

@@ -0,0 +1,8 @@
+package fr.titionfire.ffsaf.ws;
+
+public enum PermLevel {
+    NONE,
+    VIEW,
+    TABLE,
+    ADMIN,
+}

src/main/java/fr/titionfire/ffsaf/ws/data/WelcomeInfo.java

@@ -0,0 +1,13 @@
+package fr.titionfire.ffsaf.ws.data;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import lombok.Data;
+
+@Data
+@RegisterForReflection
+public class WelcomeInfo {
+    private String name;
+    private String perm;
+    private boolean show_blason;
+    private boolean show_flag;
+}

src/main/java/fr/titionfire/ffsaf/ws/recv/RCard.java

@@ -0,0 +1,159 @@
+package fr.titionfire.ffsaf.ws.recv;
+
+import fr.titionfire.ffsaf.data.model.CardModel;
+import fr.titionfire.ffsaf.data.model.MatchModel;
+import fr.titionfire.ffsaf.data.repository.CardRepository;
+import fr.titionfire.ffsaf.data.repository.ClubCardRepository;
+import fr.titionfire.ffsaf.data.repository.CompetitionRepository;
+import fr.titionfire.ffsaf.data.repository.MatchRepository;
+import fr.titionfire.ffsaf.domain.service.CardService;
+import fr.titionfire.ffsaf.domain.service.TradService;
+import fr.titionfire.ffsaf.rest.exception.DForbiddenException;
+import fr.titionfire.ffsaf.rest.exception.DNotFoundException;
+import fr.titionfire.ffsaf.ws.PermLevel;
+import fr.titionfire.ffsaf.ws.send.SSCard;
+import io.quarkus.hibernate.reactive.panache.Panache;
+import io.quarkus.hibernate.reactive.panache.common.WithSession;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import io.quarkus.websockets.next.WebSocketConnection;
+import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.unchecked.Unchecked;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+import java.util.Date;
+import java.util.List;
+
+@WithSession
+@ApplicationScoped
+@RegisterForReflection
+public class RCard {
+
+    @Inject
+    MatchRepository matchRepository;
+
+    @Inject
+    ClubCardRepository clubCardRepository;
+
+    @Inject
+    CardRepository cardRepository;
+
+    @Inject
+    CardService cardService;
+
+    @Inject
+    CompetitionRepository competitionRepository;
+
+    @Inject
+    TradService trad;
+
+    private Uni<MatchModel> getById(long id, WebSocketConnection connection) {
+        return matchRepository.findById(id)
+                .invoke(Unchecked.consumer(o -> {
+                    if (o == null)
+                        throw new DNotFoundException(trad.t("matche.non.trouver", connection));
+                    if (!o.getCategory().getCompet().getUuid().equals(connection.pathParam("uuid")))
+                        throw new DForbiddenException(trad.t("permission.denied", connection));
+                }));
+    }
+
+    @WSReceiver(code = "getCardForMatch", permission = PermLevel.VIEW)
+    public Uni<List<CardModel>> getCardForMatch(WebSocketConnection connection, Long matchId) {
+        if (matchId == null)
+            return Uni.createFrom().nullItem();
+        return getById(matchId, connection).chain(matchModel -> cardService.getForMatch(matchModel));
+    }
+
+    @WSReceiver(code = "getAllForTeamNoDetail", permission = PermLevel.VIEW)
+    public Uni<List<SendTeamCards>> getAllForTeamNoDetail(WebSocketConnection connection, Object o) {
+        return competitionRepository.find("uuid", connection.pathParam("uuid")).firstResult()
+                .chain(c -> clubCardRepository.list("competition = ?1", c.getId()))
+                .map(cards -> cards.stream()
+                        .map(card -> new SendTeamCards(card.getTeamUuid(), card.getTeamName(), List.of(),
+                                card.getType(), card.getReason(), card.getDate()))
+                        .toList());
+    }
+
+    @WSReceiver(code = "sendCardAdd", permission = PermLevel.TABLE)
+    public Uni<Void> sendCardAdd(WebSocketConnection connection, SendCardAdd card) {
+        return getById(card.matchId(), connection)
+                .chain(matchModel -> cardService.checkCanBeAdded(card, matchModel)
+                        .chain(c -> {
+                            CardModel model = new CardModel();
+                            model.setComb(card.combId());
+                            model.setMatch(card.matchId());
+                            model.setCategory(matchModel.getCategory().getId());
+                            model.setCompetition(matchModel.getCategory().getCompet());
+                            model.setCompetitionId(matchModel.getCategory().getCompet().getId());
+                            model.setType(card.type());
+                            model.setReason(card.reason());
+
+                            return Panache.withTransaction(() -> cardRepository.persist(model));
+                        })
+                )
+                .invoke(cardModel -> SSCard.sendCards(connection, List.of(cardModel)))
+                .replaceWithVoid();
+    }
+
+    @WSReceiver(code = "sendCardRm", permission = PermLevel.ADMIN)
+    public Uni<Void> sendCardRm(WebSocketConnection connection, SendCardAdd card) {
+        return competitionRepository.find("uuid", connection.pathParam("uuid")).firstResult()
+                .chain(competition -> cardRepository.find(
+                                "match IS NULL AND comb = ?1 AND type = ?2 AND competition = ?3 AND match " + (card.matchId() == null ? "IS NULL" : "= " + card.matchId()),
+                                card.combId(), card.type(), competition)
+                        .firstResult()
+                        .invoke(Unchecked.consumer(o -> {
+                            if (o == null)
+                                throw new DNotFoundException(trad.t("carton.non.trouver", connection));
+                            SSCard.sendRmCards(connection, List.of(o.getId()));
+                        }))
+                        .chain(cardModel -> Panache.withTransaction(() -> cardRepository.delete(cardModel)))
+                )
+                .replaceWithVoid();
+    }
+
+    @WSReceiver(code = "applyTeamCards", permission = PermLevel.TABLE)
+    public Uni<Void> applyTeamCards(WebSocketConnection connection, SendTeamCards teamCards) {
+        return competitionRepository.find("uuid", connection.pathParam("uuid")).firstResult()
+                .chain(c -> cardService.addTeamCard(c, teamCards.teamUuid(), teamCards.teamName(), teamCards.type,
+                        teamCards.reason()))
+                .invoke(cards -> SSCard.sendTeamCard(connection,
+                        new SendTeamCards(teamCards.teamUuid(), teamCards.teamName(), cards, teamCards.type(),
+                                teamCards.reason(), new Date())))
+                .replaceWithVoid();
+    }
+
+    @WSReceiver(code = "sendTeamCardReturnState", permission = PermLevel.TABLE)
+    public Uni<Void> sendTeamCardReturnState(WebSocketConnection connection, SendTeamCardReturnState state) {
+        if (state.state <= 0 || state.state > 2)
+            return Uni.createFrom().voidItem();
+
+        return competitionRepository.find("uuid", connection.pathParam("uuid")).firstResult()
+                .chain(c -> cardService.recvReturnState(c, state))
+                .invoke(cards -> SSCard.sendCards(connection, cards))
+                .replaceWithVoid();
+    }
+
+    @WSReceiver(code = "removeTeamCards", permission = PermLevel.TABLE)
+    public Uni<Void> removeTeamCards(WebSocketConnection connection, SendTeamCards teamCards) {
+        return competitionRepository.find("uuid", connection.pathParam("uuid")).firstResult()
+                .chain(c -> cardService.rmTeamCard(c, teamCards.teamUuid(), teamCards.teamName(), teamCards.type))
+                .invoke(cards -> SSCard.sendRmCards(connection, cards))
+                .invoke(__ -> SSCard.rmTeamCard(connection, teamCards))
+                .replaceWithVoid();
+    }
+
+    @RegisterForReflection
+    public record SendCardAdd(Long matchId, long combId, CardModel.CardType type, String reason) {
+    }
+
+    @RegisterForReflection
+    public record SendTeamCards(String teamUuid, String teamName, List<CardModel> cards, CardModel.CardType type,
+                                String reason, Date date) {
+    }
+
+    @RegisterForReflection
+    public record SendTeamCardReturnState(String teamUuid, String teamName, CardModel.CardType type,
+                                          int state, Long selectedCategory, Long selectedMatch) {
+    }
+}