Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

feat: comp register optional weight config

Browse Source
This commit is contained in:
Thibaut Valentin
2026-01-22 15:13:48 +01:00
parent d2a7e6cbac
commit 4a07eb4ed9
12 changed files with 142 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/fr/titionfire/ffsaf/data/model/CompetitionGuestModel.java
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;
}
}

3
src/main/java/fr/titionfire/ffsaf/data/model/CompetitionModel.java
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;

7
src/main/java/fr/titionfire/ffsaf/data/model/RegisterModel.java
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;
}
}

21
src/main/java/fr/titionfire/ffsaf/domain/service/CompetitionService.java
View File

@@ -301,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());
@@ -388,7 +389,9 @@ public class CompetitionService {
model.setGenre(data.getGenre());
model.setClub(data.getClub());
model.setCountry(data.getCountry());
model.setWeight(data.getWeight());
model.setWeightReal(data.getWeightReal());
if (model.getCompetition().getRequiredWeight().contains(model.getCategorie()))
model.setWeight(data.getWeight());
model.setCategorie(data.getCategorie());
})
.call(g -> Mutiny.fetch(g.getCategoriesInscrites()))
@@ -452,7 +455,6 @@ public class CompetitionService {
if (r != null) {
if (!admin && r.isLockEdit())
throw new DForbiddenException(trad.t("insc.err3"));
r.setWeight(data.getWeight());
r.setOverCategory(data.getOverCategory());
r.setCategorie(
(combModel.getBirth_date() == null) ? combModel.getCategorie() :
@@ -461,24 +463,29 @@ public class CompetitionService {
int days = Utils.getDaysBeforeCompetition(c.getDate());
if (days > -7)
r.setClub(combModel.getClub());
if (admin)
if (c.getRequiredWeight().contains(r.getCategorie2()))
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(),
(r.getClub() == null) ? null : r.getClub().getName()), c.getId());
}
@@ -779,7 +786,7 @@ 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, new ArrayList<>(), null,
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()

16
src/main/java/fr/titionfire/ffsaf/rest/data/CompetitionData.java
View File

@@ -35,7 +35,7 @@ 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;
@@ -44,12 +44,13 @@ public class CompetitionData {
private String data4;
private String config;
private List<PresetData> presets;
private List<Categorie> requiredWeight;
public CompetitionData () {
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<>(), new ArrayList<>());
}
public static CompetitionData fromModel(CompetitionModel model) {
@@ -60,7 +61,8 @@ public class CompetitionData {
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, false,
model.getData1(), model.getData2(), model.getData3(), model.getData4(), model.getConfig(), new ArrayList<>());
model.getData1(), model.getData2(), model.getData3(), model.getData4(), model.getConfig(),
new ArrayList<>(), model.getRequiredWeight());
}
public static CompetitionData fromModelLight(CompetitionModel model) {
@@ -71,7 +73,7 @@ public class CompetitionData {
model.getAdresse(), "", model.getDate(), model.getTodate(), null,
model.getRegisterMode(), model.getStartRegister(), model.getEndRegister(), model.isPublicVisible(),
null, model.getClub().getName(), "", null, false, false,
"", "", "", "", "{}", new ArrayList<>());
"", "", "", "", "{}", new ArrayList<>(), model.getRequiredWeight());
if (model.getRegisterMode() == RegisterMode.HELLOASSO) {
out.setData1(model.getData1());
@@ -85,11 +87,11 @@ public class CompetitionData {
public CompetitionData addInsc(List<RegisterModel> insc, List<CompetitionGuestModel> guests) {
this.registers = Stream.concat(
insc.stream()
.map(i -> new SimpleRegister(i.getMembre().getId(), i.getOverCategory(), i.getWeight(),
.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.getWeight(),
.map(i -> new SimpleRegister(i.getId() * -1, 0, i.getWeight2(),
i.getCategorie(), null, i.getClub()))).toList();
return this;
}

1
src/main/java/fr/titionfire/ffsaf/rest/data/RegisterRequestData.java
View File

@@ -19,6 +19,7 @@ public class RegisterRequestData {
private String lname;
private Integer weight;
private Integer weightReal;
private int overCategory;
private boolean lockEdit = false;
private List<Long> categoriesInscrites;

5
src/main/java/fr/titionfire/ffsaf/rest/data/SimpleRegisterComb.java
View File

@@ -25,6 +25,7 @@ public class SimpleRegisterComb {
private SimpleClubModel club;
private Integer licence;
private Integer weight;
private Integer weightReal;
private int overCategory;
private boolean hasLicenceActive;
private boolean lockEdit;
@@ -36,7 +37,7 @@ public class SimpleRegisterComb {
membreModel.getGenre(), membreModel.getCountry(),
(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(), new ArrayList<>());
}
@@ -45,7 +46,7 @@ public class SimpleRegisterComb {
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(), 0, false, false,
null, guest.getWeight(), guest.getWeightReal(), 0, false, false,
new ArrayList<>());
}