diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/ArrondissementController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/ArrondissementController.java index 166e6ed..feeb5bc 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/ArrondissementController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/ArrondissementController.java @@ -45,6 +45,7 @@ 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); @@ -76,6 +77,7 @@ 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<>( @@ -99,6 +101,7 @@ public class ArrondissementController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_ARRONDISSEMENT')") public ResponseEntity deleteArrondissement(@PathVariable Long id) { try { arrondissementService.deleteArrondissement(id); @@ -123,6 +126,7 @@ public class ArrondissementController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_ARRONDISSEMENT')") public ResponseEntity getAllArrondissementList() { try { return new ResponseEntity<>( @@ -147,6 +151,7 @@ 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); @@ -172,6 +177,7 @@ public class ArrondissementController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_ARRONDISSEMENT')") public ResponseEntity getArrondissementById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -196,6 +202,7 @@ public class ArrondissementController { } @GetMapping("/commune/{communeId}") + @PreAuthorize("hasAuthority('READ_ARRONDISSEMENT')") public ResponseEntity getArrondissementByCommune(@PathVariable Long communeId) { try { return new ResponseEntity<>( @@ -219,6 +226,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/CommuneController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/CommuneController.java index f33dadf..1748a35 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/CommuneController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/CommuneController.java @@ -38,6 +38,7 @@ public class CommuneController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_COMMUNE')") public ResponseEntity createCommune(@RequestBody @Valid @Validated Commune commune) { try { commune = communeService.createCommune(commune); @@ -62,6 +63,7 @@ public class CommuneController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_COMMUNE')") public ResponseEntity updateCommune(@PathVariable Long id, @RequestBody Commune commune) { try { return new ResponseEntity<>( @@ -85,6 +87,7 @@ public class CommuneController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_COMMUNE')") public ResponseEntity deleteCommuner(@PathVariable Long id) { try { communeService.deleteCommune(id); @@ -109,6 +112,7 @@ public class CommuneController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_COMMUNE')") public ResponseEntity getAllCommuneList() { try { return new ResponseEntity<>( @@ -133,6 +137,7 @@ 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); @@ -158,6 +163,7 @@ public class CommuneController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_COMMUNE')") public ResponseEntity getCommuneById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -181,6 +187,7 @@ public class CommuneController { } @GetMapping("/departement/{departementId}") + @PreAuthorize("hasAuthority('READ_COMMUNE')") public ResponseEntity getCommuneByDepartement(@PathVariable Long departementId) { try { @@ -205,6 +212,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/DepartementController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/DepartementController.java index 4064dd2..509c10a 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/DepartementController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/DepartementController.java @@ -37,6 +37,7 @@ public class DepartementController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_DEPARTEMENT')") public ResponseEntity createDepartement(@RequestBody @Valid @Validated Departement departement) { try { departement = departementService.createDepartement(departement); @@ -61,6 +62,7 @@ public class DepartementController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_DEPARTEMENT')") public ResponseEntity updateDepartement(@PathVariable Long id, @RequestBody Departement departement) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class DepartementController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_DEPARTEMENT')") public ResponseEntity deleteDepartementr(@PathVariable Long id) { try { departementService.deleteDepartement(id); @@ -108,6 +111,7 @@ public class DepartementController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_DEPARTEMENT')") public ResponseEntity getAllDepartementList() { try { return new ResponseEntity<>( @@ -132,6 +136,7 @@ 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); @@ -157,6 +162,7 @@ public class DepartementController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_DEPARTEMENT')") public ResponseEntity getDepartementById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/NationaliteController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/NationaliteController.java index 6a27d21..27ee0f1 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/NationaliteController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/NationaliteController.java @@ -37,6 +37,7 @@ public class NationaliteController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_NATIONALITE')") public ResponseEntity createNationalite(@RequestBody @Valid @Validated Nationalite nationalite) { try { nationalite = nationaliteService.createNationalite(nationalite); @@ -61,6 +62,7 @@ public class NationaliteController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_NATIONALITE')") public ResponseEntity updateNationalite(@PathVariable Long id, @RequestBody Nationalite nationalite) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class NationaliteController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_NATIONALITE')") public ResponseEntity deleteNationaliter(@PathVariable Long id) { try { nationaliteService.deleteNationalite(id); @@ -108,6 +111,7 @@ public class NationaliteController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_NATIONALITE')") public ResponseEntity getAllNationaliteList() { try { return new ResponseEntity<>( @@ -131,6 +135,7 @@ 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); @@ -156,6 +161,7 @@ public class NationaliteController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_NATIONALITE')") public ResponseEntity getNationaliteById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/QuartierController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/QuartierController.java index 6749843..b438ab7 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/QuartierController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/QuartierController.java @@ -37,6 +37,7 @@ public class QuartierController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_QUARTIER')") public ResponseEntity createQuartier(@RequestBody @Valid @Validated Quartier quartier) { try { quartier = quartierService.createQuartier(quartier); @@ -61,6 +62,7 @@ public class QuartierController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_QUARTIER')") public ResponseEntity updateQuartier(@PathVariable Long id, @RequestBody Quartier quartier) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class QuartierController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_QUARTIER')") public ResponseEntity deleteQuartier(@PathVariable Long id) { try { quartierService.deleteQuartier(id); @@ -108,6 +111,7 @@ public class QuartierController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_QUARTIER')") public ResponseEntity getAllQuartierList() { try { return new ResponseEntity<>( @@ -131,6 +135,7 @@ 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); @@ -155,6 +160,7 @@ public class QuartierController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_QUARTIER')") public ResponseEntity getQuartierById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -178,6 +184,7 @@ public class QuartierController { } @GetMapping("/arrondissement/{arrondissementId}") + @PreAuthorize("hasAuthority('READ_QUARTIER')") public ResponseEntity getQuartierByArrondissement(@PathVariable Long arrondissementId) { try { @@ -202,6 +209,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java index 100779e..976f83e 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java @@ -42,6 +42,7 @@ 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); @@ -70,6 +71,7 @@ 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<>( @@ -96,6 +98,7 @@ 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); @@ -123,6 +126,7 @@ 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<>( @@ -150,6 +154,7 @@ 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); @@ -178,6 +183,7 @@ 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<>( @@ -205,6 +211,7 @@ 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<>( @@ -233,6 +240,7 @@ 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); @@ -263,6 +271,7 @@ 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<>( @@ -291,6 +300,7 @@ 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); @@ -320,6 +330,7 @@ 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<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurDecoupageController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurDecoupageController.java index be9a5f7..b454ef1 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurDecoupageController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurDecoupageController.java @@ -37,6 +37,7 @@ public class SecteurDecoupageController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_SECTEUR_DECOUPAGE')") public ResponseEntity createSecteurDecoupage(@RequestBody @Valid @Validated SecteurDecoupagePaylaodWeb secteurDecoupagePaylaodWeb) { try { secteurDecoupagePaylaodWeb = secteurDecoupageService.createSecteurDecoupage(secteurDecoupagePaylaodWeb); @@ -61,6 +62,7 @@ public class SecteurDecoupageController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_SECTEUR_DECOUPAGE')") public ResponseEntity updateSecteurDecoupage(@PathVariable Long id, @RequestBody SecteurDecoupagePaylaodWeb secteurDecoupagePaylaodWeb) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class SecteurDecoupageController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_SECTEUR_DECOUPAGE')") public ResponseEntity deleteSecteurDecoupager(@PathVariable Long id) { try { secteurDecoupageService.deleteSecteurDecoupage(id); @@ -108,6 +111,7 @@ public class SecteurDecoupageController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')") public ResponseEntity getAllSecteurDecoupageList() { try { return new ResponseEntity<>( @@ -131,6 +135,7 @@ 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); @@ -155,6 +160,7 @@ public class SecteurDecoupageController { } @GetMapping("/by-secteur-id/{secteurId}") + @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')") public ResponseEntity getAllSecteurDecoupageListBySecteurId(@PathVariable Long secteurId) { try { return new ResponseEntity<>( @@ -178,6 +184,7 @@ 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); @@ -202,6 +209,7 @@ public class SecteurDecoupageController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')") public ResponseEntity getSecteurDecoupageById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -226,6 +234,7 @@ public class SecteurDecoupageController { @GetMapping("/arbre/user-id/{userId}") + @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')") public ResponseEntity getArborescenceByUserId(@PathVariable Long userId) { try { return new ResponseEntity<>( @@ -250,6 +259,7 @@ 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<>( @@ -274,6 +284,7 @@ public class SecteurDecoupageController { @GetMapping("/arbre/enquete-valide/user-id/{userId}") + @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')") public ResponseEntity getArborescenceEnqueteValideByUserId(@PathVariable Long userId) { try { return new ResponseEntity<>( @@ -298,6 +309,7 @@ public class SecteurDecoupageController { @GetMapping("/arbre/enquete-cloture/user-id/{userId}") + @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')") public ResponseEntity getArborescenceEnqueteClotureByUserId(@PathVariable Long userId) { try { return new ResponseEntity<>( @@ -323,6 +335,7 @@ public class SecteurDecoupageController { @GetMapping("/arbre/enquete-batiment-en-cours/user-id/{userId}") + @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')") public ResponseEntity getArborescenceEnqueteBatimentEncoursByUserId(@PathVariable Long userId) { try { return new ResponseEntity<>( @@ -347,6 +360,7 @@ public class SecteurDecoupageController { @GetMapping("/arbre/enquete-batiment-valide/user-id/{userId}") + @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')") public ResponseEntity getArborescenceEnqueteBatimentValideByUserId(@PathVariable Long userId) { try { return new ResponseEntity<>( @@ -371,6 +385,7 @@ public class SecteurDecoupageController { @GetMapping("/arbre/enquete-batiment-cloture/user-id/{userId}") + @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')") public ResponseEntity getArborescenceEnqueteBatimentClotureByUserId(@PathVariable Long userId) { try { return new ResponseEntity<>( @@ -395,6 +410,7 @@ public class SecteurDecoupageController { @GetMapping("/arbre/enquete-unitlog-en-cours/user-id/{userId}") + @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')") public ResponseEntity getArborescenceEnqueteUniteLogEncoursByUserId(@PathVariable Long userId) { try { return new ResponseEntity<>( @@ -419,6 +435,7 @@ public class SecteurDecoupageController { @GetMapping("/arbre/enquete-unitlog-valide/user-id/{userId}") + @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')") public ResponseEntity getArborescenceEnqueteUniteLogValideByUserId(@PathVariable Long userId) { try { return new ResponseEntity<>( @@ -443,6 +460,7 @@ public class SecteurDecoupageController { @GetMapping("/arbre/enquete-unitlog-cloture/user-id/{userId}") + @PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')") public ResponseEntity getArborescenceEnqueteUniteLigClotureByUserId(@PathVariable Long userId) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/SectionController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/SectionController.java index c0d2244..2f3bea3 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/SectionController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/SectionController.java @@ -15,6 +15,7 @@ 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,6 +40,7 @@ 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); @@ -67,6 +69,7 @@ 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<>( @@ -93,6 +96,7 @@ 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); @@ -120,6 +124,7 @@ 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<>( @@ -147,6 +152,7 @@ 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); @@ -175,6 +181,7 @@ 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<>( @@ -202,6 +209,7 @@ 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<>( @@ -230,6 +238,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ActeurConcerneController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ActeurConcerneController.java index 6ab10fe..441a99b 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ActeurConcerneController.java +++ b/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,6 +36,7 @@ public class ActeurConcerneController { @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_ACTEURCONCERNE')") public ResponseEntity getArrondissementById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -58,6 +59,7 @@ public class ActeurConcerneController { } } @GetMapping("/get-details/{id}") + @PreAuthorize("hasAuthority('READ_ACTEURCONCERNE')") public ResponseEntity getDetails(@PathVariable Long id) { try{ PersonneCompletDTO personneCompletDTO = personneService.getPersonneComplete(id); diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java index aff9f75..e021d67 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java @@ -39,8 +39,9 @@ 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()); @@ -64,8 +65,9 @@ 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<>( @@ -87,8 +89,9 @@ 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); @@ -111,8 +114,9 @@ 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<>( @@ -134,8 +138,9 @@ 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<>( @@ -157,8 +162,9 @@ 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<>( @@ -180,8 +186,9 @@ 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<>( @@ -203,8 +210,9 @@ 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 { @@ -227,8 +235,9 @@ 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 { @@ -253,6 +262,7 @@ 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 commentaires) { try { @@ -277,6 +287,7 @@ 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 { @@ -299,8 +310,9 @@ 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 syncCommentaireRequests) { try { diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java index ec68e35..9a2e483 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java @@ -50,6 +50,7 @@ public class EnqueteController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_ENQUETE')") public ResponseEntity createEnquete(@RequestBody @Valid @Validated EnquetePayLoadWeb enquetePayLoadWeb) { try { enquetePayLoadWeb = enqueteService.createEnquete(enquetePayLoadWeb); @@ -76,6 +77,7 @@ public class EnqueteController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_ENQUETE')") public ResponseEntity updateEnquete(@PathVariable Long id, @RequestBody EnquetePayLoadWeb enquetePayLoadWeb) { try { return new ResponseEntity<>( @@ -99,6 +101,7 @@ public class EnqueteController { } @PutMapping("/validation") + @PreAuthorize("hasAuthority('UPDATE_ENQUETE')") public ResponseEntity validerEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) { try { return new ResponseEntity<>( @@ -122,6 +125,7 @@ public class EnqueteController { } @PutMapping("/rejet") + @PreAuthorize("hasAuthority('UPDATE_ENQUETE')") public ResponseEntity rejeterEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) { try { @@ -146,6 +150,7 @@ public class EnqueteController { } @PutMapping("/validation-lot") + @PreAuthorize("hasAuthority('UPDATE_ENQUETE')") public ResponseEntity validerEnqueteParLot(@RequestBody List enqueteTraitementPayLoads) { try { return new ResponseEntity<>( @@ -169,6 +174,7 @@ public class EnqueteController { } @PutMapping("/rejet-lot") + @PreAuthorize("hasAuthority('UPDATE_ENQUETE')") public ResponseEntity rejeterEnqueteParLot(@RequestBody List enqueteTraitementPayLoads) { try { return new ResponseEntity<>( @@ -192,6 +198,7 @@ public class EnqueteController { } @GetMapping("/all/decoupage-admin-for-enquete") + @PreAuthorize("hasAuthority('READ_ENQUETE')") public ResponseEntity getAllByEnqueteDecoupageAdmin() { try { return new ResponseEntity<>( @@ -219,6 +226,7 @@ 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<>( @@ -247,6 +255,7 @@ 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); @@ -275,6 +284,7 @@ public class EnqueteController { @GetMapping("/all/dgi/decoupage-admin-for-enquete") + @PreAuthorize("hasAuthority('READ_ENQUETE')") public ResponseEntity getAllByEnqueteDecoupageAdminForDgi() { try { return new ResponseEntity<>( @@ -299,6 +309,7 @@ public class EnqueteController { @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_ENQUETE')") public ResponseEntity deleteStructurer(@PathVariable Long id) { try { enqueteService.deleteEnquete(id); @@ -323,6 +334,7 @@ public class EnqueteController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_ENQUETE')") public ResponseEntity getAllStructureList() { try { return new ResponseEntity<>( @@ -346,6 +358,7 @@ public class EnqueteController { } @GetMapping("/all/com-arrond-bloc") + @PreAuthorize("hasAuthority('READ_ENQUETE')") public ResponseEntity getAllByCommuneArrondBloc() { try { return new ResponseEntity<>( @@ -369,6 +382,7 @@ public class EnqueteController { } @PostMapping("/all/com-arrond-bloc/filtre") + @PreAuthorize("hasAuthority('READ_ENQUETE')") public ResponseEntity getAllByCommuneArrondBlocFiltre(@RequestBody FiltreEnquetePayLoad filtreEnquetePayLoad) { try { return new ResponseEntity<>( @@ -392,6 +406,7 @@ 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); @@ -416,6 +431,7 @@ public class EnqueteController { } @GetMapping("/fiche/id/{id}") + @PreAuthorize("hasAuthority('READ_ENQUETE')") public ResponseEntity getFicheEnqueteById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -439,6 +455,7 @@ public class EnqueteController { } @GetMapping("/fiche/nup-provisoir/{nupProvisoir}") + @PreAuthorize("hasAuthority('READ_ENQUETE')") public ResponseEntity getFicheEnqueteByNupProvisoir(@PathVariable String nupProvisoir) { try { return new ResponseEntity<>( @@ -462,6 +479,7 @@ public class EnqueteController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_ENQUETE')") public ResponseEntity getStructureById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -487,6 +505,7 @@ 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) { try { Pageable pageable = PageRequest.of(pageNo, pageSize); @@ -518,6 +537,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleController.java index b6f1c7e..560ca63 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleController.java @@ -23,6 +23,7 @@ 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; @@ -49,6 +50,7 @@ public class ParcelleController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_PARCELLE')") public ResponseEntity createParcelle(@RequestBody @Valid @Validated ParcellePayLoadWeb parcellePayLoadWeb) { try { parcellePayLoadWeb = parcelleService.createParcelle(parcellePayLoadWeb); @@ -74,6 +76,7 @@ public class ParcelleController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_PARCELLE')") public ResponseEntity updateEnquete(@PathVariable Long id, @RequestBody ParcellePayLoadWeb parcellePayLoadWeb) { try { return new ResponseEntity<>( @@ -100,6 +103,7 @@ public class ParcelleController { @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_PARCELLE')") public ResponseEntity deleteStructurer(@PathVariable Long id) { try { parcelleService.deleteParcelle(id); @@ -145,6 +149,7 @@ public class ParcelleController { // } // } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_PARCELLE')") public ResponseEntity getParcelleById(@CurrentUser UserPrincipal currentUser, @PathVariable Long id) { try { if(currentUser==null) @@ -173,6 +178,7 @@ public class ParcelleController { } } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_PARCELLE')") public ResponseEntity getAllParcelle(@CurrentUser UserPrincipal currentUser) { try { if(currentUser==null) @@ -202,6 +208,7 @@ 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); @@ -234,6 +241,7 @@ 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); @@ -266,6 +274,7 @@ 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) @@ -295,6 +304,7 @@ 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); @@ -327,6 +337,7 @@ 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) @@ -356,6 +367,7 @@ 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); @@ -389,6 +401,7 @@ public class ParcelleController { @PutMapping("/syncrhonise-etat-batie-parcelle") + @PreAuthorize("hasAuthority('READ_PARCELLE')") public ResponseEntity putSynchroniseEtatBatieParcelle() { try { Integer nombreParcelleSync= parcelleService.majParcelleBatieNonbatie(); diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleGeomController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleGeomController.java index f68031e..a1558ce 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleGeomController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleGeomController.java @@ -31,6 +31,7 @@ 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); @@ -48,6 +49,7 @@ 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."), @@ -56,6 +58,7 @@ 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."), @@ -65,6 +68,7 @@ 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."), @@ -73,6 +77,7 @@ 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<>( @@ -82,6 +87,7 @@ 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."), @@ -91,6 +97,7 @@ 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<>( @@ -100,6 +107,7 @@ public class ParcelleGeomController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_PARCELLEGEOM')") public ResponseEntity getParcelleGeomById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java index adb55ee..1a2d26c 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java @@ -39,6 +39,7 @@ 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); @@ -64,6 +65,7 @@ public class PersonneController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_PERSONNE')") public ResponseEntity updatePersonne(@PathVariable Long id, @RequestBody PersonnePayLoadWeb personnePayLoadWeb) { try { return new ResponseEntity<>( @@ -86,6 +88,7 @@ public class PersonneController { } } @GetMapping("/get-details/{id}") + @PreAuthorize("hasAuthority('READ_PERSONNE')") public ResponseEntity getDetails(@PathVariable Long id) { try{ PersonneCompletDTO personneCompletDTO = personneService.getPersonneComplete(id); @@ -102,6 +105,7 @@ public class PersonneController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_PERSONNE')") public ResponseEntity getPersonneById(@PathVariable Long id) { try{ Optional optionalPersonne= personneService.getPersonneById(id); @@ -118,6 +122,7 @@ public class PersonneController { } @PostMapping("/recherche") + @PreAuthorize("hasAuthority('READ_PERSONNE')") public ResponseEntity rechercherPersonne(@RequestBody RecherchePersonneResquestBody recherchePersonneResquestBody ) { try{ // personneService.recherchePersonne(recherchePersonneResquestBody); @@ -135,6 +140,7 @@ public class PersonneController { @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_PERSONNE')") public ResponseEntity getAllPersonne() { try { @@ -159,6 +165,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PieceController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PieceController.java index f0fd4dc..43cb2ec 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PieceController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PieceController.java @@ -16,6 +16,7 @@ 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,6 +36,7 @@ public class PieceController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_PIECE')") public ResponseEntity createPiece(@RequestBody @Valid @Validated PiecePayLoadWeb piecePayLoadWeb) { try { piecePayLoadWeb = pieceService.createPiece(piecePayLoadWeb); @@ -59,6 +61,7 @@ public class PieceController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_PIECE')") public ResponseEntity updatePiece(@PathVariable Long id, @RequestBody PiecePayLoadWeb piecePayLoadWeb) { try { return new ResponseEntity<>( @@ -82,6 +85,7 @@ public class PieceController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_PIECE')") public ResponseEntity deletePiece(@PathVariable Long id) { try { pieceService.deletePiece(id); @@ -106,6 +110,7 @@ public class PieceController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_PIECE')") public ResponseEntity getAllPieceList() { try { return new ResponseEntity<>( @@ -129,6 +134,7 @@ 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); @@ -153,6 +159,7 @@ public class PieceController { } @GetMapping("/all/by-enquete-id/{enqueteId}") + @PreAuthorize("hasAuthority('READ_PIECE')") public ResponseEntity getAllPieceByEnqueteList(@PathVariable Long enqueteId) { try { return new ResponseEntity<>( @@ -176,6 +183,7 @@ 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); @@ -201,6 +209,7 @@ public class PieceController { @GetMapping("/by-enquete-batiment-id/{enqueteBatimentId}") + @PreAuthorize("hasAuthority('READ_PIECE')") public ResponseEntity getAllPieceByEnqueteBatiment(@PathVariable Long enqueteBatimentId) { try { return new ResponseEntity<>( @@ -225,6 +234,7 @@ public class PieceController { @GetMapping("/by-enquete-unite-logement-id/{enqueteUniteLogementId}") + @PreAuthorize("hasAuthority('READ_PIECE')") public ResponseEntity getAllPieceByEnqueteUniteLogement(@PathVariable Long enqueteUniteLogementId) { try { return new ResponseEntity<>( @@ -248,6 +258,7 @@ public class PieceController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_PIECE')") public ResponseEntity getPieceById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/TpeController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/TpeController.java index 50fb6ac..962a152 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/TpeController.java +++ b/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,6 +37,7 @@ public class TpeController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_TPE')") public ResponseEntity createTpe(@RequestBody @Valid @Validated Tpe tpe) { try { tpe = tpeService.createTpe(tpe); @@ -60,6 +61,7 @@ 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); @@ -75,6 +77,7 @@ public class TpeController { } } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_TPE')") public ResponseEntity majTpe(@PathVariable Long id, @RequestBody Tpe tpe) { try { return new ResponseEntity<>( @@ -99,6 +102,7 @@ public class TpeController { @PutMapping("/restaure/{id}") + @PreAuthorize("hasAuthority('UPDATE_TPE')") public ResponseEntity updateTpe(@PathVariable Long id, @RequestBody Tpe tpe) { try { return new ResponseEntity<>( @@ -122,6 +126,7 @@ public class TpeController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_TPE')") public ResponseEntity deleteTper(@PathVariable Long id) { try { tpeService.deleteTpe(id); @@ -146,6 +151,7 @@ public class TpeController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_TPE')") public ResponseEntity getAllTpeList() { try { return new ResponseEntity<>( @@ -169,6 +175,7 @@ public class TpeController { } @GetMapping("/all-by-model/{model}") + @PreAuthorize("hasAuthority('READ_TPE')") public ResponseEntity getAllTpeListByModel(@PathVariable String model) { try { return new ResponseEntity<>( @@ -192,6 +199,7 @@ public class TpeController { } @GetMapping("/all-by-userId/{userId}") + @PreAuthorize("hasAuthority('READ_TPE')") public ResponseEntity getAllTpeListByUserId(@PathVariable Long userId) { try { return new ResponseEntity<>( @@ -216,6 +224,7 @@ 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); @@ -240,6 +249,7 @@ public class TpeController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_TPE')") public ResponseEntity getTpeById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -263,6 +273,7 @@ public class TpeController { } @GetMapping("/identifier/{identifier}") + @PreAuthorize("hasAuthority('READ_TPE')") public ResponseEntity getTpeByIdentifier(@PathVariable String identifier) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java index bd00918..a1305eb 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java @@ -76,6 +76,7 @@ public class UploadController { @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_UPLOAD')") public ResponseEntity all() { try { if (uploadRepository.findAll().isEmpty()) { @@ -95,6 +96,7 @@ public class UploadController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_UPLOAD')") public ResponseEntity one(@PathVariable Long id) { try { @@ -121,6 +123,7 @@ public class UploadController { * @return */ @GetMapping("/downloadfile/{fileName:.+}") + @PreAuthorize("hasAuthority('READ_UPLOAD')") public ResponseEntity downloadFile(@PathVariable String fileName, HttpServletRequest request) { // Load file as Resource Resource resource = fileStorageService.loadFileAsResource(fileName); @@ -148,6 +151,7 @@ public class UploadController { value = "/save", consumes = MediaType.MULTIPART_FORM_DATA_VALUE ) + @PreAuthorize("hasAuthority('CREATE_UPLOAD')") public ResponseEntity saveFilePieceId( @Parameter( description = "Fichier à uploader", @@ -178,6 +182,7 @@ 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()) { @@ -204,6 +209,7 @@ 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); @@ -244,6 +250,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java index 8b765bb..ebacfe2 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java @@ -39,6 +39,7 @@ 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); @@ -63,6 +64,7 @@ public class BlocController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_BLOC')") public ResponseEntity updateBloc(@PathVariable Long id, @RequestBody Bloc bloc) { try { return new ResponseEntity<>( @@ -86,6 +88,7 @@ public class BlocController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_BLOC')") public ResponseEntity deleteBlocr(@PathVariable Long id) { try { blocService.deleteBloc(id); @@ -110,6 +113,7 @@ public class BlocController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_BLOC')") public ResponseEntity getAllBlocList() { try { return new ResponseEntity<>( @@ -134,6 +138,7 @@ public class BlocController { } @GetMapping("/list-by-arrondissement") + @PreAuthorize("hasAuthority('READ_BLOC')") public ResponseEntity getAllBlocListByArrondissement(@RequestParam Long idArrondissement) { try { return new ResponseEntity<>( @@ -159,6 +164,7 @@ public class BlocController { @GetMapping("/list-by-structure") + @PreAuthorize("hasAuthority('READ_BLOC')") public ResponseEntity getAllBlocListByStructure(@RequestParam Long idStructure) { try { return new ResponseEntity<>( @@ -183,6 +189,7 @@ 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 { @@ -207,6 +214,7 @@ public class BlocController { } @GetMapping("/all-paged") + @PreAuthorize("hasAuthority('READ_BLOC')") public ResponseEntity getAllBlocPaged(@RequestParam int pageNo, @RequestParam int pageSize) { try { @@ -233,6 +241,7 @@ public class BlocController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_BLOC')") public ResponseEntity getBlocById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java index fb3dcda..08e0d38 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java @@ -38,6 +38,7 @@ public class ModeAcquisitionController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_MODEACQUISITION')") public ResponseEntity createModeAcquisition(@RequestBody @Valid @Validated ModeAcquisition modeAcquisition) { try { modeAcquisition = modeAcquisitionService.createModeAcquisition(modeAcquisition); @@ -62,6 +63,7 @@ public class ModeAcquisitionController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_MODEACQUISITION')") public ResponseEntity updateModeAcquisition(@PathVariable Long id, @RequestBody ModeAcquisition modeAcquisition) { try { return new ResponseEntity<>( @@ -85,6 +87,7 @@ public class ModeAcquisitionController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_MODEACQUISITION')") public ResponseEntity deleteModeAcquisitionr(@PathVariable Long id) { try { modeAcquisitionService.deleteModeAcquisition(id); @@ -109,6 +112,7 @@ public class ModeAcquisitionController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_MODEACQUISITION')") public ResponseEntity getAllModeAcquisitionList() { try { return new ResponseEntity<>( @@ -132,6 +136,7 @@ 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); @@ -156,6 +161,7 @@ public class ModeAcquisitionController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_MODEACQUISITION')") public ResponseEntity getModeAcquisitionById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java index 6b9166a..f4596b0 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java @@ -37,6 +37,7 @@ public class NatureDomaineController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_NATUREDOMAINE')") public ResponseEntity createNatureDomaine(@RequestBody @Valid @Validated NatureDomaine natureDomaine) { try { natureDomaine = natureDomaineService.createNatureDomaine(natureDomaine); @@ -61,6 +62,7 @@ public class NatureDomaineController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_NATUREDOMAINE')") public ResponseEntity updateNatureDomaine(@PathVariable Long id, @RequestBody NatureDomaine natureDomaine) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class NatureDomaineController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_NATUREDOMAINE')") public ResponseEntity deleteNatureDomainer(@PathVariable Long id) { try { natureDomaineService.deleteNatureDomaine(id); @@ -108,6 +111,7 @@ public class NatureDomaineController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_NATUREDOMAINE')") public ResponseEntity getAllNatureDomaineList() { try { return new ResponseEntity<>( @@ -131,6 +135,7 @@ 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); @@ -155,6 +160,7 @@ public class NatureDomaineController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_NATUREDOMAINE')") public ResponseEntity getNatureDomaineById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java index 4f418b3..353120e 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java @@ -37,6 +37,7 @@ public class PositionRepresentationController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_POSITIONREPRESENTATION')") public ResponseEntity createPositionRepresentation(@RequestBody @Valid @Validated PositionRepresentation positionRepresentation) { try { positionRepresentation = positionRepresentationService.createPositionRepresentation(positionRepresentation); @@ -61,6 +62,7 @@ public class PositionRepresentationController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_POSITIONREPRESENTATION')") public ResponseEntity updatePositionRepresentation(@PathVariable Long id, @RequestBody PositionRepresentation positionRepresentation) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class PositionRepresentationController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_POSITIONREPRESENTATION')") public ResponseEntity deletePositionRepresentation(@PathVariable Long id) { try { positionRepresentationService.deletePositionRepresentation(id); @@ -108,6 +111,7 @@ public class PositionRepresentationController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_POSITIONREPRESENTATION')") public ResponseEntity getAllPositionRepresentationList() { try { return new ResponseEntity<>( @@ -131,6 +135,7 @@ 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); @@ -157,6 +162,7 @@ public class PositionRepresentationController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_POSITIONREPRESENTATION')") public ResponseEntity getPositionRepresentationById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java index edfb7c5..4ac4ed3 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java @@ -38,6 +38,7 @@ public class ProfessionController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_PROFESSION')") public ResponseEntity createProfession(@RequestBody @Valid @Validated Profession profession) { try { profession = professionService.createProfession(profession); @@ -62,6 +63,7 @@ public class ProfessionController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_PROFESSION')") public ResponseEntity updateProfession(@PathVariable Long id, @RequestBody Profession profession) { try { return new ResponseEntity<>( @@ -85,6 +87,7 @@ public class ProfessionController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_PROFESSION')") public ResponseEntity deleteProfessionr(@PathVariable Long id) { try { professionService.deleteProfession(id); @@ -109,6 +112,7 @@ public class ProfessionController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_PROFESSION')") public ResponseEntity getAllProfessionList() { try { return new ResponseEntity<>( @@ -133,6 +137,7 @@ 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); @@ -158,6 +163,7 @@ public class ProfessionController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_PROFESSION')") public ResponseEntity getProfessionById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java index aa1d968..18dee95 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java @@ -37,6 +37,7 @@ public class SituationGeographiqueController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_SITUATIONGEOGRAPHIQUE')") public ResponseEntity createSituationGeographique(@RequestBody @Valid @Validated SituationGeographique situationGeographique) { try { situationGeographique = situationGeographiqueService.createSituationGeographique(situationGeographique); @@ -61,6 +62,7 @@ public class SituationGeographiqueController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_SITUATIONGEOGRAPHIQUE')") public ResponseEntity updateSituationGeographique(@PathVariable Long id, @RequestBody SituationGeographique situationGeographique) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class SituationGeographiqueController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_SITUATIONGEOGRAPHIQUE')") public ResponseEntity deleteSituationGeographiquer(@PathVariable Long id) { try { situationGeographiqueService.deleteSituationGeographique(id); @@ -108,6 +111,7 @@ public class SituationGeographiqueController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_SITUATIONGEOGRAPHIQUE')") public ResponseEntity getAllSituationGeographiqueList() { try { return new ResponseEntity<>( @@ -131,6 +135,7 @@ 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); @@ -155,6 +160,7 @@ public class SituationGeographiqueController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_SITUATIONGEOGRAPHIQUE')") public ResponseEntity getSituationGeographiqueById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java index 2fb45c7..f3ba612 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java @@ -37,6 +37,7 @@ public class SituationMatrimonialeController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_SITUATIONMATRIMONIALE')") public ResponseEntity createSituationMatrimoniale(@RequestBody @Valid @Validated SituationMatrimoniale situationMatrimoniale) { try { situationMatrimoniale = situationMatrimonialeService.createSituationMatrimoniale(situationMatrimoniale); @@ -61,6 +62,7 @@ public class SituationMatrimonialeController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_SITUATIONMATRIMONIALE')") public ResponseEntity updateSituationMatrimoniale(@PathVariable Long id, @RequestBody SituationMatrimoniale situationMatrimoniale) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class SituationMatrimonialeController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_SITUATIONMATRIMONIALE')") public ResponseEntity deleteSituationMatrimonialer(@PathVariable Long id) { try { situationMatrimonialeService.deleteSituationMatrimoniale(id); @@ -108,6 +111,7 @@ public class SituationMatrimonialeController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_SITUATIONMATRIMONIALE')") public ResponseEntity getAllSituationMatrimonialeList() { try { return new ResponseEntity<>( @@ -131,6 +135,7 @@ 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); @@ -155,6 +160,7 @@ public class SituationMatrimonialeController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_SITUATIONMATRIMONIALE')") public ResponseEntity getSituationMatrimonialeById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java index a55920c..08098b2 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java @@ -37,6 +37,7 @@ public class SourceDroitController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_SOURCEDROIT')") public ResponseEntity createSourceDroit(@RequestBody @Valid @Validated SourceDroit sourceDroit) { try { sourceDroit = sourceDroitService.createSourceDroit(sourceDroit); @@ -61,6 +62,7 @@ public class SourceDroitController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_SOURCEDROIT')") public ResponseEntity updateSourceDroit(@PathVariable Long id, @RequestBody SourceDroit sourceDroit) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class SourceDroitController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_SOURCEDROIT')") public ResponseEntity deleteSourceDroitr(@PathVariable Long id) { try { sourceDroitService.deleteSourceDroit(id); @@ -108,6 +111,7 @@ public class SourceDroitController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_SOURCEDROIT')") public ResponseEntity getAllSourceDroitList() { try { return new ResponseEntity<>( @@ -131,6 +135,7 @@ 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); @@ -155,6 +160,7 @@ public class SourceDroitController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_SOURCEDROIT')") public ResponseEntity getSourceDroitById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java index 73379c3..c664cc3 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java @@ -41,6 +41,7 @@ public class StructureController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_STRUCTURE')") public ResponseEntity createStructure(@RequestBody StructurePaylaodWeb structurePaylaodWeb) { try { structurePaylaodWeb = structureService.createStructure(structurePaylaodWeb); @@ -65,6 +66,7 @@ public class StructureController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_STRUCTURE')") public ResponseEntity updateStructure(@PathVariable Long id, @RequestBody StructurePaylaodWeb structurePaylaodWeb) { try { return new ResponseEntity<>( @@ -88,6 +90,7 @@ public class StructureController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_STRUCTURE')") public ResponseEntity deleteStructurer(@PathVariable Long id) { try { structureService.deleteStructure(id); @@ -112,6 +115,7 @@ public class StructureController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_STRUCTURE')") public ResponseEntity getAllStructureList() { try { return new ResponseEntity<>( @@ -136,6 +140,7 @@ 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); @@ -161,6 +166,7 @@ public class StructureController { } @GetMapping("/by-commune/{communeId}") + @PreAuthorize("hasAuthority('READ_STRUCTURE')") public ResponseEntity getAllStructureListByCommune(@PathVariable Long communeId) { try { return new ResponseEntity<>( @@ -184,6 +190,7 @@ 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); @@ -208,6 +215,7 @@ public class StructureController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_STRUCTURE')") public ResponseEntity getStructureById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java index c603174..0e9d092 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java @@ -37,6 +37,7 @@ public class TypeContestationController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_TYPECONTESTATION')") public ResponseEntity createTypeContestation(@RequestBody @Valid @Validated TypeContestation typeContestation) { try { typeContestation = typeContestationService.createTypeContestation(typeContestation); @@ -61,6 +62,7 @@ public class TypeContestationController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_TYPECONTESTATION')") public ResponseEntity updateTypeContestation(@PathVariable Long id, @RequestBody TypeContestation typeContestation) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class TypeContestationController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_TYPECONTESTATION')") public ResponseEntity deleteTypeContestationr(@PathVariable Long id) { try { typeContestationService.deleteTypeContestation(id); @@ -108,6 +111,7 @@ public class TypeContestationController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_TYPECONTESTATION')") public ResponseEntity getAllTypeContestationList() { try { return new ResponseEntity<>( @@ -131,6 +135,7 @@ 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); @@ -155,6 +160,7 @@ public class TypeContestationController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_TYPECONTESTATION')") public ResponseEntity getTypeContestationById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java index ebdd997..9752555 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java @@ -37,6 +37,7 @@ public class TypeDomaineController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_TYPEDOMAINE')") public ResponseEntity createTypeDomaine(@RequestBody @Valid @Validated TypeDomaine typeDomaine) { try { typeDomaine = typeDomaineService.createTypeDomaine(typeDomaine); @@ -61,6 +62,7 @@ public class TypeDomaineController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_TYPEDOMAINE')") public ResponseEntity updateTypeDomaine(@PathVariable Long id, @RequestBody TypeDomaine typeDomaine) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class TypeDomaineController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_TYPEDOMAINE')") public ResponseEntity deleteTypeDomainer(@PathVariable Long id) { try { typeDomaineService.deleteTypeDomaine(id); @@ -108,6 +111,7 @@ public class TypeDomaineController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_TYPEDOMAINE')") public ResponseEntity getAllTypeDomaineList() { try { return new ResponseEntity<>( @@ -131,6 +135,7 @@ 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); @@ -155,6 +160,7 @@ public class TypeDomaineController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_TYPEDOMAINE')") public ResponseEntity getTypeDomaineById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java index c0a24f6..1aba20f 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java @@ -37,6 +37,7 @@ public class TypePersonneController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_TYPEPERSONNE')") public ResponseEntity createTypePersonne(@RequestBody @Valid @Validated TypePersonne typePersonne) { try { typePersonne = typePersonneService.createTypePersonne(typePersonne); @@ -61,6 +62,7 @@ public class TypePersonneController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_TYPEPERSONNE')") public ResponseEntity updateTypePersonne(@PathVariable Long id, @RequestBody TypePersonne typePersonne) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class TypePersonneController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_TYPEPERSONNE')") public ResponseEntity deleteTypePersonner(@PathVariable Long id) { try { typePersonneService.deleteTypePersonne(id); @@ -108,6 +111,7 @@ public class TypePersonneController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_TYPEPERSONNE')") public ResponseEntity getAllTypePersonneList() { try { return new ResponseEntity<>( @@ -131,6 +135,7 @@ 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); @@ -155,6 +160,7 @@ public class TypePersonneController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_TYPEPERSONNE')") public ResponseEntity getTypePersonneById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java index 5e62b1f..dad4707 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java @@ -37,6 +37,7 @@ public class TypePieceController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_TYPEPIECE')") public ResponseEntity createTypePiece(@RequestBody @Valid @Validated TypePiece typePiece) { try { typePiece = typePieceService.createTypePiece(typePiece); @@ -61,6 +62,7 @@ public class TypePieceController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_TYPEPIECE')") public ResponseEntity updateTypePiece(@PathVariable Long id, @RequestBody TypePiece typePiece) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class TypePieceController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_TYPEPIECE')") public ResponseEntity deleteTypePiecer(@PathVariable Long id) { try { typePieceService.deleteTypePiece(id); @@ -108,6 +111,7 @@ public class TypePieceController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_TYPEPIECE')") public ResponseEntity getAllTypePieceList() { try { return new ResponseEntity<>( @@ -131,6 +135,7 @@ 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); @@ -155,6 +160,7 @@ public class TypePieceController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_TYPEPIECE')") public ResponseEntity getTypePieceById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java index 47a311d..c903bd6 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java @@ -37,6 +37,7 @@ public class TypeRepresentationController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_TYPEREPRESENTATION')") public ResponseEntity createTypeRepresentation(@RequestBody @Valid @Validated TypeRepresentation typeRepresentation) { try { typeRepresentation = typeRepresentationService.createTypeRepresentation(typeRepresentation); @@ -61,6 +62,7 @@ public class TypeRepresentationController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_TYPEREPRESENTATION')") public ResponseEntity updateTypeRepresentation(@PathVariable Long id, @RequestBody TypeRepresentation typeRepresentation) { try { return new ResponseEntity<>( @@ -84,6 +86,7 @@ public class TypeRepresentationController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_TYPEREPRESENTATION')") public ResponseEntity deleteTypeRepresentationr(@PathVariable Long id) { try { typeRepresentationService.deleteTypeRepresentation(id); @@ -108,6 +111,7 @@ public class TypeRepresentationController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_TYPEREPRESENTATION')") public ResponseEntity getAllTypeRepresentationList() { try { return new ResponseEntity<>( @@ -131,6 +135,7 @@ 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); @@ -155,6 +160,7 @@ public class TypeRepresentationController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_TYPEREPRESENTATION')") public ResponseEntity getTypeRepresentationById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java index ab10445..ba48937 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java @@ -16,6 +16,7 @@ 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,6 +38,7 @@ public class BatimentController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_BATIMENT')") public ResponseEntity createBatiment(@RequestBody @Valid @Validated BatimentPaylaodWeb batimentPaylaodWeb) { try { batimentPaylaodWeb = batimentService.createBatiment(batimentPaylaodWeb); @@ -61,6 +63,7 @@ public class BatimentController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_BATIMENT')") public ResponseEntity updateBatiment(@PathVariable Long id, @RequestBody BatimentPaylaodWeb batimentPaylaodWeb) { try { return new ResponseEntity<>( @@ -84,6 +87,7 @@ public class BatimentController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_BATIMENT')") public ResponseEntity deleteBatiment(@PathVariable Long id) { try { batimentService.deleteBatiment(id); @@ -108,6 +112,7 @@ public class BatimentController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_BATIMENT')") public ResponseEntity getAllBatimentList() { try { return new ResponseEntity<>( @@ -131,6 +136,7 @@ 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); @@ -155,6 +161,7 @@ public class BatimentController { } @GetMapping("/all/by-parcelle-id/{parcelleId}") + @PreAuthorize("hasAuthority('READ_BATIMENT')") public ResponseEntity getAllBatimentByParcelleList(@PathVariable Long parcelleId) { try { return new ResponseEntity<>( @@ -178,6 +185,7 @@ 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); @@ -202,6 +210,7 @@ public class BatimentController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_BATIMENT')") public ResponseEntity getBatimentById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -225,6 +234,7 @@ public class BatimentController { } @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); @@ -250,6 +260,7 @@ public class BatimentController { @GetMapping("/all/by-quartier-id/{quartierId}") + @PreAuthorize("hasAuthority('READ_BATIMENT')") public ResponseEntity getAllBatimentByQuartier(@PathVariable Long quartierId) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java index d8e52d7..7139f44 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java @@ -2,6 +2,8 @@ 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; @@ -16,6 +18,7 @@ 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 +39,10 @@ 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."), @@ -51,6 +56,7 @@ public class CaracteristiqueBatimentController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_CARACTERISTIQUEBATIMENT')") public ResponseEntity updateCaracteristiqueBatiment(@PathVariable Long id, @RequestBody CaracteristiqueBatimentPayloadWeb caracteristiqueBatimentPayloadWeb) { try { return new ResponseEntity<>( @@ -74,6 +80,7 @@ public class CaracteristiqueBatimentController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_CARACTERISTIQUEBATIMENT')") public ResponseEntity deleteCaracteristiqueBatiment(@PathVariable Long id) { try { caracteristiqueBatimentService.deleteCaracteristiqueBatiment(id); @@ -98,6 +105,7 @@ public class CaracteristiqueBatimentController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEBATIMENT')") public ResponseEntity getAllCaracteristiqueBatimentList() { try { return new ResponseEntity<>( @@ -121,6 +129,7 @@ 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); @@ -145,6 +154,7 @@ public class CaracteristiqueBatimentController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEBATIMENT')") public ResponseEntity getCaracteristiqueBatimentById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -168,6 +178,7 @@ public class CaracteristiqueBatimentController { } @GetMapping("/by-enquete-batiment-id/{enqueteBatimentId}") + @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEBATIMENT')") public ResponseEntity getCaracteristiqueBatimentByBatimentId(@PathVariable Long enqueteBatimentId) { try { return new ResponseEntity<>( @@ -191,6 +202,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueParcelleController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueParcelleController.java index 573bcf6..806e03f 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueParcelleController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueParcelleController.java @@ -16,6 +16,7 @@ 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,6 +37,7 @@ public class CaracteristiqueParcelleController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_CARACTERISTIQUEPARCELLE')") public ResponseEntity createCaracteristiqueParcelle(@RequestBody @Valid @Validated CaracteristiqueParcellePayloadWeb caracteristiqueParcellePayloadWeb) { try { caracteristiqueParcellePayloadWeb = caracteristiqueParcelleService.createCaracteristiqueParcelle(caracteristiqueParcellePayloadWeb); @@ -60,6 +62,7 @@ public class CaracteristiqueParcelleController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_CARACTERISTIQUEPARCELLE')") public ResponseEntity updateCaracteristiqueParcelle(@PathVariable Long id, @RequestBody CaracteristiqueParcellePayloadWeb caracteristiqueParcellePayloadWeb) { try { return new ResponseEntity<>( @@ -83,6 +86,7 @@ public class CaracteristiqueParcelleController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_CARACTERISTIQUEPARCELLE')") public ResponseEntity deleteCaracteristiqueParcelle(@PathVariable Long id) { try { caracteristiqueParcelleService.deleteCaracteristiqueParcelle(id); @@ -107,6 +111,7 @@ public class CaracteristiqueParcelleController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEPARCELLE')") public ResponseEntity getAllCaracteristiqueParcelleList() { try { return new ResponseEntity<>( @@ -130,6 +135,7 @@ 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); @@ -154,6 +160,7 @@ public class CaracteristiqueParcelleController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEPARCELLE')") public ResponseEntity getCaracteristiqueParcelleById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -178,6 +185,7 @@ public class CaracteristiqueParcelleController { @GetMapping("/by-enquete-id/{enqueteId}") + @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEPARCELLE')") public ResponseEntity getAllCaracteristiqueParcelleList(@PathVariable Long enqueteId) { try { return new ResponseEntity<>( @@ -201,6 +209,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java index cd72882..021e516 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java @@ -16,6 +16,7 @@ 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,6 +37,7 @@ public class CaracteristiqueUniteLogementController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_CARACTERISTIQUEUNITELOGEMENT')") public ResponseEntity createCaracteristiqueUniteLogement(@RequestBody @Valid @Validated CaracteristiqueUniteLogementPayloadWeb caracteristiqueUniteLogementPayloadWeb) { try { caracteristiqueUniteLogementPayloadWeb = caracteristiqueUniteLogementService.createCaracteristiqueUniteLogement(caracteristiqueUniteLogementPayloadWeb); @@ -60,6 +62,7 @@ public class CaracteristiqueUniteLogementController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_CARACTERISTIQUEUNITELOGEMENT')") public ResponseEntity updateCaracteristiqueUniteLogement(@PathVariable Long id, @RequestBody CaracteristiqueUniteLogementPayloadWeb caracteristiqueUniteLogementPayloadWeb) { try { return new ResponseEntity<>( @@ -83,6 +86,7 @@ public class CaracteristiqueUniteLogementController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_CARACTERISTIQUEUNITELOGEMENT')") public ResponseEntity deleteCaracteristiqueUniteLogement(@PathVariable Long id) { try { caracteristiqueUniteLogementService.deleteCaracteristiqueUniteLogement(id); @@ -107,6 +111,7 @@ public class CaracteristiqueUniteLogementController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEUNITELOGEMENT')") public ResponseEntity getAllCaracteristiqueUniteLogementList() { try { return new ResponseEntity<>( @@ -130,6 +135,7 @@ 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); @@ -154,6 +160,7 @@ public class CaracteristiqueUniteLogementController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEUNITELOGEMENT')") public ResponseEntity getCaracteristiqueUniteLogementById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -177,6 +184,7 @@ public class CaracteristiqueUniteLogementController { } @GetMapping("/by-enquete-ulo-id/{enqueteUloId}") + @PreAuthorize("hasAuthority('READ_CARACTERISTIQUEUNITELOGEMENT')") public ResponseEntity getAllCaracteristiqueUniteLogementListByEul(@PathVariable Long enqueteUloId) { try { return new ResponseEntity<>( @@ -200,6 +208,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CommuneCentreAssignationController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CommuneCentreAssignationController.java index db619b0..b93731a 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CommuneCentreAssignationController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CommuneCentreAssignationController.java @@ -21,6 +21,7 @@ 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; @@ -44,6 +45,7 @@ public class CommuneCentreAssignationController { // } @PostMapping("/assigne-centre") + @PreAuthorize("hasAuthority('CREATE_COMMUNECENTREASSIGNATION')") public ResponseEntity AssigneCommuneCentre(@CurrentUser UserPrincipal userPrincipal, @RequestBody CommuneCentreAssignationPaylaodWeb communeCentreAssignationPaylaodWeb) { try { if(userPrincipal==null){ @@ -75,6 +77,7 @@ public class CommuneCentreAssignationController { } @PostMapping("/detache-centre") + @PreAuthorize("hasAuthority('UPDATE_COMMUNECENTREASSIGNATION')") public ResponseEntity detacheCommuneCentre(@CurrentUser UserPrincipal userPrincipal, @RequestBody CommuneCentreAssignationPaylaodWeb communeCentreAssignationPaylaodWeb) { try { if(userPrincipal==null){ @@ -106,6 +109,7 @@ public class CommuneCentreAssignationController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_COMMUNECENTREASSIGNATION')") public ResponseEntity updateCommuneCentreAssignation(@PathVariable Long id, @RequestBody CommuneCentreAssignationPaylaodWeb communeCentreAssignationPaylaodWeb) { try { return new ResponseEntity<>( @@ -129,6 +133,7 @@ public class CommuneCentreAssignationController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_COMMUNECENTREASSIGNATION')") public ResponseEntity deleteCommuneCentreAssignation(@PathVariable Long id) { try { communeCentreAssignationService.deleteCommuneCentreAssignation(id); @@ -153,6 +158,7 @@ public class CommuneCentreAssignationController { } @GetMapping("/all-paged") + @PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')") public ResponseEntity getAllCommuneCentreAssignationPaged(@RequestParam int pageNo, @RequestParam int pageSize) { try { Pageable pageable = PageRequest.of(pageNo, pageSize); @@ -177,6 +183,7 @@ public class CommuneCentreAssignationController { } @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); @@ -203,6 +210,7 @@ public class CommuneCentreAssignationController { @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')") public ResponseEntity getCommuneCentreAssignationById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -227,6 +235,7 @@ public class CommuneCentreAssignationController { @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); @@ -253,6 +262,7 @@ public class CommuneCentreAssignationController { @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); @@ -280,6 +290,7 @@ public class CommuneCentreAssignationController { @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){ diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/DeclarationNcController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/DeclarationNcController.java index 855ba89..d58a1f6 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/DeclarationNcController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/DeclarationNcController.java @@ -18,6 +18,7 @@ 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,6 +37,7 @@ public class DeclarationNcController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_DECLARATIONNC')") public ResponseEntity createDeclarationNc(@RequestBody DeclarationNcPayloadWeb declarationNcPayloadWeb) { try { declarationNcPayloadWeb = declarationNcService.createDeclarationNc(declarationNcPayloadWeb); @@ -60,6 +62,7 @@ public class DeclarationNcController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_DECLARATIONNC')") public ResponseEntity updateEnqueteBatiment(@PathVariable Long id, @RequestBody DeclarationNcPayloadWeb declarationNcPayloadWeb) { try { return new ResponseEntity<>( @@ -83,6 +86,7 @@ public class DeclarationNcController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_DECLARATIONNC')") public ResponseEntity deleteEnqueteBatiment(@PathVariable Long id) { try { declarationNcService.deleteDeclarationNc(id); @@ -107,6 +111,7 @@ public class DeclarationNcController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_DECLARATIONNC')") public ResponseEntity getAllEnqueteBatimentList() { try { return new ResponseEntity<>( @@ -130,6 +135,7 @@ 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); @@ -155,6 +161,7 @@ public class DeclarationNcController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_DECLARATIONNC')") public ResponseEntity getEnqueteBatimentById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -178,6 +185,7 @@ public class DeclarationNcController { } @GetMapping("/by-personne-id/{personneId}") + @PreAuthorize("hasAuthority('READ_DECLARATIONNC')") public ResponseEntity getDeclarationNcByPersonne(@PathVariable Long personneId) { try { return new ResponseEntity<>( @@ -201,6 +209,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/DonneesImpositionTfuController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/DonneesImpositionTfuController.java index 5d0984f..5dc447b 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/DonneesImpositionTfuController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/DonneesImpositionTfuController.java @@ -23,6 +23,7 @@ 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; @@ -46,6 +47,7 @@ public class DonneesImpositionTfuController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_DONNEESIMPOSITIONTFU')") public ResponseEntity createDonneesImpositionTfu(@RequestBody @Valid @Validated DonneesImpositionTfu donneesImpositionTfu) { try { donneesImpositionTfu = donneesImpositionTfuService.createDonneesImpositionTfu(donneesImpositionTfu); @@ -70,6 +72,7 @@ public class DonneesImpositionTfuController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_DONNEESIMPOSITIONTFU')") public ResponseEntity updateDonneesImpositionTfu(@PathVariable Long id, @RequestBody DonneesImpositionTfu donneesImpositionTfu) { try { return new ResponseEntity<>( @@ -93,6 +96,7 @@ public class DonneesImpositionTfuController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_DONNEESIMPOSITIONTFU')") public ResponseEntity deleteDonneesImpositionTfu(@PathVariable Long id) { try { donneesImpositionTfuService.deleteDonneesImpositionTfu(id); @@ -165,6 +169,7 @@ public class DonneesImpositionTfuController { @GetMapping("/all-page/by-imposition-id/{impositionId}") + @PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')") public ResponseEntity getAllDonneesImpositionTfuByImpositionIdPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) { try { Pageable pageable = PageRequest.of(pageNo, pageSize); @@ -189,6 +194,7 @@ 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) { try { Pageable pageable = PageRequest.of(pageNo, pageSize); @@ -214,6 +220,7 @@ public class DonneesImpositionTfuController { @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); @@ -238,6 +245,7 @@ public class DonneesImpositionTfuController { } @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); @@ -262,6 +270,7 @@ public class DonneesImpositionTfuController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')") public ResponseEntity getDonneesImpositionTfuById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -285,6 +294,7 @@ public class DonneesImpositionTfuController { } @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) { try { Optional optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId()); @@ -338,6 +348,7 @@ public class DonneesImpositionTfuController { 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 optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId()); @@ -390,6 +401,7 @@ public class DonneesImpositionTfuController { @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 optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId()); @@ -443,6 +455,7 @@ public class DonneesImpositionTfuController { 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 optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId()); @@ -492,6 +505,7 @@ 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 { @@ -518,6 +532,7 @@ 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 { @@ -543,6 +558,7 @@ public class DonneesImpositionTfuController { @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); @@ -568,6 +584,7 @@ public class DonneesImpositionTfuController { } @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"); @@ -594,6 +611,7 @@ public class DonneesImpositionTfuController { @GetMapping("/all/by-personne-id/{personneId}") + @PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')") public ResponseEntity getAllDonneesImpositionTfuByPersonneId(@PathVariable Long personneId) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteActiviteController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteActiviteController.java index 4530aa2..6961211 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteActiviteController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteActiviteController.java @@ -16,6 +16,7 @@ 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,6 +38,7 @@ public class EnqueteActiviteController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_ENQUETEACTIVITE')") public ResponseEntity createEnqueteActivite(@RequestBody @Valid @Validated EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) { try { EnqueteActivite enqueteActivite = enqueteActiviteService.createEnqueteActivite(enqueteActivitePayLoadWeb); @@ -61,6 +63,7 @@ public class EnqueteActiviteController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_ENQUETEACTIVITE')") public ResponseEntity updateEnqueteActivite(@PathVariable Long id, @RequestBody EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) { try { return new ResponseEntity<>( @@ -84,6 +87,7 @@ public class EnqueteActiviteController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_ENQUETEACTIVITE')") public ResponseEntity deleteEnqueteActivite(@PathVariable Long id) { try { enqueteActiviteService.deleteEnqueteActivite(id); @@ -108,6 +112,7 @@ public class EnqueteActiviteController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_ENQUETEACTIVITE')") public ResponseEntity getAllEnqueteActiviteList() { try { return new ResponseEntity<>( @@ -131,6 +136,7 @@ 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); @@ -155,6 +161,7 @@ public class EnqueteActiviteController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_ENQUETEACTIVITE')") public ResponseEntity getEnqueteActiviteById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java index cdcdfa6..2600c87 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java @@ -20,6 +20,7 @@ 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; @@ -42,6 +43,7 @@ public class EnqueteBatimentController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_ENQUETEBATIMENT')") public ResponseEntity createEnqueteBatiment(@RequestBody @Valid @Validated EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) { try { enqueteBatimentPayloadWeb = enqueteBatimentService.createEnqueteBatiment(enqueteBatimentPayloadWeb); @@ -67,6 +69,7 @@ public class EnqueteBatimentController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')") public ResponseEntity updateEnqueteBatiment(@PathVariable Long id, @RequestBody EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) { try { return new ResponseEntity<>( @@ -90,6 +93,7 @@ public class EnqueteBatimentController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_ENQUETEBATIMENT')") public ResponseEntity deleteEnqueteBatiment(@PathVariable Long id) { try { enqueteBatimentService.deleteEnqueteBatiment(id); @@ -114,6 +118,7 @@ public class EnqueteBatimentController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')") public ResponseEntity getAllEnqueteBatimentList() { try { return new ResponseEntity<>( @@ -137,6 +142,7 @@ 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); @@ -162,6 +168,7 @@ public class EnqueteBatimentController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')") public ResponseEntity getEnqueteBatimentById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -185,6 +192,7 @@ public class EnqueteBatimentController { } @GetMapping("/by-batiment-id/{batimentId}") + @PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')") public ResponseEntity getEnqueteBatimentByBatimentId(@PathVariable Long batimentId) { try { return new ResponseEntity<>( @@ -208,6 +216,7 @@ 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); @@ -233,6 +242,7 @@ public class EnqueteBatimentController { @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); @@ -263,6 +273,7 @@ public class EnqueteBatimentController { } @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); @@ -294,6 +305,7 @@ public class EnqueteBatimentController { @PutMapping("/validation") + @PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')") public ResponseEntity validerEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) { try { return new ResponseEntity<>( @@ -317,6 +329,7 @@ public class EnqueteBatimentController { } @PutMapping("/rejet") + @PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')") public ResponseEntity rejeterEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) { try { @@ -341,6 +354,7 @@ public class EnqueteBatimentController { } @PutMapping("/validation-lot") + @PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')") public ResponseEntity validerEnqueteParLot(@RequestBody List enqueteTraitementPayLoads) { try { return new ResponseEntity<>( @@ -364,6 +378,7 @@ public class EnqueteBatimentController { } @PutMapping("/rejet-lot") + @PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')") public ResponseEntity rejeterEnqueteParLot(@RequestBody List enqueteTraitementPayLoads) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java index ce05191..45dac5f 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java @@ -20,6 +20,7 @@ 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; @@ -42,6 +43,7 @@ public class EnqueteUniteLogementController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_ENQUETEUNITELOGEMENT')") public ResponseEntity createEnqueteUniteLogement(@RequestBody @Valid @Validated EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) { try { enqueteUniteLogementPayloadWeb = enqueteUniteLogementService.createEnqueteUniteLogement(enqueteUniteLogementPayloadWeb); @@ -66,6 +68,7 @@ public class EnqueteUniteLogementController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')") public ResponseEntity updateEnqueteUniteLogement(@PathVariable Long id, @RequestBody EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) { try { return new ResponseEntity<>( @@ -89,6 +92,7 @@ public class EnqueteUniteLogementController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_ENQUETEUNITELOGEMENT')") public ResponseEntity deleteEnqueteUniteLogement(@PathVariable Long id) { try { enqueteUniteLogementService.deleteEnqueteUniteLogement(id); @@ -113,6 +117,7 @@ public class EnqueteUniteLogementController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')") public ResponseEntity getAllEnqueteUniteLogementList() { try { return new ResponseEntity<>( @@ -136,6 +141,7 @@ 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); @@ -161,6 +167,7 @@ public class EnqueteUniteLogementController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')") public ResponseEntity getEnqueteUniteLogementById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -184,6 +191,7 @@ public class EnqueteUniteLogementController { } @GetMapping("/by-unite-logement-id/{uniteLogementId}") + @PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')") public ResponseEntity getEnqueteUniteLogementByUniteLogement(@PathVariable Long uniteLogementId) { try { return new ResponseEntity<>( @@ -207,6 +215,7 @@ 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); @@ -232,6 +241,7 @@ public class EnqueteUniteLogementController { @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); @@ -263,6 +273,7 @@ public class EnqueteUniteLogementController { @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); @@ -294,6 +305,7 @@ public class EnqueteUniteLogementController { @PutMapping("/validation") + @PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')") public ResponseEntity validerEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) { try { return new ResponseEntity<>( @@ -317,6 +329,7 @@ public class EnqueteUniteLogementController { } @PutMapping("/rejet") + @PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')") public ResponseEntity rejeterEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) { try { @@ -341,6 +354,7 @@ public class EnqueteUniteLogementController { } @PutMapping("/validation-lot") + @PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')") public ResponseEntity validerEnqueteParLot(@RequestBody List enqueteTraitementPayLoads) { try { return new ResponseEntity<>( @@ -364,6 +378,7 @@ public class EnqueteUniteLogementController { } @PutMapping("/rejet-lot") + @PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')") public ResponseEntity rejeterEnqueteParLot(@RequestBody List enqueteTraitementPayLoads) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java index cadfc3b..dcd8826 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java @@ -24,6 +24,7 @@ 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; @@ -44,6 +45,7 @@ public class ImpositionsTfuController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_IMPOSITIONSTFU')") public ResponseEntity createImpositionsTfu(@CurrentUser UserPrincipal currentUser,@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) { try { if(currentUser==null){ @@ -84,6 +86,7 @@ public class ImpositionsTfuController { @PutMapping("/cloturer-enquete") + @PreAuthorize("hasAuthority('UPDATE_IMPOSITIONSTFU')") public ResponseEntity cloturer(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb ) { try { @@ -151,6 +154,7 @@ public class ImpositionsTfuController { ) @PutMapping("/autoriser-generation-avis") + @PreAuthorize("hasAuthority('UPDATE_IMPOSITIONSTFU')") public ResponseEntity autoriserImpositionsTfu(@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) { try { return new ResponseEntity<>( @@ -174,6 +178,7 @@ public class ImpositionsTfuController { } @PutMapping("/rejeter") + @PreAuthorize("hasAuthority('UPDATE_IMPOSITIONSTFU')") public ResponseEntity annulerImpositionsTfu(@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) { try { return new ResponseEntity<>( @@ -197,6 +202,7 @@ public class ImpositionsTfuController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_IMPOSITIONSTFU')") public ResponseEntity deleteImpositionsTfu(@PathVariable Long id) { try { impositionsTfuService.deleteImpositionsTfu(id); @@ -221,6 +227,7 @@ public class ImpositionsTfuController { } @GetMapping("/all/by-user") + @PreAuthorize("hasAuthority('READ_IMPOSITIONSTFU')") public ResponseEntity getAllImpositionsTfuList(@CurrentUser UserPrincipal userPrincipal) { try { @@ -252,6 +259,7 @@ 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); @@ -277,6 +285,7 @@ public class ImpositionsTfuController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_IMPOSITIONSTFU')") public ResponseEntity getImpositionsTfuById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java index 5a7a0e6..506b41f 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java @@ -16,6 +16,7 @@ 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,6 +37,7 @@ public class UniteLogementController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_UNITELOGEMENT')") public ResponseEntity createUniteLogement(@RequestBody @Valid @Validated UniteLogementPaylaodWeb enqueteUniteLogementPaylaodWeb) { try { enqueteUniteLogementPaylaodWeb = enqueteUniteLogementService.createUniteLogement(enqueteUniteLogementPaylaodWeb); @@ -60,6 +62,7 @@ public class UniteLogementController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_UNITELOGEMENT')") public ResponseEntity updateUniteLogement(@PathVariable Long id, @RequestBody UniteLogementPaylaodWeb enqueteUniteLogementPaylaodWeb) { try { return new ResponseEntity<>( @@ -83,6 +86,7 @@ public class UniteLogementController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_UNITELOGEMENT')") public ResponseEntity deleteUniteLogement(@PathVariable Long id) { try { enqueteUniteLogementService.deleteUniteLogement(id); @@ -107,6 +111,7 @@ public class UniteLogementController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_UNITELOGEMENT')") public ResponseEntity getAllUniteLogementList() { try { return new ResponseEntity<>( @@ -130,6 +135,7 @@ 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); @@ -155,6 +161,7 @@ public class UniteLogementController { } @GetMapping("/all/by-batiment-id/{batimentId}") + @PreAuthorize("hasAuthority('READ_UNITELOGEMENT')") public ResponseEntity getAllUniteLogementListByBatiment(@PathVariable Long batimentId) { try { return new ResponseEntity<>( @@ -178,6 +185,7 @@ 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); @@ -203,6 +211,7 @@ public class UniteLogementController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_UNITELOGEMENT')") public ResponseEntity getUniteLogementById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -226,6 +235,7 @@ public class UniteLogementController { } @GetMapping("/by-parcelle-id/{id}") + @PreAuthorize("hasAuthority('READ_UNITELOGEMENT')") public ResponseEntity getUniteLogementByParcelleId(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -250,6 +260,7 @@ public class UniteLogementController { @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); @@ -276,6 +287,7 @@ public class UniteLogementController { @GetMapping("/all/by-quartier-id/{quartierId}") + @PreAuthorize("hasAuthority('READ_UNITELOGEMENT')") public ResponseEntity getAllUniteLogementByQuartier(@PathVariable Long quartierId) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuController.java index fce5bac..fb303cd 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuController.java @@ -15,6 +15,7 @@ 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; @@ -34,6 +35,7 @@ public class BaremRfuController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_BAREMRFUBATI')") public ResponseEntity createBaremRfu(@RequestBody @Valid @Validated BaremRfuBatiPayloadWeb baremRfuBatiPayloadWeb) { try { baremRfuBatiPayloadWeb = baremRfuBatiService.createBaremRfu(baremRfuBatiPayloadWeb); @@ -58,6 +60,7 @@ public class BaremRfuController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_BAREMRFUBATI')") public ResponseEntity updateBaremRfu(@PathVariable Long id, @RequestBody BaremRfuBatiPayloadWeb baremRfuBatiPayloadWeb) { try { return new ResponseEntity<>( @@ -81,6 +84,7 @@ public class BaremRfuController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_BAREMRFUBATI')") public ResponseEntity deleteBaremRfur(@PathVariable Long id) { try { baremRfuBatiService.deleteBaremRfu(id); @@ -105,6 +109,7 @@ public class BaremRfuController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_BAREMRFUBATI')") public ResponseEntity getAllBaremRfuList() { try { return new ResponseEntity<>( @@ -128,6 +133,7 @@ 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); @@ -153,6 +159,7 @@ public class BaremRfuController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_BAREMRFUBATI')") public ResponseEntity getBaremRfuById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -176,6 +183,7 @@ 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) { @@ -202,6 +210,7 @@ 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 @@ -229,6 +238,7 @@ 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 diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuNonBatiController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuNonBatiController.java index 9c19476..50f4168 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuNonBatiController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuNonBatiController.java @@ -15,6 +15,7 @@ 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,6 +36,7 @@ public class BaremRfuNonBatiController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_BAREMRFUNONBATI')") public ResponseEntity createBaremRfuNonBati(@RequestBody BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) { try { baremRfuNonBatiPayloadWeb = baremRfuNonBatiService.createBaremRfuNonBati(baremRfuNonBatiPayloadWeb); @@ -59,6 +61,7 @@ public class BaremRfuNonBatiController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_BAREMRFUNONBATI')") public ResponseEntity updateBaremRfuNonBati(@PathVariable Long id, @RequestBody BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) { try { return new ResponseEntity<>( @@ -82,6 +85,7 @@ public class BaremRfuNonBatiController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_BAREMRFUNONBATI')") public ResponseEntity deleteBaremRfuNonBatir(@PathVariable Long id) { try { baremRfuNonBatiService.deleteBaremRfuNonBati(id); @@ -106,6 +110,7 @@ public class BaremRfuNonBatiController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_BAREMRFUNONBATI')") public ResponseEntity getAllBaremRfuNonBatiList() { try { return new ResponseEntity<>( @@ -129,6 +134,7 @@ 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); @@ -154,6 +160,7 @@ public class BaremRfuNonBatiController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_BAREMRFUNONBATI')") public ResponseEntity getBaremRfuNonBatiById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -178,6 +185,7 @@ 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<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CampagneController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CampagneController.java index 6d719e9..926621c 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CampagneController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CampagneController.java @@ -15,6 +15,7 @@ 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,6 +36,7 @@ public class CampagneController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_CAMPAGNE')") public ResponseEntity createCampagne(@RequestBody @Valid @Validated Campagne campagne) { try { campagne = campagneService.createCampagne(campagne); @@ -59,6 +61,7 @@ public class CampagneController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_CAMPAGNE')") public ResponseEntity updateCampagne(@PathVariable Long id, @RequestBody Campagne campagne) { try { return new ResponseEntity<>( @@ -82,6 +85,7 @@ public class CampagneController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_CAMPAGNE')") public ResponseEntity deleteCampagner(@PathVariable Long id) { try { campagneService.deleteCampagne(id); @@ -106,6 +110,7 @@ public class CampagneController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_CAMPAGNE')") public ResponseEntity getAllCampagneList() { try { return new ResponseEntity<>( @@ -129,6 +134,7 @@ 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); @@ -154,6 +160,7 @@ public class CampagneController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_CAMPAGNE')") public ResponseEntity getCampagneById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -177,6 +184,7 @@ public class CampagneController { } @GetMapping("/type-campagne/{typeCampagne}") + @PreAuthorize("hasAuthority('READ_CAMPAGNE')") public ResponseEntity getCampagneByType(@PathVariable TypeCampagne typeCampagne) { try { diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CaracteristiqueController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CaracteristiqueController.java index dad243b..d9d83b9 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CaracteristiqueController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CaracteristiqueController.java @@ -15,6 +15,7 @@ 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; @@ -34,6 +35,7 @@ public class CaracteristiqueController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_CARACTERISTIQUE')") public ResponseEntity createCaracteristique(@RequestBody @Valid @Validated Caracteristique caracteristique) { try { caracteristique = caracteristiqueService.createCaracteristique(caracteristique); @@ -58,6 +60,7 @@ public class CaracteristiqueController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_CARACTERISTIQUE')") public ResponseEntity updateCaracteristique(@PathVariable Long id, @RequestBody Caracteristique caracteristique) { try { return new ResponseEntity<>( @@ -81,6 +84,7 @@ public class CaracteristiqueController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_CARACTERISTIQUE')") public ResponseEntity deleteCaracteristique(@PathVariable Long id) { try { caracteristiqueService.deleteCaracteristique(id); @@ -105,6 +109,7 @@ public class CaracteristiqueController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_CARACTERISTIQUE')") public ResponseEntity getAllCaracteristiqueList() { try { return new ResponseEntity<>( @@ -128,6 +133,7 @@ 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); @@ -153,6 +159,7 @@ public class CaracteristiqueController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_CARACTERISTIQUE')") public ResponseEntity getCaracteristiqueById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CategorieBatimentController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CategorieBatimentController.java index 4660bd8..d096b39 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CategorieBatimentController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CategorieBatimentController.java @@ -14,6 +14,7 @@ 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; @@ -34,6 +35,7 @@ public class CategorieBatimentController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_CATEGORIEBATIMENT')") public ResponseEntity createCategorieBatiment(@RequestBody @Valid @Validated CategorieBatiment categorieBatiment) { try { categorieBatiment = categorieBatimentService.createCategorieBatiment(categorieBatiment); @@ -58,6 +60,7 @@ public class CategorieBatimentController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_CATEGORIEBATIMENT')") public ResponseEntity updateCategorieBatiment(@PathVariable Long id, @RequestBody CategorieBatiment categorieBatiment) { try { return new ResponseEntity<>( @@ -81,6 +84,7 @@ public class CategorieBatimentController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_CATEGORIEBATIMENT')") public ResponseEntity deleteCategorieBatimentr(@PathVariable Long id) { try { categorieBatimentService.deleteCategorieBatiment(id); @@ -105,6 +109,7 @@ public class CategorieBatimentController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_CATEGORIEBATIMENT')") public ResponseEntity getAllCategorieBatimentList() { try { return new ResponseEntity<>( @@ -128,6 +133,7 @@ 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); @@ -153,6 +159,7 @@ public class CategorieBatimentController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_CATEGORIEBATIMENT')") public ResponseEntity getCategorieBatimentById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java index c73b89b..1acefb1 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java @@ -15,6 +15,7 @@ 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,6 +36,7 @@ public class EquipeController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_EQUIPE')") public ResponseEntity createEquipe(@RequestBody @Valid @Validated EquipePayload equipePayload) { try { Equipe equipe = equipeService.createEquipe(equipePayload); @@ -59,6 +61,7 @@ public class EquipeController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_EQUIPE')") public ResponseEntity updateEquipe(@PathVariable Long id, @RequestBody EquipePayload equipePayload) { try { return new ResponseEntity<>( @@ -82,6 +85,7 @@ public class EquipeController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_EQUIPE')") public ResponseEntity deleteEquiper(@PathVariable Long id) { try { equipeService.deleteEquipe(id); @@ -106,6 +110,7 @@ public class EquipeController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_EQUIPE')") public ResponseEntity getAllEquipeList() { try { return new ResponseEntity<>( @@ -129,6 +134,7 @@ 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); @@ -154,6 +160,7 @@ public class EquipeController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_EQUIPE')") public ResponseEntity getEquipeById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/ExerciceController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/ExerciceController.java index dd889c1..6f03e8c 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/ExerciceController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/ExerciceController.java @@ -14,6 +14,7 @@ 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; @@ -34,6 +35,7 @@ public class ExerciceController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_EXERCICE')") public ResponseEntity createExercice(@RequestBody @Valid @Validated Exercice exercice) { try { exercice = exerciceService.createExercice(exercice); @@ -58,6 +60,7 @@ public class ExerciceController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_EXERCICE')") public ResponseEntity updateExercice(@PathVariable Long id, @RequestBody Exercice exercice) { try { return new ResponseEntity<>( @@ -81,6 +84,7 @@ public class ExerciceController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_EXERCICE')") public ResponseEntity deleteExercicer(@PathVariable Long id) { try { exerciceService.deleteExercice(id); @@ -105,6 +109,7 @@ public class ExerciceController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_EXERCICE')") public ResponseEntity getAllExerciceList() { try { return new ResponseEntity<>( @@ -128,6 +133,7 @@ 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); @@ -153,6 +159,7 @@ public class ExerciceController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_EXERCICE')") public ResponseEntity getExerciceById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -175,6 +182,5 @@ public class ExerciceController { } } - } diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/TypeCaracteristiqueController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/TypeCaracteristiqueController.java index 75c1150..a1eb56f 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/TypeCaracteristiqueController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/TypeCaracteristiqueController.java @@ -15,6 +15,7 @@ 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; @@ -34,6 +35,7 @@ public class TypeCaracteristiqueController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_TYPECARACTERISTIQUE')") public ResponseEntity createTypeCaracteristique(@RequestBody @Valid @Validated TypeCaracteristique typeCaracteristique) { try { typeCaracteristique = typeCaracteristiqueService.createTypeCaracteristique(typeCaracteristique); @@ -58,6 +60,7 @@ public class TypeCaracteristiqueController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_TYPECARACTERISTIQUE')") public ResponseEntity updateTypeCaracteristique(@PathVariable Long id, @RequestBody TypeCaracteristique typeCaracteristique) { try { return new ResponseEntity<>( @@ -81,6 +84,7 @@ public class TypeCaracteristiqueController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_TYPECARACTERISTIQUE')") public ResponseEntity deleteTypeCaracteristique(@PathVariable Long id) { try { typeCaracteristiqueService.deleteTypeCaracteristique(id); @@ -105,6 +109,7 @@ public class TypeCaracteristiqueController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_TYPECARACTERISTIQUE')") public ResponseEntity getAllTypeCaracteristiqueList() { try { return new ResponseEntity<>( @@ -128,6 +133,7 @@ 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); @@ -153,6 +159,7 @@ public class TypeCaracteristiqueController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_TYPECARACTERISTIQUE')") public ResponseEntity getTypeCaracteristiqueById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/UsageController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/UsageController.java index a333f65..f53f13a 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/UsageController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/UsageController.java @@ -14,6 +14,7 @@ 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; @@ -34,6 +35,7 @@ public class UsageController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_USAGE')") public ResponseEntity createUsage(@RequestBody @Valid @Validated Usage usage) { try { usage = usageService.createUsage(usage); @@ -58,6 +60,7 @@ public class UsageController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_USAGE')") public ResponseEntity updateUsage(@PathVariable Long id, @RequestBody Usage usage) { try { return new ResponseEntity<>( @@ -81,6 +84,7 @@ public class UsageController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_USAGE')") public ResponseEntity deleteUsager(@PathVariable Long id) { try { usageService.deleteUsage(id); @@ -105,6 +109,7 @@ public class UsageController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_USAGE')") public ResponseEntity getAllUsageList() { try { return new ResponseEntity<>( @@ -128,6 +133,7 @@ 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); @@ -153,6 +159,7 @@ public class UsageController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_USAGE')") public ResponseEntity getUsageById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/ZoneRfuController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/ZoneRfuController.java index 2cf112d..d5438f2 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/ZoneRfuController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/ZoneRfuController.java @@ -14,6 +14,7 @@ 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; @@ -34,6 +35,7 @@ public class ZoneRfuController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_ZONERFU')") public ResponseEntity createZoneRfu(@RequestBody @Valid @Validated ZoneRfu zoneRfu) { try { zoneRfu = zoneRfuService.createZoneRfu(zoneRfu); @@ -58,6 +60,7 @@ public class ZoneRfuController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_ZONERFU')") public ResponseEntity updateZoneRfu(@PathVariable Long id, @RequestBody ZoneRfu zoneRfu) { try { return new ResponseEntity<>( @@ -81,6 +84,7 @@ public class ZoneRfuController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_ZONERFU')") public ResponseEntity deleteZoneRfur(@PathVariable Long id) { try { zoneRfuService.deleteZoneRfu(id); @@ -105,6 +109,7 @@ public class ZoneRfuController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_ZONERFU')") public ResponseEntity getAllZoneRfuList() { try { return new ResponseEntity<>( @@ -128,6 +133,7 @@ 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); @@ -153,6 +159,7 @@ public class ZoneRfuController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_ZONERFU')") public ResponseEntity getZoneRfuById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/synchronisation/RestaurationController.java b/src/main/java/io/gmss/fiscad/controllers/synchronisation/RestaurationController.java index ee8c461..60f606a 100644 --- a/src/main/java/io/gmss/fiscad/controllers/synchronisation/RestaurationController.java +++ b/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; diff --git a/src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java b/src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java index 081f9b1..7c6fd61 100644 --- a/src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java +++ b/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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 enqueteUniteLogementPayloads) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/user/AvoirFonctionController.java b/src/main/java/io/gmss/fiscad/controllers/user/AvoirFonctionController.java index 2f8a46a..d4c8d3c 100755 --- a/src/main/java/io/gmss/fiscad/controllers/user/AvoirFonctionController.java +++ b/src/main/java/io/gmss/fiscad/controllers/user/AvoirFonctionController.java @@ -16,6 +16,7 @@ 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,6 +38,7 @@ public class AvoirFonctionController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_AVOIRFONCTION')") public ResponseEntity createAvoirFonction(@RequestBody @Valid @Validated AvoirFonctionPaylaodWeb avoirFonctionPaylaodWeb ) { try { return new ResponseEntity<>( @@ -61,6 +63,7 @@ public class AvoirFonctionController { @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_AVOIRFONCTION')") public ResponseEntity updateAvoirFonction(@PathVariable Long id, @RequestBody AvoirFonctionPaylaodWeb avoirFonctionPaylaodWeb) { try { return new ResponseEntity<>( @@ -84,6 +87,7 @@ public class AvoirFonctionController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_AVOIRFONCTION')") public ResponseEntity deleteAvoirFonction(@PathVariable Long id) { try { avoirFonctionService.deleteAvoirFonction(id); @@ -108,6 +112,7 @@ public class AvoirFonctionController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_AVOIRFONCTION')") public ResponseEntity getAll() { try { return new ResponseEntity<>( @@ -132,6 +137,7 @@ 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); @@ -157,6 +163,7 @@ public class AvoirFonctionController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_AVOIRFONCTION')") public ResponseEntity getById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -181,6 +188,7 @@ public class AvoirFonctionController { @GetMapping("/by-utilisateur-id/{userId}") + @PreAuthorize("hasAuthority('READ_AVOIRFONCTION')") public ResponseEntity getByUserId(@PathVariable Long userId) { try { return new ResponseEntity<>( @@ -205,6 +213,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/user/DemandeReinitialisationMPController.java b/src/main/java/io/gmss/fiscad/controllers/user/DemandeReinitialisationMPController.java index 2ce55a8..680abe0 100644 --- a/src/main/java/io/gmss/fiscad/controllers/user/DemandeReinitialisationMPController.java +++ b/src/main/java/io/gmss/fiscad/controllers/user/DemandeReinitialisationMPController.java @@ -21,6 +21,7 @@ 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; @@ -43,6 +44,7 @@ public class DemandeReinitialisationMPController { } @GetMapping("/create") + @PreAuthorize("hasAuthority('CREATE_DEMANDEREINITIALISATIONMP')") public ResponseEntity createDemandeReinitialisationMP(@RequestParam String usernamrOrEmail) { try { demandeReinitialisationMPService.createDemandeReinitialisationMP(usernamrOrEmail); @@ -67,6 +69,7 @@ public class DemandeReinitialisationMPController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_DEMANDEREINITIALISATIONMP')") public ResponseEntity updateDemandeReinitialisationMP(@PathVariable Long id, @RequestBody DemandeReinitialisationMP demandeReinitialisationMP) { try { return new ResponseEntity<>( @@ -90,6 +93,7 @@ public class DemandeReinitialisationMPController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_DEMANDEREINITIALISATIONMP')") public ResponseEntity deleteDemandeReinitialisationMPr(@PathVariable Long id) { try { demandeReinitialisationMPService.deleteDemandeReinitialisationMP(id); @@ -168,6 +172,7 @@ 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); @@ -193,6 +198,7 @@ public class DemandeReinitialisationMPController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_DEMANDEREINITIALISATIONMP')") public ResponseEntity getDemandeReinitialisationMPById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -216,6 +222,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/user/FonctionController.java b/src/main/java/io/gmss/fiscad/controllers/user/FonctionController.java index 8d40817..65e0b86 100644 --- a/src/main/java/io/gmss/fiscad/controllers/user/FonctionController.java +++ b/src/main/java/io/gmss/fiscad/controllers/user/FonctionController.java @@ -16,6 +16,7 @@ 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,6 +38,7 @@ public class FonctionController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_FONCTION')") public ResponseEntity createFonction(@RequestBody @Valid @Validated FonctionPaylaodWeb fonctionPaylaodWeb) { try { Fonction fonction = fonctionService.createFonction(fonctionPaylaodWeb); @@ -61,6 +63,7 @@ public class FonctionController { } @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_FONCTION')") public ResponseEntity updateFonction(@PathVariable Long id, @RequestBody FonctionPaylaodWeb fonctionPaylaodWeb) { try { return new ResponseEntity<>( @@ -84,6 +87,7 @@ public class FonctionController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_FONCTION')") public ResponseEntity deleteFonction(@PathVariable Long id) { try { fonctionService.deleteFonction(id); @@ -108,6 +112,7 @@ public class FonctionController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_FONCTION')") public ResponseEntity getAllFonctionList() { try { return new ResponseEntity<>( @@ -131,6 +136,7 @@ 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); @@ -155,6 +161,7 @@ public class FonctionController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_FONCTION')") public ResponseEntity getFonctionById(@PathVariable Long id) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/user/ProfileController.java b/src/main/java/io/gmss/fiscad/controllers/user/ProfileController.java index fcdf407..3b6dc50 100755 --- a/src/main/java/io/gmss/fiscad/controllers/user/ProfileController.java +++ b/src/main/java/io/gmss/fiscad/controllers/user/ProfileController.java @@ -16,6 +16,7 @@ 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,6 +38,7 @@ public class ProfileController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_PROFILE')") public ResponseEntity createProfile(@RequestBody @Valid @Validated ProfilePaylaodWeb profilePaylaodWeb ) { try { Profile profile = profileService.createProfile(profilePaylaodWeb); @@ -62,6 +64,7 @@ public class ProfileController { @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_PROFILE')") public ResponseEntity updateProfile(@PathVariable Long id, @RequestBody ProfilePaylaodWeb profilePaylaodWeb) { try { return new ResponseEntity<>( @@ -85,6 +88,7 @@ public class ProfileController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_PROFILE')") public ResponseEntity deleteProfile(@PathVariable Long id) { try { profileService.deleteProfile(id); @@ -109,6 +113,7 @@ public class ProfileController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_PROFILE')") public ResponseEntity getAll() { try { return new ResponseEntity<>( @@ -132,6 +137,7 @@ public class ProfileController { } @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_PROFILE')") public ResponseEntity getById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -155,6 +161,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/user/RoleController.java b/src/main/java/io/gmss/fiscad/controllers/user/RoleController.java index 27bd5c0..aad7615 100755 --- a/src/main/java/io/gmss/fiscad/controllers/user/RoleController.java +++ b/src/main/java/io/gmss/fiscad/controllers/user/RoleController.java @@ -15,6 +15,7 @@ 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,6 +37,7 @@ public class RoleController { @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_ROLE')") public ResponseEntity createRole(@RequestBody @Valid @Validated Role role) { try { role = roleService.createRole(role); @@ -61,6 +63,7 @@ public class RoleController { @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_ROLE')") public ResponseEntity updateRole(@PathVariable Long id, @RequestBody Role role) { try { return new ResponseEntity<>( @@ -84,6 +87,7 @@ public class RoleController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_ROLE')") public ResponseEntity deleteRole(@PathVariable Long id) { try { roleService.deleteRole(id); @@ -108,6 +112,7 @@ public class RoleController { } @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_ROLE')") public ResponseEntity getAll() { try { return new ResponseEntity<>( @@ -131,6 +136,7 @@ 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); diff --git a/src/main/java/io/gmss/fiscad/controllers/user/UserController.java b/src/main/java/io/gmss/fiscad/controllers/user/UserController.java index f6a36d2..643ed72 100755 --- a/src/main/java/io/gmss/fiscad/controllers/user/UserController.java +++ b/src/main/java/io/gmss/fiscad/controllers/user/UserController.java @@ -20,6 +20,7 @@ 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; @@ -44,6 +45,7 @@ public class UserController { } @PostMapping("/create") + @PreAuthorize("hasAuthority('CREATE_USER')") public ResponseEntity createUser(@RequestBody @Valid @Validated UserPaylaodWeb userPaylaodWeb) { try { userPaylaodWeb = userService.createUser(userPaylaodWeb); @@ -68,6 +70,7 @@ 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()); @@ -92,6 +95,7 @@ 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()); @@ -116,6 +120,7 @@ public class UserController { } @PostMapping("/validate-user-account/{userName}") + @PreAuthorize("hasAuthority('UPDATE_USER')") public ResponseEntity validateUserAccount(@PathVariable String userName) { try { User user = userService.validateUserAccount(userName); @@ -141,6 +146,7 @@ public class UserController { @PutMapping("/update/{id}") + @PreAuthorize("hasAuthority('UPDATE_USER')") public ResponseEntity updateUser(@PathVariable Long id, @RequestBody UserPaylaodWeb userPaylaodWeb) { try { return new ResponseEntity<>( @@ -164,6 +170,7 @@ public class UserController { } @GetMapping("/activate/{id}") + @PreAuthorize("hasAuthority('UPDATE_USER')") public ResponseEntity acitvateUser(@PathVariable Long id) { try { User user = userService.activateUser(id); @@ -189,6 +196,7 @@ public class UserController { @GetMapping("/desactivate/{id}") + @PreAuthorize("hasAuthority('UPDATE_USER')") public ResponseEntity disacitvateUser(@PathVariable Long id) { try { User user = userService.disactivateUser(id); @@ -213,6 +221,7 @@ public class UserController { } @DeleteMapping("/delete/{id}") + @PreAuthorize("hasAuthority('DELETE_USER')") public ResponseEntity deleteUser(@PathVariable Long id) { try { userService.deleteUser(id); @@ -238,6 +247,7 @@ public class UserController { @GetMapping("/all") + @PreAuthorize("hasAuthority('READ_USER')") public ResponseEntity getAll() { try { @@ -261,6 +271,7 @@ 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); @@ -284,6 +295,7 @@ public class UserController { } @GetMapping("/all-by-structure/{structureId}") + @PreAuthorize("hasAuthority('READ_USER')") public ResponseEntity getAllByStructure(@PathVariable Long structureId) { try { @@ -310,6 +322,7 @@ 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); @@ -338,6 +351,7 @@ public class UserController { @GetMapping("/id/{id}") + @PreAuthorize("hasAuthority('READ_USER')") public ResponseEntity getUserById(@PathVariable Long id) { try { return new ResponseEntity<>( @@ -361,6 +375,7 @@ public class UserController { } @GetMapping("/username/{username}") + @PreAuthorize("hasAuthority('READ_USER')") public ResponseEntity getUserByUsername(@PathVariable String username) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/enums/UserRole.java b/src/main/java/io/gmss/fiscad/enums/UserRole.java index 94a46a4..e0f5626 100644 --- a/src/main/java/io/gmss/fiscad/enums/UserRole.java +++ b/src/main/java/io/gmss/fiscad/enums/UserRole.java @@ -1,24 +1,265 @@ package io.gmss.fiscad.enums; public enum UserRole { - - ADMIN, - CREATE_USER, - UPDATE_USER, - READ_USER, - DELETE_USER, + 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, - UPDATE_PARCELLE, READ_PARCELLE, + UPDATE_PARCELLE, DELETE_PARCELLE, - CREATE_ENQUETE, - UPDATE_ENQUETE, - READ_ENQUETE, - DELETE_ENQUETE, + CREATE_PERSONNE, + READ_PERSONNE, + UPDATE_PERSONNE, + DELETE_PERSONNE, CREATE_BATIMENT, - UPDATE_BATIMENT, READ_BATIMENT, - DELETE_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, + CREATE_USER, + READ_USER, + UPDATE_USER, + DELETE_USER, + CREATE_PARAMETERS, + READ_PARAMETERS, + UPDATE_PARAMETERS } diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java index 4bda8b7..e281cfb 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java @@ -170,6 +170,8 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ Integer nbsrtbbt= donneesImpositionTfuRepository.genererDonneesSrtbBatie(impositionsTfuPaylaodWeb.getId(),userId,parcelleId); + Integer nbMajAcompteRirf= donneesImpositionTfuRepository.majDonneesAcompteRirf(impositionsTfuPaylaodWeb.getId()); + ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb); impositionsTfu.setStatusAvis(StatusAvis.GENERE); diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql index e40c7cc..62bd03c 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql @@ -107,7 +107,8 @@ SELECT distinct on (exo.annee,dimp.parcelle_id,dimp.nature_impot) case when cca.parcelle_id is not null then true else false - end as booleen_parcelle_contact + end as booleen_parcelle_contact, + dimp.penalite FROM impositions_tfu imp INNER JOIN donnees_imposition_tfu dimp ON dimp.impositions_tfu_id = imp.id @@ -121,8 +122,7 @@ FROM impositions_tfu imp AND cca.parcelle_id = dimp.parcelle_id LEFT JOIN structure st ON st.id = cca.structure_id - where dimp.personne_id is not null ; - + where dimp.personne_id is not null @@ -133,4 +133,14 @@ select * from e_avis_detail_view where qip_quartier='6431' and qip_ilot='1656' and qip_parcelle='C' ; -'6431', '1656', 'C' \ No newline at end of file +select * from e_avis_view; + +select * from e_avis_detail_view eda +where not exists(select 1 from parcelle_view pv + where pv.q=eda.qip_quartier + and pv.i=eda.qip_ilot + and pv.p=eda.qip_parcelle ); + + +select penalite +from donnees_imposition_tfu; \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_parcelles_vers_sigibe.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_parcelles_vers_sigibe.sql index 8f052f4..8173201 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_parcelles_vers_sigibe.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_parcelles_vers_sigibe.sql @@ -1,5 +1,21 @@ ----------------- create or replace view parcelle_view as -select distinct q.code as r_quartier,q.nom,p.nup, p.q,p.i,p.p from parcelle p -inner join quartier q on q.id=p.quartier_id \ No newline at end of file +select distinct q.code as r_quartier,q.nom,p.nup, p.q,p.i,p.p +from parcelle p +inner join quartier q on q.id=p.quartier_id ; + + +select * from donnees_imposition_tfu dimp +where not exists( +select * from parcelle p + inner join quartier q on q.id=p.quartier_id +where dimp.q=p.q and dimp.ilot=p.i and dimp.parcelle=p.p); + +select * from parcelle_view; + + + + +select * from impositions_tfu; + diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/maj_donnees_imposition_acompte_rirf.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/maj_donnees_imposition_acompte_rirf.sql index 6aaf8ec..2c18350 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/maj_donnees_imposition_acompte_rirf.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/maj_donnees_imposition_acompte_rirf.sql @@ -3,7 +3,7 @@ - recuperation et cumul des rirf par exercice, commune, ifu et parcelle */ -CREATE OR REPLACE FUNCTION public.maj_donnees_imposition_tfu_irf_( +CREATE OR REPLACE FUNCTION public.maj_donnees_imposition_tfu_rirf_atfu( p_impositions_tfu_id BIGINT ) RETURNS INTEGER diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java index 9296476..71960ad 100755 --- a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java @@ -616,6 +616,13 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb( ); + @Query(value = "SELECT maj_donnees_imposition_tfu_rirf_atfu(:impositionId)", nativeQuery = true) + Integer majDonneesAcompteRirf( + @Param("impositionId") Long impositionId + ); + + + @Query(value = """ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb( diff --git a/src/main/java/io/gmss/fiscad/security/UserPrincipal.java b/src/main/java/io/gmss/fiscad/security/UserPrincipal.java index 3df80ad..6ede604 100755 --- a/src/main/java/io/gmss/fiscad/security/UserPrincipal.java +++ b/src/main/java/io/gmss/fiscad/security/UserPrincipal.java @@ -42,7 +42,8 @@ public class UserPrincipal implements UserDetails { .collect(Collectors.toSet()); rolesUtilisateur.forEach((role) -> { - authorities.add(new SimpleGrantedAuthority("ROLE_" + role.getNom().name())); + // authorities.add(new SimpleGrantedAuthority("ROLE_" + role.getNom().name())); + authorities.add(new SimpleGrantedAuthority(role.getNom().name())); } ); @@ -51,8 +52,6 @@ public class UserPrincipal implements UserDetails { authorities ); - - } public void setAuthorities(Collection authorities) { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1a0a2d9..f3ffe74 100755 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ -spring.profiles.active=${SPRING_PROFILES_ACTIVE} +#spring.profiles.active=${SPRING_PROFILES_ACTIVE} #spring.profiles.active=abomey -#spring.profiles.active=test +spring.profiles.active=test spring.jpa.properties.hibernate.id.new_generator_mappings=false spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true spring.jpa.open-in-view=false