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

feat: club filter

Browse Source
This commit is contained in:
Thibaut Valentin
2024-07-16 23:16:46 +02:00
parent f297ae557b
commit edcda185db
6 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,15 +277,13 @@ public class AffiliationService {
}
public Uni<List<SimpleAffiliation>> getCurrentSaisonAffiliation() {
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())
return repositoryRequest.list("saison = ?1 or saison = ?1 + 1", Utils.getSaison())
.map(models -> models.stream()
.map(model -> new SimpleAffiliation(model.getId() * -1, model.getSiret(), model.getSaison(),
false)).toList())
.chain(aff -> repository.list("saison = ?1", Utils.getSaison())
.map(models -> models.stream().map(SimpleAffiliation::fromModel).toList())
.map(aff2 -> Stream.concat(aff2.stream(), aff.stream()).toList())
);
}