diff --git a/src/main/java/fr/titionfire/ffsaf/data/model/AffiliationRequestModel.java b/src/main/java/fr/titionfire/ffsaf/data/model/AffiliationRequestModel.java index 622d883..24a1011 100644 --- a/src/main/java/fr/titionfire/ffsaf/data/model/AffiliationRequestModel.java +++ b/src/main/java/fr/titionfire/ffsaf/data/model/AffiliationRequestModel.java @@ -21,8 +21,7 @@ public class AffiliationRequestModel { Long id; String name; - long siret; - String RNA; + String state_id; String address; String contact; diff --git a/src/main/java/fr/titionfire/ffsaf/data/model/ClubModel.java b/src/main/java/fr/titionfire/ffsaf/data/model/ClubModel.java index 8a5dd38..64c6036 100644 --- a/src/main/java/fr/titionfire/ffsaf/data/model/ClubModel.java +++ b/src/main/java/fr/titionfire/ffsaf/data/model/ClubModel.java @@ -55,11 +55,8 @@ public class ClubModel implements LoggableModel { @Schema(description = "Adresse postale du club", example = "1 rue de l'exemple, 75000 Paris") String address; - @Schema(description = "RNA du club", example = "W123456789") - String RNA; - - @Schema(description = "Numéro SIRET du club", example = "12345678901234") - Long SIRET; + @Schema(description = "Numéro SIRET ou RNA du club", example = "12345678901234") + String StateId; @Schema(description = "Numéro d'affiliation du club", example = "12345") Long no_affiliation; diff --git a/src/main/java/fr/titionfire/ffsaf/domain/entity/ClubEntity.java b/src/main/java/fr/titionfire/ffsaf/domain/entity/ClubEntity.java index cb840e9..18e65b1 100644 --- a/src/main/java/fr/titionfire/ffsaf/domain/entity/ClubEntity.java +++ b/src/main/java/fr/titionfire/ffsaf/domain/entity/ClubEntity.java @@ -22,8 +22,7 @@ public class ClubEntity { private String training_location; private String training_day_time; private String contact_intern; - private String RNA; - private Long SIRET; + private String StateId; private Long no_affiliation; private boolean international; @@ -41,8 +40,7 @@ public class ClubEntity { .training_location(model.getTraining_location()) .training_day_time(model.getTraining_day_time()) .contact_intern(model.getContact_intern()) - .RNA(model.getRNA()) - .SIRET(model.getSIRET()) + .StateId(model.getStateId()) .no_affiliation(model.getNo_affiliation()) .international(model.isInternational()) .build(); diff --git a/src/main/java/fr/titionfire/ffsaf/domain/service/AffiliationService.java b/src/main/java/fr/titionfire/ffsaf/domain/service/AffiliationService.java index 3bafd63..3096633 100644 --- a/src/main/java/fr/titionfire/ffsaf/domain/service/AffiliationService.java +++ b/src/main/java/fr/titionfire/ffsaf/domain/service/AffiliationService.java @@ -80,14 +80,14 @@ public class AffiliationService { throw new DBadRequestException("Saison non valid"); } })) - .chain(() -> repositoryRequest.count("siret = ?1 and saison = ?2", affModel.getSiret(), + .chain(() -> repositoryRequest.count("state_id = ?1 and saison = ?2", affModel.getState_id(), affModel.getSaison())) .onItem().invoke(Unchecked.consumer(count -> { if (count != 0 && unique) { throw new DBadRequestException("Demande d'affiliation déjà existante"); } })) - .chain(() -> clubRepository.find("SIRET = ?1", affModel.getSiret()).firstResult().chain(club -> + .chain(() -> clubRepository.find("StateId = ?1", affModel.getState_id()).firstResult().chain(club -> repository.count("club = ?1 and saison = ?2", club, affModel.getSaison()))) .onItem().invoke(Unchecked.consumer(count -> { if (count != 0) { @@ -124,7 +124,6 @@ public class AffiliationService { .onItem().ifNull().failWith(new DNotFoundException("Demande d'affiliation non trouvé")) .chain(origine -> { origine.setName(model.getName()); - origine.setRNA(model.getRNA()); origine.setAddress(model.getAddress()); origine.setContact(model.getContact()); origine.setM1_lname(model.getM1_lname()); @@ -181,8 +180,7 @@ public class AffiliationService { .onItem().ifNull().failWith(new DNotFoundException("Demande d'affiliation non trouvé")) .map(model -> { model.setName(form.getName()); - model.setSiret(form.getSiret()); - model.setRNA(form.getRna()); + model.setState_id(form.getState_id()); model.setAddress(form.getAddress()); model.setContact(form.getContact()); @@ -289,10 +287,12 @@ public class AffiliationService { return repositoryRequest.findById(form.getId()) .onItem().ifNull().failWith(new DNotFoundException("Demande d'affiliation non trouvé")) .chain(req -> - clubRepository.find("SIRET = ?1", form.getSiret()).firstResult() + clubRepository.find("StateId = ?1", form.getState_id()).firstResult() .chain(model -> (model == null) ? acceptNew(form, req) : acceptOld(form, req, model)) - .call(club -> setMembre(form.new Member(1), club, req.getSaison()) - .call(__ -> setMembre(form.new Member(2), club, req.getSaison()) + .call(club -> setMembre(form.new Member(1), club, req.getSaison()).onFailure() + .recoverWithNull() + .call(__ -> setMembre(form.new Member(2), club, req.getSaison()).onFailure() + .recoverWithNull() .call(___ -> setMembre(form.new Member(3), club, req.getSaison())))) .onItem() .invoke(model -> Uni.createFrom() @@ -317,8 +317,7 @@ public class AffiliationService { ClubModel club = new ClubModel(); club.setName(form.getName()); club.setCountry("FR"); - club.setSIRET(form.getSiret()); - club.setRNA(form.getRna()); + club.setStateId(form.getState_id()); club.setAddress(form.getAddress()); club.setContact_intern(form.getContact()); club.setAffiliations(new ArrayList<>()); @@ -355,8 +354,7 @@ public class AffiliationService { .chain(() -> { club.setName(form.getName()); club.setCountry("FR"); - club.setSIRET(form.getSiret()); - club.setRNA(form.getRna()); + club.setStateId(form.getState_id()); club.setAddress(form.getAddress()); club.setContact_intern(form.getContact()); return Panache.withTransaction(() -> clubRepository.persist(club) @@ -369,7 +367,7 @@ public class AffiliationService { public Uni getRequest(long id) { return repositoryRequest.findById(id).map(SimpleReqAffiliation::fromModel) .onItem().ifNull().failWith(new DNotFoundException("Demande d'affiliation non trouvé")) - .call(out -> clubRepository.find("SIRET = ?1", out.getSiret()).firstResult().invoke(c -> { + .call(out -> clubRepository.find("StateId = ?1", out.getStateId()).firstResult().invoke(c -> { if (c != null) { out.setClub(c.getId()); out.setClub_name(c.getName()); @@ -382,7 +380,7 @@ public class AffiliationService { public Uni> getCurrentSaisonAffiliation() { return repositoryRequest.list("saison = ?1 or saison = ?1 + 1", Utils.getSaison()) .map(models -> models.stream() - .map(model -> new SimpleAffiliation(model.getId() * -1, model.getSiret(), model.getSaison(), + .map(model -> new SimpleAffiliation(model.getId() * -1, model.getState_id(), model.getSaison(), false)).toList()) .chain(aff -> repository.list("saison = ?1", Utils.getSaison()) .map(models -> models.stream().map(SimpleAffiliation::fromModel).toList()) @@ -394,9 +392,9 @@ public class AffiliationService { return clubRepository.findById(id) .onItem().ifNull().failWith(new DNotFoundException("Club non trouvé")) .call(model -> Mutiny.fetch(model.getAffiliations())) - .chain(model -> repositoryRequest.list("siret = ?1", model.getSIRET()) + .chain(model -> repositoryRequest.list("state_id = ?1", model.getStateId()) .map(reqs -> reqs.stream().map(req -> - new SimpleAffiliation(req.getId() * -1, model.getId(), req.getSaison(), false))) + new SimpleAffiliation(req.getId() * -1, model.getStateId(), req.getSaison(), false))) .map(aff2 -> Stream.concat(aff2, model.getAffiliations().stream().map(SimpleAffiliation::fromModel)).toList()) ); @@ -426,9 +424,9 @@ public class AffiliationService { return Panache.withTransaction(() -> repository.deleteById(id)); } - public Uni deleteReqAffiliation(long id, String reason) { + public Uni deleteReqAffiliation(long id, String reason, boolean federationAdmin) { return repositoryRequest.findById(id) - .call(aff -> reactiveMailer.send( + .call(aff -> federationAdmin ? reactiveMailer.send( Mail.withText(aff.getM1_email(), "FFSAF - Votre demande d'affiliation a été rejetée.", String.format( @@ -445,7 +443,7 @@ public class AffiliationService { """, aff.getName(), reason) ).setFrom("FFSAF ").setReplyTo("contact@ffsaf.fr") .addTo(aff.getM2_email(), aff.getM3_email()) - )) + ) : Uni.createFrom().nullItem()) .chain(aff -> Panache.withTransaction(() -> repositoryRequest.delete(aff))) .call(__ -> Utils.deleteMedia(id, media, "aff_request/logo")) .call(__ -> Utils.deleteMedia(id, media, "aff_request/status")); diff --git a/src/main/java/fr/titionfire/ffsaf/domain/service/ClubService.java b/src/main/java/fr/titionfire/ffsaf/domain/service/ClubService.java index 40a6155..f9d8a76 100644 --- a/src/main/java/fr/titionfire/ffsaf/domain/service/ClubService.java +++ b/src/main/java/fr/titionfire/ffsaf/domain/service/ClubService.java @@ -211,11 +211,9 @@ public class ClubService { m.setTraining_day_time(input.getTraining_day_time()); ls.logChange("Contact interne", m.getContact_intern(), input.getContact_intern(), m); m.setContact_intern(input.getContact_intern()); - ls.logChange("N° RNA", m.getRNA(), input.getRna(), m); - m.setRNA(input.getRna()); - if (input.getSiret() != null && !input.getSiret().isBlank()) { - ls.logChange("N° SIRET", m.getSIRET(), input.getSiret(), m); - m.setSIRET(Long.parseLong(input.getSiret())); + if (input.getState_id() != null && !input.getState_id().isBlank()) { + ls.logChange("N° SIRET", m.getClubId(), input.getState_id(), m); + m.setStateId(input.getState_id()); } ls.logChange("Adresse administrative", m.getAddress(), input.getAddress(), m); m.setAddress(input.getAddress()); @@ -251,9 +249,8 @@ public class ClubService { clubModel.setTraining_location(input.getTraining_location()); clubModel.setTraining_day_time(input.getTraining_day_time()); clubModel.setContact_intern(input.getContact_intern()); - clubModel.setRNA(input.getRna()); - if (input.getSiret() != null && !input.getSiret().isBlank()) - clubModel.setSIRET(Long.parseLong(input.getSiret())); + if (input.getState_id() != null && !input.getState_id().isBlank()) + clubModel.setStateId(input.getState_id()); clubModel.setAddress(input.getAddress()); try { @@ -300,9 +297,9 @@ public class ClubService { .call(clubModel -> Mutiny.fetch(clubModel.getAffiliations())) .invoke(clubModel -> { data.setName(clubModel.getName()); - data.setSiret(clubModel.getSIRET()); - data.setRna(clubModel.getRNA()); + data.setState_id(clubModel.getStateId()); data.setAddress(clubModel.getAddress()); + data.setContact(clubModel.getContact_intern()); data.setSaison( clubModel.getAffiliations().stream().max(Comparator.comparing(AffiliationModel::getSaison)) .map(AffiliationModel::getSaison).map(i -> Math.min(i + 1, Utils.getSaison() + 1)) diff --git a/src/main/java/fr/titionfire/ffsaf/rest/AffiliationRequestEndpoints.java b/src/main/java/fr/titionfire/ffsaf/rest/AffiliationRequestEndpoints.java index fcb2d6b..16ddb09 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/AffiliationRequestEndpoints.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/AffiliationRequestEndpoints.java @@ -92,7 +92,7 @@ public class AffiliationRequestEndpoints { @DELETE @Path("/{id}") - @RolesAllowed({"federation_admin"}) + @RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"}) @Produces(MediaType.APPLICATION_JSON) @Operation(summary = "Supprime une demande d'affiliation", description = "Cette méthode supprime une demande " + "d'affiliation pour l'identifiant spécifié.") @@ -107,7 +107,7 @@ public class AffiliationRequestEndpoints { if (o.getClub() == null && !securityCtx.roleHas("federation_admin")) throw new DForbiddenException(); })).invoke(o -> checkPerm.accept(o.getClub())) - .chain(o -> service.deleteReqAffiliation(id, reason)); + .chain(o -> service.deleteReqAffiliation(id, reason, securityCtx.roleHas("federation_admin"))); } @PUT diff --git a/src/main/java/fr/titionfire/ffsaf/rest/AssoEndpoints.java b/src/main/java/fr/titionfire/ffsaf/rest/AssoEndpoints.java index a7904c5..c81b955 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/AssoEndpoints.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/AssoEndpoints.java @@ -1,7 +1,7 @@ package fr.titionfire.ffsaf.rest; -import fr.titionfire.ffsaf.rest.client.SirenService; -import fr.titionfire.ffsaf.rest.data.UniteLegaleRoot; +import fr.titionfire.ffsaf.rest.client.StateIdService; +import fr.titionfire.ffsaf.rest.data.AssoData; import fr.titionfire.ffsaf.rest.exception.DNotFoundException; import io.smallrye.mutiny.Uni; import jakarta.ws.rs.*; @@ -13,17 +13,17 @@ import org.eclipse.microprofile.rest.client.inject.RestClient; public class AssoEndpoints { @RestClient - SirenService sirenService; + StateIdService stateIdService; @GET - @Path("siren/{siren}") + @Path("state_id/{stateId}") @Produces(MediaType.APPLICATION_JSON) @Operation(hidden = true) - public Uni getInfoSiren(@PathParam("siren") String siren) { - return sirenService.get_unite(siren).onFailure().transform(throwable -> { + public Uni getAssoInfo(@PathParam("stateId") String stateId) { + return stateIdService.get_status(stateId).onFailure().transform(throwable -> { if (throwable instanceof WebApplicationException exception) { - if (exception.getResponse().getStatus() == 400) - return new DNotFoundException("Siret introuvable"); + if (exception.getResponse().getStatus() == 404) + return new DNotFoundException("Asso introuvable"); } return throwable; }); diff --git a/src/main/java/fr/titionfire/ffsaf/rest/client/SirenService.java b/src/main/java/fr/titionfire/ffsaf/rest/client/SirenService.java deleted file mode 100644 index 413ddc7..0000000 --- a/src/main/java/fr/titionfire/ffsaf/rest/client/SirenService.java +++ /dev/null @@ -1,19 +0,0 @@ -package fr.titionfire.ffsaf.rest.client; - -import fr.titionfire.ffsaf.rest.data.UniteLegaleRoot; -import io.smallrye.mutiny.Uni; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; -import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; - -@Path("/") -@RegisterRestClient -@ClientHeaderParam(name = "X-Client-Secret", value = "${siren-api.key}") -public interface SirenService { - - @GET - @Path("/v3/unites_legales/{SIREN}") - Uni get_unite(@PathParam("SIREN") String siren); -} diff --git a/src/main/java/fr/titionfire/ffsaf/rest/client/StateIdService.java b/src/main/java/fr/titionfire/ffsaf/rest/client/StateIdService.java new file mode 100644 index 0000000..9d03809 --- /dev/null +++ b/src/main/java/fr/titionfire/ffsaf/rest/client/StateIdService.java @@ -0,0 +1,17 @@ +package fr.titionfire.ffsaf.rest.client; + +import fr.titionfire.ffsaf.rest.data.AssoData; +import io.smallrye.mutiny.Uni; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + +@Path("/") +@RegisterRestClient +public interface StateIdService { + + @GET + @Path("/structure/{id}") + Uni get_status(@PathParam("id") String id); +} diff --git a/src/main/java/fr/titionfire/ffsaf/rest/data/AssoData.java b/src/main/java/fr/titionfire/ffsaf/rest/data/AssoData.java new file mode 100644 index 0000000..a7e1f39 --- /dev/null +++ b/src/main/java/fr/titionfire/ffsaf/rest/data/AssoData.java @@ -0,0 +1,38 @@ +package fr.titionfire.ffsaf.rest.data; + +import io.quarkus.runtime.annotations.RegisterForReflection; +import lombok.Data; + +@Data +@RegisterForReflection +public class AssoData { + String id_siren; + String id_rna; + Identite identite; + Coordonnee coordonnees; + + @Data + @RegisterForReflection + public static class Identite { + String nom; + } + + @Data + @RegisterForReflection + public static class Coordonnee { + Address adresse_siege; + } + + @Data + @RegisterForReflection + public static class Address { + String cplt_1; + String cplt_2; + String cplt_3; + String num_voie; + String type_voie; + String voie; + String cp; + String commune; + } +} diff --git a/src/main/java/fr/titionfire/ffsaf/rest/data/RenewAffData.java b/src/main/java/fr/titionfire/ffsaf/rest/data/RenewAffData.java index 02ce7cc..4744054 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/data/RenewAffData.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/data/RenewAffData.java @@ -17,9 +17,9 @@ import java.util.List; @RegisterForReflection public class RenewAffData { String name; - Long siret; - String rna; + String state_id; String address; + String contact; int saison; List members; diff --git a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleAffiliation.java b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleAffiliation.java index 2631783..edc4299 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleAffiliation.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleAffiliation.java @@ -14,8 +14,8 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; public class SimpleAffiliation { @Schema(description = "L'identifiant de l'affiliation.", example = "1") private Long id; - @Schema(description = "L'identifiant du club associé à l'affiliation.", example = "123") - private Long club; + @Schema(description = "L'identifiant du club associé à l'affiliation si id > 0 sinon n° SIRET ou RNA du club.", example = "123") + private String club; @Schema(description = "La saison de l'affiliation.", example = "2022") private int saison; @Schema(description = "Indique si l'affiliation est validée ou non.", example = "true") @@ -27,7 +27,7 @@ public class SimpleAffiliation { return new SimpleAffiliationBuilder() .id(model.getId()) - .club(model.getClub().getId()) + .club(String.valueOf(model.getClub().getId())) .saison(model.getSaison()) .validate(true) .build(); diff --git a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleClub.java b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleClub.java index 6229aa6..cbb904b 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleClub.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleClub.java @@ -36,10 +36,8 @@ public class SimpleClub { private String contact_intern; @Schema(description = "Adresse postale du club", example = "1 rue de l'exemple, 75000 Paris") private String address; - @Schema(description = "RNA du club", example = "W123456789") - private String RNA; - @Schema(description = "Numéro SIRET du club", example = "12345678901234") - private Long SIRET; + @Schema(description = "Numéro SIRET ou RNA du club", example = "12345678901234") + private String state_id; @Schema(description = "Numéro d'affiliation du club", example = "12345") private Long no_affiliation; @Schema(description = "Club international", example = "false") @@ -60,8 +58,7 @@ public class SimpleClub { .training_location(model.getTraining_location()) .training_day_time(model.getTraining_day_time()) .contact_intern(model.getContact_intern()) - .RNA(model.getRNA()) - .SIRET(model.getSIRET()) + .state_id(model.getStateId()) .no_affiliation(model.getNo_affiliation()) .international(model.isInternational()) .address(model.getAddress()) diff --git a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleClubList.java b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleClubList.java index b42edb6..d523d7d 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleClubList.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleClubList.java @@ -20,8 +20,8 @@ public class SimpleClubList { String name; @Schema(description = "Pays du club", example = "FR") String country; - @Schema(description = "Numéro SIRET du club", example = "12345678901234") - Long siret; + @Schema(description = "Numéro SIRET ou RNA du club", example = "12345678901234") + String state_id; @Schema(description = "Numéro d'affiliation du club", example = "12345") Long no_affiliation; @@ -29,7 +29,7 @@ public class SimpleClubList { if (model == null) return null; - return new SimpleClubList(model.getId(), model.getName(), model.getCountry(), model.getSIRET(), + return new SimpleClubList(model.getId(), model.getName(), model.getCountry(), model.getStateId(), model.getNo_affiliation()); } } diff --git a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleReqAffiliation.java b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleReqAffiliation.java index ea0ef71..30ab3ac 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleReqAffiliation.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleReqAffiliation.java @@ -25,10 +25,8 @@ public class SimpleReqAffiliation { Long club_no_aff; @Schema(description = "Nom du club demander", example = "Association sportive") String name; - @Schema(description = "Numéro SIRET de l'association", example = "12345678901234") - long siret; - @Schema(description = "Numéro RNA de l'association", example = "W123456789") - String RNA; + @Schema(description = "Numéro SIRET ou RNA de l'association", example = "12345678901234") + String stateId; @Schema(description = "Adresse de l'association", example = "1 rue de l'exemple, 75000 Paris") String address; @Schema(description = "Email de contact de l'association", example = "test@test.fr") @@ -45,8 +43,7 @@ public class SimpleReqAffiliation { return new SimpleReqAffiliation.SimpleReqAffiliationBuilder() .id(model.getId()) .name(model.getName()) - .siret(model.getSiret()) - .RNA(model.getRNA()) + .stateId(model.getState_id()) .address(model.getAddress()) .saison(model.getSaison()) .contact(model.getContact()) diff --git a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleReqAffiliationResume.java b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleReqAffiliationResume.java index f99ace0..1f73405 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleReqAffiliationResume.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleReqAffiliationResume.java @@ -16,8 +16,8 @@ public class SimpleReqAffiliationResume { Long id; @Schema(description = "Le nom de l'association.", example = "Association sportive") String name; - @Schema(description = "Le numéro SIRET de l'association.", example = "12345678901234") - long siret; + @Schema(description = "Le numéro SIRET ou RNA de l'association.", example = "12345678901234") + String stateId; @Schema(description = "La saison de l'affiliation.", example = "2025") int saison; @@ -25,10 +25,10 @@ public class SimpleReqAffiliationResume { if (model == null) return null; - return new SimpleReqAffiliationResume.SimpleReqAffiliationResumeBuilder() + return new SimpleReqAffiliationResumeBuilder() .id(model.getId()) .name(model.getName()) - .siret(model.getSiret()) + .stateId(model.getState_id()) .saison(model.getSaison()) .build(); } diff --git a/src/main/java/fr/titionfire/ffsaf/rest/data/UniteLegaleRoot.java b/src/main/java/fr/titionfire/ffsaf/rest/data/UniteLegaleRoot.java deleted file mode 100644 index 2b5c34a..0000000 --- a/src/main/java/fr/titionfire/ffsaf/rest/data/UniteLegaleRoot.java +++ /dev/null @@ -1,107 +0,0 @@ -package fr.titionfire.ffsaf.rest.data; - -import io.quarkus.runtime.annotations.RegisterForReflection; -import lombok.Data; - -import java.util.ArrayList; -import java.util.Date; - -@Data -@RegisterForReflection -public class UniteLegaleRoot { - public UniteLegale unite_legale; - - @Data - @RegisterForReflection - public static class UniteLegale { - public String activite_principale; - public Object annee_categorie_entreprise; - public Object annee_effectifs; - public Object caractere_employeur; - public Object categorie_entreprise; - public String categorie_juridique; - public String date_creation; - public String date_debut; - public Date date_dernier_traitement; - public String denomination; - public Object denomination_usuelle_1; - public Object denomination_usuelle_2; - public Object denomination_usuelle_3; - public String economie_sociale_solidaire; - public Etablissement etablissement_siege; - public ArrayList etablissements; - public String etat_administratif; - public String identifiant_association; - public String nic_siege; - public Object nom; - public Object nom_usage; - public int nombre_periodes; - public String nomenclature_activite_principale; - public Object prenom_1; - public Object prenom_2; - public Object prenom_3; - public Object prenom_4; - public Object prenom_usuel; - public Object pseudonyme; - public Object sexe; - public Object sigle; - public String siren; - public String societe_mission; - public String statut_diffusion; - public Object tranche_effectifs; - public Object unite_purgee; - } - - @Data - @RegisterForReflection - public static class Etablissement { - private String activite_principale; - private Object activite_principale_registre_metiers; - private Object annee_effectifs; - private String caractere_employeur; - private Object code_cedex; - private Object code_cedex_2; - private String code_commune; - private Object code_commune_2; - private Object code_pays_etranger; - private Object code_pays_etranger_2; - private String code_postal; - private Object code_postal_2; - private Object complement_adresse; - private Object complement_adresse2; - private String date_creation; - private String date_debut; - private Date date_dernier_traitement; - private Object denomination_usuelle; - private Object distribution_speciale; - private Object distribution_speciale_2; - private Object enseigne_1; - private Object enseigne_2; - private Object enseigne_3; - private boolean etablissement_siege; - private String etat_administratif; - private Object indice_repetition; - private Object indice_repetition_2; - private Object libelle_cedex; - private Object libelle_cedex_2; - private String libelle_commune; - private Object libelle_commune_2; - private Object libelle_commune_etranger; - private Object libelle_commune_etranger_2; - private Object libelle_pays_etranger; - private Object libelle_pays_etranger_2; - private String libelle_voie; - private Object libelle_voie_2; - private String nic; - private int nombre_periodes; - private String nomenclature_activite_principale; - private String numero_voie; - private Object numero_voie_2; - private String siren; - private String siret; - private String statut_diffusion; - private Object tranche_effectifs; - private String type_voie; - private Object type_voie_2; - } -} \ No newline at end of file diff --git a/src/main/java/fr/titionfire/ffsaf/rest/from/AffiliationRequestForm.java b/src/main/java/fr/titionfire/ffsaf/rest/from/AffiliationRequestForm.java index 9dfb985..ae657de 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/from/AffiliationRequestForm.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/from/AffiliationRequestForm.java @@ -21,13 +21,9 @@ public class AffiliationRequestForm { @FormParam("name") private String name = null; - @Schema(description = "Le numéro SIRET de l'association.", example = "12345678901234", required = true) - @FormParam("siret") - private Long siret = null; - - @Schema(description = "Le numéro RNA de l'association. (peut être null)", example = "W123456789") - @FormParam("rna") - private String rna = null; + @Schema(description = "Le numéro SIRET/RNA de l'association.", example = "12345678901234", required = true) + @FormParam("state_id") + private String state_id = null; @Schema(description = "L'adresse de l'association.", example = "1 rue de l'exemple, 75000 Paris", required = true) @FormParam("adresse") @@ -114,8 +110,7 @@ public class AffiliationRequestForm { public AffiliationRequestModel toModel() { AffiliationRequestModel model = new AffiliationRequestModel(); model.setName(this.getName()); - model.setSiret(this.getSiret()); - model.setRNA(this.getRna()); + model.setState_id(this.getState_id()); model.setAddress(this.getAdresse()); model.setSaison(this.getSaison()); model.setContact(this.getContact()); diff --git a/src/main/java/fr/titionfire/ffsaf/rest/from/AffiliationRequestSaveForm.java b/src/main/java/fr/titionfire/ffsaf/rest/from/AffiliationRequestSaveForm.java index 36f62e9..a1f66aa 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/from/AffiliationRequestSaveForm.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/from/AffiliationRequestSaveForm.java @@ -17,13 +17,9 @@ public class AffiliationRequestSaveForm { @FormParam("name") private String name = null; - @Schema(description = "Le numéro SIRET de l'association.", example = "12345678901234", required = true) - @FormParam("siret") - private Long siret = null; - - @Schema(description = "Le numéro RNA de l'association. (peut être null)", example = "W123456789") - @FormParam("rna") - private String rna = null; + @Schema(description = "Le numéro SIRET ou RNA de l'association.", example = "12345678901234", required = true) + @FormParam("state_id") + private String state_id = null; @Schema(description = "L'adresse de l'association.", example = "1 rue de l'exemple, 75000 Paris", required = true) @FormParam("address") @@ -175,8 +171,7 @@ public class AffiliationRequestSaveForm { return "AffiliationRequestSaveForm{" + "id=" + id + ", name='" + name + '\'' + - ", siret=" + siret + - ", rna='" + rna + '\'' + + ", state_id=" + state_id + ", address='" + address + '\'' + ", contact='" + contact + '\'' + ", status_len=" + status.length + diff --git a/src/main/java/fr/titionfire/ffsaf/rest/from/FullClubForm.java b/src/main/java/fr/titionfire/ffsaf/rest/from/FullClubForm.java index 26f81f1..6a23b52 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/from/FullClubForm.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/from/FullClubForm.java @@ -43,13 +43,9 @@ public class FullClubForm { @Schema(description = "Adresse postale du club", example = "1 rue de l'exemple, 75000 Paris", required = true) private String address = null; - @FormParam("rna") - @Schema(description = "RNA du club", example = "W123456789") - private String rna = null; - - @FormParam("siret") - @Schema(description = "Numéro SIRET du club", example = "12345678901234", required = true) - private String siret = null; + @FormParam("state_id") + @Schema(description = "Numéro SIRET ou RNA du club", example = "12345678901234", required = true) + private String state_id = null; @FormParam("international") @Schema(description = "Club international", example = "false", required = true) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0e1ae68..387faeb 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -41,8 +41,7 @@ database.pass= notif.affRequest.mail= -siren-api.key=siren-ap -quarkus.rest-client."fr.titionfire.ffsaf.rest.client.SirenService".url=https://data.siren-api.fr/ +quarkus.rest-client."fr.titionfire.ffsaf.rest.client.StateIdService".url=https://siva-int.menjes.ate.info/apim/api-asso/api/ #Login quarkus.oidc.token-state-manager.split-tokens=true diff --git a/src/main/webapp/src/pages/DemandeAff.jsx b/src/main/webapp/src/pages/DemandeAff.jsx index d0a2953..e2e46ee 100644 --- a/src/main/webapp/src/pages/DemandeAff.jsx +++ b/src/main/webapp/src/pages/DemandeAff.jsx @@ -16,28 +16,26 @@ function formatAdresse(data) { }).join(" "); } -function reconstruireAdresse(infos) { - console.log(infos); +function reconstruireAdresse2(infos) { let adresseReconstruite = ""; - if (infos.numero_voie === null) { - if (infos.complement_adresse) { - adresseReconstruite += formatAdresse(infos.complement_adresse) + ', '; - } - } else { - adresseReconstruite += infos.numero_voie + ' '; + if (infos?.cplt_1) { + adresseReconstruite += formatAdresse(infos.cplt_1) + ', '; + } + if (infos?.cplt_2) { + adresseReconstruite += formatAdresse(infos.cplt_2) + ', '; + } + if (infos?.cplt_3) { + adresseReconstruite += formatAdresse(infos.cplt_3) + ', '; + } + + if (infos?.num_voie) { + adresseReconstruite += infos.num_voie + ' '; } adresseReconstruite += formatAdresse(infos.type_voie) + ' '; - adresseReconstruite += formatAdresse(infos.libelle_voie) + ', '; - adresseReconstruite += infos.code_postal + ' ' + infos.libelle_commune + ', '; - - if (infos.complement_adresse && infos.numero_voie !== null) { - adresseReconstruite += formatAdresse(infos.complement_adresse) + ', '; - } - if (infos.code_cedex && infos.libelle_cedex) { - adresseReconstruite += 'Cedex ' + infos.code_cedex + ' - ' + infos.libelle_cedex; - } + adresseReconstruite += formatAdresse(infos.voie) + ', '; + adresseReconstruite += infos.cp + ' ' + infos.commune + ', '; if (adresseReconstruite.endsWith(', ')) { adresseReconstruite = adresseReconstruite.slice(0, -2); @@ -85,8 +83,7 @@ export function DemandeAff() { event.preventDefault() const formData = new FormData(event.target) formData.append("m1_role", event.target.m1_role?.value) - formData.append("rna", event.target.rna?.value) - formData.append("siret", event.target.siret?.value) + formData.append("state_id", event.target.state_id?.value) let error = false; for (let i = 1; i <= 3; i++) { @@ -219,20 +216,19 @@ export function DemandeAff() { function AssoInfo({initData, needFile}) { const [denomination, setDenomination] = useState("") - const [siret, setSiret] = useState(initData.siret ? String(initData.siret) : "") - const [rna, setRna] = useState(initData.rna ? initData.rna : "") - const [rnaEnable, setRnaEnable] = useState(false) + const [stateId, setStateId] = useState(initData.stateId ? String(initData.stateId) : (initData.state_id ? String(initData.state_id) : "")) const [adresse, setAdresse] = useState(initData.address ? initData.address : "") const [contact, setContact] = useState(initData.contact ? initData.contact : "") - const fetchSiret = () => { - if (siret.length < 14) { - toast.error("Le SIRET doit contenir 14 chiffres") + const fetchStateId = () => { + const regex = /^(?:\d{14}|W?\d{9})$/; + if (!regex.test(stateId)) { + toast.error("Le format du SIRET/RNA est invalide"); return; } toast.promise( - apiAxios.get(`asso/siren/${siret.substring(0, siret.length - 5)}`), + apiAxios.get(`asso/state_id/${stateId}`), { pending: "Recherche de l'association en cours", success: "Association trouvée avec succès 🎉", @@ -243,12 +239,10 @@ function AssoInfo({initData, needFile}) { } } ).then(data => { - const data2 = data.data.unite_legale - setDenomination(data2.denomination) - setRnaEnable(data2.identifiant_association === null) - setRna(data2.identifiant_association ? data2.identifiant_association : "") + const data2 = data.data + setDenomination(data2.identite.nom) if (!initData.saison || adresse === "") - setAdresse(reconstruireAdresse(data2.etablissement_siege)) + setAdresse(reconstruireAdresse2(data2.coordonnees.adresse_siege)) }) } return <> @@ -262,11 +256,11 @@ function AssoInfo({initData, needFile}) {
- N° SIRET* - setSiret(e.target.value)}/> + N° SIRET ou RNA* + setStateId(e.target.value)}/>
@@ -277,13 +271,6 @@ function AssoInfo({initData, needFile}) { aria-describedby="basic-addon1" disabled value={denomination} readOnly/> -
- RNA - setRna(e.target.value)}/> -
-
Adresse administrative* diff --git a/src/main/webapp/src/pages/admin/affiliation/AffiliationReqList.jsx b/src/main/webapp/src/pages/admin/affiliation/AffiliationReqList.jsx index 54e9d65..a60a762 100644 --- a/src/main/webapp/src/pages/admin/affiliation/AffiliationReqList.jsx +++ b/src/main/webapp/src/pages/admin/affiliation/AffiliationReqList.jsx @@ -68,7 +68,7 @@ function MakeRow({request, navigate}) {
{request.name}
- {request.saison}-{request.saison + 1}
{request.siret} + {request.saison}-{request.saison + 1}
{request.state_id}
} @@ -104,4 +104,4 @@ function Def() {
    • -} \ No newline at end of file +} diff --git a/src/main/webapp/src/pages/admin/affiliation/AffiliationReqPage.jsx b/src/main/webapp/src/pages/admin/affiliation/AffiliationReqPage.jsx index cb292bb..6fc3830 100644 --- a/src/main/webapp/src/pages/admin/affiliation/AffiliationReqPage.jsx +++ b/src/main/webapp/src/pages/admin/affiliation/AffiliationReqPage.jsx @@ -66,8 +66,7 @@ function Content({data, refresh}) { formData.append('id', data.id); formData.append('name', event.target.name.value); - formData.append('siret', event.target.siret.value); - formData.append('rna', event.target.rna.value); + formData.append('state_id', event.target.state_id.value); formData.append('address', event.target.address.value); formData.append('contact', event.target.contact.value); @@ -177,8 +176,7 @@ function Content({data, refresh}) { {data.club &&
    Ancien nom: {data.club_name}
    } - - + diff --git a/src/main/webapp/src/pages/admin/club/ClubList.jsx b/src/main/webapp/src/pages/admin/club/ClubList.jsx index 85941c8..5be10fb 100644 --- a/src/main/webapp/src/pages/admin/club/ClubList.jsx +++ b/src/main/webapp/src/pages/admin/club/ClubList.jsx @@ -40,7 +40,7 @@ export function ClubList() { country: e.country, siret: e.siret, no_affiliation: e.no_affiliation, - affiliation: showAffiliationState ? affiliationData.find(aff => (aff.id >= 0) ? aff.club === e.id : aff.club === e.siret) : null + affiliation: showAffiliationState ? affiliationData.find(aff => (aff.id >= 0) ? Number(aff.club) === e.id : aff.club === e.state_id) : null }) } setClubData(data2); @@ -197,4 +197,4 @@ function Def() {
    • -} \ No newline at end of file +} diff --git a/src/main/webapp/src/pages/admin/club/ClubPage.jsx b/src/main/webapp/src/pages/admin/club/ClubPage.jsx index 5a6768a..a6a3e76 100644 --- a/src/main/webapp/src/pages/admin/club/ClubPage.jsx +++ b/src/main/webapp/src/pages/admin/club/ClubPage.jsx @@ -130,8 +130,7 @@ function InformationForm({data}) { {!switchOn && <> - - + {!switchOn && <> - - + diff --git a/src/main/webapp/src/pages/club/club/MyClubPage.jsx b/src/main/webapp/src/pages/club/club/MyClubPage.jsx index d8e0fb6..a4f9ae4 100644 --- a/src/main/webapp/src/pages/club/club/MyClubPage.jsx +++ b/src/main/webapp/src/pages/club/club/MyClubPage.jsx @@ -75,8 +75,7 @@ function InformationForm({data}) { {!data.international && <> - - + }
    diff --git a/src/main/webapp/vite.config.js b/src/main/webapp/vite.config.js index c532ed0..6b5b768 100644 --- a/src/main/webapp/vite.config.js +++ b/src/main/webapp/vite.config.js @@ -24,4 +24,4 @@ export default ({mode}) => { }, }, }); -}; \ No newline at end of file +};