wip: club
This commit is contained in:
@@ -1,8 +1,11 @@
|
||||
package fr.titionfire.ffsaf.domain.service;
|
||||
|
||||
import fr.titionfire.ffsaf.data.model.AffiliationRequestModel;
|
||||
import fr.titionfire.ffsaf.data.model.ClubModel;
|
||||
import fr.titionfire.ffsaf.data.repository.AffiliationRequestRepository;
|
||||
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;
|
||||
@@ -12,6 +15,9 @@ import jakarta.enterprise.context.ApplicationScoped;
|
||||
import jakarta.inject.Inject;
|
||||
import org.eclipse.microprofile.config.inject.ConfigProperty;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
@WithSession
|
||||
@ApplicationScoped
|
||||
public class AffiliationService {
|
||||
@@ -29,32 +35,49 @@ public class AffiliationService {
|
||||
AffiliationRequestModel affModel = form.toModel();
|
||||
affModel.setSaison(Utils.getSaison());
|
||||
|
||||
// noinspection ResultOfMethodCallIgnored
|
||||
return Uni.createFrom().item(affModel)
|
||||
.call(model -> ((model.getPresident_lincence() != 0) ? combRepository.find("licence",
|
||||
model.getPresident_lincence()).count().invoke(count -> {
|
||||
.call(model -> ((model.getM1_lincence() != 0) ? combRepository.find("licence",
|
||||
model.getM1_lincence()).count().invoke(count -> {
|
||||
if (count == 0) {
|
||||
throw new IllegalArgumentException("Licence président inconnue");
|
||||
throw new IllegalArgumentException("Licence membre n°1 inconnue");
|
||||
}
|
||||
}) : Uni.createFrom().nullItem())
|
||||
)
|
||||
.call(model -> ((model.getTresorier_lincence() != 0) ? combRepository.find("licence",
|
||||
model.getTresorier_lincence()).count().invoke(count -> {
|
||||
.call(model -> ((model.getM2_lincence() != 0) ? combRepository.find("licence",
|
||||
model.getM2_lincence()).count().invoke(count -> {
|
||||
if (count == 0) {
|
||||
throw new IllegalArgumentException("Licence trésorier inconnue");
|
||||
throw new IllegalArgumentException("Licence membre n°2 inconnue");
|
||||
}
|
||||
}) : Uni.createFrom().nullItem())
|
||||
)
|
||||
.call(model -> ((model.getSecretaire_lincence() != 0) ? combRepository.find("licence",
|
||||
model.getSecretaire_lincence()).count().invoke(count -> {
|
||||
.call(model -> ((model.getM3_lincence() != 0) ? combRepository.find("licence",
|
||||
model.getM3_lincence()).count().invoke(count -> {
|
||||
if (count == 0) {
|
||||
throw new IllegalArgumentException("Licence secrétaire inconnue");
|
||||
throw new IllegalArgumentException("Licence membre n°3 inconnue");
|
||||
}
|
||||
}) : Uni.createFrom().nullItem())
|
||||
).chain(model -> Panache.withTransaction(() -> repository.persist(model)))
|
||||
.call(model -> Uni.createFrom().future(Utils.replacePhoto(model.getId(), form.getLogo(), media,
|
||||
.onItem().invoke(model -> Uni.createFrom().future(Utils.replacePhoto(model.getId(), form.getLogo(), media,
|
||||
"aff_request/logo")))
|
||||
.call(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
|
||||
}
|
||||
|
||||
public Uni<List<SimpleAffiliation>> getAffiliation(long id, Consumer<ClubModel> checkPerm) {
|
||||
return Uni.createFrom().nullItem(); // TODO
|
||||
}
|
||||
|
||||
public Uni<SimpleAffiliation> setAffiliation(long id, AffiliationForm form) {
|
||||
return Uni.createFrom().nullItem(); // TODO
|
||||
}
|
||||
|
||||
public Uni<?> deleteAffiliation(long id) {
|
||||
return Uni.createFrom().nullItem(); // TODO
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,12 +3,20 @@ package fr.titionfire.ffsaf.domain.service;
|
||||
import fr.titionfire.ffsaf.data.model.ClubModel;
|
||||
import fr.titionfire.ffsaf.data.repository.ClubRepository;
|
||||
import fr.titionfire.ffsaf.net2.data.SimpleClubModel;
|
||||
import fr.titionfire.ffsaf.rest.from.FullClubForm;
|
||||
import fr.titionfire.ffsaf.utils.PageResult;
|
||||
import io.quarkus.hibernate.reactive.panache.Panache;
|
||||
import io.quarkus.hibernate.reactive.panache.PanacheQuery;
|
||||
import io.quarkus.hibernate.reactive.panache.common.WithSession;
|
||||
import io.quarkus.panache.common.Page;
|
||||
import io.quarkus.panache.common.Sort;
|
||||
import io.quarkus.vertx.VertxContextSupport;
|
||||
import io.smallrye.mutiny.Uni;
|
||||
import io.smallrye.mutiny.unchecked.Unchecked;
|
||||
import jakarta.enterprise.context.ApplicationScoped;
|
||||
import jakarta.inject.Inject;
|
||||
import jakarta.ws.rs.BadRequestException;
|
||||
import org.hibernate.reactive.mutiny.Mutiny;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@@ -39,4 +47,63 @@ public class ClubService {
|
||||
return Panache.withTransaction(() -> repository.persist(clubModel));
|
||||
});
|
||||
}
|
||||
|
||||
public Uni<PageResult<SimpleClubModel>> search(Integer limit, int page, String search, String country) {
|
||||
if (search == null)
|
||||
search = "";
|
||||
search = search + "%";
|
||||
|
||||
PanacheQuery<ClubModel> query;
|
||||
|
||||
if (country == null || country.isBlank())
|
||||
query = repository.find("name LIKE ?1",
|
||||
Sort.ascending("name"), search).page(Page.ofSize(limit));
|
||||
else
|
||||
query = repository.find("name LIKE ?1 AND country LIKE ?2",
|
||||
Sort.ascending("name"), search, country + "%").page(Page.ofSize(limit));
|
||||
return getPageResult(query, limit, page);
|
||||
}
|
||||
|
||||
private Uni<PageResult<SimpleClubModel>> getPageResult(PanacheQuery<ClubModel> query, int limit, int page) {
|
||||
return Uni.createFrom().item(new PageResult<SimpleClubModel>())
|
||||
.invoke(result -> result.setPage(page))
|
||||
.invoke(result -> result.setPage_size(limit))
|
||||
.call(result -> query.count().invoke(result::setResult_count))
|
||||
.call(result -> query.pageCount()
|
||||
.invoke(Unchecked.consumer(pages -> {
|
||||
if (page > pages) throw new BadRequestException();
|
||||
}))
|
||||
.invoke(result::setPage_count))
|
||||
.call(result -> query.page(Page.of(page, limit)).list()
|
||||
.map(membreModels -> membreModels.stream().map(SimpleClubModel::fromModel).toList())
|
||||
.invoke(result::setResult));
|
||||
}
|
||||
|
||||
public Uni<ClubModel> getById(long id) {
|
||||
return repository.findById(id).call(m -> Mutiny.fetch(m.getContact()));
|
||||
}
|
||||
|
||||
public Uni<ClubModel> getByClubId(String clubId) {
|
||||
return repository.find("clubId", clubId).firstResult();
|
||||
}
|
||||
|
||||
public Uni<String> update(long id, FullClubForm input) {
|
||||
/*return repository.findById(id)
|
||||
.onItem().transformToUni(m -> {
|
||||
m.setName(input.getName());
|
||||
m.setCountry(input.getCountry());
|
||||
m.setNo_affiliation(input.getNo_affiliation());
|
||||
m.setShieldURL(input.getShieldURL());
|
||||
return Panache.withTransaction(() -> repository.persist(m));
|
||||
});*/
|
||||
return Uni.createFrom().nullItem();
|
||||
}
|
||||
|
||||
public Uni<Long> add(FullClubForm input) {
|
||||
return Uni.createFrom().nullItem();
|
||||
}
|
||||
|
||||
public Uni<?> delete(long id) {
|
||||
return Uni.createFrom().nullItem();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user