feat: add team support to result

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

@@ -12,6 +12,8 @@ import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 @Getter
 @Setter
@@ -71,6 +73,8 @@ public class CompetitionGuestModel implements CombModel {
 
     @Override
     public String getName() {
+        if (this.isTeam())
+            return this.fname;
         return this.fname + " " + this.lname;
     }
 
@@ -78,4 +82,21 @@ public class CompetitionGuestModel implements CombModel {
     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_));
+    }
 }

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

@@ -114,6 +114,9 @@ public class MatchModel {
     }
 
     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_);
@@ -124,6 +127,9 @@ public class MatchModel {
     }
 
     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_);