Compare commits
152 Commits
features/c
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
| 002299ba82 | |||
| 23682b2b1d | |||
| 590e85964e | |||
| 91303f184c | |||
| faf56ec592 | |||
| 35e99b62b8 | |||
| 5279da4f31 | |||
| 939c338b22 | |||
| 5169d2d464 | |||
| 66eef2c669 | |||
| 6ddcf786c8 | |||
| 8250b2053e | |||
| f976beabb8 | |||
| 649da1940a | |||
| 38c0d04a19 | |||
| 43ca94c535 | |||
| 6595e003ae | |||
| 668b101d53 | |||
| a2283a835b | |||
| 7b074663ce | |||
| 06c8b06909 | |||
| ea7e693759 | |||
| ae2f5bd188 | |||
| 6b954c7467 | |||
| 71e566da25 | |||
| 2b2805a125 | |||
| fc82e6b1df | |||
| 49aea6e50a | |||
| ec991b7df9 | |||
| 3e105855f0 | |||
| 03f38dfe1c | |||
| 5b73474192 | |||
| 9a91961484 | |||
| 13ce1f31e2 | |||
| ff5a659190 | |||
| d8dd0ed95e | |||
| 5f2686ed7b | |||
| ada442ffa4 | |||
| 77671bfb90 | |||
| 5d519855a7 | |||
| 44827030be | |||
| 8bcae0751a | |||
| 14ca79d49e | |||
| 34d1502334 | |||
| aec566935c | |||
| e2468328fd | |||
| d06d6336de | |||
| 41e55da1df | |||
| 16dd68c72c | |||
| 705af14b4e | |||
| bfe7b319c2 | |||
| 9063162c33 | |||
| 4997fd32c1 | |||
| 3f9cdcdad3 | |||
| d85b622acf | |||
| e58e338123 | |||
| db8b38b1c0 | |||
| afc44b95fb | |||
| 253332bbd3 | |||
| faf2ccdb8f | |||
| 6dcd549889 | |||
| 04ca166db4 | |||
| 6ba1365148 | |||
| 0d27aaebac | |||
| 0d5f7bba1c | |||
| afbf525af5 | |||
| 8ee2f7c9b0 | |||
| 6bdfa3ad1e | |||
| b8ba15c6fb | |||
| 698b7e7c99 | |||
| 9e597386f8 | |||
| cb2faeea32 | |||
| 6b3ab8fc43 | |||
| 906a74571f | |||
| 6494fe235e | |||
| 28da361054 | |||
| 3993d28d51 | |||
| 09d8b21909 | |||
| 274b47d116 | |||
| bdb08b88fd | |||
| b86c685cd0 | |||
| d46a14626e | |||
| 920c70c877 | |||
| 2ab5b9299c | |||
| bf19ab6e6a | |||
| 84451d5a15 | |||
| e687a9a904 | |||
| 9685c73513 | |||
| 650470efff | |||
| 9f5cc61726 | |||
| 41175d93f0 | |||
| 1ecaecdee3 | |||
| 122dfcbead | |||
| d168b68d4b | |||
| 2af14dd4cd | |||
| 76f0d34e79 | |||
| 666779ecce | |||
| 7fcd676fc0 | |||
| fffdef7103 | |||
| 95c0dacd1e | |||
| 7ac6b953d3 | |||
| e010100472 | |||
| 177a9c7b56 | |||
| 3054930a86 | |||
| 4397abd041 | |||
| a4b403ca20 | |||
| ff7b88f9f8 | |||
| 37fdba1d85 | |||
| f50ed9aa5f | |||
| 966fd2ca7a | |||
| a10253b2e8 | |||
| 08b68f9e08 | |||
| be487d6a03 | |||
| 3be64e7f44 | |||
| 03a661cdc0 | |||
| a68ec444cc | |||
| 58f517bf31 | |||
| 7f18f22efb | |||
| af3218412f | |||
| f35670c72e | |||
| a77c0e854d | |||
| e75eff4e20 | |||
| 40d078c653 | |||
| 31dd11d017 | |||
| 6dfd12fae8 | |||
| a4ad0a4556 | |||
| 411a6c0c2d | |||
| bed73b2b16 | |||
| 5a0814a0ba | |||
| 126254ea94 | |||
| f9e4681af4 | |||
| 84089d3639 | |||
| 02b0a937b4 | |||
| c0096457fb | |||
| b6062ba4d1 | |||
| 8dc8c974d3 | |||
| 957416df9e | |||
| 8d8af75108 | |||
| 555f13508e | |||
| d92a2b2503 | |||
| 5ccfdb6a3f | |||
| 87b3bfbe83 | |||
| 62f25ea726 | |||
| 6125fcbd0b | |||
| 211af6103a | |||
| d27b622db8 | |||
| c80b40082c | |||
| 4a88af6487 | |||
| 966b0af1c2 | |||
| 58aa088ac3 | |||
| 033b430051 | |||
| b8dbc7f625 |
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package io.gmss.fiscad.controllers.decoupage;
|
||||
|
||||
import io.gmss.fiscad.entities.decoupage.SecteurDecoupage;
|
||||
import io.gmss.fiscad.enums.StatutEnquete;
|
||||
import io.gmss.fiscad.exceptions.*;
|
||||
import io.gmss.fiscad.interfaces.decoupage.SecteurDecoupageService;
|
||||
import io.gmss.fiscad.interfaces.decoupage.SecteurService;
|
||||
@@ -36,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);
|
||||
@@ -60,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<>(
|
||||
@@ -83,6 +86,7 @@ public class SecteurDecoupageController {
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete/{id}")
|
||||
@PreAuthorize("hasAuthority('DELETE_SECTEUR_DECOUPAGE')")
|
||||
public ResponseEntity<?> deleteSecteurDecoupager(@PathVariable Long id) {
|
||||
try {
|
||||
secteurDecoupageService.deleteSecteurDecoupage(id);
|
||||
@@ -107,6 +111,7 @@ public class SecteurDecoupageController {
|
||||
}
|
||||
|
||||
@GetMapping("/all")
|
||||
@PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
|
||||
public ResponseEntity<?> getAllSecteurDecoupageList() {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -130,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);
|
||||
@@ -154,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<>(
|
||||
@@ -177,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);
|
||||
@@ -201,6 +209,7 @@ public class SecteurDecoupageController {
|
||||
}
|
||||
|
||||
@GetMapping("/id/{id}")
|
||||
@PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
|
||||
public ResponseEntity<?> getSecteurDecoupageById(@PathVariable Long id) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -225,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<>(
|
||||
@@ -248,4 +258,230 @@ public class SecteurDecoupageController {
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/arbre/enquete-en-cours/user-id/{userId}")
|
||||
@PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
|
||||
public ResponseEntity<?> getArborescenceEnqueteEncoursByUserId(@PathVariable Long userId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteDecoupageByUserId(userId, StatutEnquete.EN_COURS.toString()), "SecteurDecoupage trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/arbre/enquete-valide/user-id/{userId}")
|
||||
@PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
|
||||
public ResponseEntity<?> getArborescenceEnqueteValideByUserId(@PathVariable Long userId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteDecoupageByUserId(userId, StatutEnquete.VALIDE.toString()), "SecteurDecoupage trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/arbre/enquete-cloture/user-id/{userId}")
|
||||
@PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
|
||||
public ResponseEntity<?> getArborescenceEnqueteClotureByUserId(@PathVariable Long userId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteDecoupageByUserId(userId, StatutEnquete.CLOTURE.toString()), "SecteurDecoupage trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@GetMapping("/arbre/enquete-batiment-en-cours/user-id/{userId}")
|
||||
@PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
|
||||
public ResponseEntity<?> getArborescenceEnqueteBatimentEncoursByUserId(@PathVariable Long userId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteBatimentDecoupageByUserId(userId, StatutEnquete.EN_COURS.toString()), "SecteurDecoupage trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/arbre/enquete-batiment-valide/user-id/{userId}")
|
||||
@PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
|
||||
public ResponseEntity<?> getArborescenceEnqueteBatimentValideByUserId(@PathVariable Long userId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteBatimentDecoupageByUserId(userId, StatutEnquete.VALIDE.toString()), "SecteurDecoupage trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/arbre/enquete-batiment-cloture/user-id/{userId}")
|
||||
@PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
|
||||
public ResponseEntity<?> getArborescenceEnqueteBatimentClotureByUserId(@PathVariable Long userId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteBatimentDecoupageByUserId(userId, StatutEnquete.CLOTURE.toString()), "SecteurDecoupage trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/arbre/enquete-unitlog-en-cours/user-id/{userId}")
|
||||
@PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
|
||||
public ResponseEntity<?> getArborescenceEnqueteUniteLogEncoursByUserId(@PathVariable Long userId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteUniteLogementDecoupageByUserId(userId, StatutEnquete.EN_COURS.toString()), "SecteurDecoupage trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/arbre/enquete-unitlog-valide/user-id/{userId}")
|
||||
@PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
|
||||
public ResponseEntity<?> getArborescenceEnqueteUniteLogValideByUserId(@PathVariable Long userId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteUniteLogementDecoupageByUserId(userId, StatutEnquete.VALIDE.toString()), "SecteurDecoupage trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/arbre/enquete-unitlog-cloture/user-id/{userId}")
|
||||
@PreAuthorize("hasAuthority('READ_SECTEUR_DECOUPAGE')")
|
||||
public ResponseEntity<?> getArborescenceEnqueteUniteLigClotureByUserId(@PathVariable Long userId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteUniteLogementDecoupageByUserId(userId, StatutEnquete.CLOTURE.toString()), "SecteurDecoupage trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -0,0 +1,183 @@
|
||||
package io.gmss.fiscad.controllers.frontend;
|
||||
|
||||
|
||||
import io.gmss.fiscad.exceptions.*;
|
||||
import io.gmss.fiscad.interfaces.frontend.FonctionnaliteService;
|
||||
import io.gmss.fiscad.paylaods.ApiResponse;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.FonctionnalitePayloadWeb;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.client.HttpClientErrorException;
|
||||
|
||||
@AllArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping(value = "api/fonctionnalite", produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
@SecurityRequirement(name = "bearer")
|
||||
@Tag(name = "Fonctionnalite")
|
||||
@CrossOrigin(origins = "*")
|
||||
public class FonctionnaliteController {
|
||||
|
||||
private final FonctionnaliteService fonctionnaliteService;
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(FonctionnaliteController.class);
|
||||
|
||||
|
||||
|
||||
@PostMapping("/create")
|
||||
@PreAuthorize("hasAuthority('CREATE_FONCTIONNALITE')")
|
||||
public ResponseEntity<?> createFonctionnalite(@RequestBody @Valid @Validated FonctionnalitePayloadWeb fonctionnalitePayLoadWeb) {
|
||||
try {
|
||||
fonctionnalitePayLoadWeb = fonctionnaliteService.createFonctionnalite(fonctionnalitePayLoadWeb);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, fonctionnalitePayLoadWeb, "Fonctionnalite créé avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@PutMapping("/update/{id}")
|
||||
@PreAuthorize("hasAuthority('UPDATE_FONCTIONNALITE')")
|
||||
public ResponseEntity<?> updateFonctionnalite(@PathVariable Long id, @RequestBody FonctionnalitePayloadWeb fonctionnalitePayLoadWeb) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, fonctionnaliteService.updateFonctionnalite(id,fonctionnalitePayLoadWeb), "Fonctionnalite mise à jour avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete/{id}")
|
||||
@PreAuthorize("hasAuthority('DELETE_FONCTIONNALITE')")
|
||||
public ResponseEntity<?> deleteFonctionnalite(@PathVariable Long id) {
|
||||
try {
|
||||
fonctionnaliteService.deleteFonctionnalite(id);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, "Fonctionnalite supprimée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/all")
|
||||
@PreAuthorize("hasAuthority('READ_FONCTIONNALITE')")
|
||||
public ResponseEntity<?> getAllFonctionnaliteList() {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, fonctionnaliteService.getFonctionnaliteListToDto(), "Liste des caractéristiques chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/all/by-profil-id/{profilId}")
|
||||
@PreAuthorize("hasAuthority('READ_FONCTIONNALITE')")
|
||||
public ResponseEntity<?> getAllFonctionnaliteByProfilList(@PathVariable Long profilId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, fonctionnaliteService.getAllFonctionnaliteByProfilIdToDto(profilId), "Liste des fonctionnalites chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@GetMapping("/id/{id}")
|
||||
@PreAuthorize("hasAuthority('READ_FONCTIONNALITE')")
|
||||
public ResponseEntity<?> getFonctionnaliteById(@PathVariable Long id) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, fonctionnaliteService.getFonctionnaliteByIdToDto(id), "Fonctionnalite trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,185 @@
|
||||
package io.gmss.fiscad.controllers.frontend;
|
||||
|
||||
|
||||
import io.gmss.fiscad.exceptions.*;
|
||||
import io.gmss.fiscad.interfaces.frontend.ModuleService;
|
||||
import io.gmss.fiscad.paylaods.ApiResponse;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.ModulePayloadWeb;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.client.HttpClientErrorException;
|
||||
|
||||
@AllArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping(value = "api/module", produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
@SecurityRequirement(name = "bearer")
|
||||
@Tag(name = "Module")
|
||||
@CrossOrigin(origins = "*")
|
||||
public class ModuleController {
|
||||
|
||||
private final ModuleService moduleService;
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(ModuleController.class);
|
||||
|
||||
|
||||
|
||||
@PostMapping("/create")
|
||||
@PreAuthorize("hasAuthority('CREATE_MODULE')")
|
||||
public ResponseEntity<?> createModule(@RequestBody @Valid @Validated ModulePayloadWeb modulePayLoadWeb) {
|
||||
try {
|
||||
modulePayLoadWeb = moduleService.createModule(modulePayLoadWeb);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, modulePayLoadWeb, "Module créé avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@PutMapping("/update/{id}")
|
||||
@PreAuthorize("hasAuthority('UPDATE_MODULE')")
|
||||
public ResponseEntity<?> updateModule(@PathVariable Long id, @RequestBody ModulePayloadWeb modulePayLoadWeb) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, moduleService.updateModule(id,modulePayLoadWeb), "Module mise à jour avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete/{id}")
|
||||
@PreAuthorize("hasAuthority('DELETE_MODULE')")
|
||||
public ResponseEntity<?> deleteModule(@PathVariable Long id) {
|
||||
try {
|
||||
moduleService.deleteModule(id);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, "Module supprimée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/all")
|
||||
@PreAuthorize("hasAuthority('READ_MODULE')")
|
||||
public ResponseEntity<?> getAllModuleList() {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, moduleService.getModuleListToDto(), "Liste des caractéristiques chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/all/by-profil-id/{profilId}")
|
||||
@PreAuthorize("hasAuthority('READ_MODULE')")
|
||||
public ResponseEntity<?> getAllModuleByProfilList(@PathVariable Long profilId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, moduleService.getAllModuleByProfilIdToDto(profilId), "Liste des modules chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@GetMapping("/id/{id}")
|
||||
@PreAuthorize("hasAuthority('READ_MODULE')")
|
||||
public ResponseEntity<?> getModuleById(@PathVariable Long id) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, moduleService.getModuleByIdToDto(id), "Module trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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<Commentaire> 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<SyncCommentaireRequest> syncCommentaireRequests) {
|
||||
try {
|
||||
|
||||
@@ -3,6 +3,7 @@ package io.gmss.fiscad.controllers.infocad.metier;
|
||||
import io.gmss.fiscad.entities.infocad.metier.Enquete;
|
||||
import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
|
||||
import io.gmss.fiscad.entities.user.User;
|
||||
import io.gmss.fiscad.enums.StatutEnquete;
|
||||
import io.gmss.fiscad.exceptions.*;
|
||||
import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
|
||||
import io.gmss.fiscad.paylaods.ApiResponse;
|
||||
@@ -49,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);
|
||||
@@ -67,13 +69,15 @@ public class EnqueteController {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
e.printStackTrace();
|
||||
// logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@PutMapping("/update/{id}")
|
||||
@PreAuthorize("hasAuthority('UPDATE_ENQUETE')")
|
||||
public ResponseEntity<?> updateEnquete(@PathVariable Long id, @RequestBody EnquetePayLoadWeb enquetePayLoadWeb) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -97,6 +101,7 @@ public class EnqueteController {
|
||||
}
|
||||
|
||||
@PutMapping("/validation")
|
||||
@PreAuthorize("hasAuthority('UPDATE_ENQUETE')")
|
||||
public ResponseEntity<?> validerEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -120,8 +125,10 @@ public class EnqueteController {
|
||||
}
|
||||
|
||||
@PutMapping("/rejet")
|
||||
@PreAuthorize("hasAuthority('UPDATE_ENQUETE')")
|
||||
public ResponseEntity<?> rejeterEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
|
||||
try {
|
||||
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteService.rejeterEnquete(enqueteTraitementPayLoad), "Rejet effectuée avec succès."),
|
||||
HttpStatus.OK
|
||||
@@ -143,6 +150,7 @@ public class EnqueteController {
|
||||
}
|
||||
|
||||
@PutMapping("/validation-lot")
|
||||
@PreAuthorize("hasAuthority('UPDATE_ENQUETE')")
|
||||
public ResponseEntity<?> validerEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -166,6 +174,7 @@ public class EnqueteController {
|
||||
}
|
||||
|
||||
@PutMapping("/rejet-lot")
|
||||
@PreAuthorize("hasAuthority('UPDATE_ENQUETE')")
|
||||
public ResponseEntity<?> rejeterEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -189,6 +198,7 @@ public class EnqueteController {
|
||||
}
|
||||
|
||||
@GetMapping("/all/decoupage-admin-for-enquete")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETE')")
|
||||
public ResponseEntity<?> getAllByEnqueteDecoupageAdmin() {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -216,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<>(
|
||||
@@ -244,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);
|
||||
@@ -272,6 +284,7 @@ public class EnqueteController {
|
||||
|
||||
|
||||
@GetMapping("/all/dgi/decoupage-admin-for-enquete")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETE')")
|
||||
public ResponseEntity<?> getAllByEnqueteDecoupageAdminForDgi() {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -296,6 +309,7 @@ public class EnqueteController {
|
||||
|
||||
|
||||
@DeleteMapping("/delete/{id}")
|
||||
@PreAuthorize("hasAuthority('DELETE_ENQUETE')")
|
||||
public ResponseEntity<?> deleteStructurer(@PathVariable Long id) {
|
||||
try {
|
||||
enqueteService.deleteEnquete(id);
|
||||
@@ -320,6 +334,7 @@ public class EnqueteController {
|
||||
}
|
||||
|
||||
@GetMapping("/all")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETE')")
|
||||
public ResponseEntity<?> getAllStructureList() {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -343,6 +358,7 @@ public class EnqueteController {
|
||||
}
|
||||
|
||||
@GetMapping("/all/com-arrond-bloc")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETE')")
|
||||
public ResponseEntity<?> getAllByCommuneArrondBloc() {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -366,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<>(
|
||||
@@ -389,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);
|
||||
@@ -413,6 +431,7 @@ public class EnqueteController {
|
||||
}
|
||||
|
||||
@GetMapping("/fiche/id/{id}")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETE')")
|
||||
public ResponseEntity<?> getFicheEnqueteById(@PathVariable Long id) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -436,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<>(
|
||||
@@ -459,6 +479,7 @@ public class EnqueteController {
|
||||
}
|
||||
|
||||
@GetMapping("/id/{id}")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETE')")
|
||||
public ResponseEntity<?> getStructureById(@PathVariable Long id) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -483,8 +504,67 @@ 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);
|
||||
if(currentUser==null)
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
|
||||
HttpStatus.OK
|
||||
);
|
||||
Long userId = currentUser.getUser().getId();
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteService.getEnqueteListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.EN_COURS, pageable), "Liste des enquetes en cours chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@GetMapping("/all-paged/cloture/by-quartier-id/{quartierId}")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETE')")
|
||||
public ResponseEntity<?> getAllEnqueteClotureByQuartierPaged(@CurrentUser UserPrincipal currentUser,@PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
if(currentUser==null)
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
|
||||
HttpStatus.OK
|
||||
);
|
||||
Long userId = currentUser.getUser().getId();
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteService.getEnqueteListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.CLOTURE, pageable), "Liste des enquetes en cours chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
@@ -154,7 +159,7 @@ public class ParcelleController {
|
||||
);
|
||||
Long userId = currentUser.getUser().getId();
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, parcelleService.getParcelleByIdToDto(userId,id), "enquete trouvé avec succès."),
|
||||
new ApiResponse<>(true, parcelleService.getParcelleByIdToDto(userId,id), "parcelle trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
@@ -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();
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<PersonnePayLoadWeb> 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);
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<Resource> 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);
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
@@ -223,4 +232,54 @@ public class BatimentController {
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/all-paged/by-quartier-id/{quartierId}")
|
||||
@PreAuthorize("hasAuthority('READ_BATIMENT')")
|
||||
public ResponseEntity<?> getAllBatimentByQuartierPaged(@PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, batimentService.getBatimentListByquartierPageable(quartierId,pageable), "Liste des batiments chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/all/by-quartier-id/{quartierId}")
|
||||
@PreAuthorize("hasAuthority('READ_BATIMENT')")
|
||||
public ResponseEntity<?> getAllBatimentByQuartier(@PathVariable Long quartierId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, batimentService.getBatimentListByquartier(quartierId), "Liste des batiments chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -0,0 +1,325 @@
|
||||
package io.gmss.fiscad.controllers.rfu.metier;
|
||||
|
||||
|
||||
import io.gmss.fiscad.entities.user.User;
|
||||
import io.gmss.fiscad.exceptions.*;
|
||||
import io.gmss.fiscad.implementations.infocad.metier.PersonneServiceImpl;
|
||||
import io.gmss.fiscad.interfaces.rfu.metier.CommuneCentreAssignationService;
|
||||
import io.gmss.fiscad.paylaods.ApiResponse;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.CommuneCentreAssignationPaylaodWeb;
|
||||
import io.gmss.fiscad.security.CurrentUser;
|
||||
import io.gmss.fiscad.security.UserPrincipal;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.client.HttpClientErrorException;
|
||||
|
||||
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
@RequestMapping(value = "api/commune-centre-assignation", produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
@SecurityRequirement(name = "bearer")
|
||||
@Tag(name = "CommuneCentreAssignation")
|
||||
@CrossOrigin(origins = "*")
|
||||
public class CommuneCentreAssignationController {
|
||||
|
||||
private final CommuneCentreAssignationService communeCentreAssignationService;
|
||||
private final PersonneServiceImpl personneService;
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(CommuneCentreAssignationController.class);
|
||||
|
||||
// public CommuneCentreAssignationController(CommuneCentreAssignationService communeCentreAssignationService) {
|
||||
// this.communeCentreAssignationService = communeCentreAssignationService;
|
||||
// }
|
||||
|
||||
@PostMapping("/assigne-centre")
|
||||
@PreAuthorize("hasAuthority('CREATE_COMMUNECENTREASSIGNATION')")
|
||||
public ResponseEntity<?> AssigneCommuneCentre(@CurrentUser UserPrincipal userPrincipal, @RequestBody CommuneCentreAssignationPaylaodWeb communeCentreAssignationPaylaodWeb) {
|
||||
try {
|
||||
if(userPrincipal==null){
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(false, null, "vous ne pouvez pas faire cette action."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
}
|
||||
User user = userPrincipal.getUser();
|
||||
communeCentreAssignationPaylaodWeb = communeCentreAssignationService.createCommuneCentreAssignation(user,communeCentreAssignationPaylaodWeb);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, communeCentreAssignationPaylaodWeb, "CommuneCentreAssignation créé avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/detache-centre")
|
||||
@PreAuthorize("hasAuthority('UPDATE_COMMUNECENTREASSIGNATION')")
|
||||
public ResponseEntity<?> detacheCommuneCentre(@CurrentUser UserPrincipal userPrincipal, @RequestBody CommuneCentreAssignationPaylaodWeb communeCentreAssignationPaylaodWeb) {
|
||||
try {
|
||||
if(userPrincipal==null){
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(false, null, "vous ne pouvez pas faire cette action."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
}
|
||||
User user = userPrincipal.getUser();
|
||||
communeCentreAssignationPaylaodWeb = communeCentreAssignationService.detacherCommuneCentreAssignation(user,communeCentreAssignationPaylaodWeb);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, communeCentreAssignationPaylaodWeb, "CommuneCentreAssignation créé avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@PutMapping("/update/{id}")
|
||||
@PreAuthorize("hasAuthority('UPDATE_COMMUNECENTREASSIGNATION')")
|
||||
public ResponseEntity<?> updateCommuneCentreAssignation(@PathVariable Long id, @RequestBody CommuneCentreAssignationPaylaodWeb communeCentreAssignationPaylaodWeb) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, communeCentreAssignationService.updateCommuneCentreAssignation(id,communeCentreAssignationPaylaodWeb), "CommuneCentreAssignation mise à jour avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete/{id}")
|
||||
@PreAuthorize("hasAuthority('DELETE_COMMUNECENTREASSIGNATION')")
|
||||
public ResponseEntity<?> deleteCommuneCentreAssignation(@PathVariable Long id) {
|
||||
try {
|
||||
communeCentreAssignationService.deleteCommuneCentreAssignation(id);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, "CommuneCentreAssignation supprimée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/all-paged")
|
||||
@PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')")
|
||||
public ResponseEntity<?> getAllCommuneCentreAssignationPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, communeCentreAssignationService.getCommuneCentreAssignationList(pageable), "Liste des caractéristiques chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/all-paged/by-commune-id/{communeId}")
|
||||
@PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')")
|
||||
public ResponseEntity<?> getAllCommuneCentreAssignationByCommuneList(@PathVariable Long communeId,@RequestParam int pageNo, @RequestParam int pageSize ) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, communeCentreAssignationService.getCommuneCentreAssignationListByCommunePageable(communeId,pageable), "Liste des assignation de centre chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@GetMapping("/id/{id}")
|
||||
@PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')")
|
||||
public ResponseEntity<?> getCommuneCentreAssignationById(@PathVariable Long id) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, communeCentreAssignationService.getCommuneCentreAssignationById(id), "CommuneCentreAssignation trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@Operation(summary = "Liste des contribuables ayant un centre d'assignation")
|
||||
@GetMapping("/all-paged/by-structure-id/{structureId}")
|
||||
@PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')")
|
||||
public ResponseEntity<?> getAllCommuneCentreAssignationByStrucutrePaged(@PathVariable Long structureId, @RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, communeCentreAssignationService.getCommuneCentreAssignationListByCentrePageable(structureId, pageable), "Liste des communeCentreAssignations chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Operation(summary = "Liste des contribuables sans centre d'assignation")
|
||||
@GetMapping("/all-paged/sans-centre-assignation")
|
||||
@PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')")
|
||||
public ResponseEntity<?> getAllPersonneSansCentreAssignationPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, personneService.getPersonneListNonAssigneePage(pageable), "Liste des contribuables sans centre d'assignation chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Operation(summary = "Vérifier l'assignation d'un contribuable",description = "permet de vérifier si un contribuable a déjà un centre d'assignation dans la commune de l'utilisateur connecté")
|
||||
@GetMapping("/contribuable/{personneId}")
|
||||
@PreAuthorize("hasAuthority('READ_COMMUNECENTREASSIGNATION')")
|
||||
public ResponseEntity<?> getAssignationPersonne(@CurrentUser UserPrincipal currentUser, @PathVariable Long personneId) {
|
||||
try {
|
||||
if(currentUser==null){
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(false, null, "vous ne pouvez pas faire cette action."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
}
|
||||
User user = currentUser.getUser();
|
||||
|
||||
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, communeCentreAssignationService.getCommuneCentreAssignationByPersonneIdCommune(user,personneId).orElse(null), "Assignation chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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,7 +37,8 @@ public class DeclarationNcController {
|
||||
|
||||
|
||||
@PostMapping("/create")
|
||||
public ResponseEntity<?> createDeclarationNc(@RequestBody @Valid @Validated DeclarationNcPayloadWeb declarationNcPayloadWeb) {
|
||||
@PreAuthorize("hasAuthority('CREATE_DECLARATIONNC')")
|
||||
public ResponseEntity<?> createDeclarationNc(@RequestBody DeclarationNcPayloadWeb declarationNcPayloadWeb) {
|
||||
try {
|
||||
declarationNcPayloadWeb = declarationNcService.createDeclarationNc(declarationNcPayloadWeb);
|
||||
return new ResponseEntity<>(
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
@@ -116,60 +120,61 @@ public class DonneesImpositionTfuController {
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/all")
|
||||
public ResponseEntity<?> getAllDonneesImpositionTfuList() {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, donneesImpositionTfuService.getDonneesImpositionTfuList(), "Liste des caractéristiques chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
// @GetMapping("/all")
|
||||
// public ResponseEntity<?> getAllDonneesImpositionTfuList() {
|
||||
// try {
|
||||
// return new ResponseEntity<>(
|
||||
// new ApiResponse<>(true, donneesImpositionTfuService.getDonneesImpositionTfuList(), "Liste des impositions chargée avec succès."),
|
||||
// HttpStatus.OK
|
||||
// );
|
||||
// } catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
// logger.error(e.getLocalizedMessage());
|
||||
// return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
// } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
// FileStorageException e) {
|
||||
// logger.error(e.getLocalizedMessage());
|
||||
// return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
// } catch (NullPointerException e) {
|
||||
// logger.error(e.getLocalizedMessage());
|
||||
// return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
// } catch (Exception e) {
|
||||
// logger.error(e.getLocalizedMessage());
|
||||
// return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
// }
|
||||
// }
|
||||
|
||||
@GetMapping("/all-paged")
|
||||
public ResponseEntity<?> getAllDonneesImpositionTfuPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, donneesImpositionTfuService.getDonneesImpositionTfuList(pageable), "Liste des caractéristiques chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
// @GetMapping("/all-paged")
|
||||
// public ResponseEntity<?> getAllDonneesImpositionTfuPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
// try {
|
||||
// Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
// return new ResponseEntity<>(
|
||||
// new ApiResponse<>(true, donneesImpositionTfuService.getDonneesImpositionTfuList(pageable), "Liste des impositions chargée avec succès."),
|
||||
// HttpStatus.OK
|
||||
// );
|
||||
// } catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
// logger.error(e.getLocalizedMessage());
|
||||
// return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
// } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
// FileStorageException e) {
|
||||
// logger.error(e.getLocalizedMessage());
|
||||
// return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
// } catch (NullPointerException e) {
|
||||
// logger.error(e.getLocalizedMessage());
|
||||
// return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
// } catch (Exception e) {
|
||||
// logger.error(e.getLocalizedMessage());
|
||||
// return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
@GetMapping("/all-page/by-imposition-id/{impositionId}")
|
||||
@PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
|
||||
public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdPageable(impositionId, pageable), "Liste des caractéristiques chargée avec succès."),
|
||||
new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdPageable(impositionId, pageable), "Liste des impositions chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
@@ -189,11 +194,12 @@ public class DonneesImpositionTfuController {
|
||||
}
|
||||
|
||||
@GetMapping("/all-page/by-imposition-id/non-batie/{impositionId}")
|
||||
@PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
|
||||
public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdNonBatiePaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdNonBatiePageable(impositionId, pageable), "Liste des caractéristiques chargée avec succès."),
|
||||
new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdNonBatiePageable(impositionId, pageable), "Liste des impositions chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
@@ -214,11 +220,12 @@ 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);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdBatieBatimentPageable(impositionId, pageable), "Liste des caractéristiques chargée avec succès."),
|
||||
new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdBatieBatimentPageable(impositionId, pageable), "Liste des impositions chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
@@ -238,11 +245,12 @@ 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);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdBatieUniteLogPageable(impositionId, pageable), "Liste des caractéristiques chargée avec succès."),
|
||||
new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdBatieUniteLogPageable(impositionId, pageable), "Liste des impositions chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
@@ -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<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
|
||||
@@ -333,10 +343,65 @@ public class DonneesImpositionTfuController {
|
||||
}
|
||||
|
||||
|
||||
@Operation(
|
||||
summary = "Générer les données fiscales TFU pour une seule parcelle",
|
||||
description = "Génère les impositions TFU pour une parcelle bâtie donnée"
|
||||
)
|
||||
@PostMapping("/generer-batie/{parcelleId}")
|
||||
@PreAuthorize("hasAnyAuthority('CREATE_DONNEESIMPOSITIONTFU', 'UPDATE_DONNEESIMPOSITIONTFU')")
|
||||
public ResponseEntity<?> genererDonneesFiscaleBatieUneParcelle(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb,@PathVariable Long parcelleId) {
|
||||
try {
|
||||
Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
|
||||
|
||||
if(optionalImpositionsTfu.isEmpty()){
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(false, null, "L'instance d'imposition n'est pas trouvée."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
}
|
||||
|
||||
// if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.TFU_FNB_GENERE)){
|
||||
// return new ResponseEntity<>(
|
||||
// new ApiResponse<>(false, null, "l'état actuel : "+optionalImpositionsTfu.get().getStatusAvis()+" ne permet pas cette opération."),
|
||||
// HttpStatus.OK
|
||||
// );
|
||||
// }
|
||||
|
||||
if(userPrincipal==null){
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(false, null, "Vous n'êtes pas autorisé à accéder à cette ressource"),
|
||||
HttpStatus.OK
|
||||
);
|
||||
}
|
||||
impositionsTfuPaylaodWeb=donneesImpositionTfuService.genererDonneesFiscalesParcelleBatieUneParcelle(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId(),parcelleId);
|
||||
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true,impositionsTfuPaylaodWeb, "Données d'imposition des fonciers batis Générées avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@Operation(summary = "Générer les données fiscales TFU des parcelle baties")
|
||||
@PostMapping("/generer-non-batie")
|
||||
@PreAuthorize("hasAnyAuthority('CREATE_DONNEESIMPOSITIONTFU', 'UPDATE_DONNEESIMPOSITIONTFU')")
|
||||
public ResponseEntity<?> genererDonneesImpositionNonBaties(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
|
||||
try {
|
||||
Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
|
||||
@@ -384,8 +449,63 @@ public class DonneesImpositionTfuController {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Operation(
|
||||
summary = "Générer les données fiscales TFU pour une seule parcelle",
|
||||
description = "Génère les impositions TFU pour une parcelle non bâtie donnée"
|
||||
)
|
||||
@PostMapping("/generer-non-batie/{parcelleId}")
|
||||
@PreAuthorize("hasAnyAuthority('CREATE_DONNEESIMPOSITIONTFU', 'UPDATE_DONNEESIMPOSITIONTFU')")
|
||||
public ResponseEntity<?> genererDonneesImpositionNonBatiesUneParcelle(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, @PathVariable Long parcelleId) {
|
||||
try {
|
||||
Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
|
||||
|
||||
if(optionalImpositionsTfu.isEmpty()){
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(false, null, "L'instance d'imposition n'est pas trouvée."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
}
|
||||
|
||||
// if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.GENERATION_AUTORISE)){
|
||||
// return new ResponseEntity<>(
|
||||
// new ApiResponse<>(false, null, "l'état actuel : "+optionalImpositionsTfu.get().getStatusAvis()+" ne permet pas cette opération."),
|
||||
// HttpStatus.OK
|
||||
// );
|
||||
// }
|
||||
|
||||
if(userPrincipal==null){
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(false, null, "Vous n'êtes pas autorisé à accéder à cette ressource"),
|
||||
HttpStatus.OK
|
||||
);
|
||||
}
|
||||
impositionsTfuPaylaodWeb=donneesImpositionTfuService.genererDonneesFiscalesParcelleNonBatieUneParcelle(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId(),parcelleId);
|
||||
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true,impositionsTfuPaylaodWeb, "Données d'imposition pour les fonciers non batis Générées avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@Operation(summary = "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 {
|
||||
|
||||
@@ -412,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 {
|
||||
|
||||
@@ -434,4 +555,82 @@ public class DonneesImpositionTfuController {
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/all-page/by-exercice-id/by-structure-id/{exerciceId}/{structureId}")
|
||||
@PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
|
||||
public ResponseEntity<?> getAllDonneesImpositionTfuByExerciceIdAndStructureIdPaged(@PathVariable Long exerciceId, @PathVariable Long structureId,@RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
System.out.println("NOUS SOMMES ICI");
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByExerciceAndStructureIdPageable(exerciceId,structureId, pageable), "Liste des impositions chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/all/by-exercice-id/by-structure-id/by-quartier-id/{exerciceId}/{structureId}/{quartierId}")
|
||||
@PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
|
||||
public ResponseEntity<?> getAllDonneesImpositionTfuByExerciceIdAndStructureId(@PathVariable Long exerciceId, @PathVariable Long structureId, @PathVariable Long quartierId) {
|
||||
try {
|
||||
System.out.println("NOUS SOMMES ICI");
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByExerciceAndStructureId(exerciceId,structureId,quartierId), "Liste des imposition chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@GetMapping("/all/by-personne-id/{personneId}")
|
||||
@PreAuthorize("hasAuthority('READ_DONNEESIMPOSITIONTFU')")
|
||||
public ResponseEntity<?> getAllDonneesImpositionTfuByPersonneId(@PathVariable Long personneId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByPersonneId(personneId), "Liste des impositions chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -2,10 +2,14 @@ package io.gmss.fiscad.controllers.rfu.metier;
|
||||
|
||||
|
||||
import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
|
||||
import io.gmss.fiscad.enums.StatutEnquete;
|
||||
import io.gmss.fiscad.exceptions.*;
|
||||
import io.gmss.fiscad.interfaces.rfu.metier.EnqueteBatimentService;
|
||||
import io.gmss.fiscad.paylaods.ApiResponse;
|
||||
import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb;
|
||||
import io.gmss.fiscad.security.CurrentUser;
|
||||
import io.gmss.fiscad.security.UserPrincipal;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.Valid;
|
||||
@@ -16,10 +20,13 @@ import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.client.HttpClientErrorException;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@RestController
|
||||
@RequestMapping(value = "api/enquete-batiment", produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
@@ -36,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);
|
||||
@@ -51,6 +59,7 @@ public class EnqueteBatimentController {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
@@ -60,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<>(
|
||||
@@ -83,6 +93,7 @@ public class EnqueteBatimentController {
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete/{id}")
|
||||
@PreAuthorize("hasAuthority('DELETE_ENQUETEBATIMENT')")
|
||||
public ResponseEntity<?> deleteEnqueteBatiment(@PathVariable Long id) {
|
||||
try {
|
||||
enqueteBatimentService.deleteEnqueteBatiment(id);
|
||||
@@ -107,6 +118,7 @@ public class EnqueteBatimentController {
|
||||
}
|
||||
|
||||
@GetMapping("/all")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')")
|
||||
public ResponseEntity<?> getAllEnqueteBatimentList() {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -130,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);
|
||||
@@ -155,6 +168,7 @@ public class EnqueteBatimentController {
|
||||
}
|
||||
|
||||
@GetMapping("/id/{id}")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')")
|
||||
public ResponseEntity<?> getEnqueteBatimentById(@PathVariable Long id) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -178,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<>(
|
||||
@@ -201,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);
|
||||
@@ -223,4 +239,165 @@ public class EnqueteBatimentController {
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/all-paged/en-cours/by-quartier-id/{quartierId}")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')")
|
||||
public ResponseEntity<?> getAllEnqueteBatimentEnCoursByQuartierPaged(@CurrentUser UserPrincipal currentUser, @PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
if(currentUser==null)
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
|
||||
HttpStatus.OK
|
||||
);
|
||||
Long userId = currentUser.getUser().getId();
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteBatimentService.getEnqueteBatimentListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.EN_COURS, pageable), "Liste des enquetes en cours chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/all-paged/cloture/by-quartier-id/{quartierId}")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETEBATIMENT')")
|
||||
public ResponseEntity<?> getAllEnqueteBatimentClotureByQuartierPaged(@CurrentUser UserPrincipal currentUser, @PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
if(currentUser==null)
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
|
||||
HttpStatus.OK
|
||||
);
|
||||
Long userId = currentUser.getUser().getId();
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteBatimentService.getEnqueteBatimentListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.CLOTURE, pageable), "Liste des enquetes en cours chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@PutMapping("/validation")
|
||||
@PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')")
|
||||
public ResponseEntity<?> validerEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteBatimentService.validerEnquete(enqueteTraitementPayLoad), "Validation effectuée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@PutMapping("/rejet")
|
||||
@PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')")
|
||||
public ResponseEntity<?> rejeterEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
|
||||
try {
|
||||
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteBatimentService.rejeterEnquete(enqueteTraitementPayLoad), "Rejet effectuée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@PutMapping("/validation-lot")
|
||||
@PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')")
|
||||
public ResponseEntity<?> validerEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteBatimentService.validerEnquete(enqueteTraitementPayLoads), "Validation effectuée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@PutMapping("/rejet-lot")
|
||||
@PreAuthorize("hasAuthority('UPDATE_ENQUETEBATIMENT')")
|
||||
public ResponseEntity<?> rejeterEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteBatimentService.rejeterEnquete(enqueteTraitementPayLoads), "Rejet effectuée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,10 +2,14 @@ package io.gmss.fiscad.controllers.rfu.metier;
|
||||
|
||||
|
||||
import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
|
||||
import io.gmss.fiscad.enums.StatutEnquete;
|
||||
import io.gmss.fiscad.exceptions.*;
|
||||
import io.gmss.fiscad.interfaces.rfu.metier.EnqueteUniteLogementService;
|
||||
import io.gmss.fiscad.paylaods.ApiResponse;
|
||||
import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.EnqueteUniteLogementPayloadWeb;
|
||||
import io.gmss.fiscad.security.CurrentUser;
|
||||
import io.gmss.fiscad.security.UserPrincipal;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.Valid;
|
||||
@@ -16,10 +20,13 @@ import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.client.HttpClientErrorException;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@RestController
|
||||
@RequestMapping(value = "api/enquete-unite-logement", produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
@@ -36,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);
|
||||
@@ -60,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<>(
|
||||
@@ -83,6 +92,7 @@ public class EnqueteUniteLogementController {
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete/{id}")
|
||||
@PreAuthorize("hasAuthority('DELETE_ENQUETEUNITELOGEMENT')")
|
||||
public ResponseEntity<?> deleteEnqueteUniteLogement(@PathVariable Long id) {
|
||||
try {
|
||||
enqueteUniteLogementService.deleteEnqueteUniteLogement(id);
|
||||
@@ -107,6 +117,7 @@ public class EnqueteUniteLogementController {
|
||||
}
|
||||
|
||||
@GetMapping("/all")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')")
|
||||
public ResponseEntity<?> getAllEnqueteUniteLogementList() {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -130,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);
|
||||
@@ -155,6 +167,7 @@ public class EnqueteUniteLogementController {
|
||||
}
|
||||
|
||||
@GetMapping("/id/{id}")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')")
|
||||
public ResponseEntity<?> getEnqueteUniteLogementById(@PathVariable Long id) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -178,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<>(
|
||||
@@ -201,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);
|
||||
@@ -223,4 +238,166 @@ public class EnqueteUniteLogementController {
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/all-paged/en-cours/by-quartier-id/{quartierId}")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')")
|
||||
public ResponseEntity<?> getAllEnqueteUniteLogementEncoursByQuartierPaged(@CurrentUser UserPrincipal currentUser, @PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
if(currentUser==null)
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
|
||||
HttpStatus.OK
|
||||
);
|
||||
Long userId = currentUser.getUser().getId();
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteUniteLogementService.getEnqueteUniteLogementListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.EN_COURS, pageable), "Liste des enquetes en cours chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/all-paged/cloture/by-quartier-id/{quartierId}")
|
||||
@PreAuthorize("hasAuthority('READ_ENQUETEUNITELOGEMENT')")
|
||||
public ResponseEntity<?> getAllEnqueteUniteLogementClotureByQuartierPaged(@CurrentUser UserPrincipal currentUser, @PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
if(currentUser==null)
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
|
||||
HttpStatus.OK
|
||||
);
|
||||
Long userId = currentUser.getUser().getId();
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteUniteLogementService.getEnqueteUniteLogementListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.CLOTURE, pageable), "Liste des enquetes en cours chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@PutMapping("/validation")
|
||||
@PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')")
|
||||
public ResponseEntity<?> validerEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteUniteLogementService.validerEnquete(enqueteTraitementPayLoad), "Validation effectuée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@PutMapping("/rejet")
|
||||
@PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')")
|
||||
public ResponseEntity<?> rejeterEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
|
||||
try {
|
||||
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteUniteLogementService.rejeterEnquete(enqueteTraitementPayLoad), "Rejet effectuée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@PutMapping("/validation-lot")
|
||||
@PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')")
|
||||
public ResponseEntity<?> validerEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteUniteLogementService.validerEnquete(enqueteTraitementPayLoads), "Validation effectuée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@PutMapping("/rejet-lot")
|
||||
@PreAuthorize("hasAuthority('UPDATE_ENQUETEUNITELOGEMENT')")
|
||||
public ResponseEntity<?> rejeterEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteUniteLogementService.rejeterEnquete(enqueteTraitementPayLoads), "Rejet effectuée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
@@ -247,4 +257,56 @@ public class UniteLogementController {
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/all-paged/by-quartier-id/{quartierId}")
|
||||
@PreAuthorize("hasAuthority('READ_UNITELOGEMENT')")
|
||||
public ResponseEntity<?> getAllUniteLogementByQuartierPaged(@PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
|
||||
try {
|
||||
Pageable pageable = PageRequest.of(pageNo, pageSize);
|
||||
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteUniteLogementService.getUniteLogementListByQuartierPageable(quartierId,pageable), "Liste des unites de logements chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/all/by-quartier-id/{quartierId}")
|
||||
@PreAuthorize("hasAuthority('READ_UNITELOGEMENT')")
|
||||
public ResponseEntity<?> getAllUniteLogementByQuartier(@PathVariable Long quartierId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, enqueteUniteLogementService.getUniteLogementListByQuartier(quartierId), "Liste des unites de logements chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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 {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
package io.gmss.fiscad.controllers.statistique;
|
||||
|
||||
import io.gmss.fiscad.enums.NiveauDecoupage;
|
||||
import io.gmss.fiscad.enums.StatutEnquete;
|
||||
import io.gmss.fiscad.exceptions.*;
|
||||
import io.gmss.fiscad.interfaces.statistique.StatistiquesService;
|
||||
import io.gmss.fiscad.paylaods.ApiResponse;
|
||||
import io.gmss.fiscad.security.CurrentUser;
|
||||
import io.gmss.fiscad.security.UserPrincipal;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -174,4 +177,77 @@ public class StatistiqueController {
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Operation(
|
||||
summary = "Statistique des enquetes en cours par object ",
|
||||
description = "Donnes le nombre d'enquetes en coures par objet"
|
||||
)
|
||||
@GetMapping(path = "/nombre-enquete/par-objet/en-cours")
|
||||
public ResponseEntity<?> getStatistiquesEnqueteEnCoursParObjet(@CurrentUser UserPrincipal currentUser) {
|
||||
try {
|
||||
if(currentUser==null)
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
|
||||
HttpStatus.OK
|
||||
);
|
||||
Long userId = currentUser.getUser().getId();
|
||||
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, statistiquesService.getStatNombreEnqueteParObjetUserConnect(userId,StatutEnquete.EN_COURS.toString()), "Statistique des personne par type."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Operation(
|
||||
summary = "Statistique des enquetes en cours par object ",
|
||||
description = "Donnes le nombre d'enquetes en coures par objet"
|
||||
)
|
||||
@GetMapping(path = "/nombre-enquete/par-objet/cloture")
|
||||
public ResponseEntity<?> getStatistiquesEnqueteClotureParObjet(@CurrentUser UserPrincipal currentUser) {
|
||||
try {
|
||||
if(currentUser==null)
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
|
||||
HttpStatus.OK
|
||||
);
|
||||
Long userId = currentUser.getUser().getId();
|
||||
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, statistiquesService.getStatNombreEnqueteParObjetUserConnect(userId, StatutEnquete.CLOTURE.toString()), "Statistique des personne par type."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@ public class SynchronisationController {
|
||||
|
||||
@Transactional
|
||||
@PostMapping("/personnes")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncPersonne(@RequestBody List<PersonnePayLoad> personnePayLoads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -108,7 +108,7 @@ public class SynchronisationController {
|
||||
}
|
||||
|
||||
@PostMapping("/membre-groupe")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncMembreGroupe(@RequestBody List<MembreGroupePayLoad> membreGroupePayLoads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -132,7 +132,7 @@ public class SynchronisationController {
|
||||
}
|
||||
|
||||
@PostMapping("/enquete")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
// @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncEnquete(@RequestBody List<EnquetePayLoad> enquetePayLoads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -156,7 +156,7 @@ public class SynchronisationController {
|
||||
}
|
||||
|
||||
@PostMapping("/parcelle")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncParcelle(@RequestBody List<ParcellePayLoad> parcellePayLoads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -180,7 +180,7 @@ public class SynchronisationController {
|
||||
}
|
||||
|
||||
@PostMapping("/piece")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncPiece(@RequestBody List<PiecePayLoad> piecePayLoads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -205,7 +205,7 @@ public class SynchronisationController {
|
||||
}
|
||||
|
||||
@PostMapping("/acteur-concerne")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncActeurConcerne(@RequestBody List<ActeurConcernePayLoad> piecePayLoads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -230,7 +230,7 @@ public class SynchronisationController {
|
||||
|
||||
|
||||
@PostMapping("/enquete-activite")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncEnqueteActivite(@RequestBody List<EnqueteActivitePayload> enqueteActivitePayloads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -255,7 +255,7 @@ public class SynchronisationController {
|
||||
}
|
||||
|
||||
@PostMapping("/declaraction-nc")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncDeclarationNc(@RequestBody List<DeclarationNcPayload> declarationNcPayloads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -335,7 +335,7 @@ public class SynchronisationController {
|
||||
// }
|
||||
|
||||
@PostMapping(path = "/uploads")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
// @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncUploads(@RequestBody List<UploadPayLoad> uploadPayLoads) {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, synchronisationService.syncUpload(uploadPayLoads), "Liste des uploads synchronisée avec succès."),
|
||||
@@ -369,7 +369,7 @@ public class SynchronisationController {
|
||||
// }
|
||||
|
||||
@PostMapping(path = "/synchronise/all-enquete-data")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
// @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncAllEnqueteData(@ModelAttribute EnqueteAllDataPayload enqueteAllDataPayload) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -393,7 +393,7 @@ public class SynchronisationController {
|
||||
}
|
||||
|
||||
@PostMapping(path = "/synchronise/enquete/confirme-from-mobile")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncAllEnqueteData(@RequestBody List<Long> longList) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -418,7 +418,7 @@ public class SynchronisationController {
|
||||
|
||||
|
||||
@PostMapping(path = "/batiment")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncBatiment(@RequestBody List<BatimentPaylaod> batimentPaylaods) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -443,7 +443,7 @@ public class SynchronisationController {
|
||||
}
|
||||
|
||||
@PostMapping(path = "/unite-logement")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
// @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncUniteLogement(@RequestBody List<UniteLogementPaylaod> uniteLogementPaylaods) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -468,7 +468,7 @@ public class SynchronisationController {
|
||||
}
|
||||
|
||||
@PostMapping(path = "/caracteristique-batiment")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
// @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncCaracteristiqueBatiment(@RequestBody List<CaracteristiqueBatimentPayload> CaracteristiqueBatimentPayloads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -493,7 +493,7 @@ public class SynchronisationController {
|
||||
}
|
||||
|
||||
@PostMapping(path = "/caracteristique-parcelle")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
// @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncCaracteristiqueParcelle(@RequestBody List<CaracteristiqueParcellePayload> CaracteristiqueParcellePayloads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -518,7 +518,7 @@ public class SynchronisationController {
|
||||
}
|
||||
|
||||
@PostMapping(path = "/caracteristique-unite-logement")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
// @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncCaracteristiqueUniteLogement(@RequestBody List<CaracteristiqueUniteLogementPayload> CaracteristiqueUniteLogementPayloads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -543,7 +543,7 @@ public class SynchronisationController {
|
||||
}
|
||||
|
||||
@PostMapping("/enquete-batiment")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
// @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncEnqueteBatiment(@RequestBody List<EnqueteBatimentPayload> enqueteBatimentPayloads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
@@ -568,7 +568,7 @@ public class SynchronisationController {
|
||||
}
|
||||
|
||||
@PostMapping("/enquete-unite-logement")
|
||||
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
// @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
|
||||
public ResponseEntity<?> syncEnqueteUniteLogement(@RequestBody List<EnqueteUniteLogementPayload> enqueteUniteLogementPayloads) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -0,0 +1,184 @@
|
||||
package io.gmss.fiscad.controllers.user;
|
||||
|
||||
|
||||
import io.gmss.fiscad.exceptions.*;
|
||||
import io.gmss.fiscad.interfaces.user.ProfileModuleFonctionnaliteService;
|
||||
import io.gmss.fiscad.interfaces.user.ProfileModuleFonctionnaliteService;
|
||||
import io.gmss.fiscad.paylaods.ApiResponse;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.ProfileModuleFonctionnalitePayloadWeb;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.client.HttpClientErrorException;
|
||||
|
||||
@AllArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping(value = "api/profile-module-fonctionnalite", produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
@SecurityRequirement(name = "bearer")
|
||||
@Tag(name = "ProfileModuleFonctionnalite")
|
||||
@CrossOrigin(origins = "*")
|
||||
public class ProfileModuleFonctionnaliteController {
|
||||
|
||||
private final ProfileModuleFonctionnaliteService profileModuleFonctionnaliteService;
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(ProfileModuleFonctionnaliteController.class);
|
||||
|
||||
|
||||
|
||||
@PostMapping("/create")
|
||||
@PreAuthorize("hasAuthority('CREATE_PROFILEMODULEFONCTIONNALITE')")
|
||||
public ResponseEntity<?> createProfileModuleFonctionnalite(@RequestBody @Valid @Validated ProfileModuleFonctionnalitePayloadWeb modulePayLoadWeb) {
|
||||
try {
|
||||
modulePayLoadWeb = profileModuleFonctionnaliteService.createProfileModuleFonctionnalite(modulePayLoadWeb);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, modulePayLoadWeb, "ProfileModuleFonctionnalite créé avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@PutMapping("/update/{id}")
|
||||
@PreAuthorize("hasAuthority('UPDATE_PROFILEMODULEFONCTIONNALITE')")
|
||||
public ResponseEntity<?> updateProfileModuleFonctionnalite(@PathVariable Long id, @RequestBody ProfileModuleFonctionnalitePayloadWeb modulePayLoadWeb) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, profileModuleFonctionnaliteService.updateProfileModuleFonctionnalite(id,modulePayLoadWeb), "ProfileModuleFonctionnalite mise à jour avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete/{id}")
|
||||
@PreAuthorize("hasAuthority('DELETE_PROFILEMODULEFONCTIONNALITE')")
|
||||
public ResponseEntity<?> deleteProfileModuleFonctionnalite(@PathVariable Long id) {
|
||||
try {
|
||||
profileModuleFonctionnaliteService.deleteProfileModuleFonctionnalite(id);
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, "ProfileModuleFonctionnalite supprimée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/all")
|
||||
@PreAuthorize("hasAuthority('READ_PROFILEMODULEFONCTIONNALITE')")
|
||||
public ResponseEntity<?> getAllProfileModuleFonctionnaliteList() {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, profileModuleFonctionnaliteService.getProfileModuleFonctionnaliteListToDto(), "Liste des caractéristiques chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/all/by-profil-id/{profilId}")
|
||||
@PreAuthorize("hasAuthority('READ_PROFILEMODULEFONCTIONNALITE')")
|
||||
public ResponseEntity<?> getAllProfileModuleFonctionnaliteByProfilList(@PathVariable Long profilId) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, profileModuleFonctionnaliteService.getAllProfileModuleFonctionnaliteByProfilIdToDto(profilId), "Liste des modules chargée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@GetMapping("/id/{id}")
|
||||
@PreAuthorize("hasAuthority('READ_PROFILEMODULEFONCTIONNALITE')")
|
||||
public ResponseEntity<?> getProfileModuleFonctionnaliteById(@PathVariable Long id) {
|
||||
try {
|
||||
return new ResponseEntity<>(
|
||||
new ApiResponse<>(true, profileModuleFonctionnaliteService.getProfileModuleFonctionnaliteByIdToDto(id), "ProfileModuleFonctionnalite trouvée avec succès."),
|
||||
HttpStatus.OK
|
||||
);
|
||||
} catch (HttpClientErrorException.MethodNotAllowed e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
|
||||
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
|
||||
FileStorageException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
|
||||
} catch (NullPointerException e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getLocalizedMessage());
|
||||
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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<>(
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package io.gmss.fiscad.entities.frontend;
|
||||
|
||||
import io.gmss.fiscad.entities.BaseEntity;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class Fonctionnalite extends BaseEntity implements Serializable {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
private String code;
|
||||
private String nom;
|
||||
private String lien;
|
||||
@Column(nullable = false, columnDefinition = "BOOLEAN DEFAULT true")
|
||||
private Boolean actif;
|
||||
@ManyToOne
|
||||
private ModuleApp moduleApp;
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package io.gmss.fiscad.entities.frontend;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import io.gmss.fiscad.entities.BaseEntity;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class ModuleApp extends BaseEntity implements Serializable {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
private String code;
|
||||
private String nom;
|
||||
private String lien;
|
||||
@Column(nullable = false, columnDefinition = "BOOLEAN DEFAULT true")
|
||||
private Boolean actif;
|
||||
@JsonIgnore
|
||||
@OneToMany(mappedBy = "moduleApp")
|
||||
private List<Fonctionnalite> fonctionnalites;
|
||||
}
|
||||
@@ -99,9 +99,9 @@ public class Enquete extends BaseEntity implements Serializable {
|
||||
@ManyToOne
|
||||
private Campagne campagne;
|
||||
|
||||
@JsonIgnore
|
||||
@ManyToOne
|
||||
private Equipe equipe;
|
||||
// @JsonIgnore
|
||||
// @ManyToOne
|
||||
// private Equipe equipe;
|
||||
|
||||
// @JsonIgnore
|
||||
@ManyToOne
|
||||
|
||||
@@ -61,7 +61,7 @@ public class Parcelle extends BaseEntity implements Serializable {
|
||||
@ManyToOne
|
||||
private Tpe terminal;
|
||||
private String autreNumeroTitreFoncier;
|
||||
private Long numeroProvisoire;
|
||||
private String numeroProvisoire;
|
||||
private Long blocId;
|
||||
@ColumnDefault("false")
|
||||
private boolean synchronise;
|
||||
|
||||
@@ -24,6 +24,7 @@ import org.hibernate.annotations.Where;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@@ -88,7 +89,7 @@ public class Piece extends BaseEntity implements Serializable {
|
||||
|
||||
|
||||
@OneToMany(mappedBy = "piece")
|
||||
private List<Upload> uploads;
|
||||
private List<Upload> uploads=new ArrayList<>();
|
||||
|
||||
@JsonIgnore
|
||||
@ManyToOne
|
||||
@@ -103,4 +104,9 @@ public class Piece extends BaseEntity implements Serializable {
|
||||
private boolean synchronise;
|
||||
private String observation;
|
||||
|
||||
private Long nombreFichier;
|
||||
|
||||
public Long getNombreFichier() {
|
||||
return uploads==null? 0l:uploads.size() ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,6 +41,7 @@ public class Personne extends BaseEntity implements Serializable {
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
private String ifu;
|
||||
private String nc;
|
||||
private String nom;
|
||||
private String prenom;
|
||||
private String raisonSociale;
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
package io.gmss.fiscad.entities.interface_sigibe;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import io.gmss.fiscad.deserializer.LocalDateDeserializer;
|
||||
import io.gmss.fiscad.entities.BaseEntity;
|
||||
import io.gmss.fiscad.entities.decoupage.Quartier;
|
||||
import io.gmss.fiscad.entities.infocad.parametre.Personne;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class DeclarationSpontaneBien extends BaseEntity implements Serializable {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
private Long idImposition ;
|
||||
private String rImposition ;
|
||||
private String ifu ;
|
||||
private String rCommune ;
|
||||
private String rQuartier ;
|
||||
private String qipQuartier;
|
||||
private String qipIlot;
|
||||
private String qipParcelle;
|
||||
private String nup;
|
||||
private String gpsLatitude;
|
||||
private String gpsLongitude;
|
||||
private String commentaire;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateValidation;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateInformation;
|
||||
private Long valeurBatiment;
|
||||
private Long nub;
|
||||
private Long nul;
|
||||
private Long montantLocatifAnnuel ;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateConstruction;
|
||||
private Float superficieSolBat;
|
||||
private Float superficieSolUlot;
|
||||
private Float superficieParcelle;
|
||||
private String usage;
|
||||
private Boolean bati;
|
||||
@ManyToOne
|
||||
private Personne personne;
|
||||
@ManyToOne
|
||||
private Quartier quartier;
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
package io.gmss.fiscad.entities.interface_sigibe;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import io.gmss.fiscad.deserializer.LocalDateDeserializer;
|
||||
import io.gmss.fiscad.entities.BaseEntity;
|
||||
import io.gmss.fiscad.entities.infocad.parametre.Personne;
|
||||
import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation;
|
||||
import io.gmss.fiscad.entities.infocad.parametre.TypeContestation;
|
||||
import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation;
|
||||
import io.gmss.fiscad.enums.SourceDonnee;
|
||||
import io.gmss.fiscad.enums.TypeDroit;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class EpaiementAcompte extends BaseEntity implements Serializable {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
private Long idPaiementAcompte;
|
||||
private Long idPaiementImpot;
|
||||
private String rDoc;
|
||||
private String rImpot;
|
||||
private String idImpotType;
|
||||
private String idImpotNature; /// participe unicité
|
||||
private String ifu; /// participe unicité
|
||||
private String rCommune;
|
||||
private String rQuartier; /// participe unicité
|
||||
private String qipQuartier;
|
||||
private String qipIlot; /// participe unicité
|
||||
private String qipParcelle; /// participe unicité
|
||||
private String nup;
|
||||
private Long exercice; /// participe unicité
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateValidation;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateAvisCredit;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateRapprochement;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateInformation;
|
||||
private Long montantPayer;
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
package io.gmss.fiscad.entities.interface_sigibe;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import io.gmss.fiscad.deserializer.LocalDateDeserializer;
|
||||
import io.gmss.fiscad.entities.BaseEntity;
|
||||
import io.gmss.fiscad.enums.SourceDonnee;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class EpaiementRetenu extends BaseEntity implements Serializable {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
private Long idPaiementRetenue;
|
||||
private Long idEdiGenerique;
|
||||
private Long idPaiementImpot;
|
||||
private String rDoc;
|
||||
private String rImpot;
|
||||
private String idImpotType;
|
||||
private String idImpotNature;
|
||||
private String ifuPayeur;
|
||||
private String ifuRetenue;
|
||||
private String rCommune;
|
||||
private String rQuartier;
|
||||
private String qipQuartier;
|
||||
private String qipIlot;
|
||||
private String qipParcelle;
|
||||
private String nup;
|
||||
private Long exercice;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateValidation;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateAvisCredit;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateRapprochement;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateInformation;
|
||||
private Long montantPayer;
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package io.gmss.fiscad.entities.interface_sigibe;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import io.gmss.fiscad.deserializer.LocalDateDeserializer;
|
||||
import io.gmss.fiscad.entities.BaseEntity;
|
||||
import io.gmss.fiscad.enums.SourceDonnee;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PaiementAvis extends BaseEntity implements Serializable {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
private Long idPaiementImpot;
|
||||
private Long idAvis;
|
||||
private Long idUniteFoncier;
|
||||
private Long idContribuableFoncier;
|
||||
private String rDoc;
|
||||
private String rImpot;
|
||||
private String idImpotType;
|
||||
private String idImpotNature;
|
||||
private String ifu;
|
||||
private String rCommune;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateValidation;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateAvisCredit;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateRapprochement;
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateInformation;
|
||||
private Long montantPayer;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
package io.gmss.fiscad.entities.rfu.metier;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import io.gmss.fiscad.deserializer.LocalDateDeserializer;
|
||||
import io.gmss.fiscad.entities.BaseEntity;
|
||||
import io.gmss.fiscad.entities.decoupage.Commune;
|
||||
import io.gmss.fiscad.entities.infocad.metier.Parcelle;
|
||||
import io.gmss.fiscad.entities.infocad.metier.Tpe;
|
||||
import io.gmss.fiscad.entities.infocad.parametre.Personne;
|
||||
import io.gmss.fiscad.entities.infocad.parametre.Structure;
|
||||
import io.gmss.fiscad.enums.StatutEnregistrement;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
@Entity
|
||||
@Table(
|
||||
uniqueConstraints = {
|
||||
@UniqueConstraint(
|
||||
name = "uk_structure_commune_personne",
|
||||
columnNames = {"structure_id", "commune_id", "personne_id"}
|
||||
)
|
||||
}
|
||||
)
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class CommuneCentreAssignation extends BaseEntity implements Serializable {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
|
||||
@JsonIgnore
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "structure_id", nullable = false)
|
||||
private Structure structure;
|
||||
|
||||
@JsonIgnore
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "commune_id", nullable = false)
|
||||
private Commune commune;
|
||||
|
||||
@JsonIgnore
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "personne_id")
|
||||
private Personne personne;
|
||||
|
||||
@JsonIgnore
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "parcelle_id")
|
||||
private Parcelle parcelle;
|
||||
|
||||
private String nc;
|
||||
|
||||
private String ifu;
|
||||
|
||||
private String adresseContact ;
|
||||
}
|
||||
@@ -36,19 +36,22 @@ public class DeclarationNc extends BaseEntity implements Serializable {
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateDerniereDeclaration;
|
||||
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateDeclarationNc;
|
||||
|
||||
private String nc;
|
||||
private String q;
|
||||
private String i;
|
||||
private String p;
|
||||
private String numeroTitreFoncier;
|
||||
private String nup;
|
||||
private String observation;
|
||||
|
||||
@JsonIgnore
|
||||
@ManyToOne
|
||||
private Structure structure;
|
||||
|
||||
|
||||
private Long enqueteExternalKey;
|
||||
|
||||
@JsonIgnore
|
||||
|
||||
@@ -8,6 +8,7 @@ import io.gmss.fiscad.entities.BaseEntity;
|
||||
import io.gmss.fiscad.entities.infocad.metier.Enquete;
|
||||
import io.gmss.fiscad.entities.infocad.metier.Parcelle;
|
||||
import io.gmss.fiscad.entities.infocad.metier.Tpe;
|
||||
import io.gmss.fiscad.entities.infocad.parametre.Personne;
|
||||
import io.gmss.fiscad.entities.infocad.parametre.Structure;
|
||||
import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
|
||||
import io.gmss.fiscad.enums.NatureImpot;
|
||||
@@ -73,22 +74,22 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
|
||||
private String latitude;
|
||||
private int superficieParc;
|
||||
private Long superficieAuSolBat;
|
||||
private Long superficieAuSolLoue;
|
||||
private Long superficieAuSolUlog;
|
||||
//private String batieOuiNon;
|
||||
//private String exhonereOuiNon;
|
||||
//private String batimentExhonereOuiNon;
|
||||
//private String uniteLogementExhonereOuiNon;
|
||||
private Boolean batie;
|
||||
private Boolean exonere;
|
||||
private Boolean batimentExonere;
|
||||
private Boolean uniteLogementExonere;
|
||||
private Long valeurLocativeAdm;
|
||||
private Long valeurLocativeAdm70Pour100;
|
||||
private Long valeurLocativeAdmTauxPropParc;
|
||||
private Long valeurLocativeAdmSupReel;
|
||||
private Long superficieAuSolTauxPropParc;
|
||||
private Long valeurLocativeAdmMetreCarre;
|
||||
private Long montantLoyerAnnuel;
|
||||
private Long tfuMetreCarre;
|
||||
private Long tfuMinimum;
|
||||
private String standingBat;
|
||||
private String categorieUsage;
|
||||
private String categorieBat;
|
||||
private Long nombrePiscine;
|
||||
private Long nombreUlog;
|
||||
@@ -97,15 +98,13 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateEnquete;
|
||||
private Long enqueteId;
|
||||
//private Long structureId;
|
||||
|
||||
@JsonIgnore
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "structure_id")
|
||||
private Structure structure ;
|
||||
|
||||
private Long secteurId;
|
||||
|
||||
//private Long zoneRfuId;
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "zone_rfu_id")
|
||||
private ZoneRfu zoneRfu ;
|
||||
@@ -113,7 +112,15 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
|
||||
@ColumnDefault("0")
|
||||
private Long valeurAdminParcelleNb;
|
||||
private Float tauxTfu;
|
||||
private Long tfuPiscine;
|
||||
private Float montantTaxe;
|
||||
private Float penalite;
|
||||
private Float retenuIrf ;
|
||||
private Float acompte ;
|
||||
private Float montantRestant ;
|
||||
private Float montantTaxeBrut; //montant de la taxe calculée sans comparaisons avec TFU MINI
|
||||
private Float tfuCalculeTauxPropParc;
|
||||
private Float tfuSuperficieAuSolReel;
|
||||
private Long valeurAdminParcelleNbMetreCarre;
|
||||
@JsonIgnore
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@@ -123,4 +130,27 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
|
||||
private NatureImpot natureImpot;
|
||||
private Long valeurBatiment;
|
||||
private Long valeurParcelle;
|
||||
|
||||
@JsonIgnore
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "parcelle_id")
|
||||
private Parcelle parcelleImposee ;
|
||||
|
||||
@JsonIgnore
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "batiment_id")
|
||||
private Batiment batimentImpose ;
|
||||
|
||||
@JsonIgnore
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "unite_logement_id")
|
||||
private UniteLogement uniteLogementImposee ;
|
||||
|
||||
|
||||
@JsonIgnore
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
private Personne personne ;
|
||||
|
||||
private Boolean parcelleContact;
|
||||
|
||||
}
|
||||
|
||||
@@ -83,6 +83,14 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateEnquete;
|
||||
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateValidation;
|
||||
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateRejet;
|
||||
private String descriptionMotifRejet;
|
||||
@ManyToOne
|
||||
private Exercice exercice;
|
||||
|
||||
|
||||
@@ -73,6 +73,15 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateEnquete;
|
||||
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateValidation;
|
||||
|
||||
@JsonFormat(pattern = "dd-MM-yyyy")
|
||||
@JsonDeserialize(using = LocalDateDeserializer.class)
|
||||
private LocalDate dateRejet;
|
||||
private String descriptionMotifRejet;
|
||||
private String observation;
|
||||
private Long uniteLogementExternalKey;
|
||||
|
||||
|
||||
@@ -51,6 +51,7 @@ public class UniteLogement extends BaseEntity implements Serializable {
|
||||
private Long montantLocatifAnnuelDeclare;
|
||||
private Long montantLocatifAnnuelCalcule;
|
||||
private Long valeurUniteLogementEstime;
|
||||
private Long montantLocatifAnnuelEstime;
|
||||
private Long valeurUniteLogementReel;
|
||||
private Long valeurUniteLogementCalcule;
|
||||
private Integer nombrePiscine;
|
||||
|
||||
29
src/main/java/io/gmss/fiscad/entities/user/ProfileModuleFonctionnalite.java
Executable file
29
src/main/java/io/gmss/fiscad/entities/user/ProfileModuleFonctionnalite.java
Executable file
@@ -0,0 +1,29 @@
|
||||
package io.gmss.fiscad.entities.user;
|
||||
|
||||
import io.gmss.fiscad.entities.BaseEntity;
|
||||
import io.gmss.fiscad.entities.frontend.Fonctionnalite;
|
||||
import io.gmss.fiscad.entities.frontend.ModuleApp;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
//@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Entity
|
||||
public class ProfileModuleFonctionnalite extends BaseEntity implements Serializable {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
@ManyToOne
|
||||
private Profile profile;
|
||||
@ManyToOne
|
||||
private ModuleApp moduleApp;
|
||||
@ManyToOne
|
||||
private Fonctionnalite fonctionnalite ;
|
||||
private Boolean actif;
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
package io.gmss.fiscad.enums;
|
||||
|
||||
public enum NatureImpot {
|
||||
TFU,
|
||||
IRF
|
||||
FB,
|
||||
FNB,
|
||||
IRF,
|
||||
SRTB
|
||||
}
|
||||
|
||||
@@ -13,7 +13,10 @@ public enum ParametersType {
|
||||
OBJET_CREATE_ACCOUNT,
|
||||
CORPS_CREATE_ACCOUNT,
|
||||
TOKEN_IFU_EN_LIGNE,
|
||||
TAUX_TFU_HABITATION,
|
||||
TAUX_TFU_PROFESSIONNELLE,
|
||||
TAUX_DEFAUT_SUPERFICIE_AU_SOL;
|
||||
TAUX_TFU,
|
||||
TAUX_VALEUR_LOCATIVE_PROFESSIONNELLE,
|
||||
TAUX_DEFAUT_SUPERFICIE_AU_SOL,
|
||||
TAUX_IRF,
|
||||
TAXE_SRTB,
|
||||
TFU_PAR_PISCINE;
|
||||
}
|
||||
|
||||
@@ -2,8 +2,10 @@ package io.gmss.fiscad.enums;
|
||||
|
||||
public enum StatusAvis {
|
||||
EN_COURS,
|
||||
|
||||
CLOTURE,
|
||||
GENERATION_AUTORISE,
|
||||
|
||||
REJETE,
|
||||
TFU_FNB_GENERE,
|
||||
GENERE
|
||||
|
||||
@@ -2,7 +2,6 @@ package io.gmss.fiscad.enums;
|
||||
|
||||
public enum StatutEnquete {
|
||||
EN_COURS,
|
||||
// DECLARATION,
|
||||
FINALISE,
|
||||
REJETE,
|
||||
VALIDE,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gmss.fiscad.enums;
|
||||
|
||||
public enum StatutParcelle {
|
||||
NON_ENQUETER,
|
||||
NON_ENQUETE,
|
||||
AJOUR,
|
||||
NON_AJOUR;
|
||||
}
|
||||
|
||||
@@ -1,9 +1,77 @@
|
||||
package io.gmss.fiscad.enums;
|
||||
|
||||
public enum UserProfile {
|
||||
INSPECTEUR_GESTIONNAIRE,
|
||||
ADMIN_FONCTIONNEL,
|
||||
INSPECTEUR_GESTIONNAIRE_CHEF_SECTEUR,
|
||||
INSPECTEUR_GESTIONNAIRE_CHEF_SECTION,
|
||||
INSPECTEUR_GESTIONNAIRE_CHEF_CENTRE
|
||||
EBANK_OPE,
|
||||
ACAAGENT,
|
||||
ADMINF,
|
||||
ADMINT,
|
||||
API_CONT,
|
||||
API_CONT_CONSULTATION,
|
||||
CASAGENT,
|
||||
CASCHEF,
|
||||
EBANK_OPE_BATI,
|
||||
EBANK_OPE_BATI_DIRT,
|
||||
EBANK_OPE_DIRT,
|
||||
EBANK_OPE_PAIE,
|
||||
EBANK_OPE_PAIE_DIRT,
|
||||
ECP_ADMIN,
|
||||
ENTDECL,
|
||||
ENTEFI,
|
||||
ENTFULL,
|
||||
ENTGEST,
|
||||
ENTREGL,
|
||||
ENTREGLVALID,
|
||||
ENTUSER,
|
||||
ENTENR,
|
||||
CNSS,
|
||||
CNSS_REC,
|
||||
COMPTABLE,
|
||||
COMPTACHEFDIV,
|
||||
CONSULTATION,
|
||||
CTRLAGENT,
|
||||
CTRLCHEF,
|
||||
CTRLDIRECTEUR,
|
||||
DIRECTEUR,
|
||||
DIRGENERAL,
|
||||
DLCAGENT,
|
||||
DLCCHEF,
|
||||
DLCDIRECTEUR,
|
||||
DPSE,
|
||||
DPSE_COLL,
|
||||
EBANK_ADMIN,
|
||||
EBANQUE_API,
|
||||
EBANK_CONTROLE,
|
||||
EBANK_CONTROLE_BATI,
|
||||
EBANK_CONTROLE_PAIE,
|
||||
EXP_ADMIN,
|
||||
EXP_CON,
|
||||
EXP_VAL,
|
||||
GESAGENT,
|
||||
GESCENTRE,
|
||||
GESCHEF,
|
||||
IMMAT,
|
||||
IMMAT_SAISIE,
|
||||
MINISTRE,
|
||||
ORDRECHEFDIV,
|
||||
OTM,
|
||||
PROGAGENT,
|
||||
PROGCHEF,
|
||||
PSTAGENT,
|
||||
PSTCHEFSEC,
|
||||
RECAGENT,
|
||||
RECCHB,
|
||||
RECCHEF,
|
||||
RECCHEFDIV,
|
||||
RECCHEFSEC,
|
||||
RECNAT,
|
||||
SUPPORT,
|
||||
SYSTEME,
|
||||
VERIFAGENT,
|
||||
CENTIFAGENT,
|
||||
EBANQUE_CASAGENT,
|
||||
EBANQUE_CASAGENT_DIRECT,
|
||||
EBANQUE_CASCHEF,
|
||||
ENRAGENT,
|
||||
ENRCHEF,
|
||||
AMFRE
|
||||
}
|
||||
|
||||
@@ -1,24 +1,281 @@
|
||||
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,
|
||||
DELETE_PARAMETERS,
|
||||
CREATE_SECTEUR_DECOUPAGE,
|
||||
READ_SECTEUR_DECOUPAGE,
|
||||
UPDATE_SECTEUR_DECOUPAGE,
|
||||
DELETE_SECTEUR_DECOUPAGE,
|
||||
CREATE_MODULE,
|
||||
READ_MODULE,
|
||||
UPDATE_MODULE,
|
||||
DELETE_MODULE,
|
||||
CREATE_FONCTIONNALITE,
|
||||
READ_FONCTIONNALITE,
|
||||
UPDATE_FONCTIONNALITE,
|
||||
DELETE_FONCTIONNALITE,
|
||||
CREATE_PROFILEMODULEFONCTIONNALITE,
|
||||
READ_PROFILEMODULEFONCTIONNALITE,
|
||||
UPDATE_PROFILEMODULEFONCTIONNALITE,
|
||||
DELETE_PROFILEMODULEFONCTIONNALITE
|
||||
|
||||
}
|
||||
|
||||
@@ -2,15 +2,18 @@ package io.gmss.fiscad.implementations.decoupage;
|
||||
|
||||
import io.gmss.fiscad.entities.decoupage.Secteur;
|
||||
import io.gmss.fiscad.entities.decoupage.SecteurDecoupage;
|
||||
import io.gmss.fiscad.enums.StatutEnquete;
|
||||
import io.gmss.fiscad.exceptions.BadRequestException;
|
||||
import io.gmss.fiscad.exceptions.NotFoundException;
|
||||
import io.gmss.fiscad.interfaces.decoupage.SecteurDecoupageService;
|
||||
import io.gmss.fiscad.interfaces.decoupage.SecteurService;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.SecteurDecoupagePaylaodWeb;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb;
|
||||
import io.gmss.fiscad.paylaods.response.restoration.ParcelleStatsProjectionUnSecteur;
|
||||
import io.gmss.fiscad.paylaods.response.statistique.ParcelleStatsProjectionUnSecteur;
|
||||
import io.gmss.fiscad.persistence.repositories.decoupage.SecteurDecoupageRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteBatimentRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteUniteLogementRepository;
|
||||
import io.gmss.fiscad.service.EntityFromPayLoadService;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
@@ -26,6 +29,9 @@ public class SecteurDecoupageServiceImpl implements SecteurDecoupageService {
|
||||
private final SecteurDecoupageRepository secteurDecoupageRepository;
|
||||
private final SecteurService secteurService;
|
||||
private final ParcelleRepository parcelleRepository;
|
||||
private final EnqueteRepository enqueteRepository;
|
||||
private final EnqueteBatimentRepository enqueteBatimentRepository;
|
||||
private final EnqueteUniteLogementRepository enqueteUniteLogementRepository;
|
||||
private final EntityFromPayLoadService entityFromPayLoadService;
|
||||
|
||||
|
||||
@@ -112,4 +118,36 @@ public class SecteurDecoupageServiceImpl implements SecteurDecoupageService {
|
||||
|
||||
return parcelleStatsProjectionUnSecteurs ;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ParcelleStatsProjectionUnSecteur> getStatEnqueteDecoupageByUserId(Long userId, String statutEnquete) {
|
||||
List<Secteur> secteurs= secteurService.getListSecteurUserId(userId);
|
||||
List<Long> secteurIds = secteurs.stream()
|
||||
.map(Secteur::getId)
|
||||
.toList();
|
||||
System.out.println(statutEnquete);
|
||||
return enqueteRepository.findStatsEnqueteBySecteurs(secteurIds,statutEnquete);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ParcelleStatsProjectionUnSecteur> getStatEnqueteBatimentDecoupageByUserId(Long userId, String statutEnquete) {
|
||||
List<Secteur> secteurs= secteurService.getListSecteurUserId(userId);
|
||||
List<Long> secteurIds = secteurs.stream()
|
||||
.map(Secteur::getId)
|
||||
.toList();
|
||||
System.out.println(statutEnquete);
|
||||
System.out.println(secteurIds);
|
||||
return enqueteBatimentRepository.findStatsEnqueteBatimentBySecteurs(secteurIds,statutEnquete);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ParcelleStatsProjectionUnSecteur> getStatEnqueteUniteLogementDecoupageByUserId(Long userId, String statutEnquete) {
|
||||
List<Secteur> secteurs= secteurService.getListSecteurUserId(userId);
|
||||
List<Long> secteurIds = secteurs.stream()
|
||||
.map(Secteur::getId)
|
||||
.toList();
|
||||
return enqueteUniteLogementRepository.findStatsEnqueteBatimentBySecteurs(secteurIds,statutEnquete);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
package io.gmss.fiscad.implementations.frontend;
|
||||
|
||||
import io.gmss.fiscad.entities.frontend.Fonctionnalite;
|
||||
import io.gmss.fiscad.exceptions.BadRequestException;
|
||||
import io.gmss.fiscad.exceptions.NotFoundException;
|
||||
import io.gmss.fiscad.interfaces.frontend.FonctionnaliteService;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.FonctionnalitePayloadWeb;
|
||||
import io.gmss.fiscad.persistence.repositories.frontend.FonctionnaliteRepository;
|
||||
import io.gmss.fiscad.service.EntityFromPayLoadService;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
@AllArgsConstructor
|
||||
@Service
|
||||
public class FonctionnaliteServiceImpl implements FonctionnaliteService {
|
||||
private final FonctionnaliteRepository fonctionnaliteRepository;
|
||||
private final EntityFromPayLoadService entityFromPayLoadService;
|
||||
@Override
|
||||
public FonctionnalitePayloadWeb createFonctionnalite(FonctionnalitePayloadWeb fonctionnalitePayloadWeb) throws BadRequestException {
|
||||
if (fonctionnalitePayloadWeb.getId() != null) {
|
||||
throw new BadRequestException("Impossible de créer une nouvelle déclaration NC ayant un id non null.");
|
||||
}
|
||||
|
||||
Fonctionnalite fonctionnalite= entityFromPayLoadService.getFonctionnaliteFromPayloadWeb(fonctionnalitePayloadWeb);
|
||||
fonctionnalite = fonctionnaliteRepository.save(fonctionnalite);
|
||||
return fonctionnaliteRepository.findPayloadById(fonctionnalite.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FonctionnalitePayloadWeb updateFonctionnalite(Long id, FonctionnalitePayloadWeb fonctionnalitePayloadWeb) throws NotFoundException {
|
||||
if (fonctionnalitePayloadWeb.getId() == null) {
|
||||
throw new BadRequestException("La fonctionnaliteApp n'existe pas.");
|
||||
}
|
||||
|
||||
if (!fonctionnaliteRepository.existsById(fonctionnalitePayloadWeb.getId())) {
|
||||
throw new NotFoundException("La fonctionnaliteApp n'existe pas");
|
||||
}
|
||||
|
||||
Fonctionnalite fonctionnaliteApp = entityFromPayLoadService.getFonctionnaliteFromPayloadWeb(fonctionnalitePayloadWeb);
|
||||
fonctionnaliteApp =fonctionnaliteRepository.save(fonctionnaliteApp);
|
||||
return fonctionnaliteRepository.findPayloadById(fonctionnaliteApp.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteFonctionnalite(Long id) throws NotFoundException {
|
||||
Optional<Fonctionnalite> fonctionnaliteOptional = fonctionnaliteRepository.findById(id);
|
||||
if (fonctionnaliteOptional.isPresent()) {
|
||||
fonctionnaliteRepository.deleteById(fonctionnaliteOptional.get().getId());
|
||||
} else {
|
||||
throw new NotFoundException("Impossible de trouver la fonctionnalite à supprimer .");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public List<FonctionnalitePayloadWeb> getFonctionnaliteListToDto() {
|
||||
return fonctionnaliteRepository.findAllPayload();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<FonctionnalitePayloadWeb> getFonctionnaliteByIdToDto(Long id) {
|
||||
return fonctionnaliteRepository.findPayloadById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FonctionnalitePayloadWeb> getAllFonctionnaliteByProfilIdToDto(Long id) {
|
||||
return fonctionnaliteRepository.findByProfileId(id);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
package io.gmss.fiscad.implementations.frontend;
|
||||
|
||||
import io.gmss.fiscad.entities.frontend.ModuleApp;
|
||||
import io.gmss.fiscad.exceptions.BadRequestException;
|
||||
import io.gmss.fiscad.exceptions.NotFoundException;
|
||||
import io.gmss.fiscad.interfaces.frontend.ModuleService;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.ModulePayloadWeb;
|
||||
import io.gmss.fiscad.persistence.repositories.frontend.ModuleRepository;
|
||||
import io.gmss.fiscad.service.EntityFromPayLoadService;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
@AllArgsConstructor
|
||||
@Service
|
||||
public class ModuleServiceImpl implements ModuleService {
|
||||
private final ModuleRepository moduleRepository;
|
||||
private final EntityFromPayLoadService entityFromPayLoadService;
|
||||
@Override
|
||||
public ModulePayloadWeb createModule(ModulePayloadWeb modulePayloadWeb) throws BadRequestException {
|
||||
if (modulePayloadWeb.getId() != null) {
|
||||
throw new BadRequestException("Impossible de créer une nouvelle déclaration NC ayant un id non null.");
|
||||
}
|
||||
|
||||
ModuleApp module= entityFromPayLoadService.getModuleFromPayloadWeb(modulePayloadWeb);
|
||||
module = moduleRepository.save(module);
|
||||
return moduleRepository.findPayloadById(module.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ModulePayloadWeb updateModule(Long id, ModulePayloadWeb modulePayloadWeb) throws NotFoundException {
|
||||
if (modulePayloadWeb.getId() == null) {
|
||||
throw new BadRequestException("La moduleApp n'existe pas.");
|
||||
}
|
||||
|
||||
if (!moduleRepository.existsById(modulePayloadWeb.getId())) {
|
||||
throw new NotFoundException("La moduleApp n'existe pas");
|
||||
}
|
||||
|
||||
ModuleApp moduleApp = entityFromPayLoadService.getModuleFromPayloadWeb(modulePayloadWeb);
|
||||
moduleApp =moduleRepository.save(moduleApp);
|
||||
return moduleRepository.findPayloadById(moduleApp.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteModule(Long id) throws NotFoundException {
|
||||
Optional<ModuleApp> moduleOptional = moduleRepository.findById(id);
|
||||
if (moduleOptional.isPresent()) {
|
||||
moduleRepository.deleteById(moduleOptional.get().getId());
|
||||
} else {
|
||||
throw new NotFoundException("Impossible de trouver la module à supprimer .");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public List<ModulePayloadWeb> getModuleListToDto() {
|
||||
return moduleRepository.findAllPayload();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<ModulePayloadWeb> getModuleByIdToDto(Long id) {
|
||||
return moduleRepository.findPayloadById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ModulePayloadWeb> getAllModuleByProfilIdToDto(Long id) {
|
||||
return moduleRepository.findPayloadByProfilId(id);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package io.gmss.fiscad.implementations.infocad.metier;
|
||||
|
||||
import io.gmss.fiscad.entities.decoupage.Secteur;
|
||||
import io.gmss.fiscad.entities.infocad.metier.*;
|
||||
import io.gmss.fiscad.entities.infocad.parametre.Personne;
|
||||
import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
|
||||
@@ -13,7 +14,9 @@ import io.gmss.fiscad.enums.StatutEnquete;
|
||||
import io.gmss.fiscad.exceptions.ApplicationException;
|
||||
import io.gmss.fiscad.exceptions.BadRequestException;
|
||||
import io.gmss.fiscad.exceptions.NotFoundException;
|
||||
import io.gmss.fiscad.interfaces.decoupage.SecteurService;
|
||||
import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
|
||||
import io.gmss.fiscad.interfaces.infocad.metier.ParcelleService;
|
||||
import io.gmss.fiscad.interfaces.infocad.metier.PieceService;
|
||||
import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueParcelleService;
|
||||
import io.gmss.fiscad.interfaces.rfu.metier.DeclarationNcService;
|
||||
@@ -23,6 +26,7 @@ import io.gmss.fiscad.interfaces.user.UserService;
|
||||
import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
|
||||
import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.ParcellePayLoadWeb;
|
||||
import io.gmss.fiscad.paylaods.response.* ;
|
||||
import io.gmss.fiscad.paylaods.response.FicheResponse.* ;
|
||||
import io.gmss.fiscad.paylaods.response.synchronisation.EnqueteNonSyncResponse;
|
||||
@@ -44,6 +48,7 @@ import jakarta.persistence.EntityManager;
|
||||
import jakarta.persistence.PersistenceContext;
|
||||
import jakarta.persistence.Query;
|
||||
import jakarta.transaction.Transactional;
|
||||
import jakarta.ws.rs.NotAcceptableException;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.modelmapper.ModelMapper;
|
||||
import org.springframework.data.domain.Page;
|
||||
@@ -78,13 +83,9 @@ public class EnqueteServiceImpl implements EnqueteService {
|
||||
private final ParcelleServiceImpl parcelleService;
|
||||
private final PersonneRepository personneRepository;
|
||||
private final ZoneRfuRepository zoneRfuRepository ;
|
||||
private final EquipeRepository equipeRepository ;
|
||||
private final RueRepository rueRepository ;
|
||||
private final CaracteristiqueParcelleService caracteristiqueParcelleService ;
|
||||
private final PieceService pieceService ;
|
||||
private final UploadRepository uploadRepository ;
|
||||
private final DeclarationNcService declarationNcService ;
|
||||
private final EntityFromPayLoadService entityFromPayLoadService ;
|
||||
private final SecteurService secteurService ;
|
||||
;
|
||||
|
||||
@PersistenceContext
|
||||
private final EntityManager em;
|
||||
@@ -92,69 +93,75 @@ public class EnqueteServiceImpl implements EnqueteService {
|
||||
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public EnquetePayLoadWeb createEnquete(EnquetePayLoadWeb enquetePayLoadWeb) throws BadRequestException {
|
||||
|
||||
Optional<User> optionalUser = userRepository.findById(enquetePayLoadWeb.getEnqueteurId());
|
||||
if (!optionalUser.isPresent()) {
|
||||
throw new BadRequestException("Echec de l'enregistrement : Enquêteur inexistant");
|
||||
}
|
||||
|
||||
Optional<Personne> optionalPersonne = personneRepository.findById(enquetePayLoadWeb.getPersonneId());
|
||||
if (!optionalPersonne.isPresent()) {
|
||||
throw new BadRequestException("Echec de l'enregistrement : Propriétaire inexistant");
|
||||
}
|
||||
|
||||
Optional<Parcelle> optionalParcelle = parcelleRepository.findById(enquetePayLoadWeb.getParcelleId());
|
||||
if (!optionalParcelle.isPresent()) {
|
||||
throw new BadRequestException("Echec de l'enregistrement : Parcelle inexistante");
|
||||
if(enquetePayLoadWeb.getParcelleId()!=null) {
|
||||
Optional<Parcelle> optionalParcelle = parcelleRepository.findById(enquetePayLoadWeb.getParcelleId());
|
||||
if (!optionalParcelle.isPresent()) {
|
||||
throw new BadRequestException("Echec de l'enregistrement : Parcelle inexistante");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Optional<ZoneRfu> optionalZoneRfu = zoneRfuRepository.findById(enquetePayLoadWeb.getZoneRfuId());
|
||||
if (!optionalZoneRfu.isPresent()) {
|
||||
throw new BadRequestException("Echec de l'enregistrement : zone inexistante");
|
||||
}
|
||||
|
||||
if (enquetePayLoadWeb.getParcelleId() == null) {
|
||||
throw new ApplicationException("Echec de l'enregistrement : La parcelle non renseignée.");
|
||||
}
|
||||
Enquete enquete = entityFromPayLoadService.getEnqueteFromPayLoadWeb(enquetePayLoadWeb);
|
||||
////enregistrement de l'enquete
|
||||
ParcellePayLoadWeb parcellePayLoadWeb= getParcellePayloadFromEnquetePl(enquetePayLoadWeb);
|
||||
|
||||
if(parcellePayLoadWeb.getId()==null){
|
||||
parcellePayLoadWeb=parcelleService.createParcelle(parcellePayLoadWeb);
|
||||
}else{
|
||||
parcellePayLoadWeb=parcelleService.updateParcelle(parcellePayLoadWeb.getId(),parcellePayLoadWeb);
|
||||
}
|
||||
|
||||
enquetePayLoadWeb.setParcelleId(parcellePayLoadWeb.getId());
|
||||
|
||||
Enquete enquete = entityFromPayLoadService.getEnqueteFromPayLoadWeb(enquetePayLoadWeb);
|
||||
////enregistrement de l'enquete
|
||||
enquete=enqueteRepository.save(enquete);
|
||||
|
||||
//////Enregistrement des caractéristiques parcelle
|
||||
// enquetePayLoadWeb.getCaracteristiqueParcellePayloadWebs().forEach(caracteristiqueParcellePayloadWeb -> {
|
||||
// caracteristiqueParcellePayloadWeb.setEnqueteId(finalEnquete.getId());
|
||||
// CaracteristiqueParcelle caracteristiqueParcelle=entityFromPayLoadService.getCaracteristiqueParcelleFromPayLoadWeb(caracteristiqueParcellePayloadWeb);
|
||||
// caracteristiqueParcelleService.createCaracteristiqueParcelle(caracteristiqueParcelle);
|
||||
// });
|
||||
|
||||
/////Enregistrement des pièce de parcelles
|
||||
// enquetePayLoadWeb.getPiecePayLoadWebs().forEach(piecePayLoadWeb -> {
|
||||
// piecePayLoadWeb.setEnqueteId(finalEnquete.getId());
|
||||
// //Piece piece=entityFromPayLoadService.getPieceFromPayLoadWeb(piecePayLoadWeb);
|
||||
// Piece piecefinal = pieceService.createPiece(entityFromPayLoadService.getPieceFromPayLoadWeb(piecePayLoadWeb));
|
||||
// piecePayLoadWeb.getUploadPayLoadWebs().forEach(uploadPayLoadWeb -> {
|
||||
// uploadPayLoadWeb.setEnqueteId(finalEnquete.getId());
|
||||
// Upload upload=entityFromPayLoadService.getUploadFromPayLoadWeb(uploadPayLoadWeb);
|
||||
// upload.setPiece(piecefinal);
|
||||
// uploadRepository.save(upload);
|
||||
// });
|
||||
// });
|
||||
|
||||
/////Enregistrement des pièce de parcelles
|
||||
// enquetePayLoadWeb.getDeclarationNcPayloadWebs().forEach(declarationNcPayloadWeb -> {
|
||||
// declarationNcPayloadWeb.setEnqueteId(finalEnquete.getId());
|
||||
// DeclarationNc declarationNcfinal=declarationNcService.createDeclarationNc(entityFromPayLoadService.getDeclarationNcFromPayLoadWeb(declarationNcPayloadWeb));
|
||||
// declarationNcPayloadWeb.getUploadPayLoadWebs().forEach(uploadPayLoadWeb -> {
|
||||
// uploadPayLoadWeb.setEnqueteId(finalEnquete.getId());
|
||||
// Upload upload=entityFromPayLoadService.getUploadFromPayLoadWeb(uploadPayLoadWeb);
|
||||
// upload.setDeclarationNc(declarationNcfinal);
|
||||
// uploadRepository.save(upload);
|
||||
// });
|
||||
// });
|
||||
|
||||
return enqueteRepository.findEnqueteToDto(enquete.getId()).orElse(null);
|
||||
}
|
||||
|
||||
private ParcellePayLoadWeb getParcellePayloadFromEnquetePl(EnquetePayLoadWeb enquetePayLoadWeb) {
|
||||
ParcellePayLoadWeb parcellePayLoadWeb=new ParcellePayLoadWeb();
|
||||
parcellePayLoadWeb.setId(enquetePayLoadWeb.getParcelleId());
|
||||
parcellePayLoadWeb.setQ(enquetePayLoadWeb.getParcelleQ());
|
||||
parcellePayLoadWeb.setI(enquetePayLoadWeb.getParcelleI());
|
||||
parcellePayLoadWeb.setP(enquetePayLoadWeb.getParcelleP());
|
||||
parcellePayLoadWeb.setNup(enquetePayLoadWeb.getParcelleNup());
|
||||
parcellePayLoadWeb.setNupProvisoire(enquetePayLoadWeb.getNupProvisoire());
|
||||
parcellePayLoadWeb.setNumTitreFoncier(enquetePayLoadWeb.getNumeroTitreFoncier());
|
||||
parcellePayLoadWeb.setLongitude(enquetePayLoadWeb.getLongitude());
|
||||
parcellePayLoadWeb.setLatitude(enquetePayLoadWeb.getLatitude());
|
||||
parcellePayLoadWeb.setAltitude(enquetePayLoadWeb.getAltitude());
|
||||
parcellePayLoadWeb.setSuperficie(enquetePayLoadWeb.getSuperficie());
|
||||
parcellePayLoadWeb.setObservation(enquetePayLoadWeb.getObservation());
|
||||
parcellePayLoadWeb.setSituationGeographique(enquetePayLoadWeb.getSituationGeographique());
|
||||
parcellePayLoadWeb.setNumEntreeParcelle(enquetePayLoadWeb.getNumEntreeParcelle());
|
||||
parcellePayLoadWeb.setQuartierId(enquetePayLoadWeb.getQuartierId());
|
||||
parcellePayLoadWeb.setNatureDomaineId(enquetePayLoadWeb.getNatureDomaineId());
|
||||
parcellePayLoadWeb.setTypeDomaineId(enquetePayLoadWeb.getTypeDomaineId());
|
||||
parcellePayLoadWeb.setRueId(enquetePayLoadWeb.getRueId());
|
||||
parcellePayLoadWeb.setProprietaireId(enquetePayLoadWeb.getPersonneId());
|
||||
parcellePayLoadWeb.setNatureDomaineId(enquetePayLoadWeb.getNatureDomaineId());
|
||||
parcellePayLoadWeb.setNatureDomaineId(enquetePayLoadWeb.getNatureDomaineId());
|
||||
return parcellePayLoadWeb;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnquetePayLoadWeb updateEnquete(Long id,EnquetePayLoadWeb enquetePayLoadWeb) throws NotFoundException {
|
||||
if (enquetePayLoadWeb.getId() == null) {
|
||||
@@ -168,8 +175,6 @@ public class EnqueteServiceImpl implements EnqueteService {
|
||||
throw new BadRequestException("Impossible d'enregistrer une enquête avec une parcelle inexistante");
|
||||
}
|
||||
|
||||
Optional<Parcelle> optionalParcelle=Optional.empty();
|
||||
Long rueId;
|
||||
Optional<User> optionalUser = userRepository.findById(enquetePayLoadWeb.getEnqueteurId());
|
||||
if (!optionalUser.isPresent()) {
|
||||
throw new BadRequestException("Echec de l'enregistrement : Enquêteur inexistant");
|
||||
@@ -183,13 +188,26 @@ public class EnqueteServiceImpl implements EnqueteService {
|
||||
if (!optionalZoneRfu.isPresent()) {
|
||||
throw new BadRequestException("Echec de l'enregistrement : zone inexistante");
|
||||
}
|
||||
///enregistrement de la pacelle
|
||||
if (enquetePayLoadWeb.getParcelleId() == null) {
|
||||
throw new ApplicationException("Echec de l'enregistrement : La parcelle non renseignée.");
|
||||
} else {
|
||||
optionalParcelle = parcelleService.getParcelleById(enquetePayLoadWeb.getParcelleId());
|
||||
|
||||
if(enquetePayLoadWeb.getParcelleId()!=null) {
|
||||
Optional<Parcelle> optionalParcelle = parcelleRepository.findById(enquetePayLoadWeb.getParcelleId());
|
||||
if (!optionalParcelle.isPresent()) {
|
||||
throw new BadRequestException("Echec de l'enregistrement : Parcelle inexistante");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
ParcellePayLoadWeb parcellePayLoadWeb= getParcellePayloadFromEnquetePl(enquetePayLoadWeb);
|
||||
|
||||
if(parcellePayLoadWeb.getId()==null){
|
||||
parcellePayLoadWeb=parcelleService.createParcelle(parcellePayLoadWeb);
|
||||
}else{
|
||||
parcellePayLoadWeb=parcelleService.updateParcelle(parcellePayLoadWeb.getId(),parcellePayLoadWeb);
|
||||
}
|
||||
|
||||
enquetePayLoadWeb.setParcelleId(parcellePayLoadWeb.getId());
|
||||
|
||||
|
||||
Enquete enquete = entityFromPayLoadService.getEnqueteFromPayLoadWeb(enquetePayLoadWeb);
|
||||
enquete=enqueteRepository.save(enquete);
|
||||
return enqueteRepository.findEnqueteToDto(enquete.getId()).orElse(null);
|
||||
@@ -338,7 +356,7 @@ public class EnqueteServiceImpl implements EnqueteService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enquete validerEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
|
||||
public EnquetePayLoadWeb validerEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
|
||||
if (enqueteTraitementPayLoad == null) {
|
||||
throw new BadRequestException("Impossible de valider une enquête ayant un id null.");
|
||||
}
|
||||
@@ -346,15 +364,22 @@ public class EnqueteServiceImpl implements EnqueteService {
|
||||
if (!optionalEnquete.isPresent()) {
|
||||
throw new NotFoundException("Impossible de trouver l'enquête que vous désirez valider.");
|
||||
}
|
||||
if(optionalEnquete.get().getStatutEnquete()==StatutEnquete.CLOTURE ||
|
||||
optionalEnquete.get().getStatutEnquete()==StatutEnquete.REJETE ){
|
||||
throw new NotAcceptableException("Impossible de valider : Le statut actuel "+optionalEnquete.get().getStatutEnquete()+" ne le permet pas.");
|
||||
}
|
||||
|
||||
Enquete enquete = optionalEnquete.get();
|
||||
enquete.setDateValidation(LocalDate.now());
|
||||
enquete.setStatutEnquete(StatutEnquete.VALIDE);
|
||||
enquete.setSynchronise(true);
|
||||
return enqueteRepository.save(enquete);
|
||||
|
||||
enquete= enqueteRepository.save(enquete);
|
||||
return enqueteRepository.findEnqueteToDto(enquete.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enquete rejeterEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
|
||||
public EnquetePayLoadWeb rejeterEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
|
||||
if (enqueteTraitementPayLoad.getIdBackend() == null) {
|
||||
throw new BadRequestException("Impossible de rejeter une enquête ayant un id null.");
|
||||
}
|
||||
@@ -362,38 +387,43 @@ public class EnqueteServiceImpl implements EnqueteService {
|
||||
if (!optionalEnquete.isPresent()) {
|
||||
throw new NotFoundException("Impossible de trouver l'enquête que vous désirez rejeter.");
|
||||
}
|
||||
if(optionalEnquete.get().getStatutEnquete()==StatutEnquete.CLOTURE ||
|
||||
optionalEnquete.get().getStatutEnquete()==StatutEnquete.VALIDE ){
|
||||
throw new NotAcceptableException("Impossible de rejeter : Le statut actuel "+optionalEnquete.get().getStatutEnquete()+" ne le permet pas.");
|
||||
}
|
||||
Enquete enquete = optionalEnquete.get();
|
||||
enquete.setDateRejet(LocalDate.now());
|
||||
enquete.setDescriptionMotifRejet(enqueteTraitementPayLoad.getMotifRejet());
|
||||
enquete.setStatutEnquete(StatutEnquete.REJETE);
|
||||
enquete.setSynchronise(false);
|
||||
return enqueteRepository.save(enquete);
|
||||
enquete= enqueteRepository.save(enquete);
|
||||
return enqueteRepository.findEnqueteToDto(enquete.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Enquete> validerEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
|
||||
List<Enquete> enquetes = new ArrayList<>();
|
||||
public List<EnquetePayLoadWeb> validerEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
|
||||
List<EnquetePayLoadWeb> enquetePayLoadWebs = new ArrayList<>();
|
||||
try {
|
||||
for (EnqueteTraitementPayLoad enqueteTraitementPayLoad : enqueteTraitementPayLoads) {
|
||||
enquetes.add(validerEnquete(enqueteTraitementPayLoad));
|
||||
enquetePayLoadWebs.add(validerEnquete(enqueteTraitementPayLoad));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
enquetes.add(null);
|
||||
enquetePayLoadWebs.add(null);
|
||||
}
|
||||
return enquetes;
|
||||
return enquetePayLoadWebs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Enquete> rejeterEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
|
||||
List<Enquete> enquetes = new ArrayList<>();
|
||||
public List<EnquetePayLoadWeb> rejeterEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
|
||||
List<EnquetePayLoadWeb> enquetePayLoadWebs = new ArrayList<>();
|
||||
try {
|
||||
for (EnqueteTraitementPayLoad enqueteTraitementPayLoad : enqueteTraitementPayLoads) {
|
||||
enquetes.add(rejeterEnquete(enqueteTraitementPayLoad));
|
||||
enquetePayLoadWebs.add(rejeterEnquete(enqueteTraitementPayLoad));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
enquetes.add(null);
|
||||
enquetePayLoadWebs.add(null);
|
||||
}
|
||||
return enquetes;
|
||||
return enquetePayLoadWebs;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -554,6 +584,16 @@ public class EnqueteServiceImpl implements EnqueteService {
|
||||
return nbreEnquete;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<EnquetePayLoadWeb> getEnqueteListByQuartierByStatutPageableToDto(Long userId, Long quartierId, StatutEnquete statutEnquete, Pageable pageable) {
|
||||
List<Secteur> secteurs= secteurService.getListSecteurUserId(userId);
|
||||
List<Long> secteurIds = secteurs.stream()
|
||||
.map(Secteur::getId)
|
||||
.toList();
|
||||
|
||||
return enqueteRepository.findAllEnqueteByQuartierByStatutToDtoPageable(quartierId,secteurIds,statutEnquete,pageable);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public int cloturerEnqueteParcelleBatimentUniteLogementByStructureIdAndExerciceId(Long structureId,Long exerciceId) {
|
||||
|
||||
@@ -2,10 +2,12 @@ package io.gmss.fiscad.implementations.infocad.metier;
|
||||
|
||||
import io.gmss.fiscad.entities.decoupage.Quartier;
|
||||
import io.gmss.fiscad.entities.decoupage.Secteur;
|
||||
import io.gmss.fiscad.entities.infocad.metier.Enquete;
|
||||
import io.gmss.fiscad.entities.infocad.metier.EnqueteFiltreResponse;
|
||||
import io.gmss.fiscad.entities.infocad.metier.Parcelle;
|
||||
import io.gmss.fiscad.entities.infocad.metier.Rue;
|
||||
import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
|
||||
import io.gmss.fiscad.entities.infocad.parametre.TypeDomaine;
|
||||
import io.gmss.fiscad.exceptions.BadRequestException;
|
||||
import io.gmss.fiscad.exceptions.NotFoundException;
|
||||
import io.gmss.fiscad.interfaces.decoupage.SecteurService;
|
||||
@@ -19,7 +21,9 @@ import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository
|
||||
import io.gmss.fiscad.persistence.repositories.infocad.metier.RueRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.infocad.parametre.NatureDomaineRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.infocad.parametre.SituationGeographiqueRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypeDomaineRepository;
|
||||
import io.gmss.fiscad.persistence.specification.ParcelleSpecification;
|
||||
import io.gmss.fiscad.service.EntityFromPayLoadService;
|
||||
import io.gmss.fiscad.service.GeometryService;
|
||||
import jakarta.persistence.Query;
|
||||
import jakarta.transaction.Transactional;
|
||||
@@ -39,6 +43,8 @@ public class ParcelleServiceImpl implements ParcelleService {
|
||||
private final RueRepository rueRepository;
|
||||
private final GeometryService geometryService;
|
||||
private final SecteurService secteurService;
|
||||
private final TypeDomaineRepository typeDomaineRepository;
|
||||
private final EntityFromPayLoadService entityFromPayLoadService;
|
||||
|
||||
// @Value("${infocad.geom.srid}")
|
||||
// private String defaultSrid32631;
|
||||
@@ -58,36 +64,29 @@ public class ParcelleServiceImpl implements ParcelleService {
|
||||
if (!optionalQuartier.isPresent()) {
|
||||
throw new BadRequestException("Impossible d'enregistrer une parcelle avec un quartier/village inexistant");
|
||||
}
|
||||
|
||||
Optional<TypeDomaine> optionalTypeDomaine = typeDomaineRepository.findById(parcellePayLoadWeb.getTypeDomaineId());
|
||||
if (!optionalTypeDomaine.isPresent()) {
|
||||
throw new BadRequestException("Veuillez préciser le type de domaine");
|
||||
}
|
||||
|
||||
Parcelle parcelle = new Parcelle();
|
||||
parcelle.setNatureDomaine(optionalNatureDomaine.orElse(null));
|
||||
parcelle.setQuartier(optionalQuartier.orElse(null));
|
||||
parcelle = getParcelleFromPayload(parcelle, parcellePayLoadWeb);
|
||||
parcelle = entityFromPayLoadService.getParcelleFromPayload(parcellePayLoadWeb);
|
||||
parcelle= parcelleRepository.save(parcelle);
|
||||
return parcelleRepository.findParcelleToDtoById(parcelle.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ParcellePayLoadWeb updateParcelle(Long id, ParcellePayLoadWeb parcellePayLoadWeb) throws NotFoundException {
|
||||
Optional<Parcelle> optionalParcelle = parcelleRepository.findById(parcellePayLoadWeb.getId());
|
||||
if (!optionalParcelle.isPresent()) {
|
||||
throw new NotFoundException("Impossible de trouver la parcelle que vous désirer modifier");
|
||||
}
|
||||
Optional<NatureDomaine> optionalNatureDomaine = natureDomaineRepository.findById(parcellePayLoadWeb.getNatureDomaineId());
|
||||
if (!optionalNatureDomaine.isPresent()) {
|
||||
throw new BadRequestException("Impossible d'enregistrer une parcelle avec une nature de domaine inexistante");
|
||||
}
|
||||
Optional<Quartier> optionalQuartier = quartierRepository.findById(parcellePayLoadWeb.getQuartierId());
|
||||
if (!optionalQuartier.isPresent()) {
|
||||
throw new BadRequestException("Impossible d'enregistrer une parcelle avec un quartier/village inexistant");
|
||||
}
|
||||
// Optional<SituationGeographique> optionalSituationGeographique = situationGeographiqueRepository.findById(parcellePayLoadWeb.getSituationGeographiqueId());
|
||||
// if (!optionalSituationGeographique.isPresent()) {
|
||||
// throw new BadRequestException("Impossible d'enregistrer une parcelle avec une situation géographique inexistant");
|
||||
// }
|
||||
Parcelle parcelle=optionalParcelle.get();
|
||||
parcelle.setNatureDomaine(optionalNatureDomaine.orElse(null));
|
||||
parcelle.setQuartier(optionalQuartier.orElse(null));
|
||||
parcelle = getParcelleFromPayload(optionalParcelle.get(), parcellePayLoadWeb);
|
||||
if(parcellePayLoadWeb.getId()!=null) {
|
||||
Optional<Parcelle> optionalParcelle = parcelleRepository.findById(parcellePayLoadWeb.getId());
|
||||
if (!optionalParcelle.isPresent()) {
|
||||
throw new NotFoundException("Impossible de trouver la parcelle que vous désirer modifier");
|
||||
}
|
||||
}
|
||||
|
||||
Parcelle parcelle = new Parcelle();
|
||||
parcelle = entityFromPayLoadService.getParcelleFromPayload(parcellePayLoadWeb);
|
||||
parcelle= parcelleRepository.save(parcelle);
|
||||
return parcelleRepository.findParcelleToDtoById(parcelle.getId()).orElse(null);
|
||||
}
|
||||
@@ -210,28 +209,6 @@ public class ParcelleServiceImpl implements ParcelleService {
|
||||
}
|
||||
|
||||
|
||||
|
||||
private Parcelle getParcelleFromPayload(Parcelle parcelle, ParcellePayLoadWeb parcellePayLoadWeb) {
|
||||
if(parcellePayLoadWeb.getRueId()!=null) {
|
||||
Optional<Rue> optionalRue = rueRepository.findById(parcellePayLoadWeb.getRueId());
|
||||
parcelle.setRue(optionalRue.orElse(null));
|
||||
}
|
||||
parcelle.setP(parcellePayLoadWeb.getP());
|
||||
parcelle.setI(parcellePayLoadWeb.getI());
|
||||
parcelle.setQ(parcellePayLoadWeb.getQ());
|
||||
parcelle.setNup(parcellePayLoadWeb.getNup());
|
||||
parcelle.setLatitude(parcellePayLoadWeb.getLatitude());
|
||||
parcelle.setLongitude(parcellePayLoadWeb.getLongitude());
|
||||
parcelle.setAltitude(parcellePayLoadWeb.getAltitude());
|
||||
parcelle.setSituationGeographique(parcellePayLoadWeb.getSituationGeographique());
|
||||
parcelle.setNupProvisoire(parcellePayLoadWeb.getNupProvisoire());
|
||||
parcelle.setAutreNumeroTitreFoncier(parcellePayLoadWeb.getNumTitreFoncier());
|
||||
parcelle.setObservation(parcellePayLoadWeb.getObservation());
|
||||
parcelle.setSuperficie(parcellePayLoadWeb.getSuperficie());
|
||||
|
||||
return parcelle;
|
||||
}
|
||||
|
||||
// private Parcelle getParcelle(Parcelle parcelle, ParcellePayLoadWeb parcellePayLoadWeb, Optional<SituationGeographique> optionalSituationGeographique, Optional<NatureDomaine> optionalNatureDomaine) {
|
||||
// StringBuilder coordonnees = new StringBuilder();
|
||||
// parcelle.setP(parcellePayLoadWeb.getP());
|
||||
|
||||
@@ -86,6 +86,11 @@ public class PersonneServiceImpl implements PersonneService {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<PersonnePayLoadWeb> getPersonneListNonAssigneePage(Pageable pageable) {
|
||||
return personneRepository.findAllPersonneNonAssigneCentreToDto(pageable);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PersonnePayLoadWeb> getPersonneList() {
|
||||
return null;
|
||||
@@ -253,12 +258,28 @@ public class PersonneServiceImpl implements PersonneService {
|
||||
|
||||
@Override
|
||||
public List<PersonnePayLoadWeb> recherchePersonne(RecherchePersonneResquestBody request) {
|
||||
|
||||
List<PersonnePayLoadWeb> result = new ArrayList<>(
|
||||
recherchePersonneLocal(request)
|
||||
);
|
||||
|
||||
try {
|
||||
|
||||
if(request.getIfu()!=null && !request.getIfu().equals("")){
|
||||
List<PersonnePayLoadWeb> personnePayLoadWebs =personneRepository.findAllPersonneByIfuToDto(request.getIfu());
|
||||
if(!personnePayLoadWebs.isEmpty())
|
||||
return personnePayLoadWebs;
|
||||
}
|
||||
|
||||
if(request.getNpi()!=null && !request.getNpi().equals("")){
|
||||
|
||||
List<PersonnePayLoadWeb> personnePayLoadWebs = personneRepository.findAllPersonneByNpiToDto(request.getNpi());
|
||||
if(!personnePayLoadWebs.isEmpty())
|
||||
return personnePayLoadWebs;
|
||||
}
|
||||
|
||||
List<PersonnePayLoadWeb> result=new ArrayList<>();
|
||||
|
||||
result = recherchePersonneLocal(request);
|
||||
|
||||
if (result != null && !result.isEmpty()) {
|
||||
return result;
|
||||
}
|
||||
// Conversion date en String format yyyy-MM-dd
|
||||
String dateNaissance = Optional.ofNullable(request.getDateNaissance())
|
||||
.map(d -> d.format(DateTimeFormatter.ISO_LOCAL_DATE))
|
||||
@@ -301,29 +322,48 @@ public class PersonneServiceImpl implements PersonneService {
|
||||
personne.setEtatIdentificationPersonne(EtatIdentificationPersonne.IFU);
|
||||
result.add(personne);
|
||||
}
|
||||
|
||||
return result;
|
||||
} catch (Exception e) {
|
||||
// logger.error("Erreur appel IFU EN LIGNE", e);
|
||||
return new ArrayList<>();
|
||||
}
|
||||
return result;
|
||||
|
||||
}
|
||||
|
||||
|
||||
private List<PersonnePayLoadWeb> recherchePersonneLocal(RecherchePersonneResquestBody recherchePersonneResquestBody) {
|
||||
// private List<PersonnePayLoadWeb> recherchePersonneLocal(RecherchePersonneResquestBody recherchePersonneResquestBody) {
|
||||
// System.out.println("NOUS SOMMES DANS RECHERCHE NOM ET PRENOM :"+recherchePersonneResquestBody.getNom()+" "+recherchePersonneResquestBody.getPrenom());
|
||||
// List<PersonnePayLoadWeb> personnePayLoadWebs=
|
||||
// personneRepository.findByFiltersInBaseIfuNpiCorrecte(
|
||||
// recherchePersonneResquestBody.getNom()==null?null: "%"+recherchePersonneResquestBody.getNom().trim().toUpperCase()+"%",
|
||||
// recherchePersonneResquestBody.getPrenom()==null?null: "%"+recherchePersonneResquestBody.getPrenom().trim().toUpperCase()+"%",
|
||||
// recherchePersonneResquestBody.getRaisonSociale()==null?null: "%"+recherchePersonneResquestBody.getRaisonSociale().trim().toUpperCase()+"%",
|
||||
// recherchePersonneResquestBody.getNomMere()==null?null: "%"+recherchePersonneResquestBody.getNomMere().trim().toUpperCase()+"%"
|
||||
// );
|
||||
// return personnePayLoadWebs ;
|
||||
// }
|
||||
|
||||
List<PersonnePayLoadWeb> personnePayLoadWebs=
|
||||
personneRepository.findByFiltersInBaseIfuNpiCorrecte(
|
||||
recherchePersonneResquestBody.getIfu()==null?null:recherchePersonneResquestBody.getIfu().trim().toLowerCase(),
|
||||
recherchePersonneResquestBody.getNpi()==null?null:recherchePersonneResquestBody.getNpi().trim().toLowerCase(),
|
||||
recherchePersonneResquestBody.getNom()==null?null:recherchePersonneResquestBody.getNom().trim().toLowerCase(),
|
||||
recherchePersonneResquestBody.getPrenom()==null?null:recherchePersonneResquestBody.getPrenom().trim().toLowerCase(),
|
||||
recherchePersonneResquestBody.getRaisonSociale()==null?null:recherchePersonneResquestBody.getRaisonSociale().trim().toLowerCase(),
|
||||
recherchePersonneResquestBody.getNomMere()==null?null:recherchePersonneResquestBody.getNomMere().trim().toLowerCase(),
|
||||
recherchePersonneResquestBody.getDateNaissance()
|
||||
);
|
||||
return personnePayLoadWebs ;
|
||||
private List<PersonnePayLoadWeb> recherchePersonneLocal(RecherchePersonneResquestBody request) {
|
||||
String nom = normalizeLikeParam(request.getNom());
|
||||
String prenom = normalizeLikeParam(request.getPrenom());
|
||||
String raisonSociale = normalizeLikeParam(request.getRaisonSociale());
|
||||
String nomMere = normalizeLikeParam(request.getNomMere());
|
||||
|
||||
return personneRepository.findByFiltersInBaseIfuNpiCorrecte(
|
||||
nom,
|
||||
prenom,
|
||||
raisonSociale,
|
||||
nomMere
|
||||
);
|
||||
}
|
||||
private String normalizeLikeParam(String value) {
|
||||
if (value == null) return null;
|
||||
|
||||
String cleaned = value.trim();
|
||||
|
||||
if (cleaned.isEmpty()) return null;
|
||||
|
||||
return "%" + cleaned.toUpperCase() + "%";
|
||||
}
|
||||
private List<PersonnePayLoadWeb> recherchePersonneSigibe(RecherchePersonneResquestBody recherchePersonneResquestBody) {
|
||||
// callAPIService.callGetIfuEnLigneToken();
|
||||
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
package io.gmss.fiscad.implementations.rfu.metier;
|
||||
|
||||
import io.gmss.fiscad.entities.infocad.metier.Parcelle;
|
||||
import io.gmss.fiscad.entities.rfu.metier.Batiment;
|
||||
import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment;
|
||||
import io.gmss.fiscad.exceptions.BadRequestException;
|
||||
import io.gmss.fiscad.exceptions.NotFoundException;
|
||||
import io.gmss.fiscad.interfaces.rfu.metier.BatimentService;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.BatimentPaylaodWeb;
|
||||
import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.rfu.metier.BatimentRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.rfu.parametre.CategorieBatimentRepository;
|
||||
import io.gmss.fiscad.service.EntityFromPayLoadService;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
@@ -19,6 +23,8 @@ import java.util.Optional;
|
||||
public class BatimentServiceImpl implements BatimentService {
|
||||
|
||||
private final BatimentRepository batimentRepository;
|
||||
private final ParcelleRepository parcelleRepository;
|
||||
private final CategorieBatimentRepository categorieBatimentRepository;
|
||||
private final EntityFromPayLoadService entityFromPayLoadService;
|
||||
|
||||
|
||||
@@ -27,8 +33,22 @@ public class BatimentServiceImpl implements BatimentService {
|
||||
if (batimentPaylaodWeb.getId() != null) {
|
||||
throw new BadRequestException("Impossible de créer un nouveau batiment ayant un id non null.");
|
||||
}
|
||||
if (batimentPaylaodWeb.getParcelleId() == null) {
|
||||
throw new BadRequestException("Impossible de créer un nouveau batiment: La parcelle doit être précisée.");
|
||||
}else {
|
||||
if(!parcelleRepository.existsById(batimentPaylaodWeb.getParcelleId()))
|
||||
throw new BadRequestException("Impossible de créer un nouveau batiment: La parcelle doit être précisée.");
|
||||
}
|
||||
|
||||
if (batimentPaylaodWeb.getCategorieBatimentId() == null) {
|
||||
throw new BadRequestException("Impossible de créer un nouveau batiment: La catégorie doit être précisée.");
|
||||
}else {
|
||||
if(!categorieBatimentRepository.existsById(batimentPaylaodWeb.getCategorieBatimentId()))
|
||||
throw new BadRequestException("Impossible de créer un nouveau batiment: La catégorie doit être précisée.");
|
||||
}
|
||||
Batiment batiment= entityFromPayLoadService.getBatimentFromPayLoadWeb(batimentPaylaodWeb);
|
||||
batiment= batimentRepository.save(batiment);
|
||||
System.out.println(batiment.getId());
|
||||
return batimentRepository.findBatimentAvecOccupantCourantToDto(batiment.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@@ -40,6 +60,19 @@ public class BatimentServiceImpl implements BatimentService {
|
||||
if (!batimentRepository.existsById(batimentPaylaodWeb.getId())) {
|
||||
throw new NotFoundException("Impossible de trouver le batiment spécifié dans notre base de données.");
|
||||
}
|
||||
if (batimentPaylaodWeb.getParcelleId() == null) {
|
||||
throw new BadRequestException("Impossible de créer un nouveau batiment: La parcelle doit être précisée.");
|
||||
}else {
|
||||
if(!parcelleRepository.existsById(batimentPaylaodWeb.getParcelleId()))
|
||||
throw new BadRequestException("Impossible de créer un nouveau batiment: La parcelle doit être précisée.");
|
||||
}
|
||||
|
||||
if (batimentPaylaodWeb.getCategorieBatimentId() == null) {
|
||||
throw new BadRequestException("Impossible de créer un nouveau batiment: La catégorie doit être précisée.");
|
||||
}else {
|
||||
if(!categorieBatimentRepository.existsById(batimentPaylaodWeb.getCategorieBatimentId()))
|
||||
throw new BadRequestException("Impossible de créer un nouveau batiment: La catégorie doit être précisée.");
|
||||
}
|
||||
Batiment batiment= entityFromPayLoadService.getBatimentFromPayLoadWeb(batimentPaylaodWeb);
|
||||
batiment= batimentRepository.save(batiment);
|
||||
return batimentRepository.findBatimentAvecOccupantCourantToDto(batiment.getId()).orElse(null);
|
||||
@@ -85,4 +118,14 @@ public class BatimentServiceImpl implements BatimentService {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<BatimentPaylaodWeb> getBatimentListByquartierPageable(Long quartierId, Pageable pageable) {
|
||||
return batimentRepository.findAllBatimentsAvecOccupantCourantByQuartierToDtoPageble(quartierId,pageable);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BatimentPaylaodWeb> getBatimentListByquartier(Long quartierId) {
|
||||
return batimentRepository.findAllBatimentsAvecOccupantCourantByQuartierToDto(quartierId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,187 @@
|
||||
package io.gmss.fiscad.implementations.rfu.metier;
|
||||
|
||||
import io.gmss.fiscad.entities.rfu.metier.CommuneCentreAssignation;
|
||||
import io.gmss.fiscad.entities.user.User;
|
||||
import io.gmss.fiscad.exceptions.BadRequestException;
|
||||
import io.gmss.fiscad.exceptions.NotFoundException;
|
||||
import io.gmss.fiscad.interfaces.rfu.metier.CommuneCentreAssignationService;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.CommuneCentreAssignationPaylaodWeb;
|
||||
import io.gmss.fiscad.persistence.repositories.decoupage.CommuneRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.infocad.parametre.StructureRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.rfu.metier.CommuneCentreAssignationRepository;
|
||||
import io.gmss.fiscad.service.EntityFromPayLoadService;
|
||||
import jakarta.ws.rs.NotAcceptableException;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
@AllArgsConstructor
|
||||
@Service
|
||||
public class CommuneCentreAssignationServiceImpl implements CommuneCentreAssignationService {
|
||||
|
||||
|
||||
private final EntityFromPayLoadService entityFromPayLoadService;
|
||||
private final CommuneRepository communeRepository;
|
||||
private final StructureRepository structureRepository ;
|
||||
private final PersonneRepository personneRepository ;
|
||||
private final ParcelleRepository parcelleRepository ;
|
||||
private final CommuneCentreAssignationRepository communeCentreAssignationRepository;
|
||||
|
||||
|
||||
@Override
|
||||
public CommuneCentreAssignationPaylaodWeb createCommuneCentreAssignation(User user, CommuneCentreAssignationPaylaodWeb communeCentreAssignationPaylaodWeb) throws BadRequestException {
|
||||
|
||||
if (user.getStructure() == null) {
|
||||
throw new BadRequestException("Impossible de créer l'assignation: Votre centre doit être précisé.");
|
||||
}
|
||||
|
||||
if (user.getStructure().getCommune() == null) {
|
||||
throw new BadRequestException("Impossible de créer un nouveau communeCentreAssignation: votre commune doit être précisée.");
|
||||
}
|
||||
|
||||
if (communeCentreAssignationPaylaodWeb.getPersonneId() == null) {
|
||||
throw new BadRequestException("Impossible de créer un nouveau communeCentreAssignation: Le contribuable doit être précisée.");
|
||||
}else {
|
||||
if(!personneRepository.existsById(communeCentreAssignationPaylaodWeb.getPersonneId()))
|
||||
throw new BadRequestException("Impossible de créer un nouveau communeCentreAssignation: Le contribuable doit être précisée.");
|
||||
}
|
||||
|
||||
if (communeCentreAssignationPaylaodWeb.getParcelleContactId() == null) {
|
||||
throw new BadRequestException("Impossible de créer une nouvelle assignation de centre : La parcelle de contact doit être précisée.");
|
||||
}else {
|
||||
if(!parcelleRepository.existsById(communeCentreAssignationPaylaodWeb.getParcelleContactId()))
|
||||
throw new BadRequestException("Impossible de créer une nouvelle assignation de centre: La parcelle précisée n'existe pas.");
|
||||
}
|
||||
|
||||
Optional<CommuneCentreAssignationPaylaodWeb> communeCentreAssignationPaylaodWebOptional=communeCentreAssignationRepository.findbyCommuneAndPersonne(user.getStructure().getCommune().getId(),communeCentreAssignationPaylaodWeb.getPersonneId());
|
||||
if(communeCentreAssignationPaylaodWeb.getId()==null && communeCentreAssignationPaylaodWebOptional.isPresent()){
|
||||
throw new NotAcceptableException("Impossible de créer une nouvelle assignation de centre: Le contribuable est déjà assigné au centre : "+communeCentreAssignationPaylaodWebOptional.get().getStructureNom());
|
||||
}
|
||||
|
||||
|
||||
CommuneCentreAssignation communeCentreAssignation= entityFromPayLoadService.getCommuneCentreAssignationFromPayLoadWeb(communeCentreAssignationPaylaodWeb);
|
||||
communeCentreAssignation.setStructure(user.getStructure());
|
||||
communeCentreAssignation.setCommune(user.getStructure().getCommune());
|
||||
communeCentreAssignation= communeCentreAssignationRepository.save(communeCentreAssignation);
|
||||
return communeCentreAssignationRepository.findUnique(communeCentreAssignation.getId()).orElse(null);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public CommuneCentreAssignationPaylaodWeb updateCommuneCentreAssignation(Long id,CommuneCentreAssignationPaylaodWeb communeCentreAssignationPaylaodWeb) throws NotFoundException {
|
||||
if (communeCentreAssignationPaylaodWeb.getId() == null) {
|
||||
throw new BadRequestException("Impossible de modifier un nouveau communeCentreAssignation ayant un id null.");
|
||||
}
|
||||
if (communeCentreAssignationPaylaodWeb.getCommuneId() == null) {
|
||||
throw new BadRequestException("Impossible de modifier un nouveau communeCentreAssignation: La commune doit être précisée.");
|
||||
}else {
|
||||
if(!communeRepository.existsById(communeCentreAssignationPaylaodWeb.getCommuneId()))
|
||||
throw new BadRequestException("Impossible de modifier un nouveau communeCentreAssignation: La commune doit être précisée.");
|
||||
}
|
||||
|
||||
if (communeCentreAssignationPaylaodWeb.getStructureId() == null) {
|
||||
throw new BadRequestException("Impossible de modifier un nouveau communeCentreAssignation: Le centre doit être précisée.");
|
||||
}else {
|
||||
if(!structureRepository.existsById(communeCentreAssignationPaylaodWeb.getStructureId()))
|
||||
throw new BadRequestException("Impossible de modifier un nouveau communeCentreAssignation: Le centre doit être précisée.");
|
||||
}
|
||||
|
||||
if (communeCentreAssignationPaylaodWeb.getPersonneId() == null) {
|
||||
throw new BadRequestException("Impossible de modifier un nouveau communeCentreAssignation: Le contribuable doit être précisée.");
|
||||
}else {
|
||||
if(!personneRepository.existsById(communeCentreAssignationPaylaodWeb.getPersonneId()))
|
||||
throw new BadRequestException("Impossible de modifier un nouveau communeCentreAssignation: Le contribuable doit être précisée.");
|
||||
}
|
||||
CommuneCentreAssignation communeCentreAssignation= entityFromPayLoadService.getCommuneCentreAssignationFromPayLoadWeb(communeCentreAssignationPaylaodWeb);
|
||||
communeCentreAssignation= communeCentreAssignationRepository.save(communeCentreAssignation);
|
||||
|
||||
return communeCentreAssignationRepository.findUnique(communeCentreAssignation.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CommuneCentreAssignationPaylaodWeb detacherCommuneCentreAssignation(User user, CommuneCentreAssignationPaylaodWeb communeCentreAssignationPaylaodWeb) throws NotFoundException {
|
||||
if (communeCentreAssignationPaylaodWeb.getId() != null) {
|
||||
throw new BadRequestException("Impossible de fait de detachement. L'assignation n'est pas précisée");
|
||||
}
|
||||
Optional<CommuneCentreAssignation> communeCentreAssignationOptional= communeCentreAssignationRepository.findById(communeCentreAssignationPaylaodWeb.getId());
|
||||
if (communeCentreAssignationOptional.isEmpty()) {
|
||||
throw new BadRequestException("Impossible de fait de detachement. L'assignation n'est pas précisée");
|
||||
}
|
||||
|
||||
if(communeCentreAssignationOptional.get().getStructure() != user.getStructure()){
|
||||
throw new BadRequestException("Impossible de fait de detachement. Le contribuable n'est pas rattaché à votre centre. Veuillez contracter : "+user.getStructure().getNom());
|
||||
}
|
||||
communeCentreAssignationOptional.get().setStructure(null);
|
||||
|
||||
CommuneCentreAssignation communeCentreAssignation = communeCentreAssignationRepository.save(communeCentreAssignationOptional.get());
|
||||
|
||||
return communeCentreAssignationRepository.findUnique(communeCentreAssignation.getId()).orElse(null);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteCommuneCentreAssignation(Long id) throws NotFoundException {
|
||||
Optional<CommuneCentreAssignation> communeCentreAssignationOptional = communeCentreAssignationRepository.findById(id);
|
||||
if (communeCentreAssignationOptional.isPresent()) {
|
||||
communeCentreAssignationRepository.deleteById(communeCentreAssignationOptional.get().getId());
|
||||
} else {
|
||||
throw new NotFoundException("Impossible de trouver le communeCentreAssignation spécifié dans notre base de données.");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<CommuneCentreAssignationPaylaodWeb> getCommuneCentreAssignationList(Pageable pageable) {
|
||||
return communeCentreAssignationRepository.findAllPayload(pageable);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<CommuneCentreAssignationPaylaodWeb> getCommuneCentreAssignationListByCommunePageable(Long communeId, Pageable pageable) {
|
||||
return communeCentreAssignationRepository.findByCommuneId(communeId,pageable);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<CommuneCentreAssignationPaylaodWeb> getCommuneCentreAssignationById(Long id) {
|
||||
if (communeCentreAssignationRepository.existsById(id)) {
|
||||
return communeCentreAssignationRepository.findUnique(id);
|
||||
} else {
|
||||
throw new NotFoundException("Impossible de trouver le centre d'assignation spécifiée dans la base de données.");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<CommuneCentreAssignationPaylaodWeb> getCommuneCentreAssignationByPersonneIdCommune(User user,Long personneId) {
|
||||
|
||||
if (user.getStructure() == null) {
|
||||
throw new BadRequestException("Impossible de récuperer l'assignation: Votre centre doit être précisé.");
|
||||
}
|
||||
|
||||
if (user.getStructure().getCommune() == null) {
|
||||
throw new BadRequestException("Impossible de récuperer une assignation: votre commune doit être précisée.");
|
||||
}
|
||||
|
||||
if (personneId == null) {
|
||||
throw new BadRequestException("Impossible de récuperer l'assignation: Le contribuable doit être précisée.");
|
||||
}else {
|
||||
if(!personneRepository.existsById(personneId))
|
||||
throw new BadRequestException("Impossible de récuperer l'assignation: Le contribuable précisée n'existe pas.");
|
||||
}
|
||||
|
||||
Optional<CommuneCentreAssignationPaylaodWeb> communeCentreAssignationPaylaodWebOptional=communeCentreAssignationRepository.findbyCommuneAndPersonne(user.getStructure().getCommune().getId(),personneId);
|
||||
|
||||
return communeCentreAssignationPaylaodWebOptional;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<CommuneCentreAssignationPaylaodWeb> getCommuneCentreAssignationListByCentrePageable(Long centreId, Pageable pageable) {
|
||||
return communeCentreAssignationRepository.findByStructureId(centreId,pageable);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -38,6 +38,11 @@ public class DeclarationNcServiceImpl implements DeclarationNcService {
|
||||
if (!structureRepository.existsById(declarationNcPayloadWeb.getStructureId())) {
|
||||
throw new BadRequestException("Veuillez préciser le centre.");
|
||||
}
|
||||
List<DeclarationNcPayloadWeb> declarationNcPayloadWebs= declarationNcRepository.findAllDeclarationNcByNcNotPersonneToDto(declarationNcPayloadWeb.getNc(),declarationNcPayloadWeb.getPersonneId());
|
||||
|
||||
if (!declarationNcPayloadWebs.isEmpty()) {
|
||||
throw new BadRequestException("Ce numéro Contribuable est déjà rattaché à un autre IFU");
|
||||
}
|
||||
|
||||
DeclarationNc declarationNc= entityFromPayLoadService.getDeclarationNcFromPayLoadWeb(declarationNcPayloadWeb);
|
||||
declarationNc =declarationNcRepository.save(declarationNc);
|
||||
|
||||
@@ -109,14 +109,69 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
|
||||
return impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleNonBatieUneParcelle(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId,Long parcelleId) {
|
||||
Integer nb= donneesImpositionTfuRepository.genererDonneesTfuNonBatie(impositionsTfuPaylaodWeb.getId(),userId,parcelleId);
|
||||
|
||||
ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
|
||||
impositionsTfu.setStatusAvis(StatusAvis.TFU_FNB_GENERE);
|
||||
|
||||
impositionsTfu.setNombreAvisFnb(nb);
|
||||
|
||||
impositionsTfuRepository.save(impositionsTfu);
|
||||
|
||||
return impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId) {
|
||||
|
||||
Integer nbb= donneesImpositionTfuRepository.genererDonneesTfuBatie(impositionsTfuPaylaodWeb.getId(),userId);
|
||||
|
||||
Integer nbirfbtPlusieursBati = donneesImpositionTfuRepository.majDonneesTfuBatiePlusieursBatiment(impositionsTfuPaylaodWeb.getId());
|
||||
|
||||
Integer nbulo= donneesImpositionTfuRepository.genererDonneesTfuBatieUniteLogement(impositionsTfuPaylaodWeb.getId(),userId);
|
||||
|
||||
Integer nbirfbt= donneesImpositionTfuRepository.genererDonneesIrfBatie(impositionsTfuPaylaodWeb.getId(),userId);
|
||||
|
||||
Integer nbirfulo= donneesImpositionTfuRepository.genererDonneesIrfBatieUniteLogement(impositionsTfuPaylaodWeb.getId(),userId);
|
||||
|
||||
Integer nbsrtbbt= donneesImpositionTfuRepository.genererDonneesSrtbBatie(impositionsTfuPaylaodWeb.getId(),userId);
|
||||
|
||||
|
||||
ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
|
||||
impositionsTfu.setStatusAvis(StatusAvis.GENERE);
|
||||
|
||||
impositionsTfu.setNombreAvis(nbb+nbulo+ (impositionsTfu.getNombreAvisFnb()==null?0:impositionsTfu.getNombreAvisFnb()));
|
||||
impositionsTfu.setNombreAvisBatiment(nbb);
|
||||
impositionsTfu.setNombreAvisUniteLog(nbulo);
|
||||
|
||||
impositionsTfuRepository.save(impositionsTfu);
|
||||
|
||||
return impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleBatieUneParcelle(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId, Long parcelleId) {
|
||||
|
||||
Integer nbb= donneesImpositionTfuRepository.genererDonneesTfuBatie(impositionsTfuPaylaodWeb.getId(),userId,parcelleId);
|
||||
|
||||
Integer nbirfbtPlusieursBati = donneesImpositionTfuRepository.majDonneesTfuBatiePlusieursBatiment(impositionsTfuPaylaodWeb.getId(),parcelleId);
|
||||
|
||||
Integer nbulo= donneesImpositionTfuRepository.genererDonneesTfuBatieUniteLogement(impositionsTfuPaylaodWeb.getId(),userId,parcelleId);
|
||||
|
||||
Integer nbirfbt= donneesImpositionTfuRepository.genererDonneesIrfBatie(impositionsTfuPaylaodWeb.getId(),userId,parcelleId);
|
||||
|
||||
Integer nbirfulo= donneesImpositionTfuRepository.genererDonneesIrfBatieUniteLogement(impositionsTfuPaylaodWeb.getId(),userId,parcelleId);
|
||||
|
||||
Integer nbsrtbbt= donneesImpositionTfuRepository.genererDonneesSrtbBatie(impositionsTfuPaylaodWeb.getId(),userId,parcelleId);
|
||||
|
||||
Integer nbMajAcompteRirf= donneesImpositionTfuRepository.majDonneesAcompteRirf(impositionsTfuPaylaodWeb.getId());
|
||||
|
||||
|
||||
ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
|
||||
impositionsTfu.setStatusAvis(StatusAvis.GENERE);
|
||||
@@ -164,4 +219,39 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
|
||||
public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdBatieUniteLogPageable(Long impositionsTfuId, Pageable pageable) {
|
||||
return donneesImpositionTfuRepository.findAllByImpositionTfuIdBatieUniteLogPageable(impositionsTfuId,pageable);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionIrfIdBatieBatimentPageable(Long impositionsTfuId, Pageable pageable) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionIrfIdBatieUniteLogPageable(Long impositionsTfuId, Pageable pageable) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionSrtbIdBatieBatimentPageable(Long impositionsTfuId, Pageable pageable) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionSrtbIdBatieUniteLogPageable(Long impositionsTfuId, Pageable pageable) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByExerciceAndStructureIdPageable(Long exerciceId, Long structureId, Pageable pageable) {
|
||||
return donneesImpositionTfuRepository.findAllByExericeIdStructureIdPageable(exerciceId,structureId,pageable);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DonneesImpositionPaylaodWeb> getDonneesFiscalesByExerciceAndStructureId(Long exerciceId, Long structureId,Long quartierId) {
|
||||
return donneesImpositionTfuRepository.findAllByExericeIdStructureId(exerciceId,structureId,quartierId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DonneesImpositionPaylaodWeb> getDonneesFiscalesByPersonneId(Long personneId) {
|
||||
return donneesImpositionTfuRepository.findAllByPersonneId(personneId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,59 +1,103 @@
|
||||
package io.gmss.fiscad.implementations.rfu.metier;
|
||||
|
||||
import io.gmss.fiscad.entities.decoupage.Secteur;
|
||||
import io.gmss.fiscad.entities.infocad.metier.Enquete;
|
||||
import io.gmss.fiscad.entities.infocad.metier.Upload;
|
||||
import io.gmss.fiscad.entities.infocad.parametre.Personne;
|
||||
import io.gmss.fiscad.entities.rfu.metier.Batiment;
|
||||
import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment;
|
||||
import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
|
||||
import io.gmss.fiscad.enums.StatutEnquete;
|
||||
import io.gmss.fiscad.exceptions.BadRequestException;
|
||||
import io.gmss.fiscad.exceptions.NotFoundException;
|
||||
import io.gmss.fiscad.interfaces.decoupage.SecteurService;
|
||||
import io.gmss.fiscad.interfaces.rfu.metier.BatimentService;
|
||||
import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueBatimentService;
|
||||
import io.gmss.fiscad.interfaces.rfu.metier.EnqueteBatimentService;
|
||||
import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.BatimentPaylaodWeb;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb;
|
||||
import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb;
|
||||
import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.infocad.metier.UploadRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.rfu.metier.BatimentRepository;
|
||||
import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteBatimentRepository;
|
||||
import io.gmss.fiscad.service.EntityFromPayLoadService;
|
||||
import jakarta.transaction.Transactional;
|
||||
import jakarta.ws.rs.NotAcceptableException;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
@AllArgsConstructor
|
||||
@Service
|
||||
public class EnqueteBatimentServiceImpl implements EnqueteBatimentService {
|
||||
|
||||
private final EnqueteBatimentRepository enqueteBatimentRepository;
|
||||
private final BatimentService batimentService;
|
||||
private final EnqueteRepository enqueteRepository;
|
||||
private final PersonneRepository personneRepository;
|
||||
private final EntityFromPayLoadService entityFromPayLoadService;
|
||||
private final CaracteristiqueBatimentService caracteristiqueBatimentService;
|
||||
private final UploadRepository uploadRepository;
|
||||
private final BatimentRepository batimentRepository;
|
||||
private final BatimentService batimentService;
|
||||
private final SecteurService secteurService;
|
||||
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public EnqueteBatimentPayloadWeb createEnqueteBatiment(EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) throws BadRequestException {
|
||||
EnqueteBatiment enqueteBatiment=new EnqueteBatiment();
|
||||
if (!batimentRepository.existsById(enqueteBatimentPayloadWeb.getBatimentId())) {
|
||||
throw new NotFoundException("Impossible d'enregistrer sans le batiment.");
|
||||
|
||||
if(enqueteBatimentPayloadWeb.getBatimentId()!=null) {
|
||||
if (!batimentRepository.existsById(enqueteBatimentPayloadWeb.getBatimentId())) {
|
||||
throw new NotFoundException("Impossible d'enregistrer sans le batiment.");
|
||||
}
|
||||
}
|
||||
BatimentPaylaodWeb batimentPaylaodWeb= getBatimentPayloadFromEnqueteBat(enqueteBatimentPayloadWeb);
|
||||
|
||||
if(batimentPaylaodWeb.getId()==null){
|
||||
batimentPaylaodWeb=batimentService.createBatiment(batimentPaylaodWeb);
|
||||
}else{
|
||||
batimentPaylaodWeb=batimentService.updateBatiment(batimentPaylaodWeb.getId(),batimentPaylaodWeb);
|
||||
}
|
||||
|
||||
enqueteBatimentPayloadWeb.setBatimentId(batimentPaylaodWeb.getId());
|
||||
|
||||
enqueteBatiment = entityFromPayLoadService.getEnqueteBatimentFromPayLoadWeb(enqueteBatimentPayloadWeb);
|
||||
enqueteBatiment= enqueteBatimentRepository.save(enqueteBatiment);
|
||||
enqueteBatimentPayloadWeb= enqueteBatimentRepository.findEnqueteBatimentByIdToDto(enqueteBatiment.getId()).orElse(null);
|
||||
return enqueteBatimentPayloadWeb ;
|
||||
}
|
||||
|
||||
private BatimentPaylaodWeb getBatimentPayloadFromEnqueteBat(EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) {
|
||||
BatimentPaylaodWeb batimentPaylaodWeb= new BatimentPaylaodWeb();
|
||||
batimentPaylaodWeb.setId(enqueteBatimentPayloadWeb.getBatimentId());
|
||||
batimentPaylaodWeb.setNub(enqueteBatimentPayloadWeb.getNub());
|
||||
batimentPaylaodWeb.setCode(enqueteBatimentPayloadWeb.getCode());
|
||||
batimentPaylaodWeb.setDateConstruction(enqueteBatimentPayloadWeb.getDateConstruction());
|
||||
batimentPaylaodWeb.setParcelleId(enqueteBatimentPayloadWeb.getParcelleId());
|
||||
batimentPaylaodWeb.setPersonneId(enqueteBatimentPayloadWeb.getPersonneId());
|
||||
batimentPaylaodWeb.setSuperficieAuSol(enqueteBatimentPayloadWeb.getSuperficieAuSol());
|
||||
batimentPaylaodWeb.setSuperficieLouee(enqueteBatimentPayloadWeb.getSuperficieLouee());
|
||||
batimentPaylaodWeb.setCategorieBatimentId(enqueteBatimentPayloadWeb.getCategorieBatimentId());
|
||||
batimentPaylaodWeb.setNombrePiscine(enqueteBatimentPayloadWeb.getNombrePiscine());
|
||||
batimentPaylaodWeb.setMontantLocatifAnnuelDeclare(enqueteBatimentPayloadWeb.getMontantLocatifAnnuelDeclare());
|
||||
batimentPaylaodWeb.setMontantLocatifAnnuelEstime(enqueteBatimentPayloadWeb.getMontantLocatifAnnuelEstime());
|
||||
batimentPaylaodWeb.setValeurBatimentEstime(enqueteBatimentPayloadWeb.getValeurBatimentEstime());
|
||||
batimentPaylaodWeb.setValeurBatimentReel(enqueteBatimentPayloadWeb.getValeurBatimentReel());
|
||||
batimentPaylaodWeb.setMontantMensuelLocation(enqueteBatimentPayloadWeb.getMontantMensuelLocation());
|
||||
batimentPaylaodWeb.setUsageId(enqueteBatimentPayloadWeb.getUsageId());
|
||||
batimentPaylaodWeb.setNbreUniteLogement(enqueteBatimentPayloadWeb.getNbreUniteLogement());
|
||||
return batimentPaylaodWeb;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public EnqueteBatimentPayloadWeb updateEnqueteBatiment(Long id, EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) throws NotFoundException {
|
||||
if (enqueteBatimentPayloadWeb.getId() == null) {
|
||||
throw new BadRequestException("Impossible de mettre à jour une nouvelle enquete de batiment ayant un id null.");
|
||||
@@ -64,6 +108,18 @@ public class EnqueteBatimentServiceImpl implements EnqueteBatimentService {
|
||||
if (!batimentRepository.existsById(enqueteBatimentPayloadWeb.getBatimentId())) {
|
||||
throw new NotFoundException("Impossible d'enregistrer sans le batiment.");
|
||||
}
|
||||
|
||||
BatimentPaylaodWeb batimentPaylaodWeb= getBatimentPayloadFromEnqueteBat(enqueteBatimentPayloadWeb);
|
||||
|
||||
if(batimentPaylaodWeb.getId()==null){
|
||||
batimentPaylaodWeb=batimentService.createBatiment(batimentPaylaodWeb);
|
||||
}else{
|
||||
batimentPaylaodWeb=batimentService.updateBatiment(batimentPaylaodWeb.getId(),batimentPaylaodWeb);
|
||||
}
|
||||
|
||||
enqueteBatimentPayloadWeb.setBatimentId(batimentPaylaodWeb.getId());
|
||||
|
||||
|
||||
EnqueteBatiment enqueteBatiment = entityFromPayLoadService.getEnqueteBatimentFromPayLoadWeb(enqueteBatimentPayloadWeb);
|
||||
enqueteBatiment= enqueteBatimentRepository.save(enqueteBatiment);
|
||||
enqueteBatimentPayloadWeb= enqueteBatimentRepository.findEnqueteBatimentByIdToDto(enqueteBatiment.getId()).orElse(null);
|
||||
@@ -110,4 +166,84 @@ public class EnqueteBatimentServiceImpl implements EnqueteBatimentService {
|
||||
public List<EnqueteBatimentPayloadWeb> getEnqueteBatimentByBatimentList(Long batimentId) {
|
||||
return enqueteBatimentRepository.findAllByBatimentToDto(batimentId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<EnqueteBatimentPayloadWeb> getEnqueteBatimentListByQuartierByStatutPageableToDto(Long userId, Long quartierId, StatutEnquete statutEnquete, Pageable pageable) {
|
||||
List<Secteur> secteurs= secteurService.getListSecteurUserId(userId);
|
||||
List<Long> secteurIds = secteurs.stream()
|
||||
.map(Secteur::getId)
|
||||
.toList();
|
||||
|
||||
return enqueteBatimentRepository.findAllEnqueteBatimentByQuartierByStatutToDtoPageable(quartierId,secteurIds,statutEnquete,pageable);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public EnqueteBatimentPayloadWeb validerEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
|
||||
if (enqueteTraitementPayLoad == null || enqueteTraitementPayLoad.getIdBackend()==null) {
|
||||
throw new BadRequestException("Impossible de valider une enquête ayant un id null.");
|
||||
}
|
||||
Optional<EnqueteBatiment> optionalEnqueteBatiment = enqueteBatimentRepository.findById(enqueteTraitementPayLoad.getIdBackend());
|
||||
if (!optionalEnqueteBatiment.isPresent()) {
|
||||
throw new NotFoundException("Impossible de trouver l'enquête que vous désirez valider.");
|
||||
}
|
||||
if(optionalEnqueteBatiment.get().getStatutEnquete()==StatutEnquete.CLOTURE ||
|
||||
optionalEnqueteBatiment.get().getStatutEnquete()==StatutEnquete.REJETE ){
|
||||
throw new NotAcceptableException("Impossible de valider : Le statut actuel "+optionalEnqueteBatiment.get().getStatutEnquete()+" ne le permet pas.");
|
||||
}
|
||||
|
||||
EnqueteBatiment enqueteBatiment = optionalEnqueteBatiment.get();
|
||||
enqueteBatiment.setDateValidation(LocalDate.now());
|
||||
enqueteBatiment.setStatutEnquete(StatutEnquete.VALIDE);
|
||||
|
||||
enqueteBatiment= enqueteBatimentRepository.save(enqueteBatiment);
|
||||
return enqueteBatimentRepository.findEnqueteBatimentByIdToDto(enqueteBatiment.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnqueteBatimentPayloadWeb rejeterEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
|
||||
if (enqueteTraitementPayLoad == null || enqueteTraitementPayLoad.getIdBackend()==null) {
|
||||
throw new BadRequestException("Impossible de rejeter une enquête ayant un id null.");
|
||||
}
|
||||
Optional<EnqueteBatiment> optionalEnqueteBatiment = enqueteBatimentRepository.findById(enqueteTraitementPayLoad.getIdBackend());
|
||||
if (!optionalEnqueteBatiment.isPresent()) {
|
||||
throw new NotFoundException("Impossible de trouver l'enquête que vous désirez rejeter.");
|
||||
}
|
||||
if(optionalEnqueteBatiment.get().getStatutEnquete()==StatutEnquete.CLOTURE ||
|
||||
optionalEnqueteBatiment.get().getStatutEnquete()==StatutEnquete.VALIDE ){
|
||||
throw new NotAcceptableException("Impossible de rejeter : Le statut actuel "+optionalEnqueteBatiment.get().getStatutEnquete()+" ne le permet pas.");
|
||||
}
|
||||
EnqueteBatiment enqueteBatiment = optionalEnqueteBatiment.get();
|
||||
enqueteBatiment.setDateRejet(LocalDate.now());
|
||||
enqueteBatiment.setDescriptionMotifRejet(enqueteTraitementPayLoad.getMotifRejet());
|
||||
enqueteBatiment.setStatutEnquete(StatutEnquete.REJETE);
|
||||
enqueteBatiment= enqueteBatimentRepository.save(enqueteBatiment);
|
||||
return enqueteBatimentRepository.findEnqueteBatimentByIdToDto(enqueteBatiment.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<EnqueteBatimentPayloadWeb> validerEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
|
||||
List<EnqueteBatimentPayloadWeb> enqueteBatimentPayloadWebs = new ArrayList<>();
|
||||
try {
|
||||
for (EnqueteTraitementPayLoad enqueteTraitementPayLoad : enqueteTraitementPayLoads) {
|
||||
enqueteBatimentPayloadWebs.add(validerEnquete(enqueteTraitementPayLoad));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
enqueteBatimentPayloadWebs.add(null);
|
||||
}
|
||||
return enqueteBatimentPayloadWebs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<EnqueteBatimentPayloadWeb> rejeterEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
|
||||
List<EnqueteBatimentPayloadWeb> enqueteBatimentPayloadWebs = new ArrayList<>();
|
||||
try {
|
||||
for (EnqueteTraitementPayLoad enqueteTraitementPayLoad : enqueteTraitementPayLoads) {
|
||||
enqueteBatimentPayloadWebs.add(rejeterEnquete(enqueteTraitementPayLoad));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
enqueteBatimentPayloadWebs.add(null);
|
||||
}
|
||||
return enqueteBatimentPayloadWebs;
|
||||
}
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user