feat: register import

src/main/java/fr/titionfire/ffsaf/domain/service/CompetitionService.java

@@ -367,7 +367,7 @@ public class CompetitionService {
                                     c.getBanMembre().remove(combModel.getId());
                                     return Panache.withTransaction(() -> repository.persist(c));
                                 })
-                                .chain(combModel -> updateRegister(data, c, combModel, true)))
+                                .chain(combModel -> updateRegister(data, c, combModel, true, false)))
                         .map(r -> SimpleRegisterComb.fromModel(r, r.getMembre().getLicences())
                                 .setCategorieInscrite(r.getCategoriesInscrites()));
             } else {
@@ -390,9 +390,9 @@ public class CompetitionService {
                             model.setClub(data.getClub());
                             model.setCountry(data.getCountry());
                             model.setWeightReal(data.getWeightReal());
+                            model.setCategorie(data.getCategorie());
                             if (model.getCompetition().getRequiredWeight().contains(model.getCategorie()))
                                 model.setWeight(data.getWeight());
-                            model.setCategorie(data.getCategorie());
                         })
                         .call(g -> Mutiny.fetch(g.getCategoriesInscrites()))
                         .call(g -> catPresetRepository.list("competition = ?1 AND id IN ?2", g.getCompetition(),
@@ -427,7 +427,7 @@ public class CompetitionService {
                                 if (c.getBanMembre().contains(model.getId()))
                                     throw new DForbiddenException(trad.t("insc.err1"));
                             }))
-                            .chain(combModel -> updateRegister(data, c, combModel, false)))
+                            .chain(combModel -> updateRegister(data, c, combModel, false, false)))
                     .map(r -> SimpleRegisterComb.fromModel(r, r.getMembre().getLicences())
                             .setCategorieInscrite(r.getCategoriesInscrites()));
 
@@ -443,19 +443,101 @@ public class CompetitionService {
                             if (c.getBanMembre().contains(model.getId()))
                                 throw new DForbiddenException(trad.t("insc.err2"));
                         }))
-                        .chain(combModel -> updateRegister(data, c, combModel, false)))
+                        .chain(combModel -> updateRegister(data, c, combModel, false, false)))
                 .map(r -> SimpleRegisterComb.fromModel(r, List.of()).setCategorieInscrite(r.getCategoriesInscrites()));
     }
 
+    public Uni<List<SimpleRegisterComb>> addRegistersComb(SecurityCtx securityCtx, Long id,
+                                                          List<RegisterRequestData> datas,
+                                                          String source) {
+        if (!"admin".equals(source))
+            return Uni.createFrom().failure(new DForbiddenException());
+
+        return Multi.createFrom().iterable(datas).onItem().transformToUni(data ->
+                makeImportUpdate(securityCtx, id, data).onFailure().recoverWithItem(t -> {
+                    SimpleRegisterComb errorComb = new SimpleRegisterComb();
+                    errorComb.setLicence(-42);
+                    errorComb.setFname("ERROR");
+                    errorComb.setLname(t.getMessage());
+                    return errorComb;
+                })).concatenate().collect().asList();
+    }
+
+    private Uni<SimpleRegisterComb> makeImportUpdate(SecurityCtx securityCtx, Long id, RegisterRequestData data) {
+        if (data.getLicence() == null || data.getLicence() != -1) { // not a guest
+            return permService.hasEditPerm(securityCtx, id)
+                    .chain(c -> findComb(data.getLicence(), data.getFname(), data.getLname())
+                            .call(combModel -> Mutiny.fetch(combModel.getLicences()))
+                            .call(combModel -> {
+                                if (c.getBanMembre() == null)
+                                    c.setBanMembre(new ArrayList<>());
+                                c.getBanMembre().remove(combModel.getId());
+                                return Panache.withTransaction(() -> repository.persist(c));
+                            })
+                            .chain(combModel -> updateRegister(data, c, combModel, true, true)))
+                    .map(r -> SimpleRegisterComb.fromModel(r, r.getMembre().getLicences())
+                            .setCategorieInscrite(r.getCategoriesInscrites()));
+        } else {
+            return permService.hasEditPerm(securityCtx, id)
+                    .chain(c -> findGuestOrInit(data.getFname(), data.getLname(), c))
+                    .invoke(Unchecked.consumer(model -> {
+                        if (data.getCategorie() == null)
+                            throw new DBadRequestException(trad.t("categorie.requise"));
+                        model.setCategorie(data.getCategorie());
+
+                        if (data.getGenre() == null) {
+                            if (model.getGenre() == null)
+                                data.setGenre(Genre.NA);
+                        } else
+                            model.setGenre(data.getGenre());
+
+                        if (data.getClub() == null) {
+                            if (model.getClub() == null)
+                                data.setClub("");
+                        } else
+                            model.setClub(data.getClub());
+
+                        if (data.getCountry() == null) {
+                            if (model.getCountry() == null)
+                                data.setCountry("FR");
+                        } else
+                            model.setCountry(data.getCountry());
+
+                        if (model.getCompetition().getRequiredWeight().contains(model.getCategorie())) {
+                            if (data.getCountry() != null)
+                                model.setWeight(data.getWeight());
+                        }
+                    }))
+                    .call(g -> Mutiny.fetch(g.getCategoriesInscrites()))
+                    .call(g -> catPresetRepository.list("competition = ?1 AND id IN ?2", g.getCompetition(),
+                                    data.getCategoriesInscrites())
+                            .invoke(cats -> {
+                                g.getCategoriesInscrites().clear();
+                                g.getCategoriesInscrites().addAll(cats);
+                                g.getCategoriesInscrites().removeIf(cat -> cat.getCategories().stream()
+                                        .noneMatch(e -> e.getCategorie().equals(g.getCategorie())));
+                            }))
+                    .chain(model -> Panache.withTransaction(() -> competitionGuestRepository.persist(model))
+                            .call(r -> model.getCompetition().getSystem() == CompetitionSystem.INTERNAL ?
+                                    sRegister.sendRegister(model.getCompetition().getUuid(),
+                                            r) : Uni.createFrom().voidItem()))
+                    .map(g -> SimpleRegisterComb.fromModel(g).setCategorieInscrite(g.getCategoriesInscrites()));
+        }
+    }
+
     private Uni<RegisterModel> updateRegister(RegisterRequestData data, CompetitionModel c,
-                                              MembreModel combModel, boolean admin) {
+                                              MembreModel combModel, boolean admin, boolean append) {
         return registerRepository.find("competition = ?1 AND membre = ?2", c, combModel).firstResult()
                 .onFailure().recoverWithNull()
                 .map(Unchecked.function(r -> {
                     if (r != null) {
                         if (!admin && r.isLockEdit())
                             throw new DForbiddenException(trad.t("insc.err3"));
-                        r.setOverCategory(data.getOverCategory());
+                        if (data.getOverCategory() != null || !append)
+                            if (data.getOverCategory() == null)
+                                r.setOverCategory(0);
+                            else
+                                r.setOverCategory(data.getOverCategory());
                         r.setCategorie(
                                 (combModel.getBirth_date() == null) ? combModel.getCategorie() :
                                         Utils.getCategoryFormBirthDate(combModel.getBirth_date(),
@@ -464,7 +546,8 @@ public class CompetitionService {
                         if (days > -7)
                             r.setClub(combModel.getClub());
                         if (c.getRequiredWeight().contains(r.getCategorie2()))
-                            r.setWeight(data.getWeight());
+                            if (data.getCountry() != null || !append)
+                                r.setWeight(data.getWeight());
                         if (admin) {
                             r.setWeightReal(data.getWeightReal());
                             r.setLockEdit(data.isLockEdit());
@@ -510,6 +593,27 @@ public class CompetitionService {
                         sRegister.sendRegister(c.getUuid(), r) : Uni.createFrom().voidItem());
     }
 
+    private Uni<CompetitionGuestModel> findGuestOrInit(String fname, String lname, CompetitionModel competition) {
+        if (fname == null || lname == null)
+            return Uni.createFrom().failure(new DBadRequestException(trad.t("nom.et.prenom.requis")));
+        return competitionGuestRepository.find(
+                        "unaccent(lname) ILIKE unaccent(?1) AND unaccent(fname) ILIKE unaccent(?2) AND competition = ?3",
+                        lname, fname, competition).firstResult()
+                .map(guestModel -> {
+                    if (guestModel == null) {
+                        CompetitionGuestModel model = new CompetitionGuestModel();
+                        model.setFname(fname);
+                        if (lname.equals("__team"))
+                            model.setLname("_team");
+                        else
+                            model.setLname(lname);
+                        model.setCompetition(competition);
+                        return model;
+                    }
+                    return guestModel;
+                });
+    }
+
     private Uni<MembreModel> findComb(Long licence, String fname, String lname) {
         if (licence != null && licence > 0) {
             return combRepository.find("licence = ?1", licence).firstResult()
@@ -821,7 +925,7 @@ public class CompetitionService {
                                             .call(m -> Panache.withTransaction(() ->
                                                     helloAssoRepository.persist(
                                                             new HelloAssoRegisterModel(cm, m, data.getId()))))
-                                            .chain(m -> updateRegister(req, cm, m, true)))
+                                            .chain(m -> updateRegister(req, cm, m, true, true)))
                                     .onFailure().recoverWithItem(throwable -> {
                                         fail.add("%s %s - licence n°%d".formatted(item.getUser().getLastName(),
                                                 item.getUser().getFirstName(), optional.get()));

src/main/java/fr/titionfire/ffsaf/rest/CompetitionEndpoints.java

@@ -50,6 +50,16 @@ public class CompetitionEndpoints {
         return service.addRegisterComb(securityCtx, id, data, source);
     }
 
+    @POST
+    @Path("{id}/registers/{source}")
+    @Authenticated
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(hidden = true)
+    public Uni<List<SimpleRegisterComb>> addRegistersComb(@PathParam("id") Long id, @PathParam("source") String source,
+                                                          List<RegisterRequestData> data) {
+        return service.addRegistersComb(securityCtx, id, data, source);
+    }
+
     @DELETE
     @Path("{id}/register/{comb_id}/{source}")
     @Authenticated

src/main/java/fr/titionfire/ffsaf/rest/data/RegisterRequestData.java

@@ -20,7 +20,7 @@ public class RegisterRequestData {
 
     private Integer weight;
     private Integer weightReal;
-    private int overCategory;
+    private Integer overCategory;
     private boolean lockEdit = false;
     private List<Long> categoriesInscrites;
 

src/main/java/fr/titionfire/ffsaf/rest/data/SimpleRegisterComb.java

@@ -8,12 +8,14 @@ import fr.titionfire.ffsaf.utils.Utils;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 @RegisterForReflection
 public class SimpleRegisterComb {
     private long id;