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

feat: change certif type

Browse Source
This commit is contained in:
Thibaut Valentin
2024-07-19 15:24:58 +02:00
parent 47daa459e2
commit 3ccf880057
7 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/fr/titionfire/ffsaf/data/model/LicenceModel.java
View File

@@ -24,7 +24,7 @@ public class LicenceModel {
int saison;
boolean certificate;
String certificate;
boolean validate;
}

8
src/main/java/fr/titionfire/ffsaf/domain/service/LicenceService.java
View File

@@ -54,7 +54,7 @@ public class LicenceService {
LicenceModel model = new LicenceModel();
model.setMembre(membreModel);
model.setSaison(form.getSaison());
model.setCertificate(form.isCertificate());
model.setCertificate(form.getCertificate());
model.setValidate(form.isValidate());
return Panache.withTransaction(() -> repository.persist(model)
.call(m -> (m.isValidate() && membreModel.getLicence() <= 0) ?
@@ -66,7 +66,7 @@ public class LicenceService {
});
} else {
return repository.findById(form.getId()).chain(model -> {
model.setCertificate(form.isCertificate());
model.setCertificate(form.getCertificate());
model.setValidate(form.isValidate());
return Panache.withTransaction(() -> repository.persist(model)
.call(m -> m.isValidate() ? Mutiny.fetch(m.getMembre())
@@ -96,13 +96,13 @@ public class LicenceService {
LicenceModel model = new LicenceModel();
model.setMembre(combRepository);
model.setSaison(Utils.getSaison());
model.setCertificate(form.isCertificate());
model.setCertificate(form.getCertificate());
model.setValidate(false);
return Panache.withTransaction(() -> repository.persist(model));
}));
} else {
return repository.findById(form.getId()).chain(model -> {
model.setCertificate(form.isCertificate());
model.setCertificate(form.getCertificate());
return Panache.withTransaction(() -> repository.persist(model));
});
}

4
src/main/java/fr/titionfire/ffsaf/rest/data/SimpleLicence.java
View File

@@ -14,7 +14,7 @@ public class SimpleLicence {
Long id;
Long membre;
int saison;
boolean certificate;
String certificate;
boolean validate;
public static SimpleLicence fromModel(LicenceModel model) {
@@ -25,7 +25,7 @@ public class SimpleLicence {
.id(model.getId())
.membre(model.getMembre().getId())
.saison(model.getSaison())
.certificate(model.isCertificate())
.certificate(model.getCertificate())
.validate(model.isValidate())
.build();
}

2
src/main/java/fr/titionfire/ffsaf/rest/from/LicenceForm.java
View File

@@ -17,7 +17,7 @@ public class LicenceForm {
private int saison;
@FormParam("certificate")
private boolean certificate;
private String certificate = null;
@FormParam("validate")
private boolean validate;