From 8031289509d43c188b107819e446590ec4c172f8 Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Fri, 13 Feb 2026 18:53:39 +0100 Subject: [PATCH] gestion revu de code en utilisant uniquement les DTO --- .../decoupage/SecteurController.java | 3 ++- .../decoupage/SectionController.java | 3 ++- .../infocad/parametre/BlocController.java | 2 +- .../parametre/ModeAcquisitionController.java | 2 +- .../parametre/NatureDomaineController.java | 2 +- .../PositionRepresentationController.java | 2 +- .../parametre/ProfessionController.java | 2 +- .../SituationGeographiqueController.java | 2 +- .../SituationMatrimonialeController.java | 2 +- .../parametre/SourceDroitController.java | 2 +- .../parametre/TypeContestationController.java | 2 +- .../parametre/TypeDomaineController.java | 2 +- .../parametre/TypePersonneController.java | 2 +- .../parametre/TypePieceController.java | 2 +- .../TypeRepresentationController.java | 2 +- .../java/io/gmss/fiscad/paylaods/Critere.java | 1 - .../gmss/fiscad/paylaods/FiltreParcelle.java | 27 +++++++++++++++++++ 17 files changed, 44 insertions(+), 16 deletions(-) create mode 100755 src/main/java/io/gmss/fiscad/paylaods/FiltreParcelle.java diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java index addddd8..a47bbe5 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java @@ -7,6 +7,7 @@ import io.gmss.fiscad.paylaods.ApiResponse; import io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb; import io.gmss.fiscad.paylaods.request.synchronisation.SecteurPayload; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import org.slf4j.Logger; @@ -24,7 +25,7 @@ import org.springframework.web.client.HttpClientErrorException; @RestController @RequestMapping(value = "api/secteur", produces = MediaType.APPLICATION_JSON_VALUE) -//@SecurityRequirement(name = "bearer") +@SecurityRequirement(name = "bearer") @Tag(name = "Secteur") //@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')") public class SecteurController { diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/SectionController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/SectionController.java index 557620b..c0d2244 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/SectionController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/SectionController.java @@ -5,6 +5,7 @@ import io.gmss.fiscad.interfaces.decoupage.SectionService; import io.gmss.fiscad.paylaods.ApiResponse; import io.gmss.fiscad.paylaods.request.crudweb.SectionPaylaodWeb; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import org.slf4j.Logger; @@ -21,7 +22,7 @@ import org.springframework.web.client.HttpClientErrorException; @RestController @RequestMapping(value = "api/section", produces = MediaType.APPLICATION_JSON_VALUE) -//@SecurityRequirement(name = "bearer") +@SecurityRequirement(name = "bearer") @Tag(name = "Section") //@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')") public class SectionController { diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java index 7253d52..8b765bb 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java @@ -28,7 +28,7 @@ import org.springframework.web.client.HttpClientErrorException; @SecurityRequirement(name = "bearer") @Tag(name = "Bloc") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class BlocController { private final BlocService blocService; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java index 9b4b398..fb3dcda 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java @@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException; @SecurityRequirement(name = "bearer") @Tag(name = "Mode d'acquisition") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class ModeAcquisitionController { private final ModeAcquisitionService modeAcquisitionService; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java index fcb0529..6b9166a 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java @@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException; @SecurityRequirement(name = "bearer") @Tag(name = "Nature domaine") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class NatureDomaineController { private final NatureDomaineService natureDomaineService; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java index 43ad3ac..4f418b3 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java @@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException; @SecurityRequirement(name = "bearer") @Tag(name = "Position représentation") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class PositionRepresentationController { private final PositionRepresentationService positionRepresentationService; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java index a4d8a3a..edfb7c5 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java @@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException; @SecurityRequirement(name = "bearer") @Tag(name = "Profession") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class ProfessionController { private final ProfessionService professionService; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java index 29ccaf1..aa1d968 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java @@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException; @SecurityRequirement(name = "bearer") @Tag(name = "Situation géographique") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class SituationGeographiqueController { private final SituationGeographiqueService situationGeographiqueService; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java index e4f0dd6..2fb45c7 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java @@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException; @SecurityRequirement(name = "bearer") @Tag(name = "Situation matrimoniale") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class SituationMatrimonialeController { private final SituationMatrimonialeService situationMatrimonialeService; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java index 9445e35..a55920c 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java @@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException; @SecurityRequirement(name = "bearer") @Tag(name = "Source de droit") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class SourceDroitController { private final SourceDroitService sourceDroitService; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java index e9c9460..c603174 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java @@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException; @SecurityRequirement(name = "bearer") @Tag(name = "Type de contestation") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class TypeContestationController { private final TypeContestationService typeContestationService; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java index 5b6c6d3..ebdd997 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java @@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException; @SecurityRequirement(name = "bearer") @Tag(name = "Type de domaine") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class TypeDomaineController { private final TypeDomaineService typeDomaineService; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java index a075c2c..c0a24f6 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java @@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException; @SecurityRequirement(name = "bearer") @Tag(name = "Type de personne") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class TypePersonneController { private final TypePersonneService typePersonneService; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java index 5bb656e..5e62b1f 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java @@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException; @SecurityRequirement(name = "bearer") @Tag(name = "Type de pièce") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class TypePieceController { private final TypePieceService typePieceService; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java index cf13b27..47a311d 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java @@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException; @SecurityRequirement(name = "bearer") @Tag(name = "Type de représentation") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class TypeRepresentationController { private final TypeRepresentationService typeRepresentationService; diff --git a/src/main/java/io/gmss/fiscad/paylaods/Critere.java b/src/main/java/io/gmss/fiscad/paylaods/Critere.java index a078875..240f460 100755 --- a/src/main/java/io/gmss/fiscad/paylaods/Critere.java +++ b/src/main/java/io/gmss/fiscad/paylaods/Critere.java @@ -12,7 +12,6 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor public class Critere { - private String search; private StatutEnquete status; private Date startDate; diff --git a/src/main/java/io/gmss/fiscad/paylaods/FiltreParcelle.java b/src/main/java/io/gmss/fiscad/paylaods/FiltreParcelle.java new file mode 100755 index 0000000..06b660d --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/FiltreParcelle.java @@ -0,0 +1,27 @@ +package io.gmss.fiscad.paylaods; + + +import io.gmss.fiscad.enums.StatutEnquete; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class FiltreParcelle { + private String nup; + private String nupProvisoir; + @Enumerated(EnumType.STRING) + private StatutEnquete status; + private String q; + private String i; + private String p; + private String nc; + private Long structureId; + private String numeroTitreFoncier; +} -- 2.49.1