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

feat: AffiliationCard

Browse Source
This commit is contained in:
Thibaut Valentin
2024-07-14 15:00:28 +02:00
parent 6a21bd4735
commit b2438ec3d8
10 changed files with 99 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ public class AffiliationRequestModel {
Long id;
String name;
long siren;
long siret;
String RNA;
String address;

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

@@ -53,6 +53,6 @@ public class ClubModel {
boolean international;
@OneToMany(mappedBy = "club", fetch = FetchType.EAGER)
@OneToMany(mappedBy = "club", fetch = FetchType.LAZY)
List<AffiliationModel> affiliations;
}

9
src/main/java/fr/titionfire/ffsaf/data/repository/AffiliationRepository.java Normal file
View File

@@ -0,0 +1,9 @@
package fr.titionfire.ffsaf.data.repository;
import fr.titionfire.ffsaf.data.model.AffiliationModel;
import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
public class AffiliationRepository implements PanacheRepositoryBase<AffiliationModel, Long> {
}

53
src/main/java/fr/titionfire/ffsaf/domain/service/AffiliationService.java
View File

@@ -1,11 +1,12 @@
package fr.titionfire.ffsaf.domain.service;
import fr.titionfire.ffsaf.data.model.AffiliationModel;
import fr.titionfire.ffsaf.data.model.AffiliationRequestModel;
import fr.titionfire.ffsaf.data.model.ClubModel;
import fr.titionfire.ffsaf.data.repository.AffiliationRepository;
import fr.titionfire.ffsaf.data.repository.AffiliationRequestRepository;
import fr.titionfire.ffsaf.data.repository.ClubRepository;
import fr.titionfire.ffsaf.data.repository.CombRepository;
import fr.titionfire.ffsaf.rest.data.SimpleAffiliation;
import fr.titionfire.ffsaf.rest.from.AffiliationForm;
import fr.titionfire.ffsaf.rest.from.AffiliationRequestForm;
import fr.titionfire.ffsaf.utils.Utils;
import io.quarkus.hibernate.reactive.panache.Panache;
@@ -14,9 +15,10 @@ import io.smallrye.mutiny.Uni;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.hibernate.reactive.mutiny.Mutiny;
import java.util.List;
import java.util.function.Consumer;
import java.util.stream.Stream;
@WithSession
@ApplicationScoped
@@ -26,7 +28,13 @@ public class AffiliationService {
CombRepository combRepository;
@Inject
AffiliationRequestRepository repository;
ClubRepository clubRepository;
@Inject
AffiliationRequestRepository repositoryRequest;
@Inject
AffiliationRepository repository;
@ConfigProperty(name = "upload_dir")
String media;
@@ -57,27 +65,46 @@ public class AffiliationService {
throw new IllegalArgumentException("Licence membre n°3 inconnue");
}
}) : Uni.createFrom().nullItem())
).chain(model -> Panache.withTransaction(() -> repository.persist(model)))
.onItem().invoke(model -> Uni.createFrom().future(Utils.replacePhoto(model.getId(), form.getLogo(), media,
).chain(model -> Panache.withTransaction(() -> repositoryRequest.persist(model)))
.onItem()
.invoke(model -> Uni.createFrom().future(Utils.replacePhoto(model.getId(), form.getLogo(), media,
"aff_request/logo")))
.onItem().invoke(model -> Uni.createFrom().future(Utils.replacePhoto(model.getId(), form.getStatus(), media,
.onItem()
.invoke(model -> Uni.createFrom().future(Utils.replacePhoto(model.getId(), form.getStatus(), media,
"aff_request/status")))
.map(__ -> "Ok");
}
public Uni<List<SimpleAffiliation>> getCurrentSaisonAffiliation() {
return Uni.createFrom().nullItem(); // TODO
return repository.list("saison = ?1", Utils.getSaison())
.map(models -> models.stream().map(SimpleAffiliation::fromModel).toList())
.chain(aff -> repositoryRequest.list("saison = ?1", Utils.getSaison())
.chain(models -> Uni.join().all(models.stream().map(model ->
clubRepository.find("siret = ?1", model.getSiret()).firstResult()
.map(c -> new SimpleAffiliation(model.getId() * -1, c.getId(),
model.getSaison(), false)))
.toList()).andFailFast()
).map(aff2 -> Stream.concat(aff2.stream(), aff.stream()).toList())
);
}
public Uni<List<SimpleAffiliation>> getAffiliation(long id, Consumer<ClubModel> checkPerm) {
return Uni.createFrom().nullItem(); // TODO
public Uni<List<SimpleAffiliation>> getAffiliation(long id) {
return clubRepository.findById(id).call(model -> Mutiny.fetch(model.getAffiliations()))
.chain(model -> repositoryRequest.list("siret = ?1", model.getSIRET())
.map(reqs -> reqs.stream().map(req ->
new SimpleAffiliation(req.getId() * -1, model.getId(), req.getSaison(), false)))
.map(aff2 -> Stream.concat(aff2,
model.getAffiliations().stream().map(SimpleAffiliation::fromModel)).toList())
);
}
public Uni<SimpleAffiliation> setAffiliation(long id, AffiliationForm form) {
return Uni.createFrom().nullItem(); // TODO
public Uni<SimpleAffiliation> setAffiliation(long id, int saison) {
return clubRepository.findById(id).chain(club ->
Panache.withTransaction(() -> repository.persist(new AffiliationModel(null, club, saison))))
.map(SimpleAffiliation::fromModel);
}
public Uni<?> deleteAffiliation(long id) {
return Uni.createFrom().nullItem(); // TODO
return Panache.withTransaction(() -> repository.deleteById(id));
}
}

15
src/main/java/fr/titionfire/ffsaf/rest/AffiliationEndpoints.java
View File

@@ -1,9 +1,7 @@
package fr.titionfire.ffsaf.rest;
import fr.titionfire.ffsaf.data.model.ClubModel;
import fr.titionfire.ffsaf.domain.service.AffiliationService;
import fr.titionfire.ffsaf.rest.data.SimpleAffiliation;
import fr.titionfire.ffsaf.rest.from.AffiliationForm;
import fr.titionfire.ffsaf.rest.from.AffiliationRequestForm;
import fr.titionfire.ffsaf.utils.GroupeUtils;
import io.quarkus.oidc.IdToken;
@@ -32,8 +30,8 @@ public class AffiliationEndpoints {
@Inject
SecurityIdentity securityIdentity;
Consumer<ClubModel> checkPerm = Unchecked.consumer(clubModel -> {
if (!securityIdentity.getRoles().contains("federation_admin") && !GroupeUtils.isInClubGroup(clubModel.getId(), idToken))
Consumer<Long> checkPerm = Unchecked.consumer(id -> {
if (!securityIdentity.getRoles().contains("federation_admin") && !GroupeUtils.isInClubGroup(id, idToken))
throw new ForbiddenException();
});
@@ -57,16 +55,15 @@ public class AffiliationEndpoints {
@RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
@Produces(MediaType.APPLICATION_JSON)
public Uni<List<SimpleAffiliation>> getLicence(@PathParam("id") long id) {
return service.getAffiliation(id, checkPerm);
return Uni.createFrom().item(id).invoke(checkPerm).chain(__ -> service.getAffiliation(id));
}
@POST
@PUT
@Path("{id}")
@RolesAllowed("federation_admin")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.MULTIPART_FORM_DATA)
public Uni<SimpleAffiliation> setLicence(@PathParam("id") long id, AffiliationForm form) {
return service.setAffiliation(id, form);
public Uni<SimpleAffiliation> setLicence(@PathParam("id") long id, @QueryParam("saison") int saison) {
return service.setAffiliation(id, saison);
}
@DELETE

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

@@ -16,7 +16,7 @@ public class SimpleAffiliation {
int saison;
boolean validate;
public static SimpleAffiliation fromModel(AffiliationModel model, boolean validate) {
public static SimpleAffiliation fromModel(AffiliationModel model) {
if (model == null)
return null;
@@ -24,7 +24,7 @@ public class SimpleAffiliation {
.id(model.getId())
.club(model.getClub().getId())
.saison(model.getSaison())
.validate(validate)
.validate(true)
.build();
}
}

6
src/main/java/fr/titionfire/ffsaf/rest/from/AffiliationRequestForm.java
View File

@@ -14,8 +14,8 @@ public class AffiliationRequestForm {
@FormParam("name")
private String name = null;
@FormParam("siren")
private Long siren = null;
@FormParam("siret")
private Long siret = null;
@FormParam("rna")
private String rna = null;
@@ -67,7 +67,7 @@ public class AffiliationRequestForm {
public AffiliationRequestModel toModel() {
AffiliationRequestModel model = new AffiliationRequestModel();
model.setName(this.getName());
model.setSiren(this.getSiren());
model.setSiret(this.getSiret());
model.setRNA(this.getRna());
model.setAddress(this.getAdresse());