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

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<>());
}