Merge pull request 'Gestion des barem' (#141) from features/crud_entites into develop

Reviewed-on: #141

.gitea/workflows/ci-develop.yml

@@ -52,10 +52,8 @@ jobs:
           echo "JAVA_HOME=$JAVA_HOME" >> "$GITHUB_ENV"
 
       # 4) Checkout du dépôt
-      #- name: Checkout repository
-      #  uses: https://gitea.com/actions/checkout@v4 #actions/checkout@v4
       - name: Checkout repository
-        run: git clone ${{ gitea.server_url }}/${{ gitea.repository }} .
+        uses: https://gitea.com/actions/checkout@v4 #actions/checkout@v4
 
       # 5) Création des secrets runtime (CI uniquement)
       - name: Create runtime secrets

src/main/java/io/gmss/fiscad/controllers/decoupage/ArrondissementController.java

@@ -45,7 +45,6 @@ public class ArrondissementController {
                     @io.swagger.v3.oas.annotations.responses.ApiResponse(description = "Unauthorized / Invalid Token", responseCode = "403")}
     )
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_ARRONDISSEMENT')")
     public ResponseEntity<?> createArrondissement(@RequestBody @Valid @Validated Arrondissement arrondissement) {
         try {
             arrondissement = arrondissementService.createArrondissement(arrondissement);
@@ -77,7 +76,6 @@ public class ArrondissementController {
                     @io.swagger.v3.oas.annotations.responses.ApiResponse(description = "Unauthorized / Invalid Token", responseCode = "403")}
     )
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_ARRONDISSEMENT')")
     public ResponseEntity<?> updateArrondissement(@PathVariable Long id, @RequestBody Arrondissement arrondissement) {
         try {
             return new ResponseEntity<>(
@@ -101,7 +99,6 @@ public class ArrondissementController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_ARRONDISSEMENT')")
     public ResponseEntity<?> deleteArrondissement(@PathVariable Long id) {
         try {
             arrondissementService.deleteArrondissement(id);
@@ -126,7 +123,6 @@ public class ArrondissementController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_ARRONDISSEMENT')")
     public ResponseEntity<?> getAllArrondissementList() {
         try {
             return new ResponseEntity<>(
@@ -151,7 +147,6 @@ public class ArrondissementController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_ARRONDISSEMENT')")
     public ResponseEntity<?> getAllArrondissementPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -177,7 +172,6 @@ public class ArrondissementController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_ARRONDISSEMENT')")
     public ResponseEntity<?> getArrondissementById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -202,7 +196,6 @@ public class ArrondissementController {
     }
 
     @GetMapping("/commune/{communeId}")
-    @PreAuthorize("hasAuthority('READ_ARRONDISSEMENT')")
     public ResponseEntity<?> getArrondissementByCommune(@PathVariable Long communeId) {
         try {
             return new ResponseEntity<>(
@@ -226,7 +219,6 @@ public class ArrondissementController {
     }
 
     @GetMapping("/page/commune/{communeId}")
-    @PreAuthorize("hasAuthority('READ_ARRONDISSEMENT')")
     public ResponseEntity<?> getArrondissementByCommune(@PathVariable Long communeId,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);

src/main/java/io/gmss/fiscad/controllers/decoupage/CommuneController.java

@@ -38,7 +38,6 @@ public class CommuneController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_COMMUNE')")
     public ResponseEntity<?> createCommune(@RequestBody @Valid @Validated Commune commune) {
         try {
             commune = communeService.createCommune(commune);
@@ -63,7 +62,6 @@ public class CommuneController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_COMMUNE')")
     public ResponseEntity<?> updateCommune(@PathVariable Long id, @RequestBody Commune commune) {
         try {
             return new ResponseEntity<>(
@@ -87,7 +85,6 @@ public class CommuneController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_COMMUNE')")
     public ResponseEntity<?> deleteCommuner(@PathVariable Long id) {
         try {
             communeService.deleteCommune(id);
@@ -112,7 +109,6 @@ public class CommuneController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_COMMUNE')")
     public ResponseEntity<?> getAllCommuneList() {
         try {
             return new ResponseEntity<>(
@@ -137,7 +133,6 @@ public class CommuneController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_COMMUNE')")
     public ResponseEntity<?> getAllCommunePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -163,7 +158,6 @@ public class CommuneController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_COMMUNE')")
     public ResponseEntity<?> getCommuneById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -187,7 +181,6 @@ public class CommuneController {
     }
 
     @GetMapping("/departement/{departementId}")
-    @PreAuthorize("hasAuthority('READ_COMMUNE')")
     public ResponseEntity<?> getCommuneByDepartement(@PathVariable Long departementId) {
 
         try {
@@ -212,7 +205,6 @@ public class CommuneController {
     }
 
     @GetMapping("/page/by-departement-id/{departementId}")
-    @PreAuthorize("hasAuthority('READ_COMMUNE')")
     public ResponseEntity<?> getCommuneByDepartementIdPaged(@PathVariable Long departementId,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);

src/main/java/io/gmss/fiscad/controllers/decoupage/DepartementController.java

@@ -37,7 +37,6 @@ public class DepartementController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_DEPARTEMENT')")
     public ResponseEntity<?> createDepartement(@RequestBody @Valid @Validated Departement departement) {
         try {
             departement = departementService.createDepartement(departement);
@@ -62,7 +61,6 @@ public class DepartementController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_DEPARTEMENT')")
     public ResponseEntity<?> updateDepartement(@PathVariable Long id, @RequestBody Departement departement) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +84,6 @@ public class DepartementController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_DEPARTEMENT')")
     public ResponseEntity<?> deleteDepartementr(@PathVariable Long id) {
         try {
             departementService.deleteDepartement(id);
@@ -111,7 +108,6 @@ public class DepartementController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_DEPARTEMENT')")
     public ResponseEntity<?> getAllDepartementList() {
         try {
             return new ResponseEntity<>(
@@ -136,7 +132,6 @@ public class DepartementController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_DEPARTEMENT')")
     public ResponseEntity<?> getAllDepartementPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -162,7 +157,6 @@ public class DepartementController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_DEPARTEMENT')")
     public ResponseEntity<?> getDepartementById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/decoupage/NationaliteController.java

@@ -37,7 +37,6 @@ public class NationaliteController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_NATIONALITE')")
     public ResponseEntity<?> createNationalite(@RequestBody @Valid @Validated Nationalite nationalite) {
         try {
             nationalite = nationaliteService.createNationalite(nationalite);
@@ -62,7 +61,6 @@ public class NationaliteController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_NATIONALITE')")
     public ResponseEntity<?> updateNationalite(@PathVariable Long id, @RequestBody Nationalite nationalite) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +84,6 @@ public class NationaliteController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_NATIONALITE')")
     public ResponseEntity<?> deleteNationaliter(@PathVariable Long id) {
         try {
             nationaliteService.deleteNationalite(id);
@@ -111,7 +108,6 @@ public class NationaliteController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_NATIONALITE')")
     public ResponseEntity<?> getAllNationaliteList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +131,6 @@ public class NationaliteController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_NATIONALITE')")
     public ResponseEntity<?> getAllNationalitePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -161,7 +156,6 @@ public class NationaliteController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_NATIONALITE')")
     public ResponseEntity<?> getNationaliteById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/decoupage/QuartierController.java

@@ -37,7 +37,6 @@ public class QuartierController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_QUARTIER')")
     public ResponseEntity<?> createQuartier(@RequestBody @Valid @Validated Quartier quartier) {
         try {
             quartier = quartierService.createQuartier(quartier);
@@ -62,7 +61,6 @@ public class QuartierController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_QUARTIER')")
     public ResponseEntity<?> updateQuartier(@PathVariable Long id, @RequestBody Quartier quartier) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +84,6 @@ public class QuartierController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_QUARTIER')")
     public ResponseEntity<?> deleteQuartier(@PathVariable Long id) {
         try {
             quartierService.deleteQuartier(id);
@@ -111,7 +108,6 @@ public class QuartierController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_QUARTIER')")
     public ResponseEntity<?> getAllQuartierList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +131,6 @@ public class QuartierController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_QUARTIER')")
     public ResponseEntity<?> getAllQuartierPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +155,6 @@ public class QuartierController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_QUARTIER')")
     public ResponseEntity<?> getQuartierById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -184,7 +178,6 @@ public class QuartierController {
     }
 
     @GetMapping("/arrondissement/{arrondissementId}")
-    @PreAuthorize("hasAuthority('READ_QUARTIER')")
     public ResponseEntity<?> getQuartierByArrondissement(@PathVariable Long arrondissementId) {
 
         try {
@@ -209,7 +202,6 @@ public class QuartierController {
     }
 
     @GetMapping("/page/arrondissement/{arrondissementId}")
-    @PreAuthorize("hasAuthority('READ_QUARTIER')")
     public ResponseEntity<?> getQuartierByArrondissementPaged(@PathVariable Long arrondissementId,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);

src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java

@@ -42,7 +42,6 @@ public class SecteurController {
             description = "Permet de Créer un secteur"
     )
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_SECTEUR')")
     public ResponseEntity<?> createSecteur(@RequestBody @Valid @Validated SecteurPaylaodWeb secteurPaylaodWeb) {
         try {
             secteurPaylaodWeb = secteurService.createSecteur(secteurPaylaodWeb);
@@ -71,7 +70,6 @@ public class SecteurController {
             description = "Permet de modifier un secteur"
     )
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_SECTEUR')")
     public ResponseEntity<?> updateSecteur(@PathVariable Long id, @RequestBody SecteurPaylaodWeb secteurPayloadWeb) {
         try {
             return new ResponseEntity<>(
@@ -98,7 +96,6 @@ public class SecteurController {
             description = "Permet de supprimer un secteur"
     )
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_SECTEUR')")
     public ResponseEntity<?> deleteSecteurr(@PathVariable Long id) {
         try {
             secteurService.deleteSecteur(id);
@@ -126,7 +123,6 @@ public class SecteurController {
             description = "Permet de récuperer l'ensemble des secteurs"
     )
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_SECTEUR')")
     public ResponseEntity<?> getAllSecteurList() {
         try {
             return new ResponseEntity<>(
@@ -154,7 +150,6 @@ public class SecteurController {
             description = "Permet de récuperer l'ensemble des secteurs avec pagination"
     )
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_SECTEUR')")
     public ResponseEntity<?> getAllSecteurPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -183,7 +178,6 @@ public class SecteurController {
             description = "Permet de récuperer le secteur ayant l'ID fournie en path"
     )
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR')")
     public ResponseEntity<?> getSecteurById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -211,7 +205,6 @@ public class SecteurController {
             description = "Permet de récuperer l'ensemble des secteurs de la structure dont l'ID est fourni en path"
     )
     @GetMapping("/by-structure-id/{structureId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR')")
     public ResponseEntity<?> getSecteurByStructureId(@PathVariable Long structureId) {
         try {
             return new ResponseEntity<>(
@@ -240,7 +233,6 @@ public class SecteurController {
             description = "Permet de récuperer l'ensemble des secteurs de la structure dont l'ID est fourni en path avec pagination"
     )
     @GetMapping("/page/by-structure-id/{structureId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR')")
     public ResponseEntity<?> getSecteurByStructureIdPage(@PathVariable Long structureId, @RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -271,7 +263,6 @@ public class SecteurController {
             description = "Permet de récuperer l'ensemble des secteurs de la section dont l'ID est fourni en path"
     )
     @GetMapping("/by-section-id/{sectionId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR')")
     public ResponseEntity<?> getSecteurBySectionId(@PathVariable Long sectionId) {
         try {
             return new ResponseEntity<>(
@@ -300,7 +291,6 @@ public class SecteurController {
             description = "Permet de récuperer l'ensemble des secteurs de la section dont l'ID est fourni en path avec pagination"
     )
     @GetMapping("/page/by-section-id/{sectionId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR')")
     public ResponseEntity<?> getSecteurBySectionIdPage(@PathVariable Long sectionId, @RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -330,7 +320,6 @@ public class SecteurController {
             description = "Permet de récuperer l'ensemble des secteurs du departement dont l'ID est fourni en path"
     )
     @GetMapping("/by-departement-id/{departementId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR')")
     public ResponseEntity<?> getSecteurByDepartementId(@PathVariable Long departementId) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurDecoupageController.java

@@ -1,7 +1,6 @@
 package io.gmss.fiscad.controllers.decoupage;
 
 import io.gmss.fiscad.entities.decoupage.SecteurDecoupage;
-import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.decoupage.SecteurDecoupageService;
 import io.gmss.fiscad.interfaces.decoupage.SecteurService;
@@ -37,7 +36,6 @@ public class SecteurDecoupageController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_SECTEUR_DECOUPAGE')")
     public ResponseEntity<?> createSecteurDecoupage(@RequestBody @Valid @Validated SecteurDecoupagePaylaodWeb secteurDecoupagePaylaodWeb) {
         try {
             secteurDecoupagePaylaodWeb = secteurDecoupageService.createSecteurDecoupage(secteurDecoupagePaylaodWeb);
@@ -62,7 +60,6 @@ public class SecteurDecoupageController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_SECTEUR_DECOUPAGE')")
     public ResponseEntity<?> updateSecteurDecoupage(@PathVariable Long id, @RequestBody SecteurDecoupagePaylaodWeb secteurDecoupagePaylaodWeb) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +83,6 @@ public class SecteurDecoupageController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_SECTEUR_DECOUPAGE')")
     public ResponseEntity<?> deleteSecteurDecoupager(@PathVariable Long id) {
         try {
             secteurDecoupageService.deleteSecteurDecoupage(id);
@@ -111,7 +107,6 @@ public class SecteurDecoupageController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
     public ResponseEntity<?> getAllSecteurDecoupageList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +130,6 @@ public class SecteurDecoupageController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
     public ResponseEntity<?> getAllSecteurDecoupagePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +154,6 @@ public class SecteurDecoupageController {
     }
 
     @GetMapping("/by-secteur-id/{secteurId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
     public ResponseEntity<?> getAllSecteurDecoupageListBySecteurId(@PathVariable Long secteurId) {
         try {
             return new ResponseEntity<>(
@@ -184,7 +177,6 @@ public class SecteurDecoupageController {
     }
 
     @GetMapping("/page/by-secteur-decoupage-id/{secteurId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
     public ResponseEntity<?> getAllSecteurDecoupageListBySecteurIdPaged(@PathVariable Long secteurId, @RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -209,7 +201,6 @@ public class SecteurDecoupageController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
     public ResponseEntity<?> getSecteurDecoupageById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -234,7 +225,6 @@ public class SecteurDecoupageController {
 
 
     @GetMapping("/arbre/user-id/{userId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
     public ResponseEntity<?> getArborescenceByUserId(@PathVariable Long userId) {
         try {
             return new ResponseEntity<>(
@@ -258,230 +248,4 @@ public class SecteurDecoupageController {
     }
 
 
-    @GetMapping("/arbre/enquete-en-cours/user-id/{userId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
-    public ResponseEntity<?> getArborescenceEnqueteEncoursByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteDecoupageByUserId(userId, StatutEnquete.EN_COURS.toString()), "SecteurDecoupage trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/arbre/enquete-valide/user-id/{userId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
-    public ResponseEntity<?> getArborescenceEnqueteValideByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteDecoupageByUserId(userId, StatutEnquete.VALIDE.toString()), "SecteurDecoupage trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/arbre/enquete-cloture/user-id/{userId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
-    public ResponseEntity<?> getArborescenceEnqueteClotureByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteDecoupageByUserId(userId, StatutEnquete.CLOTURE.toString()), "SecteurDecoupage trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-    @GetMapping("/arbre/enquete-batiment-en-cours/user-id/{userId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
-    public ResponseEntity<?> getArborescenceEnqueteBatimentEncoursByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteBatimentDecoupageByUserId(userId, StatutEnquete.EN_COURS.toString()), "SecteurDecoupage trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/arbre/enquete-batiment-valide/user-id/{userId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
-    public ResponseEntity<?> getArborescenceEnqueteBatimentValideByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteBatimentDecoupageByUserId(userId, StatutEnquete.VALIDE.toString()), "SecteurDecoupage trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/arbre/enquete-batiment-cloture/user-id/{userId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
-    public ResponseEntity<?> getArborescenceEnqueteBatimentClotureByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteBatimentDecoupageByUserId(userId, StatutEnquete.CLOTURE.toString()), "SecteurDecoupage trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/arbre/enquete-unitlog-en-cours/user-id/{userId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
-    public ResponseEntity<?> getArborescenceEnqueteUniteLogEncoursByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteUniteLogementDecoupageByUserId(userId, StatutEnquete.EN_COURS.toString()), "SecteurDecoupage trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/arbre/enquete-unitlog-valide/user-id/{userId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
-    public ResponseEntity<?> getArborescenceEnqueteUniteLogValideByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteUniteLogementDecoupageByUserId(userId, StatutEnquete.VALIDE.toString()), "SecteurDecoupage trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/arbre/enquete-unitlog-cloture/user-id/{userId}")
-    @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
-    public ResponseEntity<?> getArborescenceEnqueteUniteLigClotureByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteUniteLogementDecoupageByUserId(userId, StatutEnquete.CLOTURE.toString()), "SecteurDecoupage trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
 }

src/main/java/io/gmss/fiscad/controllers/decoupage/SectionController.java

@@ -15,7 +15,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -40,7 +39,6 @@ public class SectionController {
             description = "Permet de Créer un section"
     )
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_SECTION')")
     public ResponseEntity<?> createSection(@RequestBody @Valid @Validated SectionPaylaodWeb sectionPaylaodWeb) {
         try {
             sectionPaylaodWeb = sectionService.createSection(sectionPaylaodWeb);
@@ -69,7 +67,6 @@ public class SectionController {
             description = "Permet de modifier un section"
     )
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_SECTION')")
     public ResponseEntity<?> updateSection(@PathVariable Long id, @RequestBody SectionPaylaodWeb sectionPayloadWeb) {
         try {
             return new ResponseEntity<>(
@@ -96,7 +93,6 @@ public class SectionController {
             description = "Permet de supprimer un section"
     )
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_SECTION')")
     public ResponseEntity<?> deleteSection(@PathVariable Long id) {
         try {
             sectionService.deleteSection(id);
@@ -124,7 +120,6 @@ public class SectionController {
             description = "Permet de récuperer l'ensemble des sections"
     )
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_SECTION')")
     public ResponseEntity<?> getAllSectionList() {
         try {
             return new ResponseEntity<>(
@@ -152,7 +147,6 @@ public class SectionController {
             description = "Permet de récuperer l'ensemble des sections avec pagination"
     )
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_SECTION')")
     public ResponseEntity<?> getAllSectionPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -181,7 +175,6 @@ public class SectionController {
             description = "Permet de récuperer le section ayant l'ID fournie en path"
     )
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_SECTION')")
     public ResponseEntity<?> getSectionById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -209,7 +202,6 @@ public class SectionController {
             description = "Permet de récuperer l'ensemble des sections de la structure dont l'ID est fourni en path"
     )
     @GetMapping("/by-structure-id/{structureId}")
-    @PreAuthorize("hasAuthority('READ_SECTION')")
     public ResponseEntity<?> getSectionByStructureId(@PathVariable Long structureId) {
         try {
             return new ResponseEntity<>(
@@ -238,7 +230,6 @@ public class SectionController {
             description = "Permet de récuperer l'ensemble des sections de la structure dont l'ID est fourni en path avec pagination"
     )
     @GetMapping("/page/by-structure-id/{structureId}")
-    @PreAuthorize("hasAuthority('READ_SECTION')")
     public ResponseEntity<?> getSectionByStructureIdPage(@PathVariable Long structureId, @RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);

src/main/java/io/gmss/fiscad/controllers/frontend/FonctionnaliteController.java

@@ -1,183 +0,0 @@
-package io.gmss.fiscad.controllers.frontend;
-
-
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.frontend.FonctionnaliteService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.FonctionnalitePayloadWeb;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import lombok.AllArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-@AllArgsConstructor
-@RestController
-@RequestMapping(value = "api/fonctionnalite", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "Fonctionnalite")
-@CrossOrigin(origins = "*")
-public class FonctionnaliteController {
-
-    private final FonctionnaliteService fonctionnaliteService;
-
-    private static final Logger logger = LoggerFactory.getLogger(FonctionnaliteController.class);
-
-
-
-    @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_FONCTIONNALITE')")
-    public ResponseEntity<?> createFonctionnalite(@RequestBody @Valid @Validated FonctionnalitePayloadWeb fonctionnalitePayLoadWeb) {
-        try {
-            fonctionnalitePayLoadWeb = fonctionnaliteService.createFonctionnalite(fonctionnalitePayLoadWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, fonctionnalitePayLoadWeb, "Fonctionnalite créé avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_FONCTIONNALITE')")
-    public ResponseEntity<?> updateFonctionnalite(@PathVariable Long id, @RequestBody FonctionnalitePayloadWeb fonctionnalitePayLoadWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, fonctionnaliteService.updateFonctionnalite(id,fonctionnalitePayLoadWeb), "Fonctionnalite mise à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_FONCTIONNALITE')")
-    public ResponseEntity<?> deleteFonctionnalite(@PathVariable Long id) {
-        try {
-            fonctionnaliteService.deleteFonctionnalite(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "Fonctionnalite supprimée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all")
-     @PreAuthorize("hasAuthority('READ_FONCTIONNALITE')")
-    public ResponseEntity<?> getAllFonctionnaliteList() {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, fonctionnaliteService.getFonctionnaliteListToDto(), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all/by-profil-id/{profilId}")
-    @PreAuthorize("hasAuthority('READ_FONCTIONNALITE')")
-    public ResponseEntity<?> getAllFonctionnaliteByProfilList(@PathVariable Long profilId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, fonctionnaliteService.getAllFonctionnaliteByProfilIdToDto(profilId), "Liste des fonctionnalites chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-    @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_FONCTIONNALITE')")
-    public ResponseEntity<?> getFonctionnaliteById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, fonctionnaliteService.getFonctionnaliteByIdToDto(id), "Fonctionnalite trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-}

src/main/java/io/gmss/fiscad/controllers/frontend/ModuleController.java

@@ -1,185 +0,0 @@
-package io.gmss.fiscad.controllers.frontend;
-
-
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.frontend.ModuleService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.ModulePayloadWeb;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import lombok.AllArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-@AllArgsConstructor
-@RestController
-@RequestMapping(value = "api/module", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "Module")
-@CrossOrigin(origins = "*")
-public class ModuleController {
-
-    private final ModuleService moduleService;
-
-    private static final Logger logger = LoggerFactory.getLogger(ModuleController.class);
-
-
-
-    @PostMapping("/create")
-     @PreAuthorize("hasAuthority('CREATE_MODULE')")
-    public ResponseEntity<?> createModule(@RequestBody @Valid @Validated ModulePayloadWeb modulePayLoadWeb) {
-        try {
-            modulePayLoadWeb = moduleService.createModule(modulePayLoadWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, modulePayLoadWeb, "Module créé avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_MODULE')")
-    public ResponseEntity<?> updateModule(@PathVariable Long id, @RequestBody ModulePayloadWeb modulePayLoadWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, moduleService.updateModule(id,modulePayLoadWeb), "Module mise à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_MODULE')")
-    public ResponseEntity<?> deleteModule(@PathVariable Long id) {
-        try {
-            moduleService.deleteModule(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "Module supprimée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_MODULE')")
-    public ResponseEntity<?> getAllModuleList() {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, moduleService.getModuleListToDto(), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all/by-profil-id/{profilId}")
-    @PreAuthorize("hasAuthority('READ_MODULE')")
-    public ResponseEntity<?> getAllModuleByProfilList(@PathVariable Long profilId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, moduleService.getAllModuleByProfilIdToDto(profilId), "Liste des modules chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-    @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_MODULE')")
-    public ResponseEntity<?> getModuleById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, moduleService.getModuleByIdToDto(id), "Module trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-}

src/main/java/io/gmss/fiscad/controllers/infocad/metier/ActeurConcerneController.java

@@ -21,7 +21,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Actuer concerné")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class ActeurConcerneController {
 
     private final ActeurConcerneService acteurConcerneService;
@@ -36,7 +36,6 @@ public class ActeurConcerneController {
 
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_ACTEURCONCERNE')")
     public ResponseEntity<?> getArrondissementById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -59,7 +58,6 @@ public class ActeurConcerneController {
         }
     }
     @GetMapping("/get-details/{id}")
-    @PreAuthorize("hasAuthority('READ_ACTEURCONCERNE')")
     public ResponseEntity<?> getDetails(@PathVariable Long id)   {
         try{
             PersonneCompletDTO personneCompletDTO = personneService.getPersonneComplete(id);

src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java

@@ -39,9 +39,8 @@ public class CommentaireController {
         this.commentaireService = commentaireService;
     }
 
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_COMMENTAIRE')")
     public ResponseEntity<?> createcommentaire(@RequestBody @Valid @Validated Commentaire commentaire) {
         try {
             commentaire.setDateCommentaire(LocalDateTime.now());
@@ -65,9 +64,8 @@ public class CommentaireController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_COMMENTAIRE')")
     public ResponseEntity<?> updatecommentaire(@PathVariable Long id, @RequestBody Commentaire commentaire) {
         try {
             return new ResponseEntity<>(
@@ -89,9 +87,8 @@ public class CommentaireController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_COMMENTAIRE')")
     public ResponseEntity<?> deletecommentaire(@PathVariable Long id) {
         try {
             commentaireService.deleteCommentaire(id);
@@ -114,9 +111,8 @@ public class CommentaireController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_COMMENTAIRE')")
     public ResponseEntity<?> getAllcommentaireList() {
         try {
             return new ResponseEntity<>(
@@ -138,9 +134,8 @@ public class CommentaireController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_COMMENTAIRE')")
     public ResponseEntity<?> getcommentaireById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -162,9 +157,8 @@ public class CommentaireController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     @GetMapping("/nup/{nup}")
-    @PreAuthorize("hasAuthority('READ_COMMENTAIRE')")
     public ResponseEntity<?> getcommentaireByNup(@PathVariable String nup) {
         try {
             return new ResponseEntity<>(
@@ -186,9 +180,8 @@ public class CommentaireController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     @PostMapping("/enquete")
-    @PreAuthorize("hasAuthority('READ_COMMENTAIRE')")
     public ResponseEntity<?> getcommentaireByEnquete(@RequestBody Commentaire commentaire) {
         try {
             return new ResponseEntity<>(
@@ -210,9 +203,8 @@ public class CommentaireController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     @PostMapping("/enquete-and-state")
-    @PreAuthorize("hasAuthority('READ_COMMENTAIRE')")
     //@ApiOperation(value = "Cette ressource permet d'avoir la liste de tous les commentaires d'une enquête avec le statut (lu ou non lu). Les champs a renseigner pour le payload sont idEnquete et lu")
     public ResponseEntity<?> getcommentaireByEnqueteAndStatut(@RequestBody Commentaire commentaire) {
         try {
@@ -235,9 +227,8 @@ public class CommentaireController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     @PostMapping("/all-by-params")
-    @PreAuthorize("hasAuthority('READ_COMMENTAIRE')")
     //@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non lus provenant du BatimentPaylaodWeb. \n 2 - Liste des commentaires lus provenant du BatimentPaylaodWeb \n 3 - Liste des commentaires non lus provenant du mobile. \n 4 - Liste des commentaires lus provenant du mobile. \n A savoir : Les variables Origine et lu sont à varier pour avoir le résultat")
     public ResponseEntity<?> getcommentaireByParams(@RequestBody CommentaireRequest commentaireRequest) {
         try {
@@ -262,7 +253,6 @@ public class CommentaireController {
     }
 
     @PostMapping("synchronise/from-mobile")
-    @PreAuthorize("hasAuthority('CREATE_COMMENTAIRE')")
     //@ApiOperation(value = "Cette ressource permet de synchroniser tous les commentaires effectués sur le mobile vers le backend.")
     public ResponseEntity<?> synchroniseCommentairesFromMobile(@RequestBody List<Commentaire> commentaires) {
         try {
@@ -287,7 +277,6 @@ public class CommentaireController {
     }
 
     @PostMapping("synchronise/from-web")
-    @PreAuthorize("hasAuthority('READ_COMMENTAIRE')")
     //@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non synchronisés provenant du BatimentPaylaodWeb. \n 2 - Liste des commentaires synchronisés provenant du BatimentPaylaodWeb \n 3 - Liste des commentaires non synchronisés provenant du mobile. \n 4 - Liste des commentaires synchronisés provenant du mobile. \n A savoir : Les variables Origine et Synchronise sont à varier pour avoir le résultat")
     public ResponseEntity<?> synchroniseCommentairesFromWeb(@RequestBody CommentaireRequest commentaireRequest) {
         try {
@@ -310,9 +299,8 @@ public class CommentaireController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     @PostMapping("synchronise/notify-done-from-mobile")
-    @PreAuthorize("hasAuthority('CREATE_COMMENTAIRE')")
     //@ApiOperation(value = "Cette ressource permet matérialiser coté backend les commentaires du WEB déjà synchronisé avec le MOBILE pour que les prochaines extractions ne prennent pas en compte cela. ")
     public ResponseEntity<?> notifyDoneSynchronizedFromMobile(@RequestBody List<SyncCommentaireRequest> syncCommentaireRequests) {
         try {

src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java

@@ -3,7 +3,6 @@ package io.gmss.fiscad.controllers.infocad.metier;
 import io.gmss.fiscad.entities.infocad.metier.Enquete;
 import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
 import io.gmss.fiscad.entities.user.User;
-import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
 import io.gmss.fiscad.paylaods.ApiResponse;
@@ -50,7 +49,6 @@ public class EnqueteController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_ENQUETE')")
     public ResponseEntity<?> createEnquete(@RequestBody @Valid @Validated EnquetePayLoadWeb enquetePayLoadWeb) {
         try {
              enquetePayLoadWeb = enqueteService.createEnquete(enquetePayLoadWeb);
@@ -69,15 +67,13 @@ public class EnqueteController {
             logger.error(e.getLocalizedMessage());
             return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
         } catch (Exception e) {
-            e.printStackTrace();
-           // logger.error(e.getLocalizedMessage());
+            logger.error(e.getLocalizedMessage());
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
 
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETE')")
     public ResponseEntity<?> updateEnquete(@PathVariable Long id, @RequestBody EnquetePayLoadWeb enquetePayLoadWeb) {
         try {
             return new ResponseEntity<>(
@@ -101,7 +97,6 @@ public class EnqueteController {
     }
 
     @PutMapping("/validation")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETE')")
     public ResponseEntity<?> validerEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
         try {
             return new ResponseEntity<>(
@@ -125,10 +120,8 @@ public class EnqueteController {
     }
 
     @PutMapping("/rejet")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETE')")
     public ResponseEntity<?> rejeterEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
         try {
-
             return new ResponseEntity<>(
                     new ApiResponse<>(true, enqueteService.rejeterEnquete(enqueteTraitementPayLoad), "Rejet effectuée avec succès."),
                     HttpStatus.OK
@@ -150,7 +143,6 @@ public class EnqueteController {
     }
 
     @PutMapping("/validation-lot")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETE')")
     public ResponseEntity<?> validerEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
         try {
             return new ResponseEntity<>(
@@ -174,7 +166,6 @@ public class EnqueteController {
     }
 
     @PutMapping("/rejet-lot")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETE')")
     public ResponseEntity<?> rejeterEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
         try {
             return new ResponseEntity<>(
@@ -198,7 +189,6 @@ public class EnqueteController {
     }
 
     @GetMapping("/all/decoupage-admin-for-enquete")
-    @PreAuthorize("hasAuthority('READ_ENQUETE')")
     public ResponseEntity<?> getAllByEnqueteDecoupageAdmin() {
         try {
             return new ResponseEntity<>(
@@ -226,7 +216,6 @@ public class EnqueteController {
             description = "Permet de récuperer les enquêtes déjà réalisées sur une parcelles"
     )
     @GetMapping("/by-parcelle-id/{parcelleId}")
-    @PreAuthorize("hasAuthority('READ_ENQUETE')")
     public ResponseEntity<?> getAllByParcelle(@PathVariable Long parcelleId) {
         try {
             return new ResponseEntity<>(
@@ -255,7 +244,6 @@ public class EnqueteController {
             description = "Permet de récuperer les enquêtes déjà réalisées sur une parcelles"
     )
     @GetMapping("/page/by-parcelle-id/{parcelleId}")
-    @PreAuthorize("hasAuthority('READ_ENQUETE')")
     public ResponseEntity<?> getAllByParcellePaged(@PathVariable Long parcelleId,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -284,7 +272,6 @@ public class EnqueteController {
 
 
     @GetMapping("/all/dgi/decoupage-admin-for-enquete")
-    @PreAuthorize("hasAuthority('READ_ENQUETE')")
     public ResponseEntity<?> getAllByEnqueteDecoupageAdminForDgi() {
         try {
             return new ResponseEntity<>(
@@ -309,7 +296,6 @@ public class EnqueteController {
 
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_ENQUETE')")
     public ResponseEntity<?> deleteStructurer(@PathVariable Long id) {
         try {
             enqueteService.deleteEnquete(id);
@@ -334,7 +320,6 @@ public class EnqueteController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_ENQUETE')")
     public ResponseEntity<?> getAllStructureList() {
         try {
             return new ResponseEntity<>(
@@ -358,7 +343,6 @@ public class EnqueteController {
     }
 
     @GetMapping("/all/com-arrond-bloc")
-    @PreAuthorize("hasAuthority('READ_ENQUETE')")
     public ResponseEntity<?> getAllByCommuneArrondBloc() {
         try {
             return new ResponseEntity<>(
@@ -382,7 +366,6 @@ public class EnqueteController {
     }
 
     @PostMapping("/all/com-arrond-bloc/filtre")
-    @PreAuthorize("hasAuthority('READ_ENQUETE')")
     public ResponseEntity<?> getAllByCommuneArrondBlocFiltre(@RequestBody FiltreEnquetePayLoad filtreEnquetePayLoad) {
         try {
             return new ResponseEntity<>(
@@ -406,7 +389,6 @@ public class EnqueteController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_ENQUETE')")
     public ResponseEntity<?> getAllEnquetePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -431,7 +413,6 @@ public class EnqueteController {
     }
 
     @GetMapping("/fiche/id/{id}")
-    @PreAuthorize("hasAuthority('READ_ENQUETE')")
     public ResponseEntity<?> getFicheEnqueteById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -455,7 +436,6 @@ public class EnqueteController {
     }
 
     @GetMapping("/fiche/nup-provisoir/{nupProvisoir}")
-    @PreAuthorize("hasAuthority('READ_ENQUETE')")
     public ResponseEntity<?> getFicheEnqueteByNupProvisoir(@PathVariable String nupProvisoir) {
         try {
             return new ResponseEntity<>(
@@ -479,7 +459,6 @@ public class EnqueteController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_ENQUETE')")
     public ResponseEntity<?> getStructureById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -504,19 +483,20 @@ public class EnqueteController {
 
 
 
-    @GetMapping("/all-paged/en-cours/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_ENQUETE')")
-    public ResponseEntity<?> getAllEnqueteEncoursByQuartierPaged(@CurrentUser UserPrincipal currentUser,@PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
+    @PutMapping("/cloturer-enquete")
+    public ResponseEntity<?> cloturerEnquete(@CurrentUser UserPrincipal userPrincipal) {
         try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            if(currentUser==null)
+
+            if(userPrincipal==null){
                 return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
+                        new ApiResponse<>(true, null, "Accès non autorisé"),
+                        HttpStatus.NOT_ACCEPTABLE
                 );
-            Long userId = currentUser.getUser().getId();
+            }
+            User user= userPrincipal.getUser();
+
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteService.getEnqueteListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.EN_COURS, pageable), "Liste des enquetes en cours chargée avec succès."),
+                    new ApiResponse<>(true, enqueteService.cloturerEnqueteParcelleBatimentUniteLogementByUserId(user.getId()), "enquete cloturées avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -536,35 +516,5 @@ public class EnqueteController {
     }
 
 
-    @GetMapping("/all-paged/cloture/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_ENQUETE')")
-    public ResponseEntity<?> getAllEnqueteClotureByQuartierPaged(@CurrentUser UserPrincipal currentUser,@PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteService.getEnqueteListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.CLOTURE, pageable), "Liste des enquetes en cours chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
 }
 

src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleController.java

@@ -23,7 +23,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -50,7 +49,6 @@ public class ParcelleController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_PARCELLE')")
     public ResponseEntity<?> createParcelle(@RequestBody @Valid @Validated ParcellePayLoadWeb parcellePayLoadWeb) {
         try {
              parcellePayLoadWeb = parcelleService.createParcelle(parcellePayLoadWeb);
@@ -76,7 +74,6 @@ public class ParcelleController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_PARCELLE')")
     public ResponseEntity<?> updateEnquete(@PathVariable Long id, @RequestBody ParcellePayLoadWeb parcellePayLoadWeb) {
         try {
             return new ResponseEntity<>(
@@ -103,7 +100,6 @@ public class ParcelleController {
 
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_PARCELLE')")
     public ResponseEntity<?> deleteStructurer(@PathVariable Long id) {
         try {
             parcelleService.deleteParcelle(id);
@@ -149,7 +145,6 @@ public class ParcelleController {
 //        }
 //    }
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_PARCELLE')")
     public ResponseEntity<?> getParcelleById(@CurrentUser UserPrincipal currentUser, @PathVariable Long id) {
         try {
             if(currentUser==null)
@@ -159,7 +154,7 @@ public class ParcelleController {
                 );
             Long userId = currentUser.getUser().getId();
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, parcelleService.getParcelleByIdToDto(userId,id), "parcelle trouvée avec succès."),
+                    new ApiResponse<>(true, parcelleService.getParcelleByIdToDto(userId,id), "enquete trouvé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -178,7 +173,6 @@ public class ParcelleController {
         }
     }
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_PARCELLE')")
     public ResponseEntity<?> getAllParcelle(@CurrentUser UserPrincipal currentUser) {
         try {
             if(currentUser==null)
@@ -208,7 +202,6 @@ public class ParcelleController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_PARCELLE')")
     public ResponseEntity<?> getAllParcellePaged(@CurrentUser UserPrincipal currentUser,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -241,7 +234,6 @@ public class ParcelleController {
 
 
     @PostMapping("/all-paged/multi-criteres")
-    @PreAuthorize("hasAuthority('READ_PARCELLE')")
     public ResponseEntity<?> getAllParcelleFiltrePaged(@CurrentUser UserPrincipal currentUser, @RequestParam int pageNo, @RequestParam int pageSize, @RequestBody FiltreParcelle filtreParcelle) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -274,7 +266,6 @@ public class ParcelleController {
     }
 
     @GetMapping("/all/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_PARCELLE')")
     public ResponseEntity<?> getAllParcelleByQuartier(@CurrentUser UserPrincipal currentUser,@PathVariable  Long  quartierId) {
         try {
             if(currentUser==null)
@@ -304,7 +295,6 @@ public class ParcelleController {
     }
 
     @GetMapping("/all-paged/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_PARCELLE')")
     public ResponseEntity<?> getAllParcelleByQuartierPaged(@CurrentUser UserPrincipal currentUser,@PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -337,7 +327,6 @@ public class ParcelleController {
 
 
     @GetMapping("/all/by-rue-id/{rueId}")
-    @PreAuthorize("hasAuthority('READ_PARCELLE')")
     public ResponseEntity<?> getAllParcelleByRue(@CurrentUser UserPrincipal currentUser,@PathVariable  Long  rueId) {
         try {
             if(currentUser==null)
@@ -367,7 +356,6 @@ public class ParcelleController {
     }
 
     @GetMapping("/all-paged/by-rue-id/{rueId}")
-    @PreAuthorize("hasAuthority('READ_PARCELLE')")
     public ResponseEntity<?> getAllParcelleByRuePaged(@CurrentUser UserPrincipal currentUser,@PathVariable Long rueId, @RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -401,7 +389,6 @@ public class ParcelleController {
 
 
     @PutMapping("/syncrhonise-etat-batie-parcelle")
-    @PreAuthorize("hasAuthority('READ_PARCELLE')")
     public ResponseEntity<?> putSynchroniseEtatBatieParcelle() {
         try {
             Integer nombreParcelleSync= parcelleService.majParcelleBatieNonbatie();

src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleGeomController.java

@@ -31,7 +31,6 @@ public class ParcelleGeomController {
 
 
     @PostMapping(value = "/create-from-geojsonfile",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    @PreAuthorize("hasAuthority('CREATE_PARCELLEGEOM')")
     public ResponseEntity<?> createTpe(@RequestPart(required = true) MultipartFile file,@RequestParam String reference,@RequestParam String description)   {
         try{
             int n = parcelleGeomService.createParcelleFromGeoJsonFile(file, reference, description);
@@ -49,7 +48,6 @@ public class ParcelleGeomController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_PARCELLEGEOM')")
     public ResponseEntity<?> getAllTpeList() {
         return new ResponseEntity<>(
                 new ApiResponse<>(true, parcelleGeomService.getParcelleGeomList(), "Liste des parcelle chargée avec succès."),
@@ -58,7 +56,6 @@ public class ParcelleGeomController {
     }
 
     @GetMapping("/by-quartier/{codeQuartier}")
-    @PreAuthorize("hasAuthority('READ_PARCELLEGEOM')")
     public ResponseEntity<?> getParcellesGeomsByQuartier(@PathVariable String codeQuartier) {
         return new ResponseEntity<>(
                 new ApiResponse<>(true, parcelleGeomService.getParcelleGeomListUnQuatier(codeQuartier), "Liste des parcelle chargée avec succès."),
@@ -68,7 +65,6 @@ public class ParcelleGeomController {
 
 
     @GetMapping("/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_PARCELLEGEOM')")
     public ResponseEntity<?> getParcellesGeomsByQuartierId(@PathVariable Long quartierId) {
         return new ResponseEntity<>(
                 new ApiResponse<>(true, parcelleGeomService.getParcelleGeomListByQuatierId(quartierId), "Liste des parcelle chargée avec succès."),
@@ -77,7 +73,6 @@ public class ParcelleGeomController {
     }
 
     @GetMapping("/page/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_PARCELLEGEOM')")
     public ResponseEntity<?> getParcellesGeomsByQuartierIdPaged(@PathVariable Long quartierId,@RequestParam int pageNo, @RequestParam int pageSize) {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
         return new ResponseEntity<>(
@@ -87,7 +82,6 @@ public class ParcelleGeomController {
     }
 
     @GetMapping("/by-arrondissement/{codeArrondissement}")
-    @PreAuthorize("hasAuthority('READ_PARCELLEGEOM')")
     public ResponseEntity<?> getParcellesGeomsByArrondissement(@PathVariable String codeArrondissement) {
         return new ResponseEntity<>(
                 new ApiResponse<>(true, parcelleGeomService.getParcelleGeomListUnArrondissement(codeArrondissement), "Liste des parcelle chargée avec succès."),
@@ -97,7 +91,6 @@ public class ParcelleGeomController {
 
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_PARCELLEGEOM')")
     public ResponseEntity<?> getAllTpePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         Pageable pageable = PageRequest.of(pageNo, pageSize);
         return new ResponseEntity<>(
@@ -107,7 +100,6 @@ public class ParcelleGeomController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_PARCELLEGEOM')")
     public ResponseEntity<?> getParcelleGeomById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java

@@ -39,7 +39,6 @@ public class PersonneController {
     private final PersonneService personneService;
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_PERSONNE')")
     public ResponseEntity<?> createPersonne(@RequestBody @Valid @Validated PersonnePayLoadWeb personnePayLoadWeb) {
         try {
              personnePayLoadWeb = personneService.createPersonne(personnePayLoadWeb);
@@ -65,7 +64,6 @@ public class PersonneController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_PERSONNE')")
     public ResponseEntity<?> updatePersonne(@PathVariable Long id, @RequestBody PersonnePayLoadWeb personnePayLoadWeb) {
         try {
             return new ResponseEntity<>(
@@ -88,7 +86,6 @@ public class PersonneController {
         }
     }
     @GetMapping("/get-details/{id}")
-    @PreAuthorize("hasAuthority('READ_PERSONNE')")
     public ResponseEntity<?> getDetails(@PathVariable Long id)   {
         try{
             PersonneCompletDTO personneCompletDTO = personneService.getPersonneComplete(id);
@@ -105,7 +102,6 @@ public class PersonneController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_PERSONNE')")
     public ResponseEntity<?> getPersonneById(@PathVariable Long id)   {
         try{
             Optional<PersonnePayLoadWeb> optionalPersonne= personneService.getPersonneById(id);
@@ -122,7 +118,6 @@ public class PersonneController {
     }
 
     @PostMapping("/recherche")
-    @PreAuthorize("hasAuthority('READ_PERSONNE')")
     public ResponseEntity<?> rechercherPersonne(@RequestBody RecherchePersonneResquestBody recherchePersonneResquestBody )   {
         try{
            // personneService.recherchePersonne(recherchePersonneResquestBody);
@@ -140,7 +135,6 @@ public class PersonneController {
 
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_PERSONNE')")
     public ResponseEntity<?> getAllPersonne() {
         try {
 
@@ -165,7 +159,6 @@ public class PersonneController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_PERSONNE')")
     public ResponseEntity<?> getAllPersonnePaged(@CurrentUser UserPrincipal currentUser,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);

src/main/java/io/gmss/fiscad/controllers/infocad/metier/PieceController.java

@@ -16,7 +16,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -36,7 +35,6 @@ public class PieceController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_PIECE')")
     public ResponseEntity<?> createPiece(@RequestBody @Valid @Validated PiecePayLoadWeb piecePayLoadWeb) {
         try {
             piecePayLoadWeb = pieceService.createPiece(piecePayLoadWeb);
@@ -61,7 +59,6 @@ public class PieceController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_PIECE')")
     public ResponseEntity<?> updatePiece(@PathVariable Long id, @RequestBody PiecePayLoadWeb piecePayLoadWeb) {
         try {
             return new ResponseEntity<>(
@@ -85,7 +82,6 @@ public class PieceController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_PIECE')")
     public ResponseEntity<?> deletePiece(@PathVariable Long id) {
         try {
             pieceService.deletePiece(id);
@@ -110,7 +106,6 @@ public class PieceController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_PIECE')")
     public ResponseEntity<?> getAllPieceList() {
         try {
             return new ResponseEntity<>(
@@ -134,7 +129,6 @@ public class PieceController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_PIECE')")
     public ResponseEntity<?> getAllPiecePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -159,7 +153,6 @@ public class PieceController {
     }
 
     @GetMapping("/all/by-enquete-id/{enqueteId}")
-    @PreAuthorize("hasAuthority('READ_PIECE')")
     public ResponseEntity<?> getAllPieceByEnqueteList(@PathVariable Long enqueteId) {
         try {
             return new ResponseEntity<>(
@@ -183,7 +176,6 @@ public class PieceController {
     }
 
     @GetMapping("/all-paged/by-enquete-id/{enqueteId}")
-    @PreAuthorize("hasAuthority('READ_PIECE')")
     public ResponseEntity<?> getAllPieceByParcellePaged(@PathVariable Long enqueteId,  @RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -209,7 +201,6 @@ public class PieceController {
 
 
     @GetMapping("/by-enquete-batiment-id/{enqueteBatimentId}")
-    @PreAuthorize("hasAuthority('READ_PIECE')")
     public ResponseEntity<?> getAllPieceByEnqueteBatiment(@PathVariable Long enqueteBatimentId) {
         try {
             return new ResponseEntity<>(
@@ -234,7 +225,6 @@ public class PieceController {
 
 
     @GetMapping("/by-enquete-unite-logement-id/{enqueteUniteLogementId}")
-    @PreAuthorize("hasAuthority('READ_PIECE')")
     public ResponseEntity<?> getAllPieceByEnqueteUniteLogement(@PathVariable Long enqueteUniteLogementId) {
         try {
             return new ResponseEntity<>(
@@ -258,7 +248,6 @@ public class PieceController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_PIECE')")
     public ResponseEntity<?> getPieceById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/metier/TpeController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Tpe")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class TpeController {
 
     private final TpeService tpeService;
@@ -37,7 +37,6 @@ public class TpeController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_TPE')")
     public ResponseEntity<?> createTpe(@RequestBody @Valid @Validated Tpe tpe) {
         try {
             tpe = tpeService.createTpe(tpe);
@@ -61,7 +60,6 @@ public class TpeController {
         }
     }
     @PostMapping("/re-create")
-    @PreAuthorize("hasAuthority('CREATE_TPE')")
     public ResponseEntity<?> reCreateTpe(@RequestBody @Valid @Validated Tpe tpe)   {
         try{
             tpe = tpeService.majTpe(tpe.getId(),tpe);
@@ -77,7 +75,6 @@ public class TpeController {
         }
     }
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_TPE')")
     public ResponseEntity<?> majTpe(@PathVariable Long id, @RequestBody Tpe tpe) {
         try {
             return new ResponseEntity<>(
@@ -102,7 +99,6 @@ public class TpeController {
 
 
     @PutMapping("/restaure/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_TPE')")
     public ResponseEntity<?> updateTpe(@PathVariable Long id, @RequestBody Tpe tpe) {
         try {
             return new ResponseEntity<>(
@@ -126,7 +122,6 @@ public class TpeController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_TPE')")
     public ResponseEntity<?> deleteTper(@PathVariable Long id) {
         try {
             tpeService.deleteTpe(id);
@@ -151,7 +146,6 @@ public class TpeController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_TPE')")
     public ResponseEntity<?> getAllTpeList() {
         try {
             return new ResponseEntity<>(
@@ -175,7 +169,6 @@ public class TpeController {
     }
 
     @GetMapping("/all-by-model/{model}")
-    @PreAuthorize("hasAuthority('READ_TPE')")
     public ResponseEntity<?> getAllTpeListByModel(@PathVariable String model) {
         try {
             return new ResponseEntity<>(
@@ -199,7 +192,6 @@ public class TpeController {
     }
 
     @GetMapping("/all-by-userId/{userId}")
-    @PreAuthorize("hasAuthority('READ_TPE')")
     public ResponseEntity<?> getAllTpeListByUserId(@PathVariable Long userId) {
         try {
             return new ResponseEntity<>(
@@ -224,7 +216,6 @@ public class TpeController {
 
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_TPE')")
     public ResponseEntity<?> getAllTpePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -249,7 +240,6 @@ public class TpeController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_TPE')")
     public ResponseEntity<?> getTpeById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -273,7 +263,6 @@ public class TpeController {
     }
 
     @GetMapping("/identifier/{identifier}")
-    @PreAuthorize("hasAuthority('READ_TPE')")
     public ResponseEntity<?> getTpeByIdentifier(@PathVariable String identifier) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java

@@ -76,7 +76,6 @@ public class UploadController {
 
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_UPLOAD')")
     public ResponseEntity<?> all() {
         try {
             if (uploadRepository.findAll().isEmpty()) {
@@ -96,7 +95,6 @@ public class UploadController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_UPLOAD')")
     public ResponseEntity<?> one(@PathVariable Long id) {
 
         try {
@@ -123,7 +121,6 @@ public class UploadController {
      * @return
      */
     @GetMapping("/downloadfile/{fileName:.+}")
-    @PreAuthorize("hasAuthority('READ_UPLOAD')")
     public ResponseEntity<Resource> downloadFile(@PathVariable String fileName, HttpServletRequest request) {
         // Load file as Resource
         Resource resource = fileStorageService.loadFileAsResource(fileName);
@@ -151,7 +148,6 @@ public class UploadController {
             value = "/save",
             consumes = MediaType.MULTIPART_FORM_DATA_VALUE
     )
-    @PreAuthorize("hasAuthority('CREATE_UPLOAD')")
     public ResponseEntity<?> saveFilePieceId(
             @Parameter(
                     description = "Fichier à uploader",
@@ -182,7 +178,6 @@ public class UploadController {
 
 
     @DeleteMapping("/delete/id/{id}")
-    @PreAuthorize("hasAuthority('DELETE_UPLOAD')")
     public ResponseEntity<?> delete(@PathVariable Long id) {
         try {
             if (id != null || uploadRepository.findById(id).isPresent()) {
@@ -209,7 +204,6 @@ public class UploadController {
             consumes = MediaType.MULTIPART_FORM_DATA_VALUE,
             produces = MediaType.APPLICATION_JSON_VALUE
     )
-    @PreAuthorize("hasAuthority('CREATE_UPLOAD')")
     public ResponseEntity<?> submit(@RequestPart("file") MultipartFile file) throws Exception {
         if (file == null || file.isEmpty())
             return new ResponseEntity<>(new ApiResponse(false,null, "Le fichier envoyé est introuvable ou inexistant."), HttpStatus.BAD_REQUEST);
@@ -250,7 +244,6 @@ public class UploadController {
     }
 
     @GetMapping(path = "/by-piece/{pieceId}")
-    @PreAuthorize("hasAuthority('READ_UPLOAD')")
     public ResponseEntity<?> getByPiece(@PathVariable("pieceId") Long pieceId) {
         try{
             return new ResponseEntity<>(new ApiResponse(true, uploadService.getAllUploadByPiece(pieceId), "Liste des fichier de la piece"), HttpStatus.OK);

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java

@@ -39,7 +39,6 @@ public class  BlocController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_BLOC')")
     public ResponseEntity<?> createBloc(@RequestBody @Valid @Validated Bloc bloc, @CurrentUser UserPrincipal userPrincipal) {
         try {
             bloc = blocService.createBloc(bloc);
@@ -64,7 +63,6 @@ public class  BlocController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_BLOC')")
     public ResponseEntity<?> updateBloc(@PathVariable Long id, @RequestBody Bloc bloc) {
         try {
             return new ResponseEntity<>(
@@ -88,7 +86,6 @@ public class  BlocController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_BLOC')")
     public ResponseEntity<?> deleteBlocr(@PathVariable Long id) {
         try {
             blocService.deleteBloc(id);
@@ -113,7 +110,6 @@ public class  BlocController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_BLOC')")
     public ResponseEntity<?> getAllBlocList() {
         try {
             return new ResponseEntity<>(
@@ -138,7 +134,6 @@ public class  BlocController {
     }
 
     @GetMapping("/list-by-arrondissement")
-    @PreAuthorize("hasAuthority('READ_BLOC')")
     public ResponseEntity<?> getAllBlocListByArrondissement(@RequestParam Long idArrondissement) {
         try {
             return new ResponseEntity<>(
@@ -164,7 +159,6 @@ public class  BlocController {
 
 
     @GetMapping("/list-by-structure")
-    @PreAuthorize("hasAuthority('READ_BLOC')")
     public ResponseEntity<?> getAllBlocListByStructure(@RequestParam Long idStructure) {
         try {
             return new ResponseEntity<>(
@@ -189,7 +183,6 @@ public class  BlocController {
     }
 
     @GetMapping("/list-by-secteur")
-    @PreAuthorize("hasAuthority('READ_BLOC')")
     @Tag(name = "Liste blocs", description = "Liste des blocs d'un secteur")
     public ResponseEntity<?> getAllBlocListBySecteur(@RequestParam Long idSecteur) {
         try {
@@ -214,7 +207,6 @@ public class  BlocController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_BLOC')")
     public ResponseEntity<?> getAllBlocPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
 
         try {
@@ -241,7 +233,6 @@ public class  BlocController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_BLOC')")
     public ResponseEntity<?> getBlocById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java

@@ -38,7 +38,6 @@ public class ModeAcquisitionController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_MODEACQUISITION')")
     public ResponseEntity<?> createModeAcquisition(@RequestBody @Valid @Validated ModeAcquisition modeAcquisition) {
         try {
             modeAcquisition = modeAcquisitionService.createModeAcquisition(modeAcquisition);
@@ -63,7 +62,6 @@ public class ModeAcquisitionController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_MODEACQUISITION')")
     public ResponseEntity<?> updateModeAcquisition(@PathVariable Long id, @RequestBody ModeAcquisition modeAcquisition) {
         try {
             return new ResponseEntity<>(
@@ -87,7 +85,6 @@ public class ModeAcquisitionController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_MODEACQUISITION')")
     public ResponseEntity<?> deleteModeAcquisitionr(@PathVariable Long id) {
         try {
             modeAcquisitionService.deleteModeAcquisition(id);
@@ -112,7 +109,6 @@ public class ModeAcquisitionController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_MODEACQUISITION')")
     public ResponseEntity<?> getAllModeAcquisitionList() {
         try {
             return new ResponseEntity<>(
@@ -136,7 +132,6 @@ public class ModeAcquisitionController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_MODEACQUISITION')")
     public ResponseEntity<?> getAllModeAcquisitionPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -161,7 +156,6 @@ public class ModeAcquisitionController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_MODEACQUISITION')")
     public ResponseEntity<?> getModeAcquisitionById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java

@@ -37,7 +37,6 @@ public class NatureDomaineController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_NATUREDOMAINE')")
     public ResponseEntity<?> createNatureDomaine(@RequestBody @Valid @Validated NatureDomaine natureDomaine) {
         try {
             natureDomaine = natureDomaineService.createNatureDomaine(natureDomaine);
@@ -62,7 +61,6 @@ public class NatureDomaineController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_NATUREDOMAINE')")
     public ResponseEntity<?> updateNatureDomaine(@PathVariable Long id, @RequestBody NatureDomaine natureDomaine) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +84,6 @@ public class NatureDomaineController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_NATUREDOMAINE')")
     public ResponseEntity<?> deleteNatureDomainer(@PathVariable Long id) {
         try {
             natureDomaineService.deleteNatureDomaine(id);
@@ -111,7 +108,6 @@ public class NatureDomaineController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_NATUREDOMAINE')")
     public ResponseEntity<?> getAllNatureDomaineList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +131,6 @@ public class NatureDomaineController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_NATUREDOMAINE')")
     public ResponseEntity<?> getAllNatureDomainePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +155,6 @@ public class NatureDomaineController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_NATUREDOMAINE')")
     public ResponseEntity<?> getNatureDomaineById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java

@@ -37,7 +37,6 @@ public class PositionRepresentationController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_POSITIONREPRESENTATION')")
     public ResponseEntity<?> createPositionRepresentation(@RequestBody @Valid @Validated PositionRepresentation positionRepresentation) {
         try {
             positionRepresentation = positionRepresentationService.createPositionRepresentation(positionRepresentation);
@@ -62,7 +61,6 @@ public class PositionRepresentationController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_POSITIONREPRESENTATION')")
     public ResponseEntity<?> updatePositionRepresentation(@PathVariable Long id, @RequestBody PositionRepresentation positionRepresentation) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +84,6 @@ public class PositionRepresentationController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_POSITIONREPRESENTATION')")
     public ResponseEntity<?> deletePositionRepresentation(@PathVariable Long id) {
         try {
             positionRepresentationService.deletePositionRepresentation(id);
@@ -111,7 +108,6 @@ public class PositionRepresentationController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_POSITIONREPRESENTATION')")
     public ResponseEntity<?> getAllPositionRepresentationList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +131,6 @@ public class PositionRepresentationController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_POSITIONREPRESENTATION')")
     public ResponseEntity<?> getAllPositionRepresentationPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -162,7 +157,6 @@ public class PositionRepresentationController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_POSITIONREPRESENTATION')")
     public ResponseEntity<?> getPositionRepresentationById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java

@@ -38,7 +38,6 @@ public class ProfessionController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_PROFESSION')")
     public ResponseEntity<?> createProfession(@RequestBody @Valid @Validated Profession profession) {
         try {
             profession = professionService.createProfession(profession);
@@ -63,7 +62,6 @@ public class ProfessionController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_PROFESSION')")
     public ResponseEntity<?> updateProfession(@PathVariable Long id, @RequestBody Profession profession) {
         try {
             return new ResponseEntity<>(
@@ -87,7 +85,6 @@ public class ProfessionController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_PROFESSION')")
     public ResponseEntity<?> deleteProfessionr(@PathVariable Long id) {
         try {
             professionService.deleteProfession(id);
@@ -112,7 +109,6 @@ public class ProfessionController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_PROFESSION')")
     public ResponseEntity<?> getAllProfessionList() {
         try {
             return new ResponseEntity<>(
@@ -137,7 +133,6 @@ public class ProfessionController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_PROFESSION')")
     public ResponseEntity<?> getAllProfessionPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -163,7 +158,6 @@ public class ProfessionController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_PROFESSION')")
     public ResponseEntity<?> getProfessionById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java

@@ -37,7 +37,6 @@ public class SituationGeographiqueController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_SITUATIONGEOGRAPHIQUE')")
     public ResponseEntity<?> createSituationGeographique(@RequestBody @Valid @Validated SituationGeographique situationGeographique) {
         try {
             situationGeographique = situationGeographiqueService.createSituationGeographique(situationGeographique);
@@ -62,7 +61,6 @@ public class SituationGeographiqueController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_SITUATIONGEOGRAPHIQUE')")
     public ResponseEntity<?> updateSituationGeographique(@PathVariable Long id, @RequestBody SituationGeographique situationGeographique) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +84,6 @@ public class SituationGeographiqueController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_SITUATIONGEOGRAPHIQUE')")
     public ResponseEntity<?> deleteSituationGeographiquer(@PathVariable Long id) {
         try {
             situationGeographiqueService.deleteSituationGeographique(id);
@@ -111,7 +108,6 @@ public class SituationGeographiqueController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_SITUATIONGEOGRAPHIQUE')")
     public ResponseEntity<?> getAllSituationGeographiqueList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +131,6 @@ public class SituationGeographiqueController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_SITUATIONGEOGRAPHIQUE')")
     public ResponseEntity<?> getAllSituationGeographiquePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +155,6 @@ public class SituationGeographiqueController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_SITUATIONGEOGRAPHIQUE')")
     public ResponseEntity<?> getSituationGeographiqueById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java

@@ -37,7 +37,6 @@ public class SituationMatrimonialeController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_SITUATIONMATRIMONIALE')")
     public ResponseEntity<?> createSituationMatrimoniale(@RequestBody @Valid @Validated SituationMatrimoniale situationMatrimoniale) {
         try {
             situationMatrimoniale = situationMatrimonialeService.createSituationMatrimoniale(situationMatrimoniale);
@@ -62,7 +61,6 @@ public class SituationMatrimonialeController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_SITUATIONMATRIMONIALE')")
     public ResponseEntity<?> updateSituationMatrimoniale(@PathVariable Long id, @RequestBody SituationMatrimoniale situationMatrimoniale) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +84,6 @@ public class SituationMatrimonialeController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_SITUATIONMATRIMONIALE')")
     public ResponseEntity<?> deleteSituationMatrimonialer(@PathVariable Long id) {
         try {
             situationMatrimonialeService.deleteSituationMatrimoniale(id);
@@ -111,7 +108,6 @@ public class SituationMatrimonialeController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_SITUATIONMATRIMONIALE')")
     public ResponseEntity<?> getAllSituationMatrimonialeList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +131,6 @@ public class SituationMatrimonialeController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_SITUATIONMATRIMONIALE')")
     public ResponseEntity<?> getAllSituationMatrimonialePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +155,6 @@ public class SituationMatrimonialeController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_SITUATIONMATRIMONIALE')")
     public ResponseEntity<?> getSituationMatrimonialeById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java

@@ -37,7 +37,6 @@ public class SourceDroitController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_SOURCEDROIT')")
     public ResponseEntity<?> createSourceDroit(@RequestBody @Valid @Validated SourceDroit sourceDroit) {
         try {
             sourceDroit = sourceDroitService.createSourceDroit(sourceDroit);
@@ -62,7 +61,6 @@ public class SourceDroitController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_SOURCEDROIT')")
     public ResponseEntity<?> updateSourceDroit(@PathVariable Long id, @RequestBody SourceDroit sourceDroit) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +84,6 @@ public class SourceDroitController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_SOURCEDROIT')")
     public ResponseEntity<?> deleteSourceDroitr(@PathVariable Long id) {
         try {
             sourceDroitService.deleteSourceDroit(id);
@@ -111,7 +108,6 @@ public class SourceDroitController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_SOURCEDROIT')")
     public ResponseEntity<?> getAllSourceDroitList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +131,6 @@ public class SourceDroitController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_SOURCEDROIT')")
     public ResponseEntity<?> getAllSourceDroitPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +155,6 @@ public class SourceDroitController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_SOURCEDROIT')")
     public ResponseEntity<?> getSourceDroitById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java

@@ -41,7 +41,6 @@ public class StructureController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_STRUCTURE')")
     public ResponseEntity<?> createStructure(@RequestBody StructurePaylaodWeb structurePaylaodWeb) {
         try {
             structurePaylaodWeb = structureService.createStructure(structurePaylaodWeb);
@@ -66,7 +65,6 @@ public class StructureController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_STRUCTURE')")
     public ResponseEntity<?> updateStructure(@PathVariable Long id, @RequestBody StructurePaylaodWeb structurePaylaodWeb) {
         try {
             return new ResponseEntity<>(
@@ -90,7 +88,6 @@ public class StructureController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_STRUCTURE')")
     public ResponseEntity<?> deleteStructurer(@PathVariable Long id) {
         try {
             structureService.deleteStructure(id);
@@ -115,7 +112,6 @@ public class StructureController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_STRUCTURE')")
     public ResponseEntity<?> getAllStructureList() {
         try {
             return new ResponseEntity<>(
@@ -140,7 +136,6 @@ public class StructureController {
 
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_STRUCTURE')")
     public ResponseEntity<?> getAllStructurePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -166,7 +161,6 @@ public class StructureController {
     }
 
     @GetMapping("/by-commune/{communeId}")
-    @PreAuthorize("hasAuthority('READ_STRUCTURE')")
     public ResponseEntity<?> getAllStructureListByCommune(@PathVariable Long communeId) {
         try {
             return new ResponseEntity<>(
@@ -190,7 +184,6 @@ public class StructureController {
     }
 
     @GetMapping("/page/by-commune/{communeId}")
-    @PreAuthorize("hasAuthority('READ_STRUCTURE')")
     public ResponseEntity<?> getAllStructureListByCommunePageable(@PathVariable Long communeId,  @RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -215,7 +208,6 @@ public class StructureController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_STRUCTURE')")
     public ResponseEntity<?> getStructureById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java

@@ -37,7 +37,6 @@ public class TypeContestationController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_TYPECONTESTATION')")
     public ResponseEntity<?> createTypeContestation(@RequestBody @Valid @Validated TypeContestation typeContestation) {
         try {
             typeContestation = typeContestationService.createTypeContestation(typeContestation);
@@ -62,7 +61,6 @@ public class TypeContestationController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_TYPECONTESTATION')")
     public ResponseEntity<?> updateTypeContestation(@PathVariable Long id, @RequestBody TypeContestation typeContestation) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +84,6 @@ public class TypeContestationController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_TYPECONTESTATION')")
     public ResponseEntity<?> deleteTypeContestationr(@PathVariable Long id) {
         try {
             typeContestationService.deleteTypeContestation(id);
@@ -111,7 +108,6 @@ public class TypeContestationController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_TYPECONTESTATION')")
     public ResponseEntity<?> getAllTypeContestationList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +131,6 @@ public class TypeContestationController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_TYPECONTESTATION')")
     public ResponseEntity<?> getAllTypeContestationPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +155,6 @@ public class TypeContestationController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_TYPECONTESTATION')")
     public ResponseEntity<?> getTypeContestationById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java

@@ -37,7 +37,6 @@ public class TypeDomaineController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_TYPEDOMAINE')")
     public ResponseEntity<?> createTypeDomaine(@RequestBody @Valid @Validated TypeDomaine typeDomaine) {
         try {
             typeDomaine = typeDomaineService.createTypeDomaine(typeDomaine);
@@ -62,7 +61,6 @@ public class TypeDomaineController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_TYPEDOMAINE')")
     public ResponseEntity<?> updateTypeDomaine(@PathVariable Long id, @RequestBody TypeDomaine typeDomaine) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +84,6 @@ public class TypeDomaineController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_TYPEDOMAINE')")
     public ResponseEntity<?> deleteTypeDomainer(@PathVariable Long id) {
         try {
             typeDomaineService.deleteTypeDomaine(id);
@@ -111,7 +108,6 @@ public class TypeDomaineController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_TYPEDOMAINE')")
     public ResponseEntity<?> getAllTypeDomaineList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +131,6 @@ public class TypeDomaineController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_TYPEDOMAINE')")
     public ResponseEntity<?> getAllTypeDomainePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +155,6 @@ public class TypeDomaineController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_TYPEDOMAINE')")
     public ResponseEntity<?> getTypeDomaineById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java

@@ -37,7 +37,6 @@ public class TypePersonneController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_TYPEPERSONNE')")
     public ResponseEntity<?> createTypePersonne(@RequestBody @Valid @Validated TypePersonne typePersonne) {
         try {
             typePersonne = typePersonneService.createTypePersonne(typePersonne);
@@ -62,7 +61,6 @@ public class TypePersonneController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_TYPEPERSONNE')")
     public ResponseEntity<?> updateTypePersonne(@PathVariable Long id, @RequestBody TypePersonne typePersonne) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +84,6 @@ public class TypePersonneController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_TYPEPERSONNE')")
     public ResponseEntity<?> deleteTypePersonner(@PathVariable Long id) {
         try {
             typePersonneService.deleteTypePersonne(id);
@@ -111,7 +108,6 @@ public class TypePersonneController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_TYPEPERSONNE')")
     public ResponseEntity<?> getAllTypePersonneList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +131,6 @@ public class TypePersonneController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_TYPEPERSONNE')")
     public ResponseEntity<?> getAllTypePersonnePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +155,6 @@ public class TypePersonneController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_TYPEPERSONNE')")
     public ResponseEntity<?> getTypePersonneById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java

@@ -37,7 +37,6 @@ public class TypePieceController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_TYPEPIECE')")
     public ResponseEntity<?> createTypePiece(@RequestBody @Valid @Validated TypePiece typePiece) {
         try {
             typePiece = typePieceService.createTypePiece(typePiece);
@@ -62,7 +61,6 @@ public class TypePieceController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_TYPEPIECE')")
     public ResponseEntity<?> updateTypePiece(@PathVariable Long id, @RequestBody TypePiece typePiece) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +84,6 @@ public class TypePieceController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_TYPEPIECE')")
     public ResponseEntity<?> deleteTypePiecer(@PathVariable Long id) {
         try {
             typePieceService.deleteTypePiece(id);
@@ -111,7 +108,6 @@ public class TypePieceController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_TYPEPIECE')")
     public ResponseEntity<?> getAllTypePieceList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +131,6 @@ public class TypePieceController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_TYPEPIECE')")
     public ResponseEntity<?> getAllTypePiecePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +155,6 @@ public class TypePieceController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_TYPEPIECE')")
     public ResponseEntity<?> getTypePieceById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java

@@ -37,7 +37,6 @@ public class TypeRepresentationController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_TYPEREPRESENTATION')")
     public ResponseEntity<?> createTypeRepresentation(@RequestBody @Valid @Validated TypeRepresentation typeRepresentation) {
         try {
             typeRepresentation = typeRepresentationService.createTypeRepresentation(typeRepresentation);
@@ -62,7 +61,6 @@ public class TypeRepresentationController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_TYPEREPRESENTATION')")
     public ResponseEntity<?> updateTypeRepresentation(@PathVariable Long id, @RequestBody TypeRepresentation typeRepresentation) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +84,6 @@ public class TypeRepresentationController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_TYPEREPRESENTATION')")
     public ResponseEntity<?> deleteTypeRepresentationr(@PathVariable Long id) {
         try {
             typeRepresentationService.deleteTypeRepresentation(id);
@@ -111,7 +108,6 @@ public class TypeRepresentationController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_TYPEREPRESENTATION')")
     public ResponseEntity<?> getAllTypeRepresentationList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +131,6 @@ public class TypeRepresentationController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_TYPEREPRESENTATION')")
     public ResponseEntity<?> getAllTypeRepresentationPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +155,6 @@ public class TypeRepresentationController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_TYPEREPRESENTATION')")
     public ResponseEntity<?> getTypeRepresentationById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java

@@ -16,7 +16,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -38,7 +37,6 @@ public class BatimentController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_BATIMENT')")
     public ResponseEntity<?> createBatiment(@RequestBody @Valid @Validated BatimentPaylaodWeb batimentPaylaodWeb) {
         try {
             batimentPaylaodWeb = batimentService.createBatiment(batimentPaylaodWeb);
@@ -63,7 +61,6 @@ public class BatimentController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_BATIMENT')")
     public ResponseEntity<?> updateBatiment(@PathVariable Long id, @RequestBody BatimentPaylaodWeb batimentPaylaodWeb) {
         try {
             return new ResponseEntity<>(
@@ -87,7 +84,6 @@ public class BatimentController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_BATIMENT')")
     public ResponseEntity<?> deleteBatiment(@PathVariable Long id) {
         try {
             batimentService.deleteBatiment(id);
@@ -112,7 +108,6 @@ public class BatimentController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_BATIMENT')")
     public ResponseEntity<?> getAllBatimentList() {
         try {
             return new ResponseEntity<>(
@@ -136,7 +131,6 @@ public class BatimentController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_BATIMENT')")
     public ResponseEntity<?> getAllBatimentPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -161,7 +155,6 @@ public class BatimentController {
     }
 
     @GetMapping("/all/by-parcelle-id/{parcelleId}")
-    @PreAuthorize("hasAuthority('READ_BATIMENT')")
     public ResponseEntity<?> getAllBatimentByParcelleList(@PathVariable Long parcelleId) {
         try {
             return new ResponseEntity<>(
@@ -185,7 +178,6 @@ public class BatimentController {
     }
 
     @GetMapping("/all-paged/by-parcelle-id/{parcelleId}")
-    @PreAuthorize("hasAuthority('READ_BATIMENT')")
     public ResponseEntity<?> getAllBatimentByParcellePaged(@PathVariable Long parcelleId,  @RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -210,7 +202,6 @@ public class BatimentController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_BATIMENT')")
     public ResponseEntity<?> getBatimentById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -232,54 +223,4 @@ public class BatimentController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-    @GetMapping("/all-paged/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_BATIMENT')")
-    public ResponseEntity<?> getAllBatimentByQuartierPaged(@PathVariable Long quartierId,  @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, batimentService.getBatimentListByquartierPageable(quartierId,pageable), "Liste des batiments chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/all/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_BATIMENT')")
-    public ResponseEntity<?> getAllBatimentByQuartier(@PathVariable Long quartierId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, batimentService.getBatimentListByquartier(quartierId), "Liste des batiments chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
 }

src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java

@@ -2,8 +2,6 @@ package io.gmss.fiscad.controllers.rfu.metier;
 
 
 import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment;
-import io.gmss.fiscad.enums.RoleActeur;
-import io.gmss.fiscad.enums.UserRole;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueBatimentService;
 import io.gmss.fiscad.paylaods.ApiResponse;
@@ -18,7 +16,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -39,10 +36,8 @@ public class CaracteristiqueBatimentController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_CARACTERISTIQUEBATIMENT')")
     public ResponseEntity<?> createCaracteristiqueBatiment(@RequestBody @Valid @Validated CaracteristiqueBatimentPayloadWeb caracteristiqueBatimentPayloadWeb) {
         try {
-
             caracteristiqueBatimentPayloadWeb = caracteristiqueBatimentService.createCaracteristiqueBatiment(caracteristiqueBatimentPayloadWeb);
             return new ResponseEntity<>(
                     new ApiResponse<>(true, caracteristiqueBatimentPayloadWeb, "Caracteristique du batiment créé avec succès."),
@@ -56,7 +51,6 @@ public class CaracteristiqueBatimentController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_CARACTERISTIQUEBATIMENT')")
     public ResponseEntity<?> updateCaracteristiqueBatiment(@PathVariable Long id, @RequestBody CaracteristiqueBatimentPayloadWeb caracteristiqueBatimentPayloadWeb) {
         try {
             return new ResponseEntity<>(
@@ -80,7 +74,6 @@ public class CaracteristiqueBatimentController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_CARACTERISTIQUEBATIMENT')")
     public ResponseEntity<?> deleteCaracteristiqueBatiment(@PathVariable Long id) {
         try {
             caracteristiqueBatimentService.deleteCaracteristiqueBatiment(id);
@@ -105,7 +98,6 @@ public class CaracteristiqueBatimentController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEBATIMENT')")
     public ResponseEntity<?> getAllCaracteristiqueBatimentList() {
         try {
             return new ResponseEntity<>(
@@ -129,7 +121,6 @@ public class CaracteristiqueBatimentController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEBATIMENT')")
     public ResponseEntity<?> getAllCaracteristiqueBatimentPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -154,7 +145,6 @@ public class CaracteristiqueBatimentController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEBATIMENT')")
     public ResponseEntity<?> getCaracteristiqueBatimentById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -178,7 +168,6 @@ public class CaracteristiqueBatimentController {
     }
 
     @GetMapping("/by-enquete-batiment-id/{enqueteBatimentId}")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEBATIMENT')")
     public ResponseEntity<?> getCaracteristiqueBatimentByBatimentId(@PathVariable Long enqueteBatimentId) {
         try {
             return new ResponseEntity<>(
@@ -202,7 +191,6 @@ public class CaracteristiqueBatimentController {
     }
 
     @GetMapping("/page/by-enquete-batiment-id/{enqueteBatimentId}")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEBATIMENT')")
     public ResponseEntity<?> getCaracteristiqueBatimentByEnqueteBatimentIdPaged(@PathVariable Long enqueteBatimentId,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);

src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueParcelleController.java

@@ -16,7 +16,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -37,7 +36,6 @@ public class CaracteristiqueParcelleController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_CARACTERISTIQUEPARCELLE')")
     public ResponseEntity<?> createCaracteristiqueParcelle(@RequestBody @Valid @Validated CaracteristiqueParcellePayloadWeb caracteristiqueParcellePayloadWeb) {
         try {
             caracteristiqueParcellePayloadWeb = caracteristiqueParcelleService.createCaracteristiqueParcelle(caracteristiqueParcellePayloadWeb);
@@ -62,7 +60,6 @@ public class CaracteristiqueParcelleController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_CARACTERISTIQUEPARCELLE')")
     public ResponseEntity<?> updateCaracteristiqueParcelle(@PathVariable Long id, @RequestBody CaracteristiqueParcellePayloadWeb caracteristiqueParcellePayloadWeb) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +83,6 @@ public class CaracteristiqueParcelleController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_CARACTERISTIQUEPARCELLE')")
     public ResponseEntity<?> deleteCaracteristiqueParcelle(@PathVariable Long id) {
         try {
             caracteristiqueParcelleService.deleteCaracteristiqueParcelle(id);
@@ -111,7 +107,6 @@ public class CaracteristiqueParcelleController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEPARCELLE')")
     public ResponseEntity<?> getAllCaracteristiqueParcelleList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +130,6 @@ public class CaracteristiqueParcelleController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEPARCELLE')")
     public ResponseEntity<?> getAllCaracteristiqueParcellePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +154,6 @@ public class CaracteristiqueParcelleController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEPARCELLE')")
     public ResponseEntity<?> getCaracteristiqueParcelleById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -185,7 +178,6 @@ public class CaracteristiqueParcelleController {
 
 
     @GetMapping("/by-enquete-id/{enqueteId}")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEPARCELLE')")
     public ResponseEntity<?> getAllCaracteristiqueParcelleList(@PathVariable Long enqueteId) {
         try {
             return new ResponseEntity<>(
@@ -209,7 +201,6 @@ public class CaracteristiqueParcelleController {
     }
 
     @GetMapping("/page/by-enquete-id/{enqueteId}")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEPARCELLE')")
     public ResponseEntity<?> getAllCaracteristiqueParcellePaged(@PathVariable Long enqueteId,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);

src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java

@@ -16,7 +16,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -37,7 +36,6 @@ public class CaracteristiqueUniteLogementController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_CARACTERISTIQUEUNITELOGEMENT')")
     public ResponseEntity<?> createCaracteristiqueUniteLogement(@RequestBody @Valid @Validated CaracteristiqueUniteLogementPayloadWeb caracteristiqueUniteLogementPayloadWeb) {
         try {
             caracteristiqueUniteLogementPayloadWeb = caracteristiqueUniteLogementService.createCaracteristiqueUniteLogement(caracteristiqueUniteLogementPayloadWeb);
@@ -62,7 +60,6 @@ public class CaracteristiqueUniteLogementController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_CARACTERISTIQUEUNITELOGEMENT')")
     public ResponseEntity<?> updateCaracteristiqueUniteLogement(@PathVariable Long id, @RequestBody CaracteristiqueUniteLogementPayloadWeb caracteristiqueUniteLogementPayloadWeb) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +83,6 @@ public class CaracteristiqueUniteLogementController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_CARACTERISTIQUEUNITELOGEMENT')")
     public ResponseEntity<?> deleteCaracteristiqueUniteLogement(@PathVariable Long id) {
         try {
             caracteristiqueUniteLogementService.deleteCaracteristiqueUniteLogement(id);
@@ -111,7 +107,6 @@ public class CaracteristiqueUniteLogementController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEUNITELOGEMENT')")
     public ResponseEntity<?> getAllCaracteristiqueUniteLogementList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +130,6 @@ public class CaracteristiqueUniteLogementController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEUNITELOGEMENT')")
     public ResponseEntity<?> getAllCaracteristiqueUniteLogementPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +154,6 @@ public class CaracteristiqueUniteLogementController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEUNITELOGEMENT')")
     public ResponseEntity<?> getCaracteristiqueUniteLogementById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -184,7 +177,6 @@ public class CaracteristiqueUniteLogementController {
     }
 
     @GetMapping("/by-enquete-ulo-id/{enqueteUloId}")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEUNITELOGEMENT')")
     public ResponseEntity<?> getAllCaracteristiqueUniteLogementListByEul(@PathVariable Long enqueteUloId) {
         try {
             return new ResponseEntity<>(
@@ -208,7 +200,6 @@ public class CaracteristiqueUniteLogementController {
     }
 
     @GetMapping("/page/by-enquete-ulo-id/{enqueteUloId}")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEUNITELOGEMENT')")
     public ResponseEntity<?> getAllCaracteristiqueUniteLogementByEulPaged(@PathVariable Long enqueteUloId,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);

src/main/java/io/gmss/fiscad/controllers/rfu/metier/CommuneCentreAssignationController.java

@@ -1,325 +0,0 @@
-package io.gmss.fiscad.controllers.rfu.metier;
-
-
-import io.gmss.fiscad.entities.user.User;
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.implementations.infocad.metier.PersonneServiceImpl;
-import io.gmss.fiscad.interfaces.rfu.metier.CommuneCentreAssignationService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.CommuneCentreAssignationPaylaodWeb;
-import io.gmss.fiscad.security.CurrentUser;
-import io.gmss.fiscad.security.UserPrincipal;
-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 lombok.AllArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-
-@RestController
-@AllArgsConstructor
-@RequestMapping(value = "api/commune-centre-assignation", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "CommuneCentreAssignation")
-@CrossOrigin(origins = "*")
-public class CommuneCentreAssignationController {
-
-    private final CommuneCentreAssignationService communeCentreAssignationService;
-    private final PersonneServiceImpl personneService;
-
-    private static final Logger logger = LoggerFactory.getLogger(CommuneCentreAssignationController.class);
-
-//    public CommuneCentreAssignationController(CommuneCentreAssignationService communeCentreAssignationService) {
-//        this.communeCentreAssignationService = communeCentreAssignationService;
-//    }
-
-    @PostMapping("/assigne-centre")
-    @PreAuthorize("hasAuthority('CREATE_COMMUNECENTREASSIGNATION')")
-    public ResponseEntity<?> AssigneCommuneCentre(@CurrentUser UserPrincipal userPrincipal, @RequestBody CommuneCentreAssignationPaylaodWeb communeCentreAssignationPaylaodWeb) {
-        try {
-            if(userPrincipal==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "vous ne pouvez pas faire cette action."),
-                        HttpStatus.OK
-                );
-            }
-            User user = userPrincipal.getUser();
-            communeCentreAssignationPaylaodWeb = communeCentreAssignationService.createCommuneCentreAssignation(user,communeCentreAssignationPaylaodWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, communeCentreAssignationPaylaodWeb, "CommuneCentreAssignation créé avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PostMapping("/detache-centre")
-    @PreAuthorize("hasAuthority('UPDATE_COMMUNECENTREASSIGNATION')")
-    public ResponseEntity<?> detacheCommuneCentre(@CurrentUser UserPrincipal userPrincipal, @RequestBody CommuneCentreAssignationPaylaodWeb communeCentreAssignationPaylaodWeb) {
-        try {
-            if(userPrincipal==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "vous ne pouvez pas faire cette action."),
-                        HttpStatus.OK
-                );
-            }
-            User user = userPrincipal.getUser();
-            communeCentreAssignationPaylaodWeb = communeCentreAssignationService.detacherCommuneCentreAssignation(user,communeCentreAssignationPaylaodWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, communeCentreAssignationPaylaodWeb, "CommuneCentreAssignation créé avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_COMMUNECENTREASSIGNATION')")
-    public ResponseEntity<?> updateCommuneCentreAssignation(@PathVariable Long id, @RequestBody CommuneCentreAssignationPaylaodWeb communeCentreAssignationPaylaodWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, communeCentreAssignationService.updateCommuneCentreAssignation(id,communeCentreAssignationPaylaodWeb), "CommuneCentreAssignation mise à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_COMMUNECENTREASSIGNATION')")
-    public ResponseEntity<?> deleteCommuneCentreAssignation(@PathVariable Long id) {
-        try {
-            communeCentreAssignationService.deleteCommuneCentreAssignation(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "CommuneCentreAssignation supprimée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')")
-    public ResponseEntity<?> getAllCommuneCentreAssignationPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, communeCentreAssignationService.getCommuneCentreAssignationList(pageable), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged/by-commune-id/{communeId}")
-    @PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')")
-    public ResponseEntity<?> getAllCommuneCentreAssignationByCommuneList(@PathVariable Long communeId,@RequestParam int pageNo, @RequestParam int pageSize ) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, communeCentreAssignationService.getCommuneCentreAssignationListByCommunePageable(communeId,pageable), "Liste des assignation de centre chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-    @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')")
-    public ResponseEntity<?> getCommuneCentreAssignationById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, communeCentreAssignationService.getCommuneCentreAssignationById(id), "CommuneCentreAssignation trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @Operation(summary = "Liste des contribuables ayant un centre d'assignation")
-    @GetMapping("/all-paged/by-structure-id/{structureId}")
-    @PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')")
-    public ResponseEntity<?> getAllCommuneCentreAssignationByStrucutrePaged(@PathVariable Long structureId,  @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, communeCentreAssignationService.getCommuneCentreAssignationListByCentrePageable(structureId, pageable), "Liste des communeCentreAssignations chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @Operation(summary = "Liste des contribuables sans centre d'assignation")
-    @GetMapping("/all-paged/sans-centre-assignation")
-    @PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')")
-    public ResponseEntity<?> getAllPersonneSansCentreAssignationPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, personneService.getPersonneListNonAssigneePage(pageable), "Liste des contribuables sans centre d'assignation chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-    @Operation(summary = "Vérifier l'assignation d'un contribuable",description = "permet de vérifier si un contribuable a déjà un centre d'assignation dans la commune de l'utilisateur connecté")
-    @GetMapping("/contribuable/{personneId}")
-    @PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')")
-    public ResponseEntity<?> getAssignationPersonne(@CurrentUser UserPrincipal currentUser, @PathVariable Long personneId) {
-        try {
-            if(currentUser==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "vous ne pouvez pas faire cette action."),
-                        HttpStatus.OK
-                );
-            }
-            User user = currentUser.getUser();
-
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, communeCentreAssignationService.getCommuneCentreAssignationByPersonneIdCommune(user,personneId).orElse(null), "Assignation chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-}

src/main/java/io/gmss/fiscad/controllers/rfu/metier/DeclarationNcController.java

@@ -18,7 +18,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -37,8 +36,7 @@ public class DeclarationNcController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_DECLARATIONNC')")
-    public ResponseEntity<?> createDeclarationNc(@RequestBody DeclarationNcPayloadWeb declarationNcPayloadWeb) {
+    public ResponseEntity<?> createDeclarationNc(@RequestBody @Valid @Validated DeclarationNcPayloadWeb declarationNcPayloadWeb) {
         try {
              declarationNcPayloadWeb = declarationNcService.createDeclarationNc(declarationNcPayloadWeb);
             return new ResponseEntity<>(
@@ -62,7 +60,6 @@ public class DeclarationNcController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_DECLARATIONNC')")
     public ResponseEntity<?> updateEnqueteBatiment(@PathVariable Long id, @RequestBody DeclarationNcPayloadWeb declarationNcPayloadWeb) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +83,6 @@ public class DeclarationNcController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_DECLARATIONNC')")
     public ResponseEntity<?> deleteEnqueteBatiment(@PathVariable Long id) {
         try {
             declarationNcService.deleteDeclarationNc(id);
@@ -111,7 +107,6 @@ public class DeclarationNcController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_DECLARATIONNC')")
     public ResponseEntity<?> getAllEnqueteBatimentList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +130,6 @@ public class DeclarationNcController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_DECLARATIONNC')")
     public ResponseEntity<?> getAllEnqueteBatimentPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -161,7 +155,6 @@ public class DeclarationNcController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_DECLARATIONNC')")
     public ResponseEntity<?> getEnqueteBatimentById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -185,7 +178,6 @@ public class DeclarationNcController {
     }
 
     @GetMapping("/by-personne-id/{personneId}")
-    @PreAuthorize("hasAuthority('READ_DECLARATIONNC')")
     public ResponseEntity<?> getDeclarationNcByPersonne(@PathVariable Long personneId) {
         try {
             return new ResponseEntity<>(
@@ -209,7 +201,6 @@ public class DeclarationNcController {
     }
 
     @GetMapping("/page/by-personne-id/{personneId}")
-    @PreAuthorize("hasAuthority('READ_DECLARATIONNC')")
     public ResponseEntity<?> getDeclarationNcByPersonnePaged(@PathVariable Long personneId,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);

src/main/java/io/gmss/fiscad/controllers/rfu/metier/DonneesImpositionTfuController.java

@@ -7,10 +7,7 @@ import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.DonneesImpositionTfuService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
 import io.gmss.fiscad.persistence.repositories.rfu.metier.ImpositionsTfuRepository;
-import io.gmss.fiscad.security.CurrentUser;
-import io.gmss.fiscad.security.UserPrincipal;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,7 +20,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -47,7 +43,6 @@ public class DonneesImpositionTfuController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_DONNEESIMPOSITIONTFU')")
     public ResponseEntity<?> createDonneesImpositionTfu(@RequestBody @Valid @Validated DonneesImpositionTfu donneesImpositionTfu) {
         try {
             donneesImpositionTfu = donneesImpositionTfuService.createDonneesImpositionTfu(donneesImpositionTfu);
@@ -72,7 +67,6 @@ public class DonneesImpositionTfuController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_DONNEESIMPOSITIONTFU')")
     public ResponseEntity<?> updateDonneesImpositionTfu(@PathVariable Long id, @RequestBody DonneesImpositionTfu donneesImpositionTfu) {
         try {
             return new ResponseEntity<>(
@@ -96,7 +90,6 @@ public class DonneesImpositionTfuController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_DONNEESIMPOSITIONTFU')")
     public ResponseEntity<?> deleteDonneesImpositionTfu(@PathVariable Long id) {
         try {
             donneesImpositionTfuService.deleteDonneesImpositionTfu(id);
@@ -120,61 +113,11 @@ public class DonneesImpositionTfuController {
         }
     }
 
-//    @GetMapping("/all")
-//    public ResponseEntity<?> getAllDonneesImpositionTfuList() {
-//        try {
-//            return new ResponseEntity<>(
-//                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesImpositionTfuList(), "Liste des impositions chargée avec succès."),
-//                    HttpStatus.OK
-//            );
-//        } catch (HttpClientErrorException.MethodNotAllowed e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-//        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-//                 FileStorageException e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-//        } catch (NullPointerException e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-//        } catch (Exception e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-//        }
-//    }
-
-//    @GetMapping("/all-paged")
-//    public ResponseEntity<?> getAllDonneesImpositionTfuPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-//        try {
-//            Pageable pageable = PageRequest.of(pageNo, pageSize);
-//            return new ResponseEntity<>(
-//                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesImpositionTfuList(pageable), "Liste des impositions chargée avec succès."),
-//                    HttpStatus.OK
-//            );
-//        } catch (HttpClientErrorException.MethodNotAllowed e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-//        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-//                 FileStorageException e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-//        } catch (NullPointerException e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-//        } catch (Exception e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-//        }
-//    }
-
-
-    @GetMapping("/all-page/by-imposition-id/{impositionId}")
-    @PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
+    @GetMapping("/all")
+    public ResponseEntity<?> getAllDonneesImpositionTfuList() {
         try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdPageable(impositionId, pageable), "Liste des impositions chargée avec succès."),
+                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesImpositionTfuList(), "Liste des caractéristiques chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -193,64 +136,12 @@ public class DonneesImpositionTfuController {
         }
     }
 
-    @GetMapping("/all-page/by-imposition-id/non-batie/{impositionId}")
-    @PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdNonBatiePaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
+    @GetMapping("/all-paged")
+    public ResponseEntity<?> getAllDonneesImpositionTfuPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdNonBatiePageable(impositionId, pageable), "Liste des impositions chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/all-page/by-imposition-id/batie-batiment/{impositionId}")
-    @PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdBatieBatimentPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdBatieBatimentPageable(impositionId, pageable), "Liste des impositions chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-page/by-imposition-id/batie-unite-logement/{impositionId}")
-    @PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdBatieUniteLogPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdBatieUniteLogPageable(impositionId, pageable), "Liste des impositions chargée avec succès."),
+                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesImpositionTfuList(pageable), "Liste des caractéristiques chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -270,7 +161,6 @@ public class DonneesImpositionTfuController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
     public ResponseEntity<?> getDonneesImpositionTfuById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -292,201 +182,31 @@ public class DonneesImpositionTfuController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    @Operation(summary = "Générer les données fiscales TFU des parcelle baties")
-    @PostMapping("/generer-batie")
-    @PreAuthorize("hasAnyAuthority('CREATE_DONNEESIMPOSITIONTFU', 'UPDATE_DONNEESIMPOSITIONTFU')")
-    public ResponseEntity<?> genererDonneesFiscaleBatie(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    @Operation(summary = "Générer les données fiscales TFU")
+    @PostMapping("/generer")
+    public ResponseEntity<?> genererDonneesFiscale(@RequestBody ImpositionsTfu impositionsTfu) {
         try {
-            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
+            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfu.getId());
 
             if(optionalImpositionsTfu.isEmpty()){
                 return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "L'instance d'imposition n'est pas trouvée."),
+                        new ApiResponse<>(false, null, "L'imposition tfu n'est pas trouvée."),
                         HttpStatus.OK
                 );
             }
 
-            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.TFU_FNB_GENERE)){
+            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.CREE)){
                 return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "l'état actuel : "+optionalImpositionsTfu.get().getStatusAvis()+" ne permet pas cette opération."),
+                        new ApiResponse<>(false, null, "le statut actuel ne permet pas cette opération."),
                         HttpStatus.OK
                 );
             }
 
-           if(userPrincipal==null){
-               return new ResponseEntity<>(
-                       new ApiResponse<>(false, null, "Vous n'êtes pas autorisé à accéder à cette ressource"),
-                       HttpStatus.OK
-               );
-           }
-            impositionsTfuPaylaodWeb=donneesImpositionTfuService.genererDonneesFiscalesParcelleBatie(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId());
-
+            optionalImpositionsTfu.get().setStatusAvis(StatusAvis.GENERE);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true,impositionsTfuPaylaodWeb, "Données d'imposition des fonciers batis Générées avec succès."),
+                    new ApiResponse<>(true, donneesImpositionTfuService.genererDonneesFiscales(optionalImpositionsTfu.get()), "DonneesImpositionTfu trouvée avec succès."),
                     HttpStatus.OK
             );
-
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @Operation(
-            summary = "Générer les données fiscales TFU pour une seule parcelle",
-            description = "Génère les impositions TFU pour une parcelle bâtie donnée"
-    )
-    @PostMapping("/generer-batie/{parcelleId}")
-    @PreAuthorize("hasAnyAuthority('CREATE_DONNEESIMPOSITIONTFU', 'UPDATE_DONNEESIMPOSITIONTFU')")
-    public ResponseEntity<?> genererDonneesFiscaleBatieUneParcelle(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb,@PathVariable Long parcelleId) {
-        try {
-            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
-
-            if(optionalImpositionsTfu.isEmpty()){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "L'instance d'imposition n'est pas trouvée."),
-                        HttpStatus.OK
-                );
-            }
-
-//            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.TFU_FNB_GENERE)){
-//                return new ResponseEntity<>(
-//                        new ApiResponse<>(false, null, "l'état actuel : "+optionalImpositionsTfu.get().getStatusAvis()+" ne permet pas cette opération."),
-//                        HttpStatus.OK
-//                );
-//            }
-
-            if(userPrincipal==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "Vous n'êtes pas autorisé à accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            }
-            impositionsTfuPaylaodWeb=donneesImpositionTfuService.genererDonneesFiscalesParcelleBatieUneParcelle(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId(),parcelleId);
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true,impositionsTfuPaylaodWeb, "Données d'imposition des fonciers batis Générées avec succès."),
-                    HttpStatus.OK
-            );
-
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-
-    @Operation(summary = "Générer les données fiscales TFU des parcelle baties")
-    @PostMapping("/generer-non-batie")
-    @PreAuthorize("hasAnyAuthority('CREATE_DONNEESIMPOSITIONTFU', 'UPDATE_DONNEESIMPOSITIONTFU')")
-    public ResponseEntity<?> genererDonneesImpositionNonBaties(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
-        try {
-            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
-
-            if(optionalImpositionsTfu.isEmpty()){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "L'instance d'imposition n'est pas trouvée."),
-                        HttpStatus.OK
-                );
-            }
-
-            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.GENERATION_AUTORISE)){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "l'état actuel : "+optionalImpositionsTfu.get().getStatusAvis()+" ne permet pas cette opération."),
-                        HttpStatus.OK
-                );
-            }
-
-            if(userPrincipal==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "Vous n'êtes pas autorisé à accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            }
-            impositionsTfuPaylaodWeb=donneesImpositionTfuService.genererDonneesFiscalesParcelleNonBatie(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId());
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true,impositionsTfuPaylaodWeb, "Données d'imposition pour les fonciers non batis Générées avec succès."),
-                    HttpStatus.OK
-            );
-
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @Operation(
-            summary = "Générer les données fiscales TFU pour une seule parcelle",
-            description = "Génère les impositions TFU pour une parcelle non bâtie donnée"
-    )
-    @PostMapping("/generer-non-batie/{parcelleId}")
-    @PreAuthorize("hasAnyAuthority('CREATE_DONNEESIMPOSITIONTFU', 'UPDATE_DONNEESIMPOSITIONTFU')")
-    public ResponseEntity<?> genererDonneesImpositionNonBatiesUneParcelle(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, @PathVariable Long parcelleId) {
-        try {
-            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
-
-            if(optionalImpositionsTfu.isEmpty()){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "L'instance d'imposition n'est pas trouvée."),
-                        HttpStatus.OK
-                );
-            }
-
-//            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.GENERATION_AUTORISE)){
-//                return new ResponseEntity<>(
-//                        new ApiResponse<>(false, null, "l'état actuel : "+optionalImpositionsTfu.get().getStatusAvis()+" ne permet pas cette opération."),
-//                        HttpStatus.OK
-//                );
-//            }
-
-            if(userPrincipal==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "Vous n'êtes pas autorisé à accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            }
-            impositionsTfuPaylaodWeb=donneesImpositionTfuService.genererDonneesFiscalesParcelleNonBatieUneParcelle(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId(),parcelleId);
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true,impositionsTfuPaylaodWeb, "Données d'imposition pour les fonciers non batis Générées avec succès."),
-                    HttpStatus.OK
-            );
-
         } catch (HttpClientErrorException.MethodNotAllowed e) {
             logger.error(e.getLocalizedMessage());
             return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
@@ -505,7 +225,6 @@ public class DonneesImpositionTfuController {
 
     @Operation(summary = "Récuperer les avis d'id d'une imposition")
     @GetMapping("/by-impositions-id/{impositionsId}")
-    @PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
     public ResponseEntity<?> getDonneesFiscale(@PathVariable Long impositionsId) {
         try {
 
@@ -532,7 +251,6 @@ public class DonneesImpositionTfuController {
 
     @Operation(summary = "Récuperer les avis d'id d'une imposition et l'id d'un arrondissement")
     @GetMapping("/by-impositions-id/by-arrondissement/{impositionsId}/{arrondissementId}")
-    @PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
     public ResponseEntity<?> getDonneesFiscaleParImpositionArrondissement(@PathVariable Long impositionsId,@PathVariable Long arrondissementId) {
         try {
 
@@ -555,82 +273,4 @@ public class DonneesImpositionTfuController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-
-    @GetMapping("/all-page/by-exercice-id/by-structure-id/{exerciceId}/{structureId}")
-    @PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByExerciceIdAndStructureIdPaged(@PathVariable Long exerciceId, @PathVariable Long structureId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            System.out.println("NOUS SOMMES ICI");
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByExerciceAndStructureIdPageable(exerciceId,structureId, pageable), "Liste des impositions chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all/by-exercice-id/by-structure-id/by-quartier-id/{exerciceId}/{structureId}/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByExerciceIdAndStructureId(@PathVariable Long exerciceId, @PathVariable Long structureId, @PathVariable Long quartierId) {
-        try {
-            System.out.println("NOUS SOMMES ICI");
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByExerciceAndStructureId(exerciceId,structureId,quartierId), "Liste des imposition chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-    @GetMapping("/all/by-personne-id/{personneId}")
-    @PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByPersonneId(@PathVariable Long personneId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByPersonneId(personneId), "Liste des impositions chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
 }

src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteActiviteController.java

@@ -16,7 +16,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -38,7 +37,6 @@ public class EnqueteActiviteController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_ENQUETEACTIVITE')")
     public ResponseEntity<?> createEnqueteActivite(@RequestBody @Valid @Validated EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) {
         try {
            EnqueteActivite enqueteActivite = enqueteActiviteService.createEnqueteActivite(enqueteActivitePayLoadWeb);
@@ -63,7 +61,6 @@ public class EnqueteActiviteController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETEACTIVITE')")
     public ResponseEntity<?> updateEnqueteActivite(@PathVariable Long id, @RequestBody EnqueteActivitePayLoadWeb  enqueteActivitePayLoadWeb) {
         try {
             return new ResponseEntity<>(
@@ -87,7 +84,6 @@ public class EnqueteActiviteController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_ENQUETEACTIVITE')")
     public ResponseEntity<?> deleteEnqueteActivite(@PathVariable Long id) {
         try {
             enqueteActiviteService.deleteEnqueteActivite(id);
@@ -112,7 +108,6 @@ public class EnqueteActiviteController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_ENQUETEACTIVITE')")
     public ResponseEntity<?> getAllEnqueteActiviteList() {
         try {
             return new ResponseEntity<>(
@@ -136,7 +131,6 @@ public class EnqueteActiviteController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_ENQUETEACTIVITE')")
     public ResponseEntity<?> getAllEnqueteActivitePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -161,7 +155,6 @@ public class EnqueteActiviteController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_ENQUETEACTIVITE')")
     public ResponseEntity<?> getEnqueteActiviteById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java

@@ -2,14 +2,10 @@ package io.gmss.fiscad.controllers.rfu.metier;
 
 
 import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
-import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.EnqueteBatimentService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
 import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb;
-import io.gmss.fiscad.security.CurrentUser;
-import io.gmss.fiscad.security.UserPrincipal;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -20,13 +16,10 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
 
-import java.util.List;
-
 
 @RestController
 @RequestMapping(value = "api/enquete-batiment", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -43,7 +36,6 @@ public class EnqueteBatimentController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_ENQUETEBATIMENT')")
     public ResponseEntity<?> createEnqueteBatiment(@RequestBody @Valid @Validated EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) {
         try {
              enqueteBatimentPayloadWeb = enqueteBatimentService.createEnqueteBatiment(enqueteBatimentPayloadWeb);
@@ -59,7 +51,6 @@ public class EnqueteBatimentController {
             logger.error(e.getLocalizedMessage());
             return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
         } catch (NullPointerException e) {
-            e.printStackTrace();
             logger.error(e.getLocalizedMessage());
             return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
         } catch (Exception e) {
@@ -69,7 +60,6 @@ public class EnqueteBatimentController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')")
     public ResponseEntity<?> updateEnqueteBatiment(@PathVariable Long id, @RequestBody EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) {
         try {
             return new ResponseEntity<>(
@@ -93,7 +83,6 @@ public class EnqueteBatimentController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_ENQUETEBATIMENT')")
     public ResponseEntity<?> deleteEnqueteBatiment(@PathVariable Long id) {
         try {
             enqueteBatimentService.deleteEnqueteBatiment(id);
@@ -118,7 +107,6 @@ public class EnqueteBatimentController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')")
     public ResponseEntity<?> getAllEnqueteBatimentList() {
         try {
             return new ResponseEntity<>(
@@ -142,7 +130,6 @@ public class EnqueteBatimentController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')")
     public ResponseEntity<?> getAllEnqueteBatimentPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -168,7 +155,6 @@ public class EnqueteBatimentController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')")
     public ResponseEntity<?> getEnqueteBatimentById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -192,7 +178,6 @@ public class EnqueteBatimentController {
     }
 
     @GetMapping("/by-batiment-id/{batimentId}")
-    @PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')")
     public ResponseEntity<?> getEnqueteBatimentByBatimentId(@PathVariable Long batimentId) {
         try {
             return new ResponseEntity<>(
@@ -216,7 +201,6 @@ public class EnqueteBatimentController {
     }
 
     @GetMapping("/page/by-batiment-id/{batimentId}")
-    @PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')")
     public ResponseEntity<?> getEnqueteBatimentByBatimentIdPaged(@PathVariable Long batimentId,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -239,165 +223,4 @@ public class EnqueteBatimentController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-
-    @GetMapping("/all-paged/en-cours/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')")
-    public ResponseEntity<?> getAllEnqueteBatimentEnCoursByQuartierPaged(@CurrentUser UserPrincipal currentUser, @PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentService.getEnqueteBatimentListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.EN_COURS, pageable), "Liste des enquetes en cours chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged/cloture/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')")
-    public ResponseEntity<?> getAllEnqueteBatimentClotureByQuartierPaged(@CurrentUser UserPrincipal currentUser, @PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentService.getEnqueteBatimentListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.CLOTURE, pageable), "Liste des enquetes en cours chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @PutMapping("/validation")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')")
-    public ResponseEntity<?> validerEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentService.validerEnquete(enqueteTraitementPayLoad), "Validation effectuée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/rejet")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')")
-    public ResponseEntity<?> rejeterEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
-        try {
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentService.rejeterEnquete(enqueteTraitementPayLoad), "Rejet effectuée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/validation-lot")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')")
-    public ResponseEntity<?> validerEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentService.validerEnquete(enqueteTraitementPayLoads), "Validation effectuée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/rejet-lot")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')")
-    public ResponseEntity<?> rejeterEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentService.rejeterEnquete(enqueteTraitementPayLoads), "Rejet effectuée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
 }

src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java

@@ -2,14 +2,10 @@ package io.gmss.fiscad.controllers.rfu.metier;
 
 
 import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
-import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.EnqueteUniteLogementService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
 import io.gmss.fiscad.paylaods.request.crudweb.EnqueteUniteLogementPayloadWeb;
-import io.gmss.fiscad.security.CurrentUser;
-import io.gmss.fiscad.security.UserPrincipal;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -20,13 +16,10 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
 
-import java.util.List;
-
 
 @RestController
 @RequestMapping(value = "api/enquete-unite-logement", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -43,7 +36,6 @@ public class EnqueteUniteLogementController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_ENQUETEUNITELOGEMENT')")
     public ResponseEntity<?> createEnqueteUniteLogement(@RequestBody @Valid @Validated EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) {
         try {
              enqueteUniteLogementPayloadWeb = enqueteUniteLogementService.createEnqueteUniteLogement(enqueteUniteLogementPayloadWeb);
@@ -68,7 +60,6 @@ public class EnqueteUniteLogementController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')")
     public ResponseEntity<?> updateEnqueteUniteLogement(@PathVariable Long id, @RequestBody EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) {
         try {
             return new ResponseEntity<>(
@@ -92,7 +83,6 @@ public class EnqueteUniteLogementController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_ENQUETEUNITELOGEMENT')")
     public ResponseEntity<?> deleteEnqueteUniteLogement(@PathVariable Long id) {
         try {
             enqueteUniteLogementService.deleteEnqueteUniteLogement(id);
@@ -117,7 +107,6 @@ public class EnqueteUniteLogementController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')")
     public ResponseEntity<?> getAllEnqueteUniteLogementList() {
         try {
             return new ResponseEntity<>(
@@ -141,7 +130,6 @@ public class EnqueteUniteLogementController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')")
     public ResponseEntity<?> getAllEnqueteUniteLogementPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -167,7 +155,6 @@ public class EnqueteUniteLogementController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')")
     public ResponseEntity<?> getEnqueteUniteLogementById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -191,7 +178,6 @@ public class EnqueteUniteLogementController {
     }
 
     @GetMapping("/by-unite-logement-id/{uniteLogementId}")
-    @PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')")
     public ResponseEntity<?> getEnqueteUniteLogementByUniteLogement(@PathVariable Long uniteLogementId) {
         try {
             return new ResponseEntity<>(
@@ -215,7 +201,6 @@ public class EnqueteUniteLogementController {
     }
 
     @GetMapping("/page/by-unite-logement-id/{uniteLogementId}")
-    @PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')")
     public ResponseEntity<?> getEnqueteUniteLogementByUniteLogementPaged(@PathVariable Long uniteLogementId, @RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -238,166 +223,4 @@ public class EnqueteUniteLogementController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-
-    @GetMapping("/all-paged/en-cours/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')")
-    public ResponseEntity<?> getAllEnqueteUniteLogementEncoursByQuartierPaged(@CurrentUser UserPrincipal currentUser, @PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.getEnqueteUniteLogementListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.EN_COURS, pageable), "Liste des enquetes en cours chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/all-paged/cloture/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')")
-    public ResponseEntity<?> getAllEnqueteUniteLogementClotureByQuartierPaged(@CurrentUser UserPrincipal currentUser, @PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.getEnqueteUniteLogementListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.CLOTURE, pageable), "Liste des enquetes en cours chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @PutMapping("/validation")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')")
-    public ResponseEntity<?> validerEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.validerEnquete(enqueteTraitementPayLoad), "Validation effectuée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/rejet")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')")
-    public ResponseEntity<?> rejeterEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
-        try {
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.rejeterEnquete(enqueteTraitementPayLoad), "Rejet effectuée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/validation-lot")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')")
-    public ResponseEntity<?> validerEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.validerEnquete(enqueteTraitementPayLoads), "Validation effectuée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/rejet-lot")
-    @PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')")
-    public ResponseEntity<?> rejeterEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.rejeterEnquete(enqueteTraitementPayLoads), "Rejet effectuée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
 }

src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java

@@ -3,20 +3,15 @@ package io.gmss.fiscad.controllers.rfu.metier;
 
 import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
 import io.gmss.fiscad.entities.user.User;
-import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
 import io.gmss.fiscad.interfaces.rfu.metier.ImpositionsTfuService;
 import io.gmss.fiscad.paylaods.ApiResponse;
 import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
 import io.gmss.fiscad.security.CurrentUser;
 import io.gmss.fiscad.security.UserPrincipal;
-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 jakarta.ws.rs.NotAcceptableException;
-import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.PageRequest;
@@ -24,14 +19,12 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
 
 
 @RestController
-@AllArgsConstructor
 @RequestMapping(value = "api/impositions-tfu", produces = MediaType.APPLICATION_JSON_VALUE)
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Impositions TFU")
@@ -39,30 +32,15 @@ import org.springframework.web.client.HttpClientErrorException;
 public class ImpositionsTfuController {
 
     private final ImpositionsTfuService impositionsTfuService;
-    private final EnqueteService enqueteService;
     private static final Logger logger = LoggerFactory.getLogger(ImpositionsTfuController.class);
 
-
+    public ImpositionsTfuController(ImpositionsTfuService impositionsTfuService) {
+        this.impositionsTfuService = impositionsTfuService;
+    }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_IMPOSITIONSTFU')")
-    public ResponseEntity<?> createImpositionsTfu(@CurrentUser UserPrincipal currentUser,@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    public ResponseEntity<?> createImpositionsTfu(@RequestBody @Valid @Validated ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
         try {
-            if(currentUser==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."),
-                        HttpStatus.OK
-                );
-            }
-            User user=currentUser.getUser();
-
-            if(user.getStructure().getId()!=impositionsTfuPaylaodWeb.getStructureId()){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."),
-                        HttpStatus.OK
-                );
-            }
-
             impositionsTfuPaylaodWeb = impositionsTfuService.createImpositionsTfu(impositionsTfuPaylaodWeb);
             return new ResponseEntity<>(
                     new ApiResponse<>(true, impositionsTfuPaylaodWeb, "Unite de logement créé avec succès."),
@@ -84,47 +62,6 @@ public class ImpositionsTfuController {
         }
     }
 
-
-    @PutMapping("/cloturer-enquete")
-    @PreAuthorize("hasAuthority('UPDATE_IMPOSITIONSTFU')")
-    public ResponseEntity<?> cloturer(@CurrentUser UserPrincipal userPrincipal, @RequestBody  ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb ) {
-        try {
-
-            if(userPrincipal==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true, null, "Accès non autorisé"),
-                        HttpStatus.NOT_ACCEPTABLE
-                );
-            }
-
-
-            User user= userPrincipal.getUser();
-            if(user.getStructure().getId()!=impositionsTfuPaylaodWeb.getStructureId()){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous n'êtes pas autorisé à cloturer les enquetes du : "+user.getStructure().getNom()),
-                        HttpStatus.OK
-                );
-            }
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.cloturerImpositionsTfu(impositionsTfuPaylaodWeb), "enquete cloturées avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
 //    @PutMapping("/update/{id}")
 //    public ResponseEntity<?> updateImpositionsTfu(@PathVariable Long id, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
 //        try {
@@ -148,17 +85,12 @@ public class ImpositionsTfuController {
 //        }
 //    }
 
-    @Operation(
-            summary = "Autoriser la génération des avis d'un centre",
-            description = "Permet d'autoriser la génération des avis d'un centre pour un exervice données"
-    )
 
-    @PutMapping("/autoriser-generation-avis")
-    @PreAuthorize("hasAuthority('UPDATE_IMPOSITIONSTFU')")
-    public ResponseEntity<?> autoriserImpositionsTfu(@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    @PutMapping("/valider/{id}")
+    public ResponseEntity<?> validerImpositionsTfu(@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.autoriserGenerationImpositionsTfu(impositionsTfuPaylaodWeb), "Unite de logement mise à jour avec succès."),
+                    new ApiResponse<>(true, impositionsTfuService.validerImpositionsTfu(impositionsTfuPaylaodWeb), "Unite de logement mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -177,12 +109,11 @@ public class ImpositionsTfuController {
         }
     }
 
-    @PutMapping("/rejeter")
-    @PreAuthorize("hasAuthority('UPDATE_IMPOSITIONSTFU')")
-    public ResponseEntity<?> annulerImpositionsTfu(@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    @PutMapping("/annuler/{id}")
+    public ResponseEntity<?> annulerImpositionsTfu(@PathVariable Long id, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.rejeterImpositionsTfu(impositionsTfuPaylaodWeb), "Unite de logement mise à jour avec succès."),
+                    new ApiResponse<>(true, impositionsTfuService.annulerImpositionsTfu(impositionsTfuPaylaodWeb), "Unite de logement mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -202,7 +133,6 @@ public class ImpositionsTfuController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_IMPOSITIONSTFU')")
     public ResponseEntity<?> deleteImpositionsTfu(@PathVariable Long id) {
         try {
             impositionsTfuService.deleteImpositionsTfu(id);
@@ -227,7 +157,6 @@ public class ImpositionsTfuController {
     }
 
     @GetMapping("/all/by-user")
-    @PreAuthorize("hasAuthority('READ_IMPOSITIONSTFU')")
     public ResponseEntity<?> getAllImpositionsTfuList(@CurrentUser UserPrincipal userPrincipal) {
         try {
 
@@ -259,7 +188,6 @@ public class ImpositionsTfuController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_IMPOSITIONSTFU')")
     public ResponseEntity<?> getAllImpositionsTfuPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -285,7 +213,6 @@ public class ImpositionsTfuController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_IMPOSITIONSTFU')")
     public ResponseEntity<?> getImpositionsTfuById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java

@@ -16,7 +16,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -37,7 +36,6 @@ public class UniteLogementController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_UNITELOGEMENT')")
     public ResponseEntity<?> createUniteLogement(@RequestBody @Valid @Validated UniteLogementPaylaodWeb enqueteUniteLogementPaylaodWeb) {
         try {
             enqueteUniteLogementPaylaodWeb = enqueteUniteLogementService.createUniteLogement(enqueteUniteLogementPaylaodWeb);
@@ -62,7 +60,6 @@ public class UniteLogementController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_UNITELOGEMENT')")
     public ResponseEntity<?> updateUniteLogement(@PathVariable Long id, @RequestBody UniteLogementPaylaodWeb enqueteUniteLogementPaylaodWeb) {
         try {
             return new ResponseEntity<>(
@@ -86,7 +83,6 @@ public class UniteLogementController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_UNITELOGEMENT')")
     public ResponseEntity<?> deleteUniteLogement(@PathVariable Long id) {
         try {
             enqueteUniteLogementService.deleteUniteLogement(id);
@@ -111,7 +107,6 @@ public class UniteLogementController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_UNITELOGEMENT')")
     public ResponseEntity<?> getAllUniteLogementList() {
         try {
             return new ResponseEntity<>(
@@ -135,7 +130,6 @@ public class UniteLogementController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_UNITELOGEMENT')")
     public ResponseEntity<?> getAllUniteLogementPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -161,7 +155,6 @@ public class UniteLogementController {
     }
 
     @GetMapping("/all/by-batiment-id/{batimentId}")
-    @PreAuthorize("hasAuthority('READ_UNITELOGEMENT')")
     public ResponseEntity<?> getAllUniteLogementListByBatiment(@PathVariable Long batimentId) {
         try {
             return new ResponseEntity<>(
@@ -185,7 +178,6 @@ public class UniteLogementController {
     }
 
     @GetMapping("/all-paged/by-batiment-id/{batimentId}")
-    @PreAuthorize("hasAuthority('READ_UNITELOGEMENT')")
     public ResponseEntity<?> getAllUniteLogementByBatimentPaged(@PathVariable Long batimentId, @RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -211,7 +203,6 @@ public class UniteLogementController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_UNITELOGEMENT')")
     public ResponseEntity<?> getUniteLogementById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -235,7 +226,6 @@ public class UniteLogementController {
     }
 
     @GetMapping("/by-parcelle-id/{id}")
-    @PreAuthorize("hasAuthority('READ_UNITELOGEMENT')")
     public ResponseEntity<?> getUniteLogementByParcelleId(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -257,56 +247,4 @@ public class UniteLogementController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-
-    @GetMapping("/all-paged/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_UNITELOGEMENT')")
-    public ResponseEntity<?> getAllUniteLogementByQuartierPaged(@PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.getUniteLogementListByQuartierPageable(quartierId,pageable), "Liste des unites de logements chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/all/by-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_UNITELOGEMENT')")
-    public ResponseEntity<?> getAllUniteLogementByQuartier(@PathVariable Long quartierId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.getUniteLogementListByQuartier(quartierId), "Liste des unites de logements chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
 }

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuController.java

@@ -15,7 +15,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -35,7 +34,6 @@ public class BaremRfuController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_BAREMRFUBATI')")
     public ResponseEntity<?> createBaremRfu(@RequestBody @Valid @Validated BaremRfuBatiPayloadWeb baremRfuBatiPayloadWeb) {
         try {
             baremRfuBatiPayloadWeb = baremRfuBatiService.createBaremRfu(baremRfuBatiPayloadWeb);
@@ -60,7 +58,6 @@ public class BaremRfuController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_BAREMRFUBATI')")
     public ResponseEntity<?> updateBaremRfu(@PathVariable Long id, @RequestBody BaremRfuBatiPayloadWeb baremRfuBatiPayloadWeb) {
         try {
             return new ResponseEntity<>(
@@ -84,7 +81,6 @@ public class BaremRfuController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_BAREMRFUBATI')")
     public ResponseEntity<?> deleteBaremRfur(@PathVariable Long id) {
         try {
             baremRfuBatiService.deleteBaremRfu(id);
@@ -109,7 +105,6 @@ public class BaremRfuController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_BAREMRFUBATI')")
     public ResponseEntity<?> getAllBaremRfuList() {
         try {
             return new ResponseEntity<>(
@@ -133,7 +128,6 @@ public class BaremRfuController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_BAREMRFUBATI')")
     public ResponseEntity<?> getAllBaremRfuPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -159,7 +153,6 @@ public class BaremRfuController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_BAREMRFUBATI')")
     public ResponseEntity<?> getBaremRfuById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -183,7 +176,6 @@ public class BaremRfuController {
     }
 
     @GetMapping("/by-categorie-batiment-id/{idCategorieBatiment}")
-    @PreAuthorize("hasAuthority('READ_BAREMRFUBATI')")
     public ResponseEntity<?> getBaremRfuByType( //@Parameter(description = "ID de la catégorie de bâtiment", required = true)
                                                    @PathVariable Long idCategorieBatiment) {
 
@@ -210,7 +202,6 @@ public class BaremRfuController {
 
 
     @GetMapping("/by-arrondissement-id/by-categorie-batiment-id/{idArrondissement}/{idCategorieBatiment}")
-    @PreAuthorize("hasAuthority('READ_BAREMRFUBATI')")
     public ResponseEntity<?> getBaremRfuByArrondisementAndCategorie( //@Parameter(description = "ID de la catégorie de bâtiment", required = true)
                                                 @PathVariable Long idArrondissement,
                                                 @PathVariable Long idCategorieBatiment
@@ -238,7 +229,6 @@ public class BaremRfuController {
     }
 
     @GetMapping("/by-quartier-id/by-categorie-batiment-id/{idQuartier}/{idCategorieBatiment}")
-    @PreAuthorize("hasAuthority('READ_BAREMRFUBATI')")
     public ResponseEntity<?> getBaremRfuByQuartierAndCategorie( //@Parameter(description = "ID de la catégorie de bâtiment", required = true)
                                                                      @PathVariable Long idQuartier,
                                                                      @PathVariable Long idCategorieBatiment

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuNonBatiController.java

@@ -15,7 +15,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -36,8 +35,7 @@ public class BaremRfuNonBatiController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_BAREMRFUNONBATI')")
-    public ResponseEntity<?> createBaremRfuNonBati(@RequestBody BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) {
+    public ResponseEntity<?> createBaremRfuNonBati(@RequestBody @Valid @Validated BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) {
         try {
             baremRfuNonBatiPayloadWeb = baremRfuNonBatiService.createBaremRfuNonBati(baremRfuNonBatiPayloadWeb);
             return new ResponseEntity<>(
@@ -61,7 +59,6 @@ public class BaremRfuNonBatiController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_BAREMRFUNONBATI')")
     public ResponseEntity<?> updateBaremRfuNonBati(@PathVariable Long id, @RequestBody BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) {
         try {
             return new ResponseEntity<>(
@@ -85,7 +82,6 @@ public class BaremRfuNonBatiController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_BAREMRFUNONBATI')")
     public ResponseEntity<?> deleteBaremRfuNonBatir(@PathVariable Long id) {
         try {
             baremRfuNonBatiService.deleteBaremRfuNonBati(id);
@@ -110,7 +106,6 @@ public class BaremRfuNonBatiController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_BAREMRFUNONBATI')")
     public ResponseEntity<?> getAllBaremRfuNonBatiList() {
         try {
             return new ResponseEntity<>(
@@ -134,7 +129,6 @@ public class BaremRfuNonBatiController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_BAREMRFUNONBATI')")
     public ResponseEntity<?> getAllBaremRfuNonBatiPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +154,6 @@ public class BaremRfuNonBatiController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_BAREMRFUNONBATI')")
     public ResponseEntity<?> getBaremRfuNonBatiById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -185,7 +178,6 @@ public class BaremRfuNonBatiController {
 
 
     @GetMapping("/by-commune-id/by-zone-id/{communeId}/{zoneId}")
-    @PreAuthorize("hasAuthority('READ_BAREMRFUNONBATI')")
     public ResponseEntity<?> getBaremRfuNonBatiByCommineAndZoneId(@PathVariable Long communeId, Long zoneId) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CampagneController.java

@@ -15,7 +15,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -36,7 +35,6 @@ public class CampagneController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_CAMPAGNE')")
     public ResponseEntity<?> createCampagne(@RequestBody @Valid @Validated Campagne campagne) {
         try {
             campagne = campagneService.createCampagne(campagne);
@@ -61,7 +59,6 @@ public class CampagneController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_CAMPAGNE')")
     public ResponseEntity<?> updateCampagne(@PathVariable Long id, @RequestBody Campagne campagne) {
         try {
             return new ResponseEntity<>(
@@ -85,7 +82,6 @@ public class CampagneController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_CAMPAGNE')")
     public ResponseEntity<?> deleteCampagner(@PathVariable Long id) {
         try {
             campagneService.deleteCampagne(id);
@@ -110,7 +106,6 @@ public class CampagneController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_CAMPAGNE')")
     public ResponseEntity<?> getAllCampagneList() {
         try {
             return new ResponseEntity<>(
@@ -134,7 +129,6 @@ public class CampagneController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_CAMPAGNE')")
     public ResponseEntity<?> getAllCampagnePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +154,6 @@ public class CampagneController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_CAMPAGNE')")
     public ResponseEntity<?> getCampagneById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -184,7 +177,6 @@ public class CampagneController {
     }
 
     @GetMapping("/type-campagne/{typeCampagne}")
-    @PreAuthorize("hasAuthority('READ_CAMPAGNE')")
     public ResponseEntity<?> getCampagneByType(@PathVariable TypeCampagne typeCampagne) {
 
         try {

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CaracteristiqueController.java

@@ -15,7 +15,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -35,7 +34,6 @@ public class CaracteristiqueController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_CARACTERISTIQUE')")
     public ResponseEntity<?> createCaracteristique(@RequestBody @Valid @Validated Caracteristique caracteristique) {
         try {
             caracteristique = caracteristiqueService.createCaracteristique(caracteristique);
@@ -60,7 +58,6 @@ public class CaracteristiqueController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_CARACTERISTIQUE')")
     public ResponseEntity<?> updateCaracteristique(@PathVariable Long id, @RequestBody Caracteristique caracteristique) {
         try {
             return new ResponseEntity<>(
@@ -84,7 +81,6 @@ public class CaracteristiqueController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_CARACTERISTIQUE')")
     public ResponseEntity<?> deleteCaracteristique(@PathVariable Long id) {
         try {
             caracteristiqueService.deleteCaracteristique(id);
@@ -109,7 +105,6 @@ public class CaracteristiqueController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUE')")
     public ResponseEntity<?> getAllCaracteristiqueList() {
         try {
             return new ResponseEntity<>(
@@ -133,7 +128,6 @@ public class CaracteristiqueController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUE')")
     public ResponseEntity<?> getAllCaracteristiquePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -159,7 +153,6 @@ public class CaracteristiqueController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_CARACTERISTIQUE')")
     public ResponseEntity<?> getCaracteristiqueById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CategorieBatimentController.java

@@ -14,7 +14,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -35,7 +34,6 @@ public class CategorieBatimentController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_CATEGORIEBATIMENT')")
     public ResponseEntity<?> createCategorieBatiment(@RequestBody @Valid @Validated CategorieBatiment categorieBatiment) {
         try {
             categorieBatiment = categorieBatimentService.createCategorieBatiment(categorieBatiment);
@@ -60,7 +58,6 @@ public class CategorieBatimentController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_CATEGORIEBATIMENT')")
     public ResponseEntity<?> updateCategorieBatiment(@PathVariable Long id, @RequestBody CategorieBatiment categorieBatiment) {
         try {
             return new ResponseEntity<>(
@@ -84,7 +81,6 @@ public class CategorieBatimentController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_CATEGORIEBATIMENT')")
     public ResponseEntity<?> deleteCategorieBatimentr(@PathVariable Long id) {
         try {
             categorieBatimentService.deleteCategorieBatiment(id);
@@ -109,7 +105,6 @@ public class CategorieBatimentController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_CATEGORIEBATIMENT')")
     public ResponseEntity<?> getAllCategorieBatimentList() {
         try {
             return new ResponseEntity<>(
@@ -133,7 +128,6 @@ public class CategorieBatimentController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_CATEGORIEBATIMENT')")
     public ResponseEntity<?> getAllCategorieBatimentPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -159,7 +153,6 @@ public class CategorieBatimentController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_CATEGORIEBATIMENT')")
     public ResponseEntity<?> getCategorieBatimentById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java

@@ -15,7 +15,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -36,7 +35,6 @@ public class EquipeController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_EQUIPE')")
     public ResponseEntity<?> createEquipe(@RequestBody @Valid @Validated EquipePayload equipePayload) {
         try {
             Equipe equipe = equipeService.createEquipe(equipePayload);
@@ -61,7 +59,6 @@ public class EquipeController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_EQUIPE')")
     public ResponseEntity<?> updateEquipe(@PathVariable Long id, @RequestBody EquipePayload equipePayload) {
         try {
             return new ResponseEntity<>(
@@ -85,7 +82,6 @@ public class EquipeController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_EQUIPE')")
     public ResponseEntity<?> deleteEquiper(@PathVariable Long id) {
         try {
             equipeService.deleteEquipe(id);
@@ -110,7 +106,6 @@ public class EquipeController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_EQUIPE')")
     public ResponseEntity<?> getAllEquipeList() {
         try {
             return new ResponseEntity<>(
@@ -134,7 +129,6 @@ public class EquipeController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_EQUIPE')")
     public ResponseEntity<?> getAllEquipePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -160,7 +154,6 @@ public class EquipeController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_EQUIPE')")
     public ResponseEntity<?> getEquipeById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/ExerciceController.java

@@ -14,7 +14,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -35,7 +34,6 @@ public class ExerciceController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_EXERCICE')")
     public ResponseEntity<?> createExercice(@RequestBody @Valid @Validated Exercice exercice) {
         try {
             exercice = exerciceService.createExercice(exercice);
@@ -60,7 +58,6 @@ public class ExerciceController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_EXERCICE')")
     public ResponseEntity<?> updateExercice(@PathVariable Long id, @RequestBody Exercice exercice) {
         try {
             return new ResponseEntity<>(
@@ -84,7 +81,6 @@ public class ExerciceController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_EXERCICE')")
     public ResponseEntity<?> deleteExercicer(@PathVariable Long id) {
         try {
             exerciceService.deleteExercice(id);
@@ -109,7 +105,6 @@ public class ExerciceController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_EXERCICE')")
     public ResponseEntity<?> getAllExerciceList() {
         try {
             return new ResponseEntity<>(
@@ -133,7 +128,6 @@ public class ExerciceController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_EXERCICE')")
     public ResponseEntity<?> getAllExercicePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -159,7 +153,6 @@ public class ExerciceController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_EXERCICE')")
     public ResponseEntity<?> getExerciceById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -182,5 +175,6 @@ public class ExerciceController {
         }
     }
 
+
 }
 

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/TypeCaracteristiqueController.java

@@ -15,7 +15,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -35,7 +34,6 @@ public class TypeCaracteristiqueController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_TYPECARACTERISTIQUE')")
     public ResponseEntity<?> createTypeCaracteristique(@RequestBody @Valid @Validated TypeCaracteristique typeCaracteristique) {
         try {
             typeCaracteristique = typeCaracteristiqueService.createTypeCaracteristique(typeCaracteristique);
@@ -60,7 +58,6 @@ public class TypeCaracteristiqueController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_TYPECARACTERISTIQUE')")
     public ResponseEntity<?> updateTypeCaracteristique(@PathVariable Long id, @RequestBody TypeCaracteristique typeCaracteristique) {
         try {
             return new ResponseEntity<>(
@@ -84,7 +81,6 @@ public class TypeCaracteristiqueController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_TYPECARACTERISTIQUE')")
     public ResponseEntity<?> deleteTypeCaracteristique(@PathVariable Long id) {
         try {
             typeCaracteristiqueService.deleteTypeCaracteristique(id);
@@ -109,7 +105,6 @@ public class TypeCaracteristiqueController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_TYPECARACTERISTIQUE')")
     public ResponseEntity<?> getAllTypeCaracteristiqueList() {
         try {
             return new ResponseEntity<>(
@@ -133,7 +128,6 @@ public class TypeCaracteristiqueController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_TYPECARACTERISTIQUE')")
     public ResponseEntity<?> getAllTypeCaracteristiquePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -159,7 +153,6 @@ public class TypeCaracteristiqueController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_TYPECARACTERISTIQUE')")
     public ResponseEntity<?> getTypeCaracteristiqueById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/UsageController.java

@@ -14,7 +14,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -35,7 +34,6 @@ public class UsageController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_USAGE')")
     public ResponseEntity<?> createUsage(@RequestBody @Valid @Validated Usage usage) {
         try {
             usage = usageService.createUsage(usage);
@@ -60,7 +58,6 @@ public class UsageController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_USAGE')")
     public ResponseEntity<?> updateUsage(@PathVariable Long id, @RequestBody Usage usage) {
         try {
             return new ResponseEntity<>(
@@ -84,7 +81,6 @@ public class UsageController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_USAGE')")
     public ResponseEntity<?> deleteUsager(@PathVariable Long id) {
         try {
             usageService.deleteUsage(id);
@@ -109,7 +105,6 @@ public class UsageController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_USAGE')")
     public ResponseEntity<?> getAllUsageList() {
         try {
             return new ResponseEntity<>(
@@ -133,7 +128,6 @@ public class UsageController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_USAGE')")
     public ResponseEntity<?> getAllUsagePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -159,7 +153,6 @@ public class UsageController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_USAGE')")
     public ResponseEntity<?> getUsageById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/ZoneRfuController.java

@@ -14,7 +14,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -35,7 +34,6 @@ public class ZoneRfuController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_ZONERFU')")
     public ResponseEntity<?> createZoneRfu(@RequestBody @Valid @Validated ZoneRfu zoneRfu) {
         try {
             zoneRfu = zoneRfuService.createZoneRfu(zoneRfu);
@@ -60,7 +58,6 @@ public class ZoneRfuController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_ZONERFU')")
     public ResponseEntity<?> updateZoneRfu(@PathVariable Long id, @RequestBody ZoneRfu zoneRfu) {
         try {
             return new ResponseEntity<>(
@@ -84,7 +81,6 @@ public class ZoneRfuController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_ZONERFU')")
     public ResponseEntity<?> deleteZoneRfur(@PathVariable Long id) {
         try {
             zoneRfuService.deleteZoneRfu(id);
@@ -109,7 +105,6 @@ public class ZoneRfuController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_ZONERFU')")
     public ResponseEntity<?> getAllZoneRfuList() {
         try {
             return new ResponseEntity<>(
@@ -133,7 +128,6 @@ public class ZoneRfuController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_ZONERFU')")
     public ResponseEntity<?> getAllZoneRfuPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -159,7 +153,6 @@ public class ZoneRfuController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_ZONERFU')")
     public ResponseEntity<?> getZoneRfuById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/statistique/StatistiqueController.java

@@ -1,12 +1,9 @@
 package io.gmss.fiscad.controllers.statistique;
 
 import io.gmss.fiscad.enums.NiveauDecoupage;
-import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.statistique.StatistiquesService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.security.CurrentUser;
-import io.gmss.fiscad.security.UserPrincipal;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -177,77 +174,4 @@ public class StatistiqueController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-
-
-    @Operation(
-            summary = "Statistique des enquetes en cours par object ",
-            description = "Donnes le nombre d'enquetes en coures par objet"
-    )
-    @GetMapping(path = "/nombre-enquete/par-objet/en-cours")
-    public ResponseEntity<?> getStatistiquesEnqueteEnCoursParObjet(@CurrentUser UserPrincipal currentUser) {
-        try {
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, statistiquesService.getStatNombreEnqueteParObjetUserConnect(userId,StatutEnquete.EN_COURS.toString()), "Statistique des personne par type."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @Operation(
-            summary = "Statistique des enquetes en cours par object ",
-            description = "Donnes le nombre d'enquetes en coures par objet"
-    )
-    @GetMapping(path = "/nombre-enquete/par-objet/cloture")
-    public ResponseEntity<?> getStatistiquesEnqueteClotureParObjet(@CurrentUser UserPrincipal currentUser) {
-        try {
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, statistiquesService.getStatNombreEnqueteParObjetUserConnect(userId, StatutEnquete.CLOTURE.toString()), "Statistique des personne par type."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
 }

src/main/java/io/gmss/fiscad/controllers/synchronisation/RestaurationController.java

@@ -19,7 +19,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Restauration")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR') or hasRole('ROLE_ENQUETEUR')")
+@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR') or hasRole('ROLE_ENQUETEUR')")
 public class RestaurationController {
     public final RestaurationService restaurationService;
 

src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java

@@ -84,7 +84,7 @@ public class SynchronisationController {
 
     @Transactional
     @PostMapping("/personnes")
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncPersonne(@RequestBody List<PersonnePayLoad> personnePayLoads) {
         try {
             return new ResponseEntity<>(
@@ -108,7 +108,7 @@ public class SynchronisationController {
     }
 
     @PostMapping("/membre-groupe")
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncMembreGroupe(@RequestBody List<MembreGroupePayLoad> membreGroupePayLoads) {
         try {
             return new ResponseEntity<>(
@@ -132,7 +132,7 @@ public class SynchronisationController {
     }
 
     @PostMapping("/enquete")
-   // @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncEnquete(@RequestBody List<EnquetePayLoad> enquetePayLoads) {
         try {
             return new ResponseEntity<>(
@@ -156,7 +156,7 @@ public class SynchronisationController {
     }
 
     @PostMapping("/parcelle")
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncParcelle(@RequestBody List<ParcellePayLoad> parcellePayLoads) {
         try {
             return new ResponseEntity<>(
@@ -180,7 +180,7 @@ public class SynchronisationController {
     }
 
     @PostMapping("/piece")
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncPiece(@RequestBody List<PiecePayLoad> piecePayLoads) {
         try {
             return new ResponseEntity<>(
@@ -205,7 +205,7 @@ public class SynchronisationController {
     }
 
     @PostMapping("/acteur-concerne")
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncActeurConcerne(@RequestBody List<ActeurConcernePayLoad> piecePayLoads) {
         try {
             return new ResponseEntity<>(
@@ -230,7 +230,7 @@ public class SynchronisationController {
 
 
     @PostMapping("/enquete-activite")
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncEnqueteActivite(@RequestBody List<EnqueteActivitePayload> enqueteActivitePayloads) {
         try {
             return new ResponseEntity<>(
@@ -255,7 +255,7 @@ public class SynchronisationController {
     }
 
     @PostMapping("/declaraction-nc")
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncDeclarationNc(@RequestBody List<DeclarationNcPayload> declarationNcPayloads) {
         try {
             return new ResponseEntity<>(
@@ -335,7 +335,7 @@ public class SynchronisationController {
 //    }
 
     @PostMapping(path = "/uploads")
-   // @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncUploads(@RequestBody List<UploadPayLoad> uploadPayLoads) {
         return new ResponseEntity<>(
                 new ApiResponse<>(true, synchronisationService.syncUpload(uploadPayLoads), "Liste des uploads synchronisée avec succès."),
@@ -369,7 +369,7 @@ public class SynchronisationController {
 //    }
 
     @PostMapping(path = "/synchronise/all-enquete-data")
-   // @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncAllEnqueteData(@ModelAttribute EnqueteAllDataPayload enqueteAllDataPayload) {
         try {
             return new ResponseEntity<>(
@@ -393,7 +393,7 @@ public class SynchronisationController {
     }
 
     @PostMapping(path = "/synchronise/enquete/confirme-from-mobile")
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncAllEnqueteData(@RequestBody List<Long> longList) {
         try {
             return new ResponseEntity<>(
@@ -418,7 +418,7 @@ public class SynchronisationController {
 
 
     @PostMapping(path = "/batiment")
-    //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncBatiment(@RequestBody List<BatimentPaylaod> batimentPaylaods) {
         try {
             return new ResponseEntity<>(
@@ -443,7 +443,7 @@ public class SynchronisationController {
     }
 
     @PostMapping(path = "/unite-logement")
-   // @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncUniteLogement(@RequestBody List<UniteLogementPaylaod> uniteLogementPaylaods) {
         try {
             return new ResponseEntity<>(
@@ -468,7 +468,7 @@ public class SynchronisationController {
     }
 
     @PostMapping(path = "/caracteristique-batiment")
-   // @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncCaracteristiqueBatiment(@RequestBody List<CaracteristiqueBatimentPayload> CaracteristiqueBatimentPayloads) {
         try {
             return new ResponseEntity<>(
@@ -493,7 +493,7 @@ public class SynchronisationController {
     }
 
     @PostMapping(path = "/caracteristique-parcelle")
-   // @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncCaracteristiqueParcelle(@RequestBody List<CaracteristiqueParcellePayload> CaracteristiqueParcellePayloads) {
         try {
             return new ResponseEntity<>(
@@ -518,7 +518,7 @@ public class SynchronisationController {
     }
 
     @PostMapping(path = "/caracteristique-unite-logement")
-  //  @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncCaracteristiqueUniteLogement(@RequestBody List<CaracteristiqueUniteLogementPayload> CaracteristiqueUniteLogementPayloads) {
         try {
             return new ResponseEntity<>(
@@ -543,7 +543,7 @@ public class SynchronisationController {
     }
 
     @PostMapping("/enquete-batiment")
-  //  @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncEnqueteBatiment(@RequestBody List<EnqueteBatimentPayload> enqueteBatimentPayloads) {
         try {
             return new ResponseEntity<>(
@@ -568,7 +568,7 @@ public class SynchronisationController {
     }
 
     @PostMapping("/enquete-unite-logement")
- //   @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+    @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     public ResponseEntity<?> syncEnqueteUniteLogement(@RequestBody List<EnqueteUniteLogementPayload> enqueteUniteLogementPayloads) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/user/AvoirFonctionController.java

@@ -16,7 +16,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -38,7 +37,6 @@ public class AvoirFonctionController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_AVOIRFONCTION')")
     public ResponseEntity<?> createAvoirFonction(@RequestBody @Valid @Validated AvoirFonctionPaylaodWeb avoirFonctionPaylaodWeb ) {
         try {
             return new ResponseEntity<>(
@@ -63,7 +61,6 @@ public class AvoirFonctionController {
 
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_AVOIRFONCTION')")
     public ResponseEntity<?> updateAvoirFonction(@PathVariable Long id, @RequestBody AvoirFonctionPaylaodWeb avoirFonctionPaylaodWeb) {
         try {
             return new ResponseEntity<>(
@@ -87,7 +84,6 @@ public class AvoirFonctionController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_AVOIRFONCTION')")
     public ResponseEntity<?> deleteAvoirFonction(@PathVariable Long id) {
         try {
             avoirFonctionService.deleteAvoirFonction(id);
@@ -112,7 +108,6 @@ public class AvoirFonctionController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_AVOIRFONCTION')")
     public ResponseEntity<?> getAll() {
         try {
             return new ResponseEntity<>(
@@ -137,7 +132,6 @@ public class AvoirFonctionController {
 
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_AVOIRFONCTION')")
     public ResponseEntity<?> getAllPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -163,7 +157,6 @@ public class AvoirFonctionController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_AVOIRFONCTION')")
     public ResponseEntity<?> getById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -188,7 +181,6 @@ public class AvoirFonctionController {
 
 
     @GetMapping("/by-utilisateur-id/{userId}")
-    @PreAuthorize("hasAuthority('READ_AVOIRFONCTION')")
     public ResponseEntity<?> getByUserId(@PathVariable Long userId) {
         try {
             return new ResponseEntity<>(
@@ -213,7 +205,6 @@ public class AvoirFonctionController {
 
 
     @GetMapping("/page/by-utilisateur-id/{userId}")
-    @PreAuthorize("hasAuthority('READ_AVOIRFONCTION')")
     public ResponseEntity<?> getByUserIdPageable(@PathVariable Long userId,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);

src/main/java/io/gmss/fiscad/controllers/user/DemandeReinitialisationMPController.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
 
@@ -44,7 +43,6 @@ public class DemandeReinitialisationMPController {
     }
 
     @GetMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_DEMANDEREINITIALISATIONMP')")
     public ResponseEntity<?> createDemandeReinitialisationMP(@RequestParam String usernamrOrEmail) {
         try {
             demandeReinitialisationMPService.createDemandeReinitialisationMP(usernamrOrEmail);
@@ -69,7 +67,6 @@ public class DemandeReinitialisationMPController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_DEMANDEREINITIALISATIONMP')")
     public ResponseEntity<?> updateDemandeReinitialisationMP(@PathVariable Long id, @RequestBody DemandeReinitialisationMP demandeReinitialisationMP) {
         try {
             return new ResponseEntity<>(
@@ -93,7 +90,6 @@ public class DemandeReinitialisationMPController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_DEMANDEREINITIALISATIONMP')")
     public ResponseEntity<?> deleteDemandeReinitialisationMPr(@PathVariable Long id) {
         try {
             demandeReinitialisationMPService.deleteDemandeReinitialisationMP(id);
@@ -172,7 +168,6 @@ public class DemandeReinitialisationMPController {
 //    }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_DEMANDEREINITIALISATIONMP')")
     public ResponseEntity<?> getAllDemandeReinitialisationMPPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -198,7 +193,6 @@ public class DemandeReinitialisationMPController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_DEMANDEREINITIALISATIONMP')")
     public ResponseEntity<?> getDemandeReinitialisationMPById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -222,7 +216,6 @@ public class DemandeReinitialisationMPController {
     }
 
     @GetMapping("/reset")
-    @PreAuthorize("hasAuthority('UPDATE_DEMANDEREINITIALISATIONMP')")
     public ResponseEntity<?> traiterDemande(@RequestParam Long id, @RequestParam String password) {
         try {
             DemandeReinitialisationMP demandeReinitialisationMP = demandeReinitialisationMPService.traiterDemandeReinitialisation(id, password);

src/main/java/io/gmss/fiscad/controllers/user/FonctionController.java

@@ -16,7 +16,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -38,7 +37,6 @@ public class FonctionController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_FONCTION')")
     public ResponseEntity<?> createFonction(@RequestBody @Valid @Validated FonctionPaylaodWeb fonctionPaylaodWeb) {
         try {
            Fonction fonction = fonctionService.createFonction(fonctionPaylaodWeb);
@@ -63,7 +61,6 @@ public class FonctionController {
     }
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_FONCTION')")
     public ResponseEntity<?> updateFonction(@PathVariable Long id, @RequestBody FonctionPaylaodWeb fonctionPaylaodWeb) {
         try {
             return new ResponseEntity<>(
@@ -87,7 +84,6 @@ public class FonctionController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_FONCTION')")
     public ResponseEntity<?> deleteFonction(@PathVariable Long id) {
         try {
             fonctionService.deleteFonction(id);
@@ -112,7 +108,6 @@ public class FonctionController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_FONCTION')")
     public ResponseEntity<?> getAllFonctionList() {
         try {
             return new ResponseEntity<>(
@@ -136,7 +131,6 @@ public class FonctionController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_FONCTION')")
     public ResponseEntity<?> getAllFonctionPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -161,7 +155,6 @@ public class FonctionController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_FONCTION')")
     public ResponseEntity<?> getFonctionById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/user/ProfileController.java

@@ -16,7 +16,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -38,7 +37,6 @@ public class ProfileController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_PROFILE')")
     public ResponseEntity<?> createProfile(@RequestBody @Valid @Validated ProfilePaylaodWeb profilePaylaodWeb ) {
         try {
             Profile  profile = profileService.createProfile(profilePaylaodWeb);
@@ -64,7 +62,6 @@ public class ProfileController {
 
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_PROFILE')")
     public ResponseEntity<?> updateProfile(@PathVariable Long id, @RequestBody ProfilePaylaodWeb profilePaylaodWeb) {
         try {
             return new ResponseEntity<>(
@@ -88,7 +85,6 @@ public class ProfileController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_PROFILE')")
     public ResponseEntity<?> deleteProfile(@PathVariable Long id) {
         try {
             profileService.deleteProfile(id);
@@ -113,7 +109,6 @@ public class ProfileController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_PROFILE')")
     public ResponseEntity<?> getAll() {
         try {
             return new ResponseEntity<>(
@@ -137,7 +132,6 @@ public class ProfileController {
     }
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_PROFILE')")
     public ResponseEntity<?> getById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -161,7 +155,6 @@ public class ProfileController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_PROFILE')")
     public ResponseEntity<?> getAllPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);

src/main/java/io/gmss/fiscad/controllers/user/ProfileModuleFonctionnaliteController.java

@@ -1,184 +0,0 @@
-package io.gmss.fiscad.controllers.user;
-
-
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.user.ProfileModuleFonctionnaliteService;
-import io.gmss.fiscad.interfaces.user.ProfileModuleFonctionnaliteService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.ProfileModuleFonctionnalitePayloadWeb;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import lombok.AllArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-@AllArgsConstructor
-@RestController
-@RequestMapping(value = "api/profile-module-fonctionnalite", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "ProfileModuleFonctionnalite")
-@CrossOrigin(origins = "*")
-public class ProfileModuleFonctionnaliteController {
-
-    private final ProfileModuleFonctionnaliteService profileModuleFonctionnaliteService;
-
-    private static final Logger logger = LoggerFactory.getLogger(ProfileModuleFonctionnaliteController.class);
-
-
-
-    @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_PROFILEMODULEFONCTIONNALITE')")
-    public ResponseEntity<?> createProfileModuleFonctionnalite(@RequestBody @Valid @Validated ProfileModuleFonctionnalitePayloadWeb modulePayLoadWeb) {
-        try {
-            modulePayLoadWeb = profileModuleFonctionnaliteService.createProfileModuleFonctionnalite(modulePayLoadWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, modulePayLoadWeb, "ProfileModuleFonctionnalite créé avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_PROFILEMODULEFONCTIONNALITE')")
-    public ResponseEntity<?> updateProfileModuleFonctionnalite(@PathVariable Long id, @RequestBody ProfileModuleFonctionnalitePayloadWeb modulePayLoadWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, profileModuleFonctionnaliteService.updateProfileModuleFonctionnalite(id,modulePayLoadWeb), "ProfileModuleFonctionnalite mise à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_PROFILEMODULEFONCTIONNALITE')")
-    public ResponseEntity<?> deleteProfileModuleFonctionnalite(@PathVariable Long id) {
-        try {
-            profileModuleFonctionnaliteService.deleteProfileModuleFonctionnalite(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "ProfileModuleFonctionnalite supprimée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_PROFILEMODULEFONCTIONNALITE')")
-    public ResponseEntity<?> getAllProfileModuleFonctionnaliteList() {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, profileModuleFonctionnaliteService.getProfileModuleFonctionnaliteListToDto(), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all/by-profil-id/{profilId}")
-    @PreAuthorize("hasAuthority('READ_PROFILEMODULEFONCTIONNALITE')")
-    public ResponseEntity<?> getAllProfileModuleFonctionnaliteByProfilList(@PathVariable Long profilId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, profileModuleFonctionnaliteService.getAllProfileModuleFonctionnaliteByProfilIdToDto(profilId), "Liste des modules chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-    @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_PROFILEMODULEFONCTIONNALITE')")
-    public ResponseEntity<?> getProfileModuleFonctionnaliteById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, profileModuleFonctionnaliteService.getProfileModuleFonctionnaliteByIdToDto(id), "ProfileModuleFonctionnalite trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-}

src/main/java/io/gmss/fiscad/controllers/user/RoleController.java

@@ -15,7 +15,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -37,7 +36,6 @@ public class RoleController {
 
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_ROLE')")
     public ResponseEntity<?> createRole(@RequestBody @Valid @Validated Role role) {
         try {
             role = roleService.createRole(role);
@@ -63,7 +61,6 @@ public class RoleController {
 
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_ROLE')")
     public ResponseEntity<?> updateRole(@PathVariable Long id, @RequestBody Role role) {
         try {
             return new ResponseEntity<>(
@@ -87,7 +84,6 @@ public class RoleController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_ROLE')")
     public ResponseEntity<?> deleteRole(@PathVariable Long id) {
         try {
             roleService.deleteRole(id);
@@ -112,7 +108,6 @@ public class RoleController {
     }
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_ROLE')")
     public ResponseEntity<?> getAll() {
         try {
             return new ResponseEntity<>(
@@ -136,7 +131,6 @@ public class RoleController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_ROLE')")
     public ResponseEntity<?> getAllPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);

src/main/java/io/gmss/fiscad/controllers/user/UserController.java

@@ -20,7 +20,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
@@ -45,7 +44,6 @@ public class UserController {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_USER')")
     public ResponseEntity<?> createUser(@RequestBody @Valid @Validated UserPaylaodWeb userPaylaodWeb) {
         try {
             userPaylaodWeb  = userService.createUser(userPaylaodWeb);
@@ -70,7 +68,6 @@ public class UserController {
     }
 
     @PostMapping("/change-password")
-    @PreAuthorize("hasAuthority('UPDATE_USER')")
     public ResponseEntity<?> changeUserPassword(@RequestBody @Valid @Validated Login login) {
         try {
             userService.updatePassword(login.getUsername(), login.getPassword());
@@ -95,7 +92,6 @@ public class UserController {
     }
 
     @PostMapping("/reset-password")
-    @PreAuthorize("hasAuthority('UPDATE_USER')")
     public ResponseEntity<?> resetUserPassword(@RequestBody @Valid @Validated Login login) {
         try {
             UserPaylaodWeb userPaylaodWeb= userService.resetPassword(login.getUsername());
@@ -120,7 +116,6 @@ public class UserController {
     }
 
     @PostMapping("/validate-user-account/{userName}")
-    @PreAuthorize("hasAuthority('UPDATE_USER')")
     public ResponseEntity<?> validateUserAccount(@PathVariable String userName) {
         try {
             User user = userService.validateUserAccount(userName);
@@ -146,7 +141,6 @@ public class UserController {
 
 
     @PutMapping("/update/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_USER')")
     public ResponseEntity<?> updateUser(@PathVariable Long id, @RequestBody UserPaylaodWeb userPaylaodWeb) {
         try {
             return new ResponseEntity<>(
@@ -170,7 +164,6 @@ public class UserController {
     }
 
     @GetMapping("/activate/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_USER')")
     public ResponseEntity<?> acitvateUser(@PathVariable Long id) {
         try {
             User user  = userService.activateUser(id);
@@ -196,7 +189,6 @@ public class UserController {
 
 
     @GetMapping("/desactivate/{id}")
-    @PreAuthorize("hasAuthority('UPDATE_USER')")
     public ResponseEntity<?> disacitvateUser(@PathVariable Long id) {
         try {
             User user  = userService.disactivateUser(id);
@@ -221,7 +213,6 @@ public class UserController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_USER')")
     public ResponseEntity<?> deleteUser(@PathVariable Long id) {
         try {
             userService.deleteUser(id);
@@ -247,7 +238,6 @@ public class UserController {
 
 
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('READ_USER')")
     public ResponseEntity<?> getAll() {
         try {
 
@@ -271,7 +261,6 @@ public class UserController {
     }
 
     @GetMapping("/all-paged")
-    @PreAuthorize("hasAuthority('READ_USER')")
     public ResponseEntity<?> getAllPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -295,7 +284,6 @@ public class UserController {
     }
 
     @GetMapping("/all-by-structure/{structureId}")
-    @PreAuthorize("hasAuthority('READ_USER')")
     public ResponseEntity<?> getAllByStructure(@PathVariable Long structureId) {
         try {
 
@@ -322,7 +310,6 @@ public class UserController {
     }
 
     @GetMapping("/page/all-by-structure/{structureId}")
-    @PreAuthorize("hasAuthority('READ_USER')")
     public ResponseEntity<?> getAllByStructurePaged(@PathVariable Long structureId, @RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
@@ -351,7 +338,6 @@ public class UserController {
 
 
     @GetMapping("/id/{id}")
-    @PreAuthorize("hasAuthority('READ_USER')")
     public ResponseEntity<?> getUserById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
@@ -375,7 +361,6 @@ public class UserController {
     }
 
     @GetMapping("/username/{username}")
-    @PreAuthorize("hasAuthority('READ_USER')")
     public ResponseEntity<?> getUserByUsername(@PathVariable String username) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/entities/decoupage/Quartier.java

@@ -29,8 +29,6 @@ public class Quartier extends BaseEntity implements Serializable {
     @ManyToOne
     private Arrondissement arrondissement;
 
-    private String longitude;
-    private String latitude;
 //    @JsonIgnore
 //    @OneToOne(mappedBy = "quartier")
 //    private Bloc bloc;

src/main/java/io/gmss/fiscad/entities/frontend/Fonctionnalite.java

@@ -1,28 +0,0 @@
-package io.gmss.fiscad.entities.frontend;
-
-import io.gmss.fiscad.entities.BaseEntity;
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class Fonctionnalite extends BaseEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private String code;
-    private String nom;
-    private String lien;
-    @Column(nullable = false, columnDefinition = "BOOLEAN DEFAULT true")
-    private Boolean actif;
-    @ManyToOne
-    private ModuleApp moduleApp;
-}

src/main/java/io/gmss/fiscad/entities/frontend/ModuleApp.java

@@ -1,31 +0,0 @@
-package io.gmss.fiscad.entities.frontend;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.fiscad.entities.BaseEntity;
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ModuleApp extends BaseEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private String code;
-    private String nom;
-    private String lien;
-    @Column(nullable = false, columnDefinition = "BOOLEAN DEFAULT true")
-    private Boolean actif;
-    @JsonIgnore
-    @OneToMany(mappedBy = "moduleApp")
-    private List<Fonctionnalite> fonctionnalites;
-}

src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java

@@ -99,9 +99,9 @@ public class Enquete extends BaseEntity implements Serializable {
     @ManyToOne
     private Campagne campagne;
 
-//    @JsonIgnore
-//    @ManyToOne
-//    private Equipe equipe;
+    @JsonIgnore
+    @ManyToOne
+    private Equipe equipe;
 
    // @JsonIgnore
     @ManyToOne

src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java

@@ -61,7 +61,7 @@ public class Parcelle extends BaseEntity implements Serializable {
     @ManyToOne
     private Tpe terminal;
     private String autreNumeroTitreFoncier;
-    private String numeroProvisoire;
+    private Long numeroProvisoire;
     private Long blocId;
     @ColumnDefault("false")
     private boolean synchronise;

src/main/java/io/gmss/fiscad/entities/infocad/metier/ParcelleGeom.java

@@ -97,7 +97,6 @@ public class ParcelleGeom extends BaseEntity implements Serializable {
     @Enumerated(EnumType.STRING)
     private SourceDonnee sourceDonnees;
     private String observations;
-
     @Enumerated(EnumType.STRING)
     private StatutParcelle statutParcelle;
     private Long uploadId;
@@ -119,7 +118,7 @@ public class ParcelleGeom extends BaseEntity implements Serializable {
     private Quartier quartier ;
 
     @ColumnDefault("0")
-    private Integer  geomSrid;
+    private int  geomSrid;
     @JsonSerialize(using = GeometrySerializer.class)
     @JsonDeserialize(contentUsing = GeometryDeserializer.class)
     @Column(name = "geometry",columnDefinition = "geometry(Polygon,32631)")

src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java

@@ -24,7 +24,6 @@ import org.hibernate.annotations.Where;
 
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
@@ -89,7 +88,7 @@ public class Piece extends BaseEntity implements Serializable {
 
 
     @OneToMany(mappedBy = "piece")
-    private List<Upload> uploads=new ArrayList<>();
+    private List<Upload> uploads;
 
     @JsonIgnore
     @ManyToOne
@@ -104,9 +103,4 @@ public class Piece extends BaseEntity implements Serializable {
     private boolean synchronise;
     private String observation;
 
-    private Long nombreFichier;
-
-    public Long getNombreFichier() {
-        return uploads==null? 0l:uploads.size() ;
-    }
 }

src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java

@@ -41,7 +41,6 @@ public class Personne extends BaseEntity implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private String ifu;
-    private String nc;
     private String nom;
     private String prenom;
     private String raisonSociale;

src/main/java/io/gmss/fiscad/entities/interface_sigibe/DeclarationSpontaneBien.java

@@ -1,62 +0,0 @@
-package io.gmss.fiscad.entities.interface_sigibe;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.fiscad.deserializer.LocalDateDeserializer;
-import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.entities.decoupage.Quartier;
-import io.gmss.fiscad.entities.infocad.parametre.Personne;
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class DeclarationSpontaneBien extends BaseEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private Long idImposition ;
-    private String rImposition ;
-    private String ifu ;
-    private String rCommune ;
-    private String rQuartier ;
-    private String qipQuartier;
-    private String qipIlot;
-    private String qipParcelle;
-    private String nup;
-    private String gpsLatitude;
-    private String gpsLongitude;
-    private String commentaire;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateValidation;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateInformation;
-    private Long valeurBatiment;
-    private Long nub;
-    private Long nul;
-    private Long montantLocatifAnnuel ;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateConstruction;
-    private Float superficieSolBat;
-    private Float superficieSolUlot;
-    private Float superficieParcelle;
-    private String usage;
-    private Boolean bati;
-    @ManyToOne
-    private Personne personne;
-    @ManyToOne
-    private Quartier quartier;
-}

src/main/java/io/gmss/fiscad/entities/interface_sigibe/EpaiementAcompte.java

@@ -1,58 +0,0 @@
-package io.gmss.fiscad.entities.interface_sigibe;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.fiscad.deserializer.LocalDateDeserializer;
-import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.entities.infocad.parametre.Personne;
-import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation;
-import io.gmss.fiscad.entities.infocad.parametre.TypeContestation;
-import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation;
-import io.gmss.fiscad.enums.SourceDonnee;
-import io.gmss.fiscad.enums.TypeDroit;
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class EpaiementAcompte extends BaseEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private Long idPaiementAcompte;
-    private Long idPaiementImpot;
-    private String rDoc;
-    private String rImpot;
-    private String idImpotType;
-    private String idImpotNature;  /// participe unicité
-    private String ifu;       /// participe unicité
-    private String rCommune;
-    private String rQuartier; /// participe unicité
-    private String qipQuartier;
-    private String qipIlot;   /// participe unicité
-    private String qipParcelle;   /// participe unicité
-    private String nup;
-    private Long exercice;   /// participe unicité
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateValidation;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateAvisCredit;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateRapprochement;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateInformation;
-    private Long montantPayer;
-}

src/main/java/io/gmss/fiscad/entities/interface_sigibe/EpaiementRetenu.java

@@ -1,55 +0,0 @@
-package io.gmss.fiscad.entities.interface_sigibe;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.fiscad.deserializer.LocalDateDeserializer;
-import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.enums.SourceDonnee;
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class EpaiementRetenu extends BaseEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private Long idPaiementRetenue;
-    private Long idEdiGenerique;
-    private Long idPaiementImpot;
-    private String rDoc;
-    private String rImpot;
-    private String idImpotType;
-    private String idImpotNature;
-    private String ifuPayeur;
-    private String ifuRetenue;
-    private String rCommune;
-    private String rQuartier;
-    private String qipQuartier;
-    private String qipIlot;
-    private String qipParcelle;
-    private String nup;
-    private Long exercice;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateValidation;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateAvisCredit;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateRapprochement;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateInformation;
-    private Long montantPayer;
-}

src/main/java/io/gmss/fiscad/entities/interface_sigibe/PaiementAvis.java

@@ -1,50 +0,0 @@
-package io.gmss.fiscad.entities.interface_sigibe;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.fiscad.deserializer.LocalDateDeserializer;
-import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.enums.SourceDonnee;
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class PaiementAvis extends BaseEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private Long idPaiementImpot;
-    private Long idAvis;
-    private Long idUniteFoncier;
-    private Long idContribuableFoncier;
-    private String rDoc;
-    private String rImpot;
-    private String idImpotType;
-    private String idImpotNature;
-    private String ifu;
-    private String rCommune;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateValidation;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateAvisCredit;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateRapprochement;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateInformation;
-    private Long montantPayer;
-
-}

src/main/java/io/gmss/fiscad/entities/rfu/metier/CommuneCentreAssignation.java

@@ -1,67 +0,0 @@
-package io.gmss.fiscad.entities.rfu.metier;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.fiscad.deserializer.LocalDateDeserializer;
-import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.entities.decoupage.Commune;
-import io.gmss.fiscad.entities.infocad.metier.Parcelle;
-import io.gmss.fiscad.entities.infocad.metier.Tpe;
-import io.gmss.fiscad.entities.infocad.parametre.Personne;
-import io.gmss.fiscad.entities.infocad.parametre.Structure;
-import io.gmss.fiscad.enums.StatutEnregistrement;
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-
-@Entity
-@Table(
-        uniqueConstraints = {
-                @UniqueConstraint(
-                        name = "uk_structure_commune_personne",
-                        columnNames = {"structure_id", "commune_id", "personne_id"}
-                )
-        }
-)
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class CommuneCentreAssignation extends BaseEntity implements Serializable {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @JsonIgnore
-    @ManyToOne
-    @JoinColumn(name = "structure_id", nullable = false)
-    private Structure structure;
-
-    @JsonIgnore
-    @ManyToOne
-    @JoinColumn(name = "commune_id", nullable = false)
-    private Commune commune;
-
-    @JsonIgnore
-    @ManyToOne
-    @JoinColumn(name = "personne_id")
-    private Personne personne;
-
-    @JsonIgnore
-    @ManyToOne
-    @JoinColumn(name = "parcelle_id")
-    private Parcelle parcelle;
-
-    private String nc;
-
-    private String ifu;
-
-    private String adresseContact ;
-}

src/main/java/io/gmss/fiscad/entities/rfu/metier/DeclarationNc.java

@@ -36,22 +36,19 @@ public class DeclarationNc extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateDerniereDeclaration;
 
+
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateDeclarationNc;
 
     private String nc;
-    private String q;
-    private String i;
-    private String p;
-    private String numeroTitreFoncier;
-    private String nup;
     private String observation;
 
     @JsonIgnore
     @ManyToOne
     private Structure structure;
 
+
     private Long  enqueteExternalKey;
 
     @JsonIgnore

src/main/java/io/gmss/fiscad/entities/rfu/metier/DonneesImpositionTfu.java

@@ -8,10 +8,6 @@ import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.infocad.metier.Enquete;
 import io.gmss.fiscad.entities.infocad.metier.Parcelle;
 import io.gmss.fiscad.entities.infocad.metier.Tpe;
-import io.gmss.fiscad.entities.infocad.parametre.Personne;
-import io.gmss.fiscad.entities.infocad.parametre.Structure;
-import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
-import io.gmss.fiscad.enums.NatureImpot;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -74,22 +70,16 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
     private String latitude;
     private int superficieParc;
     private Long superficieAuSolBat;
-    private Long superficieAuSolLoue;
     private Long superficieAuSolUlog;
-    private Boolean batie;
-    private Boolean exonere;
-    private Boolean batimentExonere;
-    private Boolean uniteLogementExonere;
+    private String batieOuiNon;
+    private String exhonereOuiNon;
+    private String batimentExhonereOuiNon;
+    private String uniteLogementExhonereOuiNon;
     private Long valeurLocativeAdm;
-    private Long valeurLocativeAdmTauxPropParc;
-    private Long valeurLocativeAdmSupReel;
-    private Long superficieAuSolTauxPropParc;
-    private Long valeurLocativeAdmMetreCarre;
     private Long montantLoyerAnnuel;
     private Long tfuMetreCarre;
     private Long tfuMinimum;
     private String standingBat;
-    private String categorieUsage;
     private String categorieBat;
     private Long nombrePiscine;
     private Long nombreUlog;
@@ -98,59 +88,14 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateEnquete;
     private Long enqueteId;
-
-    @JsonIgnore
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "structure_id")
-    private Structure structure ;
-
+    private Long structureId;
     private Long secteurId;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "zone_rfu_id")
-    private ZoneRfu zoneRfu ;
-
+    private Long zoneRfuId;
     @ColumnDefault("0")
-    private Long valeurAdminParcelleNb;
-    private Float tauxTfu;
-    private Long tfuPiscine;
-    private Float montantTaxe;
-    private Float penalite;
-    private Float retenuIrf ;
-    private Float acompte ;
-    private Float montantRestant ;
-    private Float montantTaxeBrut;  //montant de la taxe calculée sans comparaisons avec TFU MINI
-    private Float tfuCalculeTauxPropParc;
-    private Float tfuSuperficieAuSolReel;
-    private Long valeurAdminParcelleNbMetreCarre;
+    private float tauxParcelleNonBati;
+    private Long valeurAdministrativeParcelleNonBati;
     @JsonIgnore
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "impositions_tfu_id", nullable = false)
-    private ImpositionsTfu impositionsTfu ;
-    @Enumerated(EnumType.STRING)
-    private NatureImpot natureImpot;
-    private Long valeurBatiment;
-    private Long valeurParcelle;
-
-    @JsonIgnore
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parcelle_id")
-    private Parcelle parcelleImposee ;
-
-    @JsonIgnore
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "batiment_id")
-    private Batiment batimentImpose ;
-
-    @JsonIgnore
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "unite_logement_id")
-    private UniteLogement uniteLogementImposee ;
-
-
-    @JsonIgnore
-    @ManyToOne(fetch = FetchType.LAZY)
-    private Personne personne ;
-
-    private Boolean parcelleContact;
-
+    private ImpositionsTfu impositionsTfu;
 }

src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java

@@ -83,14 +83,6 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateEnquete;
 
- @JsonFormat(pattern = "dd-MM-yyyy")
- @JsonDeserialize(using = LocalDateDeserializer.class)
- private LocalDate dateValidation;
-
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateRejet;
-    private String descriptionMotifRejet;
     @ManyToOne
     private Exercice exercice;
 

src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java

@@ -73,15 +73,6 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateEnquete;
-
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateValidation;
-
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateRejet;
-    private String descriptionMotifRejet;
     private String observation;
     private Long uniteLogementExternalKey;
 

src/main/java/io/gmss/fiscad/entities/rfu/metier/ImpositionsTfu.java

@@ -55,10 +55,7 @@ public class ImpositionsTfu extends BaseEntity implements Serializable {
     @Enumerated(EnumType.STRING)
     private StatusAvis statusAvis;
 
-    private Integer nombreAvis;
-    private Integer nombreAvisFnb;
-    private Integer nombreAvisBatiment;
-    private Integer nombreAvisUniteLog;
+    private Long nombreAvis;
 
     @Column(columnDefinition = "TEXT")
     private String motif;
@@ -68,5 +65,7 @@ public class ImpositionsTfu extends BaseEntity implements Serializable {
     @JoinColumn(name = "impositions_tfu_id")
     private List<DonneesImpositionTfu> donneesImpositionTfus;
 
-
+    public  Long getNombreAvis(){
+        return donneesImpositionTfus==null?0l:donneesImpositionTfus.size();
+    }
 }

src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java

@@ -51,7 +51,6 @@ public class UniteLogement extends BaseEntity implements Serializable {
     private Long montantLocatifAnnuelDeclare;
     private Long montantLocatifAnnuelCalcule;
     private Long valeurUniteLogementEstime;
-    private Long montantLocatifAnnuelEstime;
     private Long valeurUniteLogementReel;
     private Long valeurUniteLogementCalcule;
     private Integer nombrePiscine;

src/main/java/io/gmss/fiscad/entities/rfu/parametre/BaremRfuNonBati.java

@@ -23,8 +23,6 @@ public class BaremRfuNonBati extends BaseEntity implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private Long valeurAdministrative;
-    private Long valeurAdministrativeMetreCarre;
-    private Boolean auMetreCarre;
     private Float taux;
     @ManyToOne
     private Commune commune;

src/main/java/io/gmss/fiscad/entities/user/ProfileModuleFonctionnalite.java

@@ -1,29 +0,0 @@
-package io.gmss.fiscad.entities.user;
-
-import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.entities.frontend.Fonctionnalite;
-import io.gmss.fiscad.entities.frontend.ModuleApp;
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-//@EqualsAndHashCode(callSuper = true)
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Entity
-public class ProfileModuleFonctionnalite extends BaseEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    @ManyToOne
-    private Profile profile;
-    @ManyToOne
-    private ModuleApp moduleApp;
-    @ManyToOne
-    private Fonctionnalite fonctionnalite ;
-    private Boolean actif;
-}

src/main/java/io/gmss/fiscad/enums/NatureImpot.java

@@ -1,8 +0,0 @@
-package io.gmss.fiscad.enums;
-
-public enum NatureImpot {
-    FB,
-    FNB,
-    IRF,
-    SRTB
-}

src/main/java/io/gmss/fiscad/enums/ParametersType.java

@@ -12,11 +12,5 @@ public enum ParametersType {
     CORPS_RESET_PASSWORD,
     OBJET_CREATE_ACCOUNT,
     CORPS_CREATE_ACCOUNT,
-    TOKEN_IFU_EN_LIGNE,
-    TAUX_TFU,
-    TAUX_VALEUR_LOCATIVE_PROFESSIONNELLE,
-    TAUX_DEFAUT_SUPERFICIE_AU_SOL,
-    TAUX_IRF,
-    TAXE_SRTB,
-    TFU_PAR_PISCINE;
+    TOKEN_IFU_EN_LIGNE ;
 }

src/main/java/io/gmss/fiscad/enums/StatusAvis.java

@@ -1,13 +1,8 @@
 package io.gmss.fiscad.enums;
 
 public enum StatusAvis {
-    EN_COURS,
-
-    CLOTURE,
-    GENERATION_AUTORISE,
-
-    REJETE,
-    TFU_FNB_GENERE,
-    GENERE
-
+    CREE,  //Equivaut à la cloture des enquêtes et des mise à jour + Creation d'une imposition
+    GENERE,
+    ANNULE,
+    VALIDE,
 }

src/main/java/io/gmss/fiscad/enums/StatutEnquete.java

@@ -2,6 +2,7 @@ package io.gmss.fiscad.enums;
 
 public enum StatutEnquete {
     EN_COURS,
+    DECLARATION,
     FINALISE,
     REJETE,
     VALIDE,

src/main/java/io/gmss/fiscad/enums/StatutParcelle.java

@@ -1,7 +1,7 @@
 package io.gmss.fiscad.enums;
 
 public enum StatutParcelle {
-    NON_ENQUETE,
+    NON_ENQUETER,
     AJOUR,
     NON_AJOUR;
 }

src/main/java/io/gmss/fiscad/enums/UserProfile.java

@@ -1,77 +1,9 @@
 package io.gmss.fiscad.enums;
 
 public enum UserProfile {
-    EBANK_OPE,
-    ACAAGENT,
-    ADMINF,
-    ADMINT,
-    API_CONT,
-    API_CONT_CONSULTATION,
-    CASAGENT,
-    CASCHEF,
-    EBANK_OPE_BATI,
-    EBANK_OPE_BATI_DIRT,
-    EBANK_OPE_DIRT,
-    EBANK_OPE_PAIE,
-    EBANK_OPE_PAIE_DIRT,
-    ECP_ADMIN,
-    ENTDECL,
-    ENTEFI,
-    ENTFULL,
-    ENTGEST,
-    ENTREGL,
-    ENTREGLVALID,
-    ENTUSER,
-    ENTENR,
-    CNSS,
-    CNSS_REC,
-    COMPTABLE,
-    COMPTACHEFDIV,
-    CONSULTATION,
-    CTRLAGENT,
-    CTRLCHEF,
-    CTRLDIRECTEUR,
-    DIRECTEUR,
-    DIRGENERAL,
-    DLCAGENT,
-    DLCCHEF,
-    DLCDIRECTEUR,
-    DPSE,
-    DPSE_COLL,
-    EBANK_ADMIN,
-    EBANQUE_API,
-    EBANK_CONTROLE,
-    EBANK_CONTROLE_BATI,
-    EBANK_CONTROLE_PAIE,
-    EXP_ADMIN,
-    EXP_CON,
-    EXP_VAL,
-    GESAGENT,
-    GESCENTRE,
-    GESCHEF,
-    IMMAT,
-    IMMAT_SAISIE,
-    MINISTRE,
-    ORDRECHEFDIV,
-    OTM,
-    PROGAGENT,
-    PROGCHEF,
-    PSTAGENT,
-    PSTCHEFSEC,
-    RECAGENT,
-    RECCHB,
-    RECCHEF,
-    RECCHEFDIV,
-    RECCHEFSEC,
-    RECNAT,
-    SUPPORT,
-    SYSTEME,
-    VERIFAGENT,
-    CENTIFAGENT,
-    EBANQUE_CASAGENT,
-    EBANQUE_CASAGENT_DIRECT,
-    EBANQUE_CASCHEF,
-    ENRAGENT,
-    ENRCHEF,
-    AMFRE
+    INSPECTEUR_GESTIONNAIRE,
+    ADMIN_FONCTIONNEL,
+    INSPECTEUR_GESTIONNAIRE_CHEF_SECTEUR,
+    INSPECTEUR_GESTIONNAIRE_CHEF_SECTION,
+    INSPECTEUR_GESTIONNAIRE_CHEF_CENTRE
 }

src/main/java/io/gmss/fiscad/enums/UserRole.java

@@ -1,281 +1,24 @@
 package io.gmss.fiscad.enums;
 
 public enum UserRole {
-    CREATE_ARRONDISSEMENT,
-    READ_ARRONDISSEMENT,
-    UPDATE_ARRONDISSEMENT,
-    DELETE_ARRONDISSEMENT,
-    CREATE_COMMUNE,
-    READ_COMMUNE,
-    UPDATE_COMMUNE,
-    DELETE_COMMUNE,
-    CREATE_DEPARTEMENT,
-    READ_DEPARTEMENT,
-    UPDATE_DEPARTEMENT,
-    DELETE_DEPARTEMENT,
-    CREATE_NATIONALITE,
-    READ_NATIONALITE,
-    UPDATE_NATIONALITE,
-    DELETE_NATIONALITE,
-    CREATE_QUARTIER,
-    READ_QUARTIER,
-    UPDATE_QUARTIER,
-    DELETE_QUARTIER,
-    CREATE_SECTEUR,
-    READ_SECTEUR,
-    UPDATE_SECTEUR,
-    DELETE_SECTEUR,
-    CREATE_SECTION,
-    READ_SECTION,
-    UPDATE_SECTION,
-    DELETE_SECTION,
-    CREATE_PARCELLE,
-    READ_PARCELLE,
-    UPDATE_PARCELLE,
-    DELETE_PARCELLE,
-    CREATE_PERSONNE,
-    READ_PERSONNE,
-    UPDATE_PERSONNE,
-    DELETE_PERSONNE,
-    CREATE_BATIMENT,
-    READ_BATIMENT,
-    UPDATE_BATIMENT,
-    DELETE_BATIMENT,
-    CREATE_ACTEURCONCERNE,
-    READ_ACTEURCONCERNE,
-    UPDATE_ACTEURCONCERNE,
-    DELETE_ACTEURCONCERNE,
-    CREATE_COMMENTAIRE,
-    READ_COMMENTAIRE,
-    UPDATE_COMMENTAIRE,
-    DELETE_COMMENTAIRE,
-    CREATE_ENQUETE,
-    READ_ENQUETE,
-    UPDATE_ENQUETE,
-    DELETE_ENQUETE,
-    CREATE_MEMBREGROUPE,
-    READ_MEMBREGROUPE,
-    UPDATE_MEMBREGROUPE,
-    DELETE_MEMBREGROUPE,
-    CREATE_PARCELLEGEOM,
-    READ_PARCELLEGEOM,
-    UPDATE_PARCELLEGEOM,
-    DELETE_PARCELLEGEOM,
-    CREATE_PIECE,
-    READ_PIECE,
-    UPDATE_PIECE,
-    DELETE_PIECE,
-    CREATE_RUE,
-    READ_RUE,
-    UPDATE_RUE,
-    DELETE_RUE,
-    CREATE_TPE,
-    READ_TPE,
-    UPDATE_TPE,
-    DELETE_TPE,
-    CREATE_UPLOAD,
-    READ_UPLOAD,
-    UPDATE_UPLOAD,
-    DELETE_UPLOAD,
-    CREATE_BLOC,
-    READ_BLOC,
-    UPDATE_BLOC,
-    DELETE_BLOC,
-    CREATE_MODEACQUISITION,
-    READ_MODEACQUISITION,
-    UPDATE_MODEACQUISITION,
-    DELETE_MODEACQUISITION,
-    CREATE_NATUREDOMAINE,
-    READ_NATUREDOMAINE,
-    UPDATE_NATUREDOMAINE,
-    DELETE_NATUREDOMAINE,
-    CREATE_POSITIONREPRESENTATION,
-    READ_POSITIONREPRESENTATION,
-    UPDATE_POSITIONREPRESENTATION,
-    DELETE_POSITIONREPRESENTATION,
-    CREATE_PROFESSION,
-    READ_PROFESSION,
-    UPDATE_PROFESSION,
-    DELETE_PROFESSION,
-    CREATE_SITUATIONGEOGRAPHIQUE,
-    READ_SITUATIONGEOGRAPHIQUE,
-    UPDATE_SITUATIONGEOGRAPHIQUE,
-    DELETE_SITUATIONGEOGRAPHIQUE,
-    CREATE_SITUATIONMATRIMONIALE,
-    READ_SITUATIONMATRIMONIALE,
-    UPDATE_SITUATIONMATRIMONIALE,
-    DELETE_SITUATIONMATRIMONIALE,
-    CREATE_SOURCEDROIT,
-    READ_SOURCEDROIT,
-    UPDATE_SOURCEDROIT,
-    DELETE_SOURCEDROIT,
-    CREATE_SOURCEDROITEXERCE,
-    READ_SOURCEDROITEXERCE,
-    UPDATE_SOURCEDROITEXERCE,
-    DELETE_SOURCEDROITEXERCE,
-    CREATE_STRUCTURE,
-    READ_STRUCTURE,
-    UPDATE_STRUCTURE,
-    DELETE_STRUCTURE,
-    CREATE_TYPECONTESTATION,
-    READ_TYPECONTESTATION,
-    UPDATE_TYPECONTESTATION,
-    DELETE_TYPECONTESTATION,
-    CREATE_TYPEDOMAINE,
-    READ_TYPEDOMAINE,
-    UPDATE_TYPEDOMAINE,
-    DELETE_TYPEDOMAINE,
-    CREATE_TYPEPERSONNE,
-    READ_TYPEPERSONNE,
-    UPDATE_TYPEPERSONNE,
-    DELETE_TYPEPERSONNE,
-    CREATE_TYPEPIECE,
-    READ_TYPEPIECE,
-    UPDATE_TYPEPIECE,
-    DELETE_TYPEPIECE,
-    CREATE_TYPEREPRESENTATION,
-    READ_TYPEREPRESENTATION,
-    UPDATE_TYPEREPRESENTATION,
-    DELETE_TYPEREPRESENTATION,
-    CREATE_TYPERUE,
-    READ_TYPERUE,
-    UPDATE_TYPERUE,
-    DELETE_TYPERUE,
-    CREATE_CARACTERISTIQUEBATIMENT,
-    READ_CARACTERISTIQUEBATIMENT,
-    UPDATE_CARACTERISTIQUEBATIMENT,
-    DELETE_CARACTERISTIQUEBATIMENT,
-    CREATE_CARACTERISTIQUEPARCELLE,
-    READ_CARACTERISTIQUEPARCELLE,
-    UPDATE_CARACTERISTIQUEPARCELLE,
-    DELETE_CARACTERISTIQUEPARCELLE,
-    CREATE_CARACTERISTIQUEUNITELOGEMENT,
-    READ_CARACTERISTIQUEUNITELOGEMENT,
-    UPDATE_CARACTERISTIQUEUNITELOGEMENT,
-    DELETE_CARACTERISTIQUEUNITELOGEMENT,
-    CREATE_COMMUNECENTREASSIGNATION,
-    READ_COMMUNECENTREASSIGNATION,
-    UPDATE_COMMUNECENTREASSIGNATION,
-    DELETE_COMMUNECENTREASSIGNATION,
-    CREATE_DECLARATIONNC,
-    READ_DECLARATIONNC,
-    UPDATE_DECLARATIONNC,
-    DELETE_DECLARATIONNC,
-    CREATE_DONNEESIMPOSITIONTFU,
-    READ_DONNEESIMPOSITIONTFU,
-    UPDATE_DONNEESIMPOSITIONTFU,
-    DELETE_DONNEESIMPOSITIONTFU,
-    CREATE_ENQUETEACTIVITE,
-    READ_ENQUETEACTIVITE,
-    UPDATE_ENQUETEACTIVITE,
-    DELETE_ENQUETEACTIVITE,
-    CREATE_ENQUETEBATIMENT,
-    READ_ENQUETEBATIMENT,
-    UPDATE_ENQUETEBATIMENT,
-    DELETE_ENQUETEBATIMENT,
-    CREATE_ENQUETEUNITELOGEMENT,
-    READ_ENQUETEUNITELOGEMENT,
-    UPDATE_ENQUETEUNITELOGEMENT,
-    DELETE_ENQUETEUNITELOGEMENT,
-    CREATE_IMPOSITIONSTFU,
-    READ_IMPOSITIONSTFU,
-    UPDATE_IMPOSITIONSTFU,
-    DELETE_IMPOSITIONSTFU,
-    CREATE_SITUATIONFISCALEPARCELLE,
-    READ_SITUATIONFISCALEPARCELLE,
-    UPDATE_SITUATIONFISCALEPARCELLE,
-    DELETE_SITUATIONFISCALEPARCELLE,
-    CREATE_UNITELOGEMENT,
-    READ_UNITELOGEMENT,
-    UPDATE_UNITELOGEMENT,
-    DELETE_UNITELOGEMENT,
-    CREATE_BAREMRFUBATI,
-    READ_BAREMRFUBATI,
-    UPDATE_BAREMRFUBATI,
-    DELETE_BAREMRFUBATI,
-    CREATE_BAREMRFUNONBATI,
-    READ_BAREMRFUNONBATI,
-    UPDATE_BAREMRFUNONBATI,
-    DELETE_BAREMRFUNONBATI,
-    CREATE_CAMPAGNE,
-    READ_CAMPAGNE,
-    UPDATE_CAMPAGNE,
-    DELETE_CAMPAGNE,
-    CREATE_CARACTERISTIQUE,
-    READ_CARACTERISTIQUE,
-    UPDATE_CARACTERISTIQUE,
-    DELETE_CARACTERISTIQUE,
-    CREATE_CATEGORIEBATIMENT,
-    READ_CATEGORIEBATIMENT,
-    UPDATE_CATEGORIEBATIMENT,
-    DELETE_CATEGORIEBATIMENT,
-    CREATE_EQUIPE,
-    READ_EQUIPE,
-    UPDATE_EQUIPE,
-    DELETE_EQUIPE,
-    CREATE_EXERCICE,
-    READ_EXERCICE,
-    UPDATE_EXERCICE,
-    DELETE_EXERCICE,
-    CREATE_PARTICIPER,
-    READ_PARTICIPER,
-    UPDATE_PARTICIPER,
-    DELETE_PARTICIPER,
-    CREATE_TYPECARACTERISTIQUE,
-    READ_TYPECARACTERISTIQUE,
-    UPDATE_TYPECARACTERISTIQUE,
-    DELETE_TYPECARACTERISTIQUE,
-    CREATE_USAGE,
-    READ_USAGE,
-    UPDATE_USAGE,
-    DELETE_USAGE,
-    CREATE_ZONERFU,
-    READ_ZONERFU,
-    UPDATE_ZONERFU,
-    DELETE_ZONERFU,
-    CREATE_AVOIRFONCTION,
-    READ_AVOIRFONCTION,
-    UPDATE_AVOIRFONCTION,
-    DELETE_AVOIRFONCTION,
-    CREATE_DEMANDEREINITIALISATIONMP,
-    READ_DEMANDEREINITIALISATIONMP,
-    UPDATE_DEMANDEREINITIALISATIONMP,
-    DELETE_DEMANDEREINITIALISATIONMP,
-    CREATE_FONCTION,
-    READ_FONCTION,
-    UPDATE_FONCTION,
-    DELETE_FONCTION,
-    CREATE_PROFILE,
-    READ_PROFILE,
-    UPDATE_PROFILE,
-    DELETE_PROFILE,
-    CREATE_ROLE,
-    READ_ROLE,
-    UPDATE_ROLE,
-    DELETE_ROLE,
+
+    ADMIN,
     CREATE_USER,
-    READ_USER,
     UPDATE_USER,
+    READ_USER,
     DELETE_USER,
-    CREATE_PARAMETERS,
-    READ_PARAMETERS,
-    UPDATE_PARAMETERS,
-    DELETE_PARAMETERS,
-    CREATE_SECTEUR_DECOUPAGE,
-    READ_SECTEUR_DECOUPAGE,
-    UPDATE_SECTEUR_DECOUPAGE,
-    DELETE_SECTEUR_DECOUPAGE,
-    CREATE_MODULE,
-    READ_MODULE,
-    UPDATE_MODULE,
-    DELETE_MODULE,
-    CREATE_FONCTIONNALITE,
-    READ_FONCTIONNALITE,
-    UPDATE_FONCTIONNALITE,
-    DELETE_FONCTIONNALITE,
-    CREATE_PROFILEMODULEFONCTIONNALITE,
-    READ_PROFILEMODULEFONCTIONNALITE,
-    UPDATE_PROFILEMODULEFONCTIONNALITE,
-    DELETE_PROFILEMODULEFONCTIONNALITE
+    CREATE_PARCELLE,
+    UPDATE_PARCELLE,
+    READ_PARCELLE,
+    DELETE_PARCELLE,
+    CREATE_ENQUETE,
+    UPDATE_ENQUETE,
+    READ_ENQUETE,
+    DELETE_ENQUETE,
+    CREATE_BATIMENT,
+    UPDATE_BATIMENT,
+    READ_BATIMENT,
+    DELETE_BATIMENT
+
 
 }

src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurDecoupageServiceImpl.java

@@ -2,18 +2,15 @@ package io.gmss.fiscad.implementations.decoupage;
 
 import io.gmss.fiscad.entities.decoupage.Secteur;
 import io.gmss.fiscad.entities.decoupage.SecteurDecoupage;
-import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.decoupage.SecteurDecoupageService;
 import io.gmss.fiscad.interfaces.decoupage.SecteurService;
 import io.gmss.fiscad.paylaods.request.crudweb.SecteurDecoupagePaylaodWeb;
-import io.gmss.fiscad.paylaods.response.statistique.ParcelleStatsProjectionUnSecteur;
+import io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb;
+import io.gmss.fiscad.paylaods.response.restoration.ParcelleStatsProjectionUnSecteur;
 import io.gmss.fiscad.persistence.repositories.decoupage.SecteurDecoupageRepository;
-import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository;
-import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteBatimentRepository;
-import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteUniteLogementRepository;
 import io.gmss.fiscad.service.EntityFromPayLoadService;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -29,9 +26,6 @@ public class SecteurDecoupageServiceImpl implements SecteurDecoupageService {
     private final SecteurDecoupageRepository secteurDecoupageRepository;
     private final SecteurService secteurService;
     private final ParcelleRepository parcelleRepository;
-    private final EnqueteRepository enqueteRepository;
-    private final EnqueteBatimentRepository enqueteBatimentRepository;
-    private final EnqueteUniteLogementRepository enqueteUniteLogementRepository;
     private final EntityFromPayLoadService entityFromPayLoadService;
 
 
@@ -118,36 +112,4 @@ public class SecteurDecoupageServiceImpl implements SecteurDecoupageService {
 
         return parcelleStatsProjectionUnSecteurs ;
     }
-
-    @Override
-    public List<ParcelleStatsProjectionUnSecteur> getStatEnqueteDecoupageByUserId(Long userId, String statutEnquete) {
-        List<Secteur> secteurs= secteurService.getListSecteurUserId(userId);
-        List<Long> secteurIds = secteurs.stream()
-                .map(Secteur::getId)
-                .toList();
-        System.out.println(statutEnquete);
-        return enqueteRepository.findStatsEnqueteBySecteurs(secteurIds,statutEnquete);
-    }
-
-    @Override
-    public List<ParcelleStatsProjectionUnSecteur> getStatEnqueteBatimentDecoupageByUserId(Long userId, String statutEnquete) {
-        List<Secteur> secteurs= secteurService.getListSecteurUserId(userId);
-        List<Long> secteurIds = secteurs.stream()
-                .map(Secteur::getId)
-                .toList();
-        System.out.println(statutEnquete);
-        System.out.println(secteurIds);
-        return enqueteBatimentRepository.findStatsEnqueteBatimentBySecteurs(secteurIds,statutEnquete);
-    }
-
-    @Override
-    public List<ParcelleStatsProjectionUnSecteur> getStatEnqueteUniteLogementDecoupageByUserId(Long userId, String statutEnquete) {
-        List<Secteur> secteurs= secteurService.getListSecteurUserId(userId);
-        List<Long> secteurIds = secteurs.stream()
-                .map(Secteur::getId)
-                .toList();
-        return enqueteUniteLogementRepository.findStatsEnqueteBatimentBySecteurs(secteurIds,statutEnquete);
-    }
-
-
 }

src/main/java/io/gmss/fiscad/implementations/frontend/FonctionnaliteServiceImpl.java

@@ -1,74 +0,0 @@
-package io.gmss.fiscad.implementations.frontend;
-
-import io.gmss.fiscad.entities.frontend.Fonctionnalite;
-import io.gmss.fiscad.exceptions.BadRequestException;
-import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.interfaces.frontend.FonctionnaliteService;
-import io.gmss.fiscad.paylaods.request.crudweb.FonctionnalitePayloadWeb;
-import io.gmss.fiscad.persistence.repositories.frontend.FonctionnaliteRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-
-@AllArgsConstructor
-@Service
-public class FonctionnaliteServiceImpl implements FonctionnaliteService {
-    private final FonctionnaliteRepository fonctionnaliteRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
-    @Override
-    public FonctionnalitePayloadWeb createFonctionnalite(FonctionnalitePayloadWeb fonctionnalitePayloadWeb) throws BadRequestException {
-        if (fonctionnalitePayloadWeb.getId() != null) {
-            throw new BadRequestException("Impossible de créer une nouvelle déclaration NC ayant un id non null.");
-        }
-
-        Fonctionnalite fonctionnalite= entityFromPayLoadService.getFonctionnaliteFromPayloadWeb(fonctionnalitePayloadWeb);
-        fonctionnalite = fonctionnaliteRepository.save(fonctionnalite);
-        return fonctionnaliteRepository.findPayloadById(fonctionnalite.getId()).orElse(null);
-    }
-
-    @Override
-    public FonctionnalitePayloadWeb updateFonctionnalite(Long id, FonctionnalitePayloadWeb fonctionnalitePayloadWeb) throws NotFoundException {
-        if (fonctionnalitePayloadWeb.getId() == null) {
-            throw new BadRequestException("La fonctionnaliteApp n'existe pas.");
-        }
-
-        if (!fonctionnaliteRepository.existsById(fonctionnalitePayloadWeb.getId())) {
-            throw new NotFoundException("La fonctionnaliteApp n'existe pas");
-        }
-
-        Fonctionnalite fonctionnaliteApp = entityFromPayLoadService.getFonctionnaliteFromPayloadWeb(fonctionnalitePayloadWeb);
-        fonctionnaliteApp =fonctionnaliteRepository.save(fonctionnaliteApp);
-        return fonctionnaliteRepository.findPayloadById(fonctionnaliteApp.getId()).orElse(null);
-    }
-
-    @Override
-    public void deleteFonctionnalite(Long id) throws NotFoundException {
-        Optional<Fonctionnalite> fonctionnaliteOptional = fonctionnaliteRepository.findById(id);
-        if (fonctionnaliteOptional.isPresent()) {
-            fonctionnaliteRepository.deleteById(fonctionnaliteOptional.get().getId());
-        } else {
-            throw new NotFoundException("Impossible de trouver la fonctionnalite à supprimer .");
-        }
-    }
-
-
-
-    @Override
-    public List<FonctionnalitePayloadWeb> getFonctionnaliteListToDto() {
-        return fonctionnaliteRepository.findAllPayload();
-    }
-
-    @Override
-    public Optional<FonctionnalitePayloadWeb> getFonctionnaliteByIdToDto(Long id) {
-        return fonctionnaliteRepository.findPayloadById(id);
-    }
-
-    @Override
-    public List<FonctionnalitePayloadWeb> getAllFonctionnaliteByProfilIdToDto(Long id) {
-        return fonctionnaliteRepository.findByProfileId(id);
-    }
-
-}

src/main/java/io/gmss/fiscad/implementations/frontend/ModuleServiceImpl.java

@@ -1,75 +0,0 @@
-package io.gmss.fiscad.implementations.frontend;
-
-import io.gmss.fiscad.entities.frontend.ModuleApp;
-import io.gmss.fiscad.exceptions.BadRequestException;
-import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.interfaces.frontend.ModuleService;
-import io.gmss.fiscad.paylaods.request.crudweb.ModulePayloadWeb;
-import io.gmss.fiscad.persistence.repositories.frontend.ModuleRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-
-@AllArgsConstructor
-@Service
-public class ModuleServiceImpl implements ModuleService {
-    private final ModuleRepository moduleRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
-    @Override
-    public ModulePayloadWeb createModule(ModulePayloadWeb modulePayloadWeb) throws BadRequestException {
-        if (modulePayloadWeb.getId() != null) {
-            throw new BadRequestException("Impossible de créer une nouvelle déclaration NC ayant un id non null.");
-        }
-
-        ModuleApp module= entityFromPayLoadService.getModuleFromPayloadWeb(modulePayloadWeb);
-        module = moduleRepository.save(module);
-        return moduleRepository.findPayloadById(module.getId()).orElse(null);
-    }
-
-    @Override
-    public ModulePayloadWeb updateModule(Long id, ModulePayloadWeb modulePayloadWeb) throws NotFoundException {
-        if (modulePayloadWeb.getId() == null) {
-            throw new BadRequestException("La moduleApp n'existe pas.");
-        }
-
-        if (!moduleRepository.existsById(modulePayloadWeb.getId())) {
-            throw new NotFoundException("La moduleApp n'existe pas");
-        }
-
-        ModuleApp moduleApp = entityFromPayLoadService.getModuleFromPayloadWeb(modulePayloadWeb);
-        moduleApp =moduleRepository.save(moduleApp);
-        return moduleRepository.findPayloadById(moduleApp.getId()).orElse(null);
-    }
-
-    @Override
-    public void deleteModule(Long id) throws NotFoundException {
-        Optional<ModuleApp> moduleOptional = moduleRepository.findById(id);
-        if (moduleOptional.isPresent()) {
-            moduleRepository.deleteById(moduleOptional.get().getId());
-        } else {
-            throw new NotFoundException("Impossible de trouver la module à supprimer .");
-        }
-    }
-
-
-
-    @Override
-    public List<ModulePayloadWeb> getModuleListToDto() {
-        return moduleRepository.findAllPayload();
-    }
-
-    @Override
-    public Optional<ModulePayloadWeb> getModuleByIdToDto(Long id) {
-        return moduleRepository.findPayloadById(id);
-    }
-
-    @Override
-    public List<ModulePayloadWeb> getAllModuleByProfilIdToDto(Long id) {
-        return moduleRepository.findPayloadByProfilId(id);
-    }
-
-
-}

src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java

@@ -1,6 +1,5 @@
 package io.gmss.fiscad.implementations.infocad.metier;
 
-import io.gmss.fiscad.entities.decoupage.Secteur;
 import io.gmss.fiscad.entities.infocad.metier.*;
 import io.gmss.fiscad.entities.infocad.parametre.Personne;
 import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
@@ -14,9 +13,7 @@ import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.exceptions.ApplicationException;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.interfaces.decoupage.SecteurService;
 import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
-import io.gmss.fiscad.interfaces.infocad.metier.ParcelleService;
 import io.gmss.fiscad.interfaces.infocad.metier.PieceService;
 import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueParcelleService;
 import io.gmss.fiscad.interfaces.rfu.metier.DeclarationNcService;
@@ -26,7 +23,6 @@ import io.gmss.fiscad.interfaces.user.UserService;
 import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
 import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
 import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb;
-import io.gmss.fiscad.paylaods.request.crudweb.ParcellePayLoadWeb;
 import io.gmss.fiscad.paylaods.response.* ;
 import io.gmss.fiscad.paylaods.response.FicheResponse.* ;
 import io.gmss.fiscad.paylaods.response.synchronisation.EnqueteNonSyncResponse;
@@ -48,7 +44,6 @@ import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.Query;
 import jakarta.transaction.Transactional;
-import jakarta.ws.rs.NotAcceptableException;
 import lombok.RequiredArgsConstructor;
 import org.modelmapper.ModelMapper;
 import org.springframework.data.domain.Page;
@@ -83,9 +78,13 @@ public class EnqueteServiceImpl implements EnqueteService {
     private final ParcelleServiceImpl parcelleService;
     private final PersonneRepository personneRepository;
     private final ZoneRfuRepository zoneRfuRepository ;
+    private final EquipeRepository equipeRepository ;
+    private final RueRepository rueRepository ;
+    private final CaracteristiqueParcelleService caracteristiqueParcelleService ;
+    private final PieceService pieceService ;
+    private final UploadRepository uploadRepository ;
+    private final DeclarationNcService declarationNcService ;
     private final EntityFromPayLoadService entityFromPayLoadService ;
-    private final SecteurService secteurService ;
-            ;
 
     @PersistenceContext
     private final EntityManager em;
@@ -93,73 +92,67 @@ public class EnqueteServiceImpl implements EnqueteService {
 
 
     @Override
-    @Transactional
     public EnquetePayLoadWeb createEnquete(EnquetePayLoadWeb enquetePayLoadWeb) throws BadRequestException {
-
         Optional<User> optionalUser = userRepository.findById(enquetePayLoadWeb.getEnqueteurId());
         if (!optionalUser.isPresent()) {
             throw new BadRequestException("Echec de l'enregistrement : Enquêteur inexistant");
         }
-
         Optional<Personne> optionalPersonne = personneRepository.findById(enquetePayLoadWeb.getPersonneId());
         if (!optionalPersonne.isPresent()) {
             throw new BadRequestException("Echec de l'enregistrement : Propriétaire inexistant");
         }
 
-        if(enquetePayLoadWeb.getParcelleId()!=null) {
-            Optional<Parcelle> optionalParcelle = parcelleRepository.findById(enquetePayLoadWeb.getParcelleId());
-            if (!optionalParcelle.isPresent()) {
-                throw new BadRequestException("Echec de l'enregistrement : Parcelle inexistante");
-            }
+        Optional<Parcelle> optionalParcelle = parcelleRepository.findById(enquetePayLoadWeb.getParcelleId());
+        if (!optionalParcelle.isPresent()) {
+            throw new BadRequestException("Echec de l'enregistrement : Parcelle inexistante");
         }
 
-
         Optional<ZoneRfu> optionalZoneRfu = zoneRfuRepository.findById(enquetePayLoadWeb.getZoneRfuId());
         if (!optionalZoneRfu.isPresent()) {
             throw new BadRequestException("Echec de l'enregistrement : zone inexistante");
         }
 
-        ParcellePayLoadWeb parcellePayLoadWeb= getParcellePayloadFromEnquetePl(enquetePayLoadWeb);
-
-        if(parcellePayLoadWeb.getId()==null){
-            parcellePayLoadWeb=parcelleService.createParcelle(parcellePayLoadWeb);
-        }else{
-            parcellePayLoadWeb=parcelleService.updateParcelle(parcellePayLoadWeb.getId(),parcellePayLoadWeb);
+        if (enquetePayLoadWeb.getParcelleId() == null) {
+            throw new ApplicationException("Echec de l'enregistrement : La parcelle non renseignée.");
         }
-
-        enquetePayLoadWeb.setParcelleId(parcellePayLoadWeb.getId());
-
-        Enquete enquete = entityFromPayLoadService.getEnqueteFromPayLoadWeb(enquetePayLoadWeb);
+       Enquete enquete = entityFromPayLoadService.getEnqueteFromPayLoadWeb(enquetePayLoadWeb);
         ////enregistrement de l'enquete
+
         enquete=enqueteRepository.save(enquete);
 
-        return enqueteRepository.findEnqueteToDto(enquete.getId()).orElse(null);
-    }
+        //////Enregistrement des caractéristiques parcelle
+//        enquetePayLoadWeb.getCaracteristiqueParcellePayloadWebs().forEach(caracteristiqueParcellePayloadWeb -> {
+//            caracteristiqueParcellePayloadWeb.setEnqueteId(finalEnquete.getId());
+//            CaracteristiqueParcelle caracteristiqueParcelle=entityFromPayLoadService.getCaracteristiqueParcelleFromPayLoadWeb(caracteristiqueParcellePayloadWeb);
+//            caracteristiqueParcelleService.createCaracteristiqueParcelle(caracteristiqueParcelle);
+//        });
 
-    private ParcellePayLoadWeb getParcellePayloadFromEnquetePl(EnquetePayLoadWeb enquetePayLoadWeb) {
-                ParcellePayLoadWeb parcellePayLoadWeb=new ParcellePayLoadWeb();
-                parcellePayLoadWeb.setId(enquetePayLoadWeb.getParcelleId());
-                parcellePayLoadWeb.setQ(enquetePayLoadWeb.getParcelleQ());
-                parcellePayLoadWeb.setI(enquetePayLoadWeb.getParcelleI());
-                parcellePayLoadWeb.setP(enquetePayLoadWeb.getParcelleP());
-                parcellePayLoadWeb.setNup(enquetePayLoadWeb.getParcelleNup());
-                parcellePayLoadWeb.setNupProvisoire(enquetePayLoadWeb.getNupProvisoire());
-                parcellePayLoadWeb.setNumTitreFoncier(enquetePayLoadWeb.getNumeroTitreFoncier());
-                parcellePayLoadWeb.setLongitude(enquetePayLoadWeb.getLongitude());
-                parcellePayLoadWeb.setLatitude(enquetePayLoadWeb.getLatitude());
-                parcellePayLoadWeb.setAltitude(enquetePayLoadWeb.getAltitude());
-                parcellePayLoadWeb.setSuperficie(enquetePayLoadWeb.getSuperficie());
-                parcellePayLoadWeb.setObservation(enquetePayLoadWeb.getObservation());
-                parcellePayLoadWeb.setSituationGeographique(enquetePayLoadWeb.getSituationGeographique());
-                parcellePayLoadWeb.setNumEntreeParcelle(enquetePayLoadWeb.getNumEntreeParcelle());
-                parcellePayLoadWeb.setQuartierId(enquetePayLoadWeb.getQuartierId());
-                parcellePayLoadWeb.setNatureDomaineId(enquetePayLoadWeb.getNatureDomaineId());
-                parcellePayLoadWeb.setTypeDomaineId(enquetePayLoadWeb.getTypeDomaineId());
-                parcellePayLoadWeb.setRueId(enquetePayLoadWeb.getRueId());
-                parcellePayLoadWeb.setProprietaireId(enquetePayLoadWeb.getPersonneId());
-                parcellePayLoadWeb.setNatureDomaineId(enquetePayLoadWeb.getNatureDomaineId());
-                parcellePayLoadWeb.setNatureDomaineId(enquetePayLoadWeb.getNatureDomaineId());
-                return parcellePayLoadWeb;
+        /////Enregistrement des pièce de parcelles
+//        enquetePayLoadWeb.getPiecePayLoadWebs().forEach(piecePayLoadWeb -> {
+//            piecePayLoadWeb.setEnqueteId(finalEnquete.getId());
+//            //Piece piece=entityFromPayLoadService.getPieceFromPayLoadWeb(piecePayLoadWeb);
+//            Piece piecefinal = pieceService.createPiece(entityFromPayLoadService.getPieceFromPayLoadWeb(piecePayLoadWeb));
+//            piecePayLoadWeb.getUploadPayLoadWebs().forEach(uploadPayLoadWeb -> {
+//                uploadPayLoadWeb.setEnqueteId(finalEnquete.getId());
+//                Upload upload=entityFromPayLoadService.getUploadFromPayLoadWeb(uploadPayLoadWeb);
+//                upload.setPiece(piecefinal);
+//                uploadRepository.save(upload);
+//            });
+//        });
+
+        /////Enregistrement des pièce de parcelles
+//        enquetePayLoadWeb.getDeclarationNcPayloadWebs().forEach(declarationNcPayloadWeb -> {
+//            declarationNcPayloadWeb.setEnqueteId(finalEnquete.getId());
+//            DeclarationNc declarationNcfinal=declarationNcService.createDeclarationNc(entityFromPayLoadService.getDeclarationNcFromPayLoadWeb(declarationNcPayloadWeb));
+//            declarationNcPayloadWeb.getUploadPayLoadWebs().forEach(uploadPayLoadWeb -> {
+//                uploadPayLoadWeb.setEnqueteId(finalEnquete.getId());
+//                Upload upload=entityFromPayLoadService.getUploadFromPayLoadWeb(uploadPayLoadWeb);
+//                upload.setDeclarationNc(declarationNcfinal);
+//                uploadRepository.save(upload);
+//            });
+//        });
+
+        return enqueteRepository.findEnqueteToDto(enquete.getId()).orElse(null);
     }
 
     @Override
@@ -175,6 +168,8 @@ public class EnqueteServiceImpl implements EnqueteService {
             throw new BadRequestException("Impossible d'enregistrer une enquête avec une parcelle inexistante");
         }
 
+        Optional<Parcelle> optionalParcelle=Optional.empty();
+        Long rueId;
         Optional<User> optionalUser = userRepository.findById(enquetePayLoadWeb.getEnqueteurId());
         if (!optionalUser.isPresent()) {
             throw new BadRequestException("Echec de l'enregistrement : Enquêteur inexistant");
@@ -188,26 +183,13 @@ public class EnqueteServiceImpl implements EnqueteService {
         if (!optionalZoneRfu.isPresent()) {
             throw new BadRequestException("Echec de l'enregistrement : zone inexistante");
         }
-
-        if(enquetePayLoadWeb.getParcelleId()!=null) {
-            Optional<Parcelle> optionalParcelle = parcelleRepository.findById(enquetePayLoadWeb.getParcelleId());
-            if (!optionalParcelle.isPresent()) {
-                throw new BadRequestException("Echec de l'enregistrement : Parcelle inexistante");
-            }
+        ///enregistrement de la pacelle
+        if (enquetePayLoadWeb.getParcelleId() == null) {
+            throw new ApplicationException("Echec de l'enregistrement : La parcelle non renseignée.");
+        } else {
+            optionalParcelle = parcelleService.getParcelleById(enquetePayLoadWeb.getParcelleId());
         }
 
-
-        ParcellePayLoadWeb parcellePayLoadWeb= getParcellePayloadFromEnquetePl(enquetePayLoadWeb);
-
-        if(parcellePayLoadWeb.getId()==null){
-            parcellePayLoadWeb=parcelleService.createParcelle(parcellePayLoadWeb);
-        }else{
-            parcellePayLoadWeb=parcelleService.updateParcelle(parcellePayLoadWeb.getId(),parcellePayLoadWeb);
-        }
-
-        enquetePayLoadWeb.setParcelleId(parcellePayLoadWeb.getId());
-
-
         Enquete enquete = entityFromPayLoadService.getEnqueteFromPayLoadWeb(enquetePayLoadWeb);
         enquete=enqueteRepository.save(enquete);
         return enqueteRepository.findEnqueteToDto(enquete.getId()).orElse(null);
@@ -356,7 +338,7 @@ public class EnqueteServiceImpl implements EnqueteService {
     }
 
     @Override
-    public EnquetePayLoadWeb validerEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
+    public Enquete validerEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
         if (enqueteTraitementPayLoad == null) {
             throw new BadRequestException("Impossible de valider une enquête ayant un id null.");
         }
@@ -364,22 +346,15 @@ public class EnqueteServiceImpl implements EnqueteService {
         if (!optionalEnquete.isPresent()) {
             throw new NotFoundException("Impossible de trouver l'enquête que vous désirez valider.");
         }
-        if(optionalEnquete.get().getStatutEnquete()==StatutEnquete.CLOTURE ||
-           optionalEnquete.get().getStatutEnquete()==StatutEnquete.REJETE ){
-            throw new NotAcceptableException("Impossible de valider : Le statut actuel "+optionalEnquete.get().getStatutEnquete()+" ne le permet pas.");
-        }
-
         Enquete enquete = optionalEnquete.get();
         enquete.setDateValidation(LocalDate.now());
         enquete.setStatutEnquete(StatutEnquete.VALIDE);
-        enquete.setSynchronise(true);
-
-        enquete= enqueteRepository.save(enquete);
-        return  enqueteRepository.findEnqueteToDto(enquete.getId()).orElse(null);
+        enquete.setSynchronise(false);
+        return enqueteRepository.save(enquete);
     }
 
     @Override
-    public EnquetePayLoadWeb rejeterEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
+    public Enquete rejeterEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
         if (enqueteTraitementPayLoad.getIdBackend() == null) {
             throw new BadRequestException("Impossible de rejeter une enquête ayant un id null.");
         }
@@ -387,43 +362,38 @@ public class EnqueteServiceImpl implements EnqueteService {
         if (!optionalEnquete.isPresent()) {
             throw new NotFoundException("Impossible de trouver l'enquête que vous désirez rejeter.");
         }
-        if(optionalEnquete.get().getStatutEnquete()==StatutEnquete.CLOTURE ||
-                optionalEnquete.get().getStatutEnquete()==StatutEnquete.VALIDE ){
-            throw new NotAcceptableException("Impossible de rejeter : Le statut actuel "+optionalEnquete.get().getStatutEnquete()+" ne le permet pas.");
-        }
         Enquete enquete = optionalEnquete.get();
         enquete.setDateRejet(LocalDate.now());
         enquete.setDescriptionMotifRejet(enqueteTraitementPayLoad.getMotifRejet());
         enquete.setStatutEnquete(StatutEnquete.REJETE);
         enquete.setSynchronise(false);
-        enquete= enqueteRepository.save(enquete);
-        return enqueteRepository.findEnqueteToDto(enquete.getId()).orElse(null);
+        return enqueteRepository.save(enquete);
     }
 
     @Override
-    public List<EnquetePayLoadWeb> validerEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
-        List<EnquetePayLoadWeb> enquetePayLoadWebs = new ArrayList<>();
+    public List<Enquete> validerEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
+        List<Enquete> enquetes = new ArrayList<>();
         try {
             for (EnqueteTraitementPayLoad enqueteTraitementPayLoad : enqueteTraitementPayLoads) {
-                enquetePayLoadWebs.add(validerEnquete(enqueteTraitementPayLoad));
+                enquetes.add(validerEnquete(enqueteTraitementPayLoad));
             }
         } catch (Exception e) {
-            enquetePayLoadWebs.add(null);
+            enquetes.add(null);
         }
-        return enquetePayLoadWebs;
+        return enquetes;
     }
 
     @Override
-    public List<EnquetePayLoadWeb> rejeterEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
-        List<EnquetePayLoadWeb> enquetePayLoadWebs = new ArrayList<>();
+    public List<Enquete> rejeterEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
+        List<Enquete> enquetes = new ArrayList<>();
         try {
             for (EnqueteTraitementPayLoad enqueteTraitementPayLoad : enqueteTraitementPayLoads) {
-                enquetePayLoadWebs.add(rejeterEnquete(enqueteTraitementPayLoad));
+                enquetes.add(rejeterEnquete(enqueteTraitementPayLoad));
             }
         } catch (Exception e) {
-            enquetePayLoadWebs.add(null);
+            enquetes.add(null);
         }
-        return enquetePayLoadWebs;
+        return enquetes;
     }
 
     @Override
@@ -574,32 +544,22 @@ public class EnqueteServiceImpl implements EnqueteService {
 
     @Override
     @Transactional
-    public int cloturerEnqueteParcelleBatimentUniteLogementByUserIdAndExerciceId(Long userId,Long exerciceId) {
+    public int cloturerEnqueteParcelleBatimentUniteLogementByUserId(Long userId) {
        Optional<User> optionalUser= userRepository.findById(userId);
        int nbreEnquete=0;
        if(optionalUser.isPresent() && optionalUser.get().getStructure()!=null){
            Long structureId=optionalUser.get().getStructure().getId();
-           nbreEnquete=cloturerEnqueteParcelleBatimentUniteLogementByStructureIdAndExerciceId(structureId,exerciceId);
+           nbreEnquete=cloturerEnqueteParcelleBatimentUniteLogementByStructureId(structureId);
        }
         return nbreEnquete;
     }
 
-    @Override
-    public Page<EnquetePayLoadWeb> getEnqueteListByQuartierByStatutPageableToDto(Long userId, Long quartierId, StatutEnquete statutEnquete, Pageable pageable) {
-        List<Secteur> secteurs= secteurService.getListSecteurUserId(userId);
-        List<Long> secteurIds = secteurs.stream()
-                .map(Secteur::getId)
-                .toList();
-
-        return  enqueteRepository.findAllEnqueteByQuartierByStatutToDtoPageable(quartierId,secteurIds,statutEnquete,pageable);
-    }
-
     @Override
     @Transactional
-    public int cloturerEnqueteParcelleBatimentUniteLogementByStructureIdAndExerciceId(Long structureId,Long exerciceId) {
-        Integer nombreParcelleImpacte=enqueteRepository.clotureEnqueteParcelle(structureId,exerciceId);
-        Integer nombreBatiment=enqueteBatimentRepository.clotureEnqueteBatiment(structureId,exerciceId);
-        Integer nombreUniteLogement=enqueteUniteLogementRepository.clotureEnqueteUniteLogement(structureId,exerciceId);
+    public int cloturerEnqueteParcelleBatimentUniteLogementByStructureId(Long structureId) {
+        Integer nombreParcelleImpacte=enqueteRepository.clotureEnqueteParcelle(structureId);
+        Integer nombreBatiment=enqueteBatimentRepository.clotureEnqueteBatiment(structureId);
+        Integer nombreUniteLogement=enqueteUniteLogementRepository.clotureEnqueteUniteLogement(structureId);
         return nombreParcelleImpacte;
     }
 

src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java

@@ -2,12 +2,10 @@ package io.gmss.fiscad.implementations.infocad.metier;
 
 import io.gmss.fiscad.entities.decoupage.Quartier;
 import io.gmss.fiscad.entities.decoupage.Secteur;
-import io.gmss.fiscad.entities.infocad.metier.Enquete;
 import io.gmss.fiscad.entities.infocad.metier.EnqueteFiltreResponse;
 import io.gmss.fiscad.entities.infocad.metier.Parcelle;
 import io.gmss.fiscad.entities.infocad.metier.Rue;
 import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
-import io.gmss.fiscad.entities.infocad.parametre.TypeDomaine;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.decoupage.SecteurService;
@@ -21,9 +19,7 @@ import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository
 import io.gmss.fiscad.persistence.repositories.infocad.metier.RueRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.NatureDomaineRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.SituationGeographiqueRepository;
-import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypeDomaineRepository;
 import io.gmss.fiscad.persistence.specification.ParcelleSpecification;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
 import io.gmss.fiscad.service.GeometryService;
 import jakarta.persistence.Query;
 import jakarta.transaction.Transactional;
@@ -43,8 +39,6 @@ public class ParcelleServiceImpl implements ParcelleService {
     private final RueRepository rueRepository;
     private final GeometryService geometryService;
     private final SecteurService secteurService;
-    private final TypeDomaineRepository typeDomaineRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
 
 //    @Value("${infocad.geom.srid}")
 //    private String defaultSrid32631;
@@ -64,29 +58,36 @@ public class ParcelleServiceImpl implements ParcelleService {
         if (!optionalQuartier.isPresent()) {
             throw new BadRequestException("Impossible d'enregistrer une parcelle avec un quartier/village inexistant");
         }
-
-        Optional<TypeDomaine> optionalTypeDomaine = typeDomaineRepository.findById(parcellePayLoadWeb.getTypeDomaineId());
-        if (!optionalTypeDomaine.isPresent()) {
-            throw new BadRequestException("Veuillez préciser le type de domaine");
-        }
-
         Parcelle parcelle = new Parcelle();
-        parcelle = entityFromPayLoadService.getParcelleFromPayload(parcellePayLoadWeb);
+        parcelle.setNatureDomaine(optionalNatureDomaine.orElse(null));
+        parcelle.setQuartier(optionalQuartier.orElse(null));
+        parcelle = getParcelleFromPayload(parcelle, parcellePayLoadWeb);
         parcelle= parcelleRepository.save(parcelle);
         return parcelleRepository.findParcelleToDtoById(parcelle.getId()).orElse(null);
     }
 
     @Override
     public ParcellePayLoadWeb updateParcelle(Long id, ParcellePayLoadWeb parcellePayLoadWeb) throws NotFoundException {
-       if(parcellePayLoadWeb.getId()!=null) {
-           Optional<Parcelle> optionalParcelle = parcelleRepository.findById(parcellePayLoadWeb.getId());
-           if (!optionalParcelle.isPresent()) {
-               throw new NotFoundException("Impossible de trouver la parcelle que vous désirer modifier");
-           }
-       }
-
-       Parcelle parcelle = new Parcelle();
-        parcelle = entityFromPayLoadService.getParcelleFromPayload(parcellePayLoadWeb);
+        Optional<Parcelle> optionalParcelle = parcelleRepository.findById(parcellePayLoadWeb.getId());
+        if (!optionalParcelle.isPresent()) {
+            throw new NotFoundException("Impossible de trouver la parcelle que vous désirer modifier");
+        }
+        Optional<NatureDomaine> optionalNatureDomaine = natureDomaineRepository.findById(parcellePayLoadWeb.getNatureDomaineId());
+        if (!optionalNatureDomaine.isPresent()) {
+            throw new BadRequestException("Impossible d'enregistrer une parcelle avec une nature de domaine inexistante");
+        }
+        Optional<Quartier> optionalQuartier = quartierRepository.findById(parcellePayLoadWeb.getQuartierId());
+        if (!optionalQuartier.isPresent()) {
+            throw new BadRequestException("Impossible d'enregistrer une parcelle avec un quartier/village inexistant");
+        }
+//        Optional<SituationGeographique> optionalSituationGeographique = situationGeographiqueRepository.findById(parcellePayLoadWeb.getSituationGeographiqueId());
+//        if (!optionalSituationGeographique.isPresent()) {
+//            throw new BadRequestException("Impossible d'enregistrer une parcelle avec une situation géographique inexistant");
+//        }
+        Parcelle parcelle=optionalParcelle.get();
+        parcelle.setNatureDomaine(optionalNatureDomaine.orElse(null));
+        parcelle.setQuartier(optionalQuartier.orElse(null));
+        parcelle = getParcelleFromPayload(optionalParcelle.get(), parcellePayLoadWeb);
         parcelle= parcelleRepository.save(parcelle);
         return parcelleRepository.findParcelleToDtoById(parcelle.getId()).orElse(null);
     }
@@ -209,6 +210,28 @@ public class ParcelleServiceImpl implements ParcelleService {
     }
 
 
+
+    private Parcelle getParcelleFromPayload(Parcelle parcelle, ParcellePayLoadWeb parcellePayLoadWeb) {
+        if(parcellePayLoadWeb.getRueId()!=null) {
+            Optional<Rue> optionalRue = rueRepository.findById(parcellePayLoadWeb.getRueId());
+            parcelle.setRue(optionalRue.orElse(null));
+        }
+        parcelle.setP(parcellePayLoadWeb.getP());
+        parcelle.setI(parcellePayLoadWeb.getI());
+        parcelle.setQ(parcellePayLoadWeb.getQ());
+        parcelle.setNup(parcellePayLoadWeb.getNup());
+        parcelle.setLatitude(parcellePayLoadWeb.getLatitude());
+        parcelle.setLongitude(parcellePayLoadWeb.getLongitude());
+        parcelle.setAltitude(parcellePayLoadWeb.getAltitude());
+        parcelle.setSituationGeographique(parcellePayLoadWeb.getSituationGeographique());
+        parcelle.setNupProvisoire(parcellePayLoadWeb.getNupProvisoire());
+        parcelle.setAutreNumeroTitreFoncier(parcellePayLoadWeb.getNumTitreFoncier());
+        parcelle.setObservation(parcellePayLoadWeb.getObservation());
+        parcelle.setSuperficie(parcellePayLoadWeb.getSuperficie());
+
+        return parcelle;
+    }
+
 //    private Parcelle getParcelle(Parcelle parcelle, ParcellePayLoadWeb parcellePayLoadWeb, Optional<SituationGeographique> optionalSituationGeographique, Optional<NatureDomaine> optionalNatureDomaine) {
 //        StringBuilder coordonnees = new StringBuilder();
 //        parcelle.setP(parcellePayLoadWeb.getP());

src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java

@@ -86,11 +86,6 @@ public class PersonneServiceImpl implements PersonneService {
         return null;
     }
 
-    @Override
-    public Page<PersonnePayLoadWeb> getPersonneListNonAssigneePage(Pageable pageable) {
-        return personneRepository.findAllPersonneNonAssigneCentreToDto(pageable);
-    }
-
     @Override
     public List<PersonnePayLoadWeb> getPersonneList() {
         return null;
@@ -258,28 +253,12 @@ public class PersonneServiceImpl implements PersonneService {
 
     @Override
     public List<PersonnePayLoadWeb> recherchePersonne(RecherchePersonneResquestBody request) {
+
+        List<PersonnePayLoadWeb> result = new ArrayList<>(
+                recherchePersonneLocal(request)
+        );
+
         try {
-
-            if(request.getIfu()!=null && !request.getIfu().equals("")){
-                List<PersonnePayLoadWeb> personnePayLoadWebs =personneRepository.findAllPersonneByIfuToDto(request.getIfu());
-                if(!personnePayLoadWebs.isEmpty())
-                    return personnePayLoadWebs;
-            }
-
-            if(request.getNpi()!=null && !request.getNpi().equals("")){
-
-                List<PersonnePayLoadWeb> personnePayLoadWebs = personneRepository.findAllPersonneByNpiToDto(request.getNpi());
-                if(!personnePayLoadWebs.isEmpty())
-                    return personnePayLoadWebs;
-            }
-
-            List<PersonnePayLoadWeb> result=new ArrayList<>();
-
-            result = recherchePersonneLocal(request);
-
-            if (result != null && !result.isEmpty()) {
-                return result;
-            }
             // Conversion date en String format yyyy-MM-dd
             String dateNaissance = Optional.ofNullable(request.getDateNaissance())
                     .map(d -> d.format(DateTimeFormatter.ISO_LOCAL_DATE))
@@ -322,48 +301,29 @@ public class PersonneServiceImpl implements PersonneService {
                 personne.setEtatIdentificationPersonne(EtatIdentificationPersonne.IFU);
                 result.add(personne);
             }
-            return result;
+
         } catch (Exception e) {
-            return new ArrayList<>();
+           // logger.error("Erreur appel IFU EN LIGNE", e);
         }
-
+        return result;
     }
 
 
-//    private List<PersonnePayLoadWeb> recherchePersonneLocal(RecherchePersonneResquestBody recherchePersonneResquestBody) {
-//        System.out.println("NOUS SOMMES DANS RECHERCHE NOM ET PRENOM :"+recherchePersonneResquestBody.getNom()+" "+recherchePersonneResquestBody.getPrenom());
-//        List<PersonnePayLoadWeb> personnePayLoadWebs=
-//                personneRepository.findByFiltersInBaseIfuNpiCorrecte(
-//                        recherchePersonneResquestBody.getNom()==null?null: "%"+recherchePersonneResquestBody.getNom().trim().toUpperCase()+"%",
-//                        recherchePersonneResquestBody.getPrenom()==null?null: "%"+recherchePersonneResquestBody.getPrenom().trim().toUpperCase()+"%",
-//                        recherchePersonneResquestBody.getRaisonSociale()==null?null: "%"+recherchePersonneResquestBody.getRaisonSociale().trim().toUpperCase()+"%",
-//                        recherchePersonneResquestBody.getNomMere()==null?null: "%"+recherchePersonneResquestBody.getNomMere().trim().toUpperCase()+"%"
-//                        );
-//        return personnePayLoadWebs ;
-//    }
+    private List<PersonnePayLoadWeb> recherchePersonneLocal(RecherchePersonneResquestBody recherchePersonneResquestBody) {
 
-    private List<PersonnePayLoadWeb> recherchePersonneLocal(RecherchePersonneResquestBody request) {
-        String nom = normalizeLikeParam(request.getNom());
-        String prenom = normalizeLikeParam(request.getPrenom());
-        String raisonSociale = normalizeLikeParam(request.getRaisonSociale());
-        String nomMere = normalizeLikeParam(request.getNomMere());
-
-        return personneRepository.findByFiltersInBaseIfuNpiCorrecte(
-                nom,
-                prenom,
-                raisonSociale,
-                nomMere
-        );
+        List<PersonnePayLoadWeb> personnePayLoadWebs=
+                personneRepository.findByFiltersInBaseIfuNpiCorrecte(
+                        recherchePersonneResquestBody.getIfu()==null?null:recherchePersonneResquestBody.getIfu().trim().toLowerCase(),
+                        recherchePersonneResquestBody.getNpi()==null?null:recherchePersonneResquestBody.getNpi().trim().toLowerCase(),
+                        recherchePersonneResquestBody.getNom()==null?null:recherchePersonneResquestBody.getNom().trim().toLowerCase(),
+                        recherchePersonneResquestBody.getPrenom()==null?null:recherchePersonneResquestBody.getPrenom().trim().toLowerCase(),
+                        recherchePersonneResquestBody.getRaisonSociale()==null?null:recherchePersonneResquestBody.getRaisonSociale().trim().toLowerCase(),
+                        recherchePersonneResquestBody.getNomMere()==null?null:recherchePersonneResquestBody.getNomMere().trim().toLowerCase(),
+                        recherchePersonneResquestBody.getDateNaissance()
+                        );
+        return personnePayLoadWebs ;
     }
-    private String normalizeLikeParam(String value) {
-        if (value == null) return null;
 
-        String cleaned = value.trim();
-
-        if (cleaned.isEmpty()) return null;
-
-        return "%" + cleaned.toUpperCase() + "%";
-    }
     private List<PersonnePayLoadWeb> recherchePersonneSigibe(RecherchePersonneResquestBody recherchePersonneResquestBody) {
         // callAPIService.callGetIfuEnLigneToken();