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

fix: null licence on import #63

Merged
Thibaut merged 1 commits from dev into master 2025-11-14 13:32:10 +00:00
Conversation 0 Commits 1 Files Changed 1 +6 -6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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 -> Objects.equals(m.getLicence(), dataIn.getLicence()) || m.getLname() .filter(m -> (dataIn.getLicence() != null && Objects.equals(m.getLicence(),
.equals(dataIn.getNom()) && m.getFname().equals(dataIn.getPrenom()) || dataIn.getLicence())) || m.getLname().equals(dataIn.getNom()) && m.getFname()
(dataIn.getEmail() != null && !dataIn.getEmail().isBlank() && Objects.equals( .equals(dataIn.getPrenom()) || (dataIn.getEmail() != null && !dataIn.getEmail()
m.getFname(), dataIn.getEmail()))).findFirst() .isBlank() && Objects.equals(m.getFname(), dataIn.getEmail()))).findFirst()
.orElseGet(() -> { .orElseGet(() -> {
MembreModel mm = new MembreModel(); MembreModel mm = new MembreModel();
mm.setClub(clubModel.get()); mm.setClub(clubModel.get());