feat: comp register optional weight config

This commit is contained in:
2026-01-22 15:13:48 +01:00
parent d2a7e6cbac
commit 4a07eb4ed9
12 changed files with 142 additions and 35 deletions

View File

@@ -44,6 +44,7 @@ public class CompetitionGuestModel implements CombModel {
String country = "fr";
Integer weight = null;
Integer weightReal = null;
@ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
@JoinTable(
@@ -107,4 +108,8 @@ public class CompetitionGuestModel implements CombModel {
}
return Stream.concat(comb.stream(), guest.stream()).anyMatch(c -> Objects.equals(c, comb_));
}
public Integer getWeight2() {
return (this.weightReal != null) ? this.weightReal : this.weight;
}
}

View File

@@ -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;
@@ -61,6 +62,8 @@ public class CompetitionModel {
@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;

View File

@@ -38,6 +38,7 @@ public class RegisterModel {
MembreModel membre;
Integer weight;
Integer weightReal;
int overCategory = 0;
Categorie categorie;
@@ -89,4 +90,10 @@ public class RegisterModel {
return null;
return Categorie.values()[Math.min(tmp.ordinal() + this.overCategory, Categorie.values().length - 1)];
}
public Integer getWeight2() {
if (weightReal != null)
return weightReal;
return weight;
}
}