fix: ws timeout

src/main/java/fr/titionfire/ffsaf/ws/recv/RCardboard.java

@@ -80,35 +80,32 @@ public class RCardboard {
                                 return Uni.createFrom().nullItem();
                             return Panache.withTransaction(() -> cardboardRepository.persist(cardboardModel));
                         }))
-                .call(model -> SSCardboard.sendCardboard(connection, CardboardEntity.fromModel(model)))
+                .invoke(model -> SSCardboard.sendCardboard(connection, CardboardEntity.fromModel(model)))
                 .replaceWithVoid();
     }
 
     @WSReceiver(code = "getCardboardWithoutThis", permission = PermLevel.VIEW)
     public Uni<CardboardAllMatch> getCardboardWithoutThis(WebSocketConnection connection, Long matchId) {
         return getById(matchId, connection)
-                .chain(matchModel -> cardboardRepository.list("compet = ?1 AND match != ?2", matchModel.getCategory().getCompet(), matchModel)
+                .chain(matchModel -> cardboardRepository.list("compet = ?1 AND match != ?2",
+                                matchModel.getCategory().getCompet(), matchModel)
                         .map(models -> {
                             CardboardAllMatch out = new CardboardAllMatch();
 
-                            models.stream().filter(c -> (matchModel.getC1_id() != null
-                                            && Objects.equals(c.getComb(), matchModel.getC1_id()))
-                                            || (matchModel.getC1_guest() != null
-                                            && Objects.equals(c.getGuestComb(), matchModel.getC1_guest())))
-                                    .forEach(c -> {
-                                        out.c1_yellow += c.getYellow();
-                                        out.c1_red += c.getRed();
-                                    });
-
-                            models.stream().filter(c -> (matchModel.getC2_id() != null
-                                            && Objects.equals(c.getComb(), matchModel.getC2_id()))
-                                            || (matchModel.getC2_guest() != null
-                                            && Objects.equals(c.getGuestComb(), matchModel.getC2_guest())))
-                                    .forEach(c -> {
-                                        out.c2_yellow += c.getYellow();
-                                        out.c2_red += c.getRed();
-                                    });
-
+                            for (CardboardModel c : models) {
+                                if ((matchModel.getC1_id() != null && Objects.equals(c.getComb(),
+                                        matchModel.getC1_id())) || (matchModel.getC1_guest() != null && Objects.equals(
+                                        c.getGuestComb(), matchModel.getC1_guest()))) {
+                                    out.c1_yellow += c.getYellow();
+                                    out.c1_red += c.getRed();
+                                }
+                                if ((matchModel.getC2_id() != null && Objects.equals(c.getComb(),
+                                        matchModel.getC2_id())) || (matchModel.getC2_guest() != null && Objects.equals(
+                                        c.getGuestComb(), matchModel.getC2_guest()))) {
+                                    out.c2_yellow += c.getYellow();
+                                    out.c2_red += c.getRed();
+                                }
+                            }
                             return out;
                         }));
     }

src/main/java/fr/titionfire/ffsaf/ws/recv/RCategorie.java

@@ -97,7 +97,7 @@ public class RCategorie {
 
                     return categoryRepository.create(categoryModel);
                 })
-                .call(cat -> SSCategorie.sendAddCategory(connection, cat))
+                .invoke(cat -> SSCategorie.sendAddCategory(connection, cat))
                 .map(CategoryModel::getId);
     }
 
@@ -121,7 +121,7 @@ public class RCategorie {
                     Uni<Long> finalUni = uni;
                     return Panache.withTransaction(() -> finalUni);
                 })
-                .call(cat -> SSCategorie.sendCategory(connection, cat))
+                .invoke(cat -> SSCategorie.sendCategory(connection, cat))
                 .replaceWithVoid();
     }
 
@@ -202,7 +202,7 @@ public class RCategorie {
                 .call(__ -> treeRepository.flush())
                 .call(cat -> treeRepository.list("category = ?1 AND level != 0", cat.getId())
                         .map(treeModels -> treeModels.stream().map(TreeEntity::fromModel).toList())
-                        .chain(trees -> SSCategorie.sendTreeCategory(connection, trees)))
+                        .invoke(trees -> SSCategorie.sendTreeCategory(connection, trees)))
                 .replaceWithVoid();
     }
 
@@ -212,7 +212,7 @@ public class RCategorie {
                 .call(cat -> Panache.withTransaction(() -> treeRepository.delete("category = ?1", cat.getId())
                         .call(__ -> matchRepository.delete("category = ?1", cat))))
                 .chain(cat -> Panache.withTransaction(() -> categoryRepository.delete(cat)))
-                .call(__ -> SSCategorie.sendDelCategory(connection, id))
+                .invoke(__ -> SSCategorie.sendDelCategory(connection, id))
                 .replaceWithVoid();
     }
 

src/main/java/fr/titionfire/ffsaf/ws/recv/RMatch.java

@@ -84,7 +84,7 @@ public class RMatch {
                 }))
                 .chain(categoryModel -> creatMatch(categoryModel, m))
                 .chain(mm -> Panache.withTransaction(() -> matchRepository.create(mm)))
-                .call(mm -> SSMatch.sendMatch(connection, MatchEntity.fromModel(mm)))
+                .invoke(mm -> SSMatch.sendMatch(connection, MatchEntity.fromModel(mm)))
                 .replaceWithVoid();
     }
 
@@ -121,7 +121,7 @@ public class RMatch {
                             mm.setC2_guest(null);
                         }))
                 .chain(mm -> Panache.withTransaction(() -> matchRepository.persist(mm)))
-                .call(mm -> SSMatch.sendMatch(connection, MatchEntity.fromModel(mm)))
+                .invoke(mm -> SSMatch.sendMatch(connection, MatchEntity.fromModel(mm)))
                 .replaceWithVoid();
     }
 
@@ -136,7 +136,7 @@ public class RMatch {
                         m.getCategory_ord()))
                 .invoke(m -> m.setCategory_ord(order.pos))
                 .call(m -> Panache.withTransaction(() -> matchRepository.persist(m)))
-                .call(mm -> SSMatch.sendMatchOrder(connection, order))
+                .invoke(mm -> SSMatch.sendMatchOrder(connection, order))
                 .replaceWithVoid();
     }
 
@@ -163,12 +163,12 @@ public class RMatch {
                             .call(mm -> {
                                 if (mm.isEnd() && mm.win() != old_win && mm.getCategory_ord() == -42) {
                                     return updateEndAndTree(mm, new ArrayList<>())
-                                            .call(l -> SSMatch.sendMatch(connection, l));
+                                            .invoke(l -> SSMatch.sendMatch(connection, l));
                                 }
                                 return Uni.createFrom().nullItem();
                             });
                 })
-                .call(mm -> SSMatch.sendMatch(connection, MatchEntity.fromModel(mm)))
+                .invoke(mm -> SSMatch.sendMatch(connection, MatchEntity.fromModel(mm)))
                 .replaceWithVoid();
     }
 
@@ -189,7 +189,7 @@ public class RMatch {
                 })
                 .invoke(mm -> toSend.add(MatchEntity.fromModel(mm)))
                 .chain(mm -> updateEndAndTree(mm, toSend))
-                .call(__ -> SSMatch.sendMatch(connection, toSend))
+                .invoke(__ -> SSMatch.sendMatch(connection, toSend))
                 .replaceWithVoid();
     }
 
@@ -278,7 +278,7 @@ public class RMatch {
     public Uni<Void> deleteMatch(WebSocketConnection connection, Long idMatch) {
         return getById(idMatch, connection)
                 .chain(matchModel -> Panache.withTransaction(() -> matchRepository.delete(matchModel)))
-                .call(__ -> SSMatch.sendDeleteMatch(connection, idMatch))
+                .invoke(__ -> SSMatch.sendDeleteMatch(connection, idMatch))
                 .replaceWithVoid();
     }
 
@@ -295,7 +295,7 @@ public class RMatch {
                 .call(cm -> data.matchesToRemove.isEmpty() ? Uni.createFrom().voidItem() :
                         (Panache.withTransaction(
                                         () -> matchRepository.delete("id IN ?1 AND category = ?2", data.matchesToRemove, cm))
-                                .call(__ -> SSMatch.sendDeleteMatch(connection, data.matchesToRemove))))
+                                .invoke(__ -> SSMatch.sendDeleteMatch(connection, data.matchesToRemove))))
                 .call(cm -> Panache.withSession(() -> matchRepository.list("id IN ?1 AND category = ?2",
                                 Stream.concat(data.matchOrderToUpdate.keySet().stream(),
                                                 data.matchPouleToUpdate.keySet().stream())
@@ -321,7 +321,7 @@ public class RMatch {
                 .chain(mm -> mm.isEmpty() ? Uni.createFrom().voidItem() :
                         Panache.withTransaction(() -> matchRepository.create(mm))
                                 .invoke(__ -> matches.addAll(mm.stream().map(MatchEntity::fromModel).toList())))
-                .call(__ -> SSMatch.sendMatch(connection, matches))
+                .invoke(__ -> SSMatch.sendMatch(connection, matches))
                 .replaceWithVoid();
     }