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

feat: add category registration system to club and user

Browse Source
This commit is contained in:
Thibaut Valentin
2026-01-20 21:49:10 +01:00
parent a5d3973394
commit b419e2f58d
6 changed files with 64 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -349,7 +349,8 @@ public class CompetitionService {
.chain(model -> registerRepository.find("competition.id = ?1 AND membre = ?2", id, model).firstResult()
.call(rm -> rm == null ? Uni.createFrom().voidItem() :
Mutiny.fetch(rm.getCategoriesInscrites()))
.map(rm -> rm == null ? List.of() : List.of(SimpleRegisterComb.fromModel(rm, List.of()))));
.map(rm -> rm == null ? List.of() : List.of(SimpleRegisterComb.fromModel(rm, List.of())
.setCategorieInscrite(rm.getCategoriesInscrites()))));
}
public Uni<SimpleRegisterComb> addRegisterComb(SecurityCtx securityCtx, Long id, RegisterRequestData data,
@@ -423,7 +424,8 @@ public class CompetitionService {
throw new DForbiddenException(trad.t("insc.err1"));
}))
.chain(combModel -> updateRegister(data, c, combModel, false)))
.map(r -> SimpleRegisterComb.fromModel(r, r.getMembre().getLicences()));
.map(r -> SimpleRegisterComb.fromModel(r, r.getMembre().getLicences())
.setCategorieInscrite(r.getCategoriesInscrites()));
return repository.findById(id)
.invoke(Unchecked.consumer(cm -> {
@@ -438,7 +440,7 @@ public class CompetitionService {
throw new DForbiddenException(trad.t("insc.err2"));
}))
.chain(combModel -> updateRegister(data, c, combModel, false)))
.map(r -> SimpleRegisterComb.fromModel(r, List.of()));
.map(r -> SimpleRegisterComb.fromModel(r, List.of()).setCategorieInscrite(r.getCategoriesInscrites()));
}
private Uni<RegisterModel> updateRegister(RegisterRequestData data, CompetitionModel c,

12
src/main/java/fr/titionfire/ffsaf/domain/service/KeycloakService.java
View File

@@ -381,11 +381,15 @@ public class KeycloakService {
}
public Optional<UserRepresentation> getUserById(String userId) {
UserResource user = keycloak.realm(realm).users().get(userId);
if (user == null)
try {
UserResource user = keycloak.realm(realm).users().get(userId);
if (user == null)
return Optional.empty();
else
return Optional.of(user.toRepresentation());
} catch (Exception e) {
return Optional.empty();
else
return Optional.of(user.toRepresentation());
}
}
private String makeLogin(MembreModel model) {