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

Compare commits

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

No commits in common. "e5e17d3862ae8c46be1ce2611f79ad45cf90fd6e" and "b107f443aa8ff21e22d487e7723c49155d8a7f22" have entirely different histories.
e5e17d3862 ... b107f443aa

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