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

Compare commits

base: Thibaut:b107f443aa8ff21e22d487e7723c49155d8a7f22
Branches Tags
Thibaut:master
Thibaut:dev-comp
Thibaut:dev
Thibaut:theme
Thibaut:Avon1
...
compare: Thibaut:e5e17d3862ae8c46be1ce2611f79ad45cf90fd6e
Branches Tags
Thibaut:dev-comp
Thibaut:master
Thibaut:dev
Thibaut:theme
Thibaut:Avon1

2 Commits
b107f443aa ... e5e17d3862

Author SHA1 Message Date
Thibaut Valentin
e5e17d3862 Merge pull request 'fix: null licence on import' (#63) from dev into master 
Reviewed-on: #63
 2025-11-14 13:32:09 +00:00
Thibaut Valentin
7410569ced fix: null licence on import
All checks were successful
Deploy Production Server / if_merged (pull_request) Successful in 10m3s
Details
2025-11-14 14:31:37 +01:00
1 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

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

@ -224,10 +224,10 @@ public class MembreService {
Uni<Void> uniResult = Uni.createFrom().voidItem();
for (SimpleMembreInOutData dataIn : data2) {
MembreModel model = membres.stream()
.filter(m -> Objects.equals(m.getLicence(), dataIn.getLicence()) || m.getLname()
.equals(dataIn.getNom()) && m.getFname().equals(dataIn.getPrenom()) ||
(dataIn.getEmail() != null && !dataIn.getEmail().isBlank() && Objects.equals(
m.getFname(), dataIn.getEmail()))).findFirst()
.filter(m -> (dataIn.getLicence() != null && Objects.equals(m.getLicence(),
dataIn.getLicence())) || m.getLname().equals(dataIn.getNom()) && m.getFname()
.equals(dataIn.getPrenom()) || (dataIn.getEmail() != null && !dataIn.getEmail()
.isBlank() && Objects.equals(m.getFname(), dataIn.getEmail()))).findFirst()
.orElseGet(() -> {
MembreModel mm = new MembreModel();
mm.setClub(clubModel.get());
@ -235,9 +235,9 @@ public class MembreService {
mm.setCountry("FR");
return mm;
});
if (model.getId() != null){
if (model.getId() != null) {
LOGGER.debugf("updating -> %s", dataIn.toString());
}else{
} else {
LOGGER.debugf("creating -> %s", dataIn.toString());
}