From 9947716ef3bc2a1c87666e90cbceb3c7657fff48 Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Tue, 13 Jan 2026 10:31:42 +0100 Subject: [PATCH 1/2] ajout des end-point de maj web --- db-init/01-enable-postgis.sql | 3 +- .../fiscad/configuration/OpenApiConfig.java | 2 +- .../decoupage/SecteurController.java | 2 +- .../infocad/metier/CommentaireController.java | 6 +- .../infocad/metier/EnqueteController.java | 65 +++- .../infocad/metier/PersonneController.java | 63 +++- .../rfu/metier/BatimentController.java | 9 +- .../rfu/metier/EnqueteBatimentController.java | 9 +- .../EnqueteUniteLogementController.java | 9 +- .../rfu/parametre/EquipeController.java | 2 +- .../SynchronisationController.java | 15 +- .../io/gmss/fiscad/entities/BaseEntity.java | 2 +- .../infocad/metier/ActeurConcerne.java | 6 +- .../entities/infocad/metier/Enquete.java | 18 +- .../entities/infocad/metier/Parcelle.java | 10 +- .../fiscad/entities/infocad/metier/Piece.java | 22 +- .../fiscad/entities/infocad/metier/Rue.java | 30 ++ .../entities/infocad/parametre/Bloc.java | 1 - .../entities/infocad/parametre/Personne.java | 10 +- .../entities/infocad/parametre/TypeRue.java | 37 ++ .../metadata/MobileDataActeurConcerne.java | 2 +- .../entities/metadata/MobileDataBatiment.java | 2 +- .../MobileDataCaracteristiqueBatiment.java | 4 +- .../MobileDataCaracteristiqueParcelle.java | 4 +- ...obileDataCaracteristiqueUniteLogement.java | 4 +- .../metadata/MobileDataDeclarationNc.java | 2 +- .../entities/metadata/MobileDataEnquete.java | 2 +- .../metadata/MobileDataEnqueteActivite.java | 4 +- .../metadata/MobileDataEnqueteBatiment.java | 2 +- .../MobileDataEnqueteUniteLogement.java | 2 +- .../metadata/MobileDataMembreGroupe.java | 2 +- .../entities/metadata/MobileDataParcelle.java | 2 +- .../metadata/MobileDataParcelleTest.java | 2 +- .../entities/metadata/MobileDataPersonne.java | 2 +- .../entities/metadata/MobileDataPiece.java | 2 +- .../metadata/MobileDataUniteLogement.java | 4 +- .../entities/metadata/MobileDataUpload.java | 2 +- .../fiscad/entities/rfu/metier/Batiment.java | 1 - .../rfu/metier/CaracteristiqueBatiment.java | 1 + .../metier/CaracteristiqueUniteLogement.java | 1 + .../entities/rfu/metier/EnqueteActivite.java | 1 + .../entities/rfu/metier/EnqueteBatiment.java | 11 +- .../rfu/metier/EnqueteUniteLogement.java | 6 +- .../entities/rfu/metier/UniteLogement.java | 7 + ...{StatusEnquete.java => StatutEnquete.java} | 3 +- .../fiscad/enums/StatutEnregistrement.java | 7 +- .../exceptions/ApplicationException.java | 11 + .../decoupage/SecteurServiceImpl.java | 4 +- .../infocad/metier/EnqueteServiceImpl.java | 269 +++++++++++---- .../metier/ParcelleGeomServiceImpl.java | 2 +- .../infocad/metier/ParcelleServiceImpl.java | 177 +++++----- .../infocad/metier/PersonneServiceImpl.java | 55 ++- .../infocad/metier/PieceServiceImpl.java | 3 +- .../infocad/metier/RueServiceImpl.java | 43 +++ .../infocad/parametre/TypeRueServiceImpl.java | 72 ++++ .../rfu/metier/BatimentServiceImpl.java | 23 +- .../metier/EnqueteActiviteServiceImpl.java | 38 +- .../metier/EnqueteBatimentServiceImpl.java | 141 +++++++- .../EnqueteUniteLogementServiceImpl.java | 136 +++++++- .../rfu/parametre/EquipeServiceImpl.java | 4 +- .../RestaurationServiceImpl.java | 67 ++-- .../SynchronisationServiceImpl.java | 106 +++--- .../interfaces/decoupage/SecteurService.java | 2 +- .../infocad/metier/EnqueteService.java | 6 +- .../infocad/metier/ParcelleService.java | 6 +- .../infocad/metier/PersonneService.java | 5 +- .../interfaces/infocad/metier/RueService.java | 25 ++ .../infocad/parametre/TypeRueService.java | 25 ++ .../rfu/metier/BatimentService.java | 5 +- .../CaracteristiqueParcelleService.java | 4 +- .../rfu/metier/EnqueteActiviteService.java | 5 +- .../rfu/metier/EnqueteBatimentService.java | 5 +- .../metier/EnqueteUniteLogementService.java | 5 +- .../rfu/metier/UniteLogementService.java | 2 +- .../rfu/parametre/EquipeService.java | 2 +- .../synchronisation/RestaurationService.java | 25 +- .../SynchronisationService.java | 11 +- .../java/io/gmss/fiscad/paylaods/Critere.java | 4 +- .../gmss/fiscad/paylaods/StatusResponse.java | 4 +- .../paylaods/dto/PersonneCompletDTO.java | 8 +- .../paylaods/dto/PersonneSimpleDTO.java | 1 + .../request/EnqueteAllDataPayload.java | 1 + .../paylaods/request/PersonnePayLoad.java | 79 ----- .../request/crudweb/BatimentPaylaodWeb.java | 15 + .../CaracteristiqueBatimentPayloadWeb.java | 12 + .../CaracteristiqueParcellePayloadWeb.java | 12 + ...aracteristiqueUniteLogementPayloadWeb.java | 12 + .../crudweb/DeclarationNcPayloadWeb.java | 18 + .../crudweb/EnqueteActivitePayLoadWeb.java | 28 ++ .../crudweb/EnqueteBatimentPayloadWeb.java | 40 +++ .../request/crudweb/EnquetePayLoadWeb.java | 48 +++ .../EnqueteUniteLogementPayloadWeb.java | 41 +++ .../request/crudweb/ParcellePayLoadWeb.java | 26 ++ .../request/crudweb/PersonnePayLoadWeb.java | 48 +++ .../request/crudweb/PiecePayLoadWeb.java | 23 ++ .../crudweb/UniteLogementPaylaodWeb.java | 16 + .../request/crudweb/UploadPayLoadWeb.java | 24 ++ .../ActeurConcernePayLoad.java | 2 +- .../BatimentPaylaod.java | 2 +- .../CaracteristiqueBatimentPayload.java} | 6 +- .../CaracteristiqueParcellePayload.java} | 4 +- .../CaracteristiqueUniteLogementPayload.java} | 4 +- .../CommentaireRequest.java | 2 +- .../DeclarationNcPayload.java | 2 +- .../EnqueteActivitePayload.java | 2 +- .../EnqueteBatimentPayload.java | 4 +- .../{ => synchronisation}/EnquetePayLoad.java | 10 +- .../EnqueteUniteLogementPayload.java | 2 +- .../{ => synchronisation}/EquipePayload.java | 2 +- .../MembreGroupePayLoad.java | 2 +- .../ParcellePayLoad.java | 3 +- .../ParticiperPayload.java | 2 +- .../synchronisation/PersonnePayLoad.java | 57 +++ .../{ => synchronisation}/PiecePayLoad.java | 2 +- .../SecteurDecoupagePayload.java | 2 +- .../{ => synchronisation}/SecteurPayload.java | 2 +- .../UniteLogementPaylaod.java | 2 +- .../{ => synchronisation}/UploadPayLoad.java | 2 +- .../response/EnqueteNonSyncResponse.java | 4 +- .../FicheResponse/FicheEnquetesResponse.java | 4 +- ....java => ActeurConcernePayLoadRestor.java} | 2 +- ...ayload.java => BatimentPayloadRestor.java} | 2 +- ...racateristiqueBatimentPayLoadsRestor.java} | 2 +- ...racateristiqueParcellePayLoadsRestor.java} | 2 +- .../CaracteristiqueUniteLogementPayLoad.java | 4 - ...cteristiqueUniteLogementPayLoadRestor.java | 4 + ...java => EnqueteBatimentPayLoadRestor.java} | 2 +- .../response/restoration/EnquetePayLoad.java | 4 +- ...=> EnqueteUniteLogementPayLoadRestor.java} | 2 +- ...ad.java => MembreGroupePayLoadRestor.java} | 2 +- ...ayLoad.java => ParcellePayLoadRestor.java} | 2 +- ...cePayLoad.java => PiecePayLoadRestor.java} | 2 +- ...d.java => UniteLogementPayLoadRestor.java} | 2 +- ...dPayLoad.java => UploadPayLoadRestor.java} | 2 +- .../metier/ActeurConcerneRepository.java | 5 +- .../metier/MembreGroupeRepository.java | 5 +- .../infocad/metier/ParcelleRepository.java | 4 +- .../infocad/metier/PieceRepository.java | 5 +- .../infocad/metier/RueRepository.java | 15 + .../infocad/metier/UploadRepository.java | 5 +- .../infocad/parametre/TypeRueRepository.java | 8 + ...DataCaracteristiqueBatimentRepository.java | 2 +- ...DataCaracteristiqueParcelleRepository.java | 2 +- ...aracteristiqueUniteLogementRepository.java | 2 +- .../rfu/metier/BatimentRepository.java | 5 +- .../CaracteristiqueBatimentRepository.java | 5 +- .../CaracteristiqueParcelleRepository.java | 5 +- ...aracteristiqueUniteLogementRepository.java | 5 +- .../rfu/metier/EnqueteActiviteRepository.java | 3 - .../rfu/metier/EnqueteBatimentRepository.java | 5 +- .../EnqueteUniteLogementRepository.java | 5 +- .../rfu/metier/ImpositionsTfuRepository.java | 2 - .../rfu/metier/UniteLogementRepository.java | 5 +- .../service/EntityFromPayLoadService.java | 325 ++++++++++++++++++ .../worker/ActeurConcerneAsyncWorker.java | 2 +- .../service/worker/BatimentAsyncWorker.java | 4 +- .../CaracteristiqueBatimentAsyncWorker.java | 42 +-- .../CaracteristiqueParcelleAsyncWorker.java | 36 +- ...racteristiqueUniteLogementAsyncWorker.java | 42 +-- .../worker/DeclarationNcAsyncWorker.java | 2 +- .../worker/EnqueteActiviteAsyncWorker.java | 2 +- .../service/worker/EnqueteAsyncWorker.java | 13 +- .../worker/EnqueteBatimentAsyncWorker.java | 6 +- .../EnqueteUniteLogementAsyncWorker.java | 8 +- .../worker/MembreGroupeAsyncWorker.java | 4 +- .../service/worker/ParcelleAsyncWorker.java | 4 +- .../service/worker/PersonneAsyncWorker.java | 9 +- .../service/worker/PieceAsyncWorker.java | 22 +- .../worker/UniteLogementAsyncWorker.java | 4 +- .../service/worker/UploadAsyncWorker.java | 4 +- src/main/resources/application-dgi.properties | 16 +- src/main/resources/application.properties | 11 +- 172 files changed, 2208 insertions(+), 746 deletions(-) create mode 100644 src/main/java/io/gmss/fiscad/entities/infocad/metier/Rue.java create mode 100644 src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRue.java rename src/main/java/io/gmss/fiscad/enums/{StatusEnquete.java => StatutEnquete.java} (67%) create mode 100755 src/main/java/io/gmss/fiscad/exceptions/ApplicationException.java create mode 100644 src/main/java/io/gmss/fiscad/implementations/infocad/metier/RueServiceImpl.java create mode 100644 src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRueServiceImpl.java create mode 100755 src/main/java/io/gmss/fiscad/interfaces/infocad/metier/RueService.java create mode 100755 src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeRueService.java delete mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/PersonnePayLoad.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueBatimentPayloadWeb.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueParcellePayloadWeb.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueUniteLogementPayloadWeb.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/DeclarationNcPayloadWeb.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteActivitePayLoadWeb.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnquetePayLoadWeb.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ParcellePayLoadWeb.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/PersonnePayLoadWeb.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/PiecePayLoadWeb.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UploadPayLoadWeb.java rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/ActeurConcernePayLoad.java (94%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/BatimentPaylaod.java (94%) rename src/main/java/io/gmss/fiscad/paylaods/request/{CaracteristiqueBatimentPaylod.java => synchronisation/CaracteristiqueBatimentPayload.java} (84%) rename src/main/java/io/gmss/fiscad/paylaods/request/{CaracteristiqueParcellePaylod.java => synchronisation/CaracteristiqueParcellePayload.java} (74%) rename src/main/java/io/gmss/fiscad/paylaods/request/{CaracteristiqueUniteLogementPaylod.java => synchronisation/CaracteristiqueUniteLogementPayload.java} (76%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/CommentaireRequest.java (83%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/DeclarationNcPayload.java (94%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/EnqueteActivitePayload.java (96%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/EnqueteBatimentPayload.java (90%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/EnquetePayLoad.java (88%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/EnqueteUniteLogementPayload.java (93%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/EquipePayload.java (88%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/MembreGroupePayLoad.java (90%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/ParcellePayLoad.java (93%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/ParticiperPayload.java (93%) create mode 100644 src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/PersonnePayLoad.java rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/PiecePayLoad.java (92%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/SecteurDecoupagePayload.java (93%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/SecteurPayload.java (88%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/UniteLogementPaylaod.java (87%) rename src/main/java/io/gmss/fiscad/paylaods/request/{ => synchronisation}/UploadPayLoad.java (93%) rename src/main/java/io/gmss/fiscad/paylaods/response/restoration/{ActeurConcernePayLoad.java => ActeurConcernePayLoadRestor.java} (94%) rename src/main/java/io/gmss/fiscad/paylaods/response/restoration/{BatimentPayload.java => BatimentPayloadRestor.java} (93%) rename src/main/java/io/gmss/fiscad/paylaods/response/restoration/{CaracateristiqueBatimentPayLoads.java => CaracateristiqueBatimentPayLoadsRestor.java} (82%) rename src/main/java/io/gmss/fiscad/paylaods/response/restoration/{CaracateristiqueParcellePayLoads.java => CaracateristiqueParcellePayLoadsRestor.java} (82%) delete mode 100644 src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracteristiqueUniteLogementPayLoad.java create mode 100644 src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracteristiqueUniteLogementPayLoadRestor.java rename src/main/java/io/gmss/fiscad/paylaods/response/restoration/{EnqueteBatimentPayLoad.java => EnqueteBatimentPayLoadRestor.java} (96%) rename src/main/java/io/gmss/fiscad/paylaods/response/restoration/{EnqueteUniteLogementPayLoad.java => EnqueteUniteLogementPayLoadRestor.java} (96%) rename src/main/java/io/gmss/fiscad/paylaods/response/restoration/{MembreGroupePayLoad.java => MembreGroupePayLoadRestor.java} (92%) rename src/main/java/io/gmss/fiscad/paylaods/response/restoration/{ParcellePayLoad.java => ParcellePayLoadRestor.java} (94%) rename src/main/java/io/gmss/fiscad/paylaods/response/restoration/{PiecePayLoad.java => PiecePayLoadRestor.java} (96%) rename src/main/java/io/gmss/fiscad/paylaods/response/restoration/{UniteLogementPayLoad.java => UniteLogementPayLoadRestor.java} (86%) rename src/main/java/io/gmss/fiscad/paylaods/response/restoration/{UploadPayLoad.java => UploadPayLoadRestor.java} (94%) create mode 100755 src/main/java/io/gmss/fiscad/repositories/infocad/metier/RueRepository.java create mode 100755 src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeRueRepository.java create mode 100644 src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java diff --git a/db-init/01-enable-postgis.sql b/db-init/01-enable-postgis.sql index 032f6f9..fb74b71 100644 --- a/db-init/01-enable-postgis.sql +++ b/db-init/01-enable-postgis.sql @@ -1,2 +1,3 @@ CREATE EXTENSION IF NOT EXISTS postgis; -CREATE EXTENSION IF NOT EXISTS postgis_topology; \ No newline at end of file +CREATE EXTENSION IF NOT EXISTS postgis_topology; +CREATE EXTENSION IF NOT EXISTS pg_cron; \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/configuration/OpenApiConfig.java b/src/main/java/io/gmss/fiscad/configuration/OpenApiConfig.java index e5954e8..088470e 100644 --- a/src/main/java/io/gmss/fiscad/configuration/OpenApiConfig.java +++ b/src/main/java/io/gmss/fiscad/configuration/OpenApiConfig.java @@ -48,7 +48,7 @@ import io.swagger.v3.oas.annotations.servers.Server; ) @SecurityScheme( name = "bearer", - description = "Authentification Json Web Token", + description = "Authentification Json BatimentPaylaodWeb Token", scheme = "Bearer", type = SecuritySchemeType.HTTP, bearerFormat = "JWT", diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java index ccfded8..408588a 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.decoupage.Secteur; import io.gmss.fiscad.exceptions.*; import io.gmss.fiscad.interfaces.decoupage.SecteurService; import io.gmss.fiscad.paylaods.ApiResponse; -import io.gmss.fiscad.paylaods.request.SecteurPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.SecteurPayload; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import org.slf4j.Logger; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java index f992758..aff9f75 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java @@ -5,7 +5,7 @@ import io.gmss.fiscad.entities.infocad.metier.Commentaire; import io.gmss.fiscad.exceptions.*; import io.gmss.fiscad.interfaces.infocad.metier.CommentaireService; import io.gmss.fiscad.paylaods.ApiResponse; -import io.gmss.fiscad.paylaods.request.CommentaireRequest; +import io.gmss.fiscad.paylaods.request.synchronisation.CommentaireRequest; import io.gmss.fiscad.paylaods.request.SyncCommentaireRequest; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; @@ -229,7 +229,7 @@ public class CommentaireController { } @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") @PostMapping("/all-by-params") - //@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non lus provenant du Web. \n 2 - Liste des commentaires lus provenant du Web \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") + //@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 { return new ResponseEntity<>( @@ -277,7 +277,7 @@ public class CommentaireController { } @PostMapping("synchronise/from-web") - //@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non synchronisés provenant du Web. \n 2 - Liste des commentaires synchronisés provenant du Web \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") + //@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 { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java index cf761a4..47d7d01 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java @@ -1,9 +1,13 @@ 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.exceptions.*; import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService; import io.gmss.fiscad.paylaods.ApiResponse; -import io.gmss.fiscad.paylaods.request.EnquetePayLoad; +import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb; +import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb; +import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad; import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -41,20 +45,51 @@ public class EnqueteController { @PostMapping("/create") - public ResponseEntity createStructure(@RequestBody @Valid @Validated EnquetePayLoad enquetePayLoad) { -// try{ -// enquete = enqueteService.createEnquete(enquete); -// return new ResponseEntity<>( -// new ApiResponse<>(true, structure, "Structure créé avec succès."), -// HttpStatus.OK -// ); -// }catch (Exception e){ -// return new ResponseEntity<>( -// new ApiResponse<>(false, e.getMessage()), -// HttpStatus.OK -// ); -// } - return null; + public ResponseEntity createEnquete(@RequestBody @Valid @Validated EnquetePayLoadWeb enquetePayLoadWeb) { + try { + Enquete enquete = enqueteService.createEnquete(enquetePayLoadWeb); + return new ResponseEntity<>( + new ApiResponse<>(true, enquete, "Enquete batiment 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}") + public ResponseEntity updateEnquete(@PathVariable Long id, @RequestBody EnquetePayLoadWeb enquetePayLoadWeb) { + try { + return new ResponseEntity<>( + new ApiResponse<>(true, enqueteService.updateEnquete(id,enquetePayLoadWeb), "Enquete batiment 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); + } } @PutMapping("/validation") diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java index 874db80..c18cfed 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java @@ -1,18 +1,25 @@ package io.gmss.fiscad.controllers.infocad.metier; +import io.gmss.fiscad.entities.infocad.metier.Enquete; +import io.gmss.fiscad.entities.infocad.parametre.Personne; +import io.gmss.fiscad.exceptions.*; import io.gmss.fiscad.interfaces.infocad.metier.PersonneService; import io.gmss.fiscad.paylaods.ApiResponse; import io.gmss.fiscad.paylaods.dto.PersonneCompletDTO; +import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb; +import io.gmss.fiscad.paylaods.request.crudweb.PersonnePayLoadWeb; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +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.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.client.HttpClientErrorException; @RestController @@ -20,9 +27,57 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class PersonneController { + private static final Logger logger = LoggerFactory.getLogger(PersonneController.class); private final PersonneService personneService; + @PostMapping("/create") + public ResponseEntity createPersonne(@RequestBody @Valid @Validated PersonnePayLoadWeb personnePayLoadWeb) { + try { + Personne personne = personneService.createPersonne(personnePayLoadWeb); + return new ResponseEntity<>( + new ApiResponse<>(true, personne, "Contribuable 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}") + public ResponseEntity updatePersonne(@PathVariable Long id, @RequestBody PersonnePayLoadWeb personnePayLoadWeb) { + try { + return new ResponseEntity<>( + new ApiResponse<>(true, personneService.updatePersonne(id,personnePayLoadWeb), "Personne 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); + } + } @GetMapping("/get-details/{id}") public ResponseEntity getDetails(@PathVariable Long id) { try{ diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java index 0de03a8..32ccc47 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java @@ -5,6 +5,7 @@ import io.gmss.fiscad.entities.rfu.metier.Batiment; import io.gmss.fiscad.exceptions.*; import io.gmss.fiscad.interfaces.rfu.metier.BatimentService; import io.gmss.fiscad.paylaods.ApiResponse; +import io.gmss.fiscad.paylaods.request.crudweb.BatimentPaylaodWeb; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -36,9 +37,9 @@ public class BatimentController { } @PostMapping("/create") - public ResponseEntity createBatiment(@RequestBody @Valid @Validated Batiment batiment) { + public ResponseEntity createBatiment(@RequestBody @Valid @Validated BatimentPaylaodWeb batimentPaylaodWeb) { try { - batiment = batimentService.createBatiment(batiment); + Batiment batiment = batimentService.createBatiment(batimentPaylaodWeb); return new ResponseEntity<>( new ApiResponse<>(true, batiment, "Batiment créé avec succès."), HttpStatus.OK @@ -60,10 +61,10 @@ public class BatimentController { } @PutMapping("/update/{id}") - public ResponseEntity updateBatiment(@PathVariable Long id, @RequestBody Batiment batiment) { + public ResponseEntity updateBatiment(@PathVariable Long id, @RequestBody BatimentPaylaodWeb batimentPaylaodWeb) { try { return new ResponseEntity<>( - new ApiResponse<>(true, batimentService.updateBatiment(id, batiment), "Batiment mise à jour avec succès."), + new ApiResponse<>(true, batimentService.updateBatiment(id,batimentPaylaodWeb), "Batiment mise à jour avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java index b971084..0de0f81 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java @@ -5,6 +5,7 @@ import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; 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.crudweb.EnqueteBatimentPayloadWeb; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -35,9 +36,9 @@ public class EnqueteBatimentController { } @PostMapping("/create") - public ResponseEntity createEnqueteBatiment(@RequestBody @Valid @Validated EnqueteBatiment enqueteBatiment) { + public ResponseEntity createEnqueteBatiment(@RequestBody @Valid @Validated EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) { try { - enqueteBatiment = enqueteBatimentService.createEnqueteBatiment(enqueteBatiment); + EnqueteBatiment enqueteBatiment = enqueteBatimentService.createEnqueteBatiment(enqueteBatimentPayloadWeb); return new ResponseEntity<>( new ApiResponse<>(true, enqueteBatiment, "Enquete batiment créé avec succès."), HttpStatus.OK @@ -59,10 +60,10 @@ public class EnqueteBatimentController { } @PutMapping("/update/{id}") - public ResponseEntity updateEnqueteBatiment(@PathVariable Long id, @RequestBody EnqueteBatiment enqueteBatiment) { + public ResponseEntity updateEnqueteBatiment(@PathVariable Long id, @RequestBody EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) { try { return new ResponseEntity<>( - new ApiResponse<>(true, enqueteBatimentService.updateEnqueteBatiment(id, enqueteBatiment), "Enquete batiment mise à jour avec succès."), + new ApiResponse<>(true, enqueteBatimentService.updateEnqueteBatiment(id, enqueteBatimentPayloadWeb), "Enquete batiment mise à jour avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java index c347d2f..b8628e0 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java @@ -5,6 +5,7 @@ import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; 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.crudweb.EnqueteUniteLogementPayloadWeb; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -35,9 +36,9 @@ public class EnqueteUniteLogementController { } @PostMapping("/create") - public ResponseEntity createEnqueteUniteLogement(@RequestBody @Valid @Validated EnqueteUniteLogement enqueteUniteLogement) { + public ResponseEntity createEnqueteUniteLogement(@RequestBody @Valid @Validated EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) { try { - enqueteUniteLogement = enqueteUniteLogementService.createEnqueteUniteLogement(enqueteUniteLogement); + EnqueteUniteLogement enqueteUniteLogement = enqueteUniteLogementService.createEnqueteUniteLogement(enqueteUniteLogementPayloadWeb); return new ResponseEntity<>( new ApiResponse<>(true, enqueteUniteLogement, "Enquete unite logement créé avec succès."), HttpStatus.OK @@ -59,10 +60,10 @@ public class EnqueteUniteLogementController { } @PutMapping("/update/{id}") - public ResponseEntity updateEnqueteUniteLogement(@PathVariable Long id, @RequestBody EnqueteUniteLogement enqueteUniteLogement) { + public ResponseEntity updateEnqueteUniteLogement(@PathVariable Long id, @RequestBody EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) { try { return new ResponseEntity<>( - new ApiResponse<>(true, enqueteUniteLogementService.updateEnqueteUniteLogement(id, enqueteUniteLogement), "Enquete unite logement mise à jour avec succès."), + new ApiResponse<>(true, enqueteUniteLogementService.updateEnqueteUniteLogement(id, enqueteUniteLogementPayloadWeb), "Enquete unite logement mise à jour avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java index 19b941a..c73b89b 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.parametre.Equipe; import io.gmss.fiscad.exceptions.*; import io.gmss.fiscad.interfaces.rfu.parametre.EquipeService; import io.gmss.fiscad.paylaods.ApiResponse; -import io.gmss.fiscad.paylaods.request.EquipePayload; +import io.gmss.fiscad.paylaods.request.synchronisation.EquipePayload; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java b/src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java index ac90492..081f9b1 100644 --- a/src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java +++ b/src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java @@ -4,7 +4,8 @@ import io.gmss.fiscad.exceptions.*; import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService; import io.gmss.fiscad.interfaces.synchronisation.SynchronisationService; import io.gmss.fiscad.paylaods.ApiResponse; -import io.gmss.fiscad.paylaods.request.*; +import io.gmss.fiscad.paylaods.request.EnqueteAllDataPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.*; import io.gmss.fiscad.service.ZipService; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; @@ -468,11 +469,11 @@ public class SynchronisationController { @PostMapping(path = "/caracteristique-batiment") @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") - public ResponseEntity syncCaracteristiqueBatiment(@RequestBody List caracteristiqueBatimentPaylods) { + public ResponseEntity syncCaracteristiqueBatiment(@RequestBody List CaracteristiqueBatimentPayloads) { try { return new ResponseEntity<>( //new ApiResponse<>(true, null, "Liste des caractéristiques des bâtiments synchronisée avec succès."), - new ApiResponse<>(true, synchronisationService.syncCaracteristiqueBatiment(caracteristiqueBatimentPaylods), "Liste des caractéristiques des bâtiments synchronisée avec succès."), + new ApiResponse<>(true, synchronisationService.syncCaracteristiqueBatiment(CaracteristiqueBatimentPayloads), "Liste des caractéristiques des bâtiments synchronisée avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { @@ -493,11 +494,11 @@ public class SynchronisationController { @PostMapping(path = "/caracteristique-parcelle") @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") - public ResponseEntity syncCaracteristiqueParcelle(@RequestBody List caracteristiqueParcellePaylods) { + public ResponseEntity syncCaracteristiqueParcelle(@RequestBody List CaracteristiqueParcellePayloads) { try { return new ResponseEntity<>( //new ApiResponse<>(true, null, "Liste des caractéristiques des parcelles synchronisée avec succès."), - new ApiResponse<>(true, synchronisationService.syncCaracteristiqueParcelle(caracteristiqueParcellePaylods), "Liste des caractéristiques des parcelles synchronisée avec succès."), + new ApiResponse<>(true, synchronisationService.syncCaracteristiqueParcelle(CaracteristiqueParcellePayloads), "Liste des caractéristiques des parcelles synchronisée avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { @@ -518,11 +519,11 @@ public class SynchronisationController { @PostMapping(path = "/caracteristique-unite-logement") @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") - public ResponseEntity syncCaracteristiqueUniteLogement(@RequestBody List caracteristiqueUniteLogementPaylods) { + public ResponseEntity syncCaracteristiqueUniteLogement(@RequestBody List CaracteristiqueUniteLogementPayloads) { try { return new ResponseEntity<>( //new ApiResponse<>(true, null, "Liste des caractéristiques des unités de logement synchronisée avec succès."), - new ApiResponse<>(true, synchronisationService.syncCaracteristiqueUniteLogement(caracteristiqueUniteLogementPaylods), "Liste des caractéristiques des unités de logement synchronisée avec succès."), + new ApiResponse<>(true, synchronisationService.syncCaracteristiqueUniteLogement(CaracteristiqueUniteLogementPayloads), "Liste des caractéristiques des unités de logement synchronisée avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { diff --git a/src/main/java/io/gmss/fiscad/entities/BaseEntity.java b/src/main/java/io/gmss/fiscad/entities/BaseEntity.java index 6a336ef..c4c0e61 100755 --- a/src/main/java/io/gmss/fiscad/entities/BaseEntity.java +++ b/src/main/java/io/gmss/fiscad/entities/BaseEntity.java @@ -23,7 +23,7 @@ public class BaseEntity implements Serializable { @CreatedDate @JsonIgnore - private Instant createdAt; + private Instant createdAt ; @LastModifiedDate @JsonIgnore private Instant updatedAt; diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/ActeurConcerne.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/ActeurConcerne.java index e26b747..95052ce 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/ActeurConcerne.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/ActeurConcerne.java @@ -55,9 +55,9 @@ public class ActeurConcerne extends BaseEntity implements Serializable { @Enumerated(EnumType.STRING) private RoleActeur roleActeur; - @OneToMany(mappedBy = "acteurConcerne") - @JsonManagedReference - private List pieces; +// @OneToMany(mappedBy = "acteurConcerne") +// @JsonManagedReference +// private List pieces; @JsonIgnore @ManyToOne diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java index ea647ee..a0013fb 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java @@ -2,7 +2,6 @@ package io.gmss.fiscad.entities.infocad.metier; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonManagedReference; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.gmss.fiscad.deserializer.LocalDateDeserializer; import io.gmss.fiscad.entities.BaseEntity; @@ -17,16 +16,13 @@ import io.gmss.fiscad.entities.rfu.parametre.Campagne; import io.gmss.fiscad.entities.rfu.parametre.Equipe; import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; -import io.gmss.fiscad.enums.StatusEnquete; +import io.gmss.fiscad.enums.StatutEnquete; import io.gmss.fiscad.enums.StatutEnregistrement; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.hibernate.annotations.SQLDelete; -import org.hibernate.annotations.Where; import java.io.Serializable; import java.time.LocalDate; @@ -97,7 +93,7 @@ public class Enquete extends BaseEntity implements Serializable { private String autreNumeroTitreFoncier; private Long personneId; @Enumerated(EnumType.STRING) - private StatusEnquete statusEnquete; + private StatutEnquete statutEnquete; @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateValidation; @@ -164,9 +160,13 @@ public class Enquete extends BaseEntity implements Serializable { private int nbreCoProprietaire; private int nbreIndivisiaire; private String autreAdresse; - private String surface; + private float superficie ; private int nbreBatiment; private int nbrePiscine; + private Long valeurMensuelleLocation; + private Long valeurAnnuelleLocation; + private Long valeurParcelleEstime; + private Long valeurParcelleReel; @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) @@ -188,8 +188,8 @@ public class Enquete extends BaseEntity implements Serializable { @OneToMany(mappedBy = "enquete") private List caracteristiqueParcelles; - @Enumerated(EnumType.STRING) - private StatutEnregistrement statutEnregistrement; + //@Enumerated(EnumType.STRING) + //private StatutEnregistrement statutEnregistrement; public Long getTerminalId() { diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java index f14d19d..5113477 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java @@ -25,7 +25,6 @@ import java.util.List; // "WHERE id = ?") //@Where(clause = " deleted = false") public class Parcelle extends BaseEntity implements Serializable { - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @@ -36,9 +35,10 @@ public class Parcelle extends BaseEntity implements Serializable { private String numeroParcelle; private String longitude; private String latitude; + private String altitude; private String situationGeographique; - @ColumnDefault("0") - private int superficie; + @ColumnDefault("0.0") + private float superficie; @ManyToOne private NatureDomaine natureDomaine; @JsonIgnore @@ -52,7 +52,6 @@ public class Parcelle extends BaseEntity implements Serializable { @ManyToOne private Tpe terminal; private String autreNumeroTitreFoncier; - private Long typeDomaineId; private Long numeroProvisoire; private Long blocId; @@ -60,6 +59,9 @@ public class Parcelle extends BaseEntity implements Serializable { private boolean synchronise; private Long idDerniereEnquete; private Long mobileDataId; + private String numEnterParcelle; + @ManyToOne + private Rue rue ; // @JsonIgnore // @OneToMany(mappedBy = "parcelle") // private List batiments; diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java index d50290b..11cd112 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java @@ -44,6 +44,10 @@ public class Piece extends BaseEntity implements Serializable { @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateExpiration; + @JsonFormat(pattern = "dd-MM-yyyy") + @JsonDeserialize(using = LocalDateDeserializer.class) + private LocalDate dateEtablissement; + @ManyToOne private TypePiece typePiece; private Long mobileDataId; @@ -52,15 +56,21 @@ public class Piece extends BaseEntity implements Serializable { private Personne personne; private Long personneExternalKey; - @JsonIgnore - @JsonBackReference - @ManyToOne(fetch = FetchType.LAZY) - private ActeurConcerne acteurConcerne; - private Long acteurConcerneExternalKey; +// @JsonIgnore +// @JsonBackReference +// @ManyToOne(fetch = FetchType.LAZY) +// private ActeurConcerne acteurConcerne; +// private Long acteurConcerneExternalKey; + @ManyToOne private SourceDroit sourceDroit; + @JsonIgnore + @JsonBackReference + @ManyToOne(fetch = FetchType.LAZY) + private Enquete enquete ; + @ManyToOne private ModeAcquisition modeAcquisition; @@ -75,7 +85,7 @@ public class Piece extends BaseEntity implements Serializable { private Long max_numero_piece_id; private Long max_numero_acteur_concerne_id; - private Long enqueteId; + //private Long enqueteId; private Long blocId; @ColumnDefault("false") private boolean synchronise; diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Rue.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Rue.java new file mode 100644 index 0000000..6543d00 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Rue.java @@ -0,0 +1,30 @@ +package io.gmss.fiscad.entities.infocad.metier; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.gmss.fiscad.entities.BaseEntity; +import io.gmss.fiscad.entities.infocad.parametre.TypeRue; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.SQLDelete; +import org.hibernate.annotations.Where; + +import java.io.Serializable; +import java.util.List; + +@EqualsAndHashCode(callSuper = true) +@Entity +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Rue extends BaseEntity implements Serializable { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private String numero ; + private String nom ; + @ManyToOne + private TypeRue typeRue ; +} diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Bloc.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Bloc.java index 7619ff8..1d16020 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Bloc.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Bloc.java @@ -34,7 +34,6 @@ import java.util.Set; "WHERE id = ?") @Where(clause = " deleted = false") public class Bloc extends BaseEntity implements Serializable { - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java index 2e0d462..adf2fd0 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java @@ -20,6 +20,7 @@ import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; import java.io.Serializable; +import java.time.LocalDate; import java.util.List; @EqualsAndHashCode(callSuper = true) @@ -38,11 +39,12 @@ public class Personne extends BaseEntity implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String ifu; - private String nomOuSigle; - private String prenomOuRaisonSociale; + private String nom; + private String prenom; + private String raisonSociale; private String numRavip; private String npi; - private String dateNaissanceOuConsti; + private LocalDate dateNaissanceOuConsti; private String lieuNaissance; private String tel1; private String tel2; @@ -91,6 +93,6 @@ public class Personne extends BaseEntity implements Serializable { } public List getPieces() { - return pieces.stream().filter(piece -> piece.getActeurConcerne() == null).toList(); + return pieces.stream().filter(piece -> piece.getPersonne() != null).toList(); } } diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRue.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRue.java new file mode 100644 index 0000000..db6420e --- /dev/null +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRue.java @@ -0,0 +1,37 @@ +package io.gmss.fiscad.entities.infocad.parametre; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.gmss.fiscad.entities.BaseEntity; +import io.gmss.fiscad.entities.decoupage.Arrondissement; +import io.gmss.fiscad.entities.decoupage.Quartier; +import io.gmss.fiscad.entities.decoupage.Secteur; +import io.gmss.fiscad.entities.decoupage.SecteurDecoupage; +import io.gmss.fiscad.entities.infocad.metier.Enquete; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.SQLDelete; +import org.hibernate.annotations.Where; + +import java.io.Serializable; +import java.util.List; +import java.util.Set; + +/** + * Un bloc représente un secteur de découpage admin dans le cadre d'une enquete fiscale + */ +@EqualsAndHashCode(callSuper = true) +@Entity +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TypeRue extends BaseEntity implements Serializable { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private String code; + private String nom; +} diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataActeurConcerne.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataActeurConcerne.java index 83744e9..679f878 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataActeurConcerne.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataActeurConcerne.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.ActeurConcernePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.ActeurConcernePayLoad; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataBatiment.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataBatiment.java index c90d7ba..f2809e8 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataBatiment.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataBatiment.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.BatimentPaylaod; +import io.gmss.fiscad.paylaods.request.synchronisation.BatimentPaylaod; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueBatiment.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueBatiment.java index a36507c..fc7ddea 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueBatiment.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueBatiment.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.CaracteristiqueBatimentPaylod; +import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueBatimentPayload; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; @@ -26,7 +26,7 @@ public class MobileDataCaracteristiqueBatiment extends BaseEntity implements Ser private Long externalKey; @Type(JsonBinaryType.class) @Column(columnDefinition = "jsonb") - private CaracteristiqueBatimentPaylod caracteristiqueBatimentPaylod ; + private CaracteristiqueBatimentPayload CaracteristiqueBatimentPayload ; @Column(columnDefinition = "boolean default false") private boolean traiter; } \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueParcelle.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueParcelle.java index 936dc42..689063b 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueParcelle.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueParcelle.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.CaracteristiqueParcellePaylod; +import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueParcellePayload; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; @@ -26,7 +26,7 @@ public class MobileDataCaracteristiqueParcelle extends BaseEntity implements Ser private Long externalKey; @Type(JsonBinaryType.class) @Column(columnDefinition = "jsonb") - private CaracteristiqueParcellePaylod caracteristiqueParcellePaylod ; + private CaracteristiqueParcellePayload CaracteristiqueParcellePayload ; @Column(columnDefinition = "boolean default false") private boolean traiter; } \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueUniteLogement.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueUniteLogement.java index 9792367..c640ffa 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueUniteLogement.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueUniteLogement.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.CaracteristiqueUniteLogementPaylod; +import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueUniteLogementPayload; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; @@ -26,7 +26,7 @@ public class MobileDataCaracteristiqueUniteLogement extends BaseEntity implement private Long externalKey; @Type(JsonBinaryType.class) @Column(columnDefinition = "jsonb") - private CaracteristiqueUniteLogementPaylod caracteristiqueUniteLogementPaylod ; + private CaracteristiqueUniteLogementPayload CaracteristiqueUniteLogementPayload ; @Column(columnDefinition = "boolean default false") private boolean traiter; } \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataDeclarationNc.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataDeclarationNc.java index 53f3780..2d7666b 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataDeclarationNc.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataDeclarationNc.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.DeclarationNcPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.DeclarationNcPayload; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnquete.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnquete.java index 2aa6221..6edc0ed 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnquete.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnquete.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.EnquetePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteActivite.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteActivite.java index 2cd029f..adbf1cf 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteActivite.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteActivite.java @@ -2,8 +2,8 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.BatimentPaylaod; -import io.gmss.fiscad.paylaods.request.EnqueteActivitePayload; +import io.gmss.fiscad.paylaods.request.synchronisation.BatimentPaylaod; +import io.gmss.fiscad.paylaods.request.synchronisation.EnqueteActivitePayload; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteBatiment.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteBatiment.java index 16e0cf8..35a0db0 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteBatiment.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteBatiment.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.EnqueteBatimentPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.EnqueteBatimentPayload; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteUniteLogement.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteUniteLogement.java index 7f5cb99..28be016 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteUniteLogement.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteUniteLogement.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.EnqueteUniteLogementPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.EnqueteUniteLogementPayload; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataMembreGroupe.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataMembreGroupe.java index ad2e273..35213b9 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataMembreGroupe.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataMembreGroupe.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.MembreGroupePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.MembreGroupePayLoad; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataParcelle.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataParcelle.java index a71c033..579757e 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataParcelle.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataParcelle.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.ParcellePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.ParcellePayLoad; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataParcelleTest.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataParcelleTest.java index d50d64b..110016a 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataParcelleTest.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataParcelleTest.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.ParcellePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.ParcellePayLoad; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataPersonne.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataPersonne.java index 8fac983..46373c8 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataPersonne.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataPersonne.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.PersonnePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.PersonnePayLoad; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataPiece.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataPiece.java index fc8219d..42ac40c 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataPiece.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataPiece.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.PiecePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.PiecePayLoad; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataUniteLogement.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataUniteLogement.java index b20eba0..c19bcba 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataUniteLogement.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataUniteLogement.java @@ -2,8 +2,8 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.ParcellePayLoad; -import io.gmss.fiscad.paylaods.request.UniteLogementPaylaod; +import io.gmss.fiscad.paylaods.request.synchronisation.ParcellePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.UniteLogementPaylaod; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataUpload.java b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataUpload.java index 7f6fe49..3277dc3 100644 --- a/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataUpload.java +++ b/src/main/java/io/gmss/fiscad/entities/metadata/MobileDataUpload.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.paylaods.request.UploadPayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.UploadPayLoad; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java index b06a9ad..daa69e9 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java @@ -25,7 +25,6 @@ import java.util.List; @AllArgsConstructor @Where(clause = " deleted = false") public class Batiment extends BaseEntity implements Serializable { - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueBatiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueBatiment.java index c00b6d7..2c5c8e6 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueBatiment.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueBatiment.java @@ -40,6 +40,7 @@ public class CaracteristiqueBatiment extends BaseEntity implements Serializable @ManyToOne private Caracteristique caracteristique; private String valeur; + private String observation ; @JsonIgnore @ManyToOne private Tpe terminal ; diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java index de2553f..c9b71cd 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java @@ -37,6 +37,7 @@ public class CaracteristiqueUniteLogement extends BaseEntity implements Serializ @ManyToOne private Caracteristique caracteristique; private String valeur; + private String observation; @JsonIgnore @ManyToOne private Tpe terminal; diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteActivite.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteActivite.java index 57e0585..1d72d99 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteActivite.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteActivite.java @@ -57,6 +57,7 @@ public class EnqueteActivite extends BaseEntity implements Serializable { private String NumeroRccm; @OneToOne private Personne personne; + private Long personneExternalKey; @ManyToOne diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java index 9e5a340..58dfa50 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java @@ -53,7 +53,10 @@ public class EnqueteBatiment extends BaseEntity implements Serializable { private float surfaceLouee; private int nbreMenage; private int nbreHabitant; - private float valeurMensuelleLocation; + private Long montantMensuelLocation; + private Long montantLocatifAnnuelDeclare; + private Long valeurBatimentEstime; + private Long valeurBatimentReel; private int nbreMoisLocation; private String autreCaracteristiquePhysique; @JsonFormat(pattern = "dd-MM-yyyy") @@ -89,7 +92,7 @@ public class EnqueteBatiment extends BaseEntity implements Serializable { @OneToMany(mappedBy = "enqueteBatiment") private List uploads; - @Enumerated(EnumType.STRING) - @JsonIgnore - private StatutEnregistrement statutEnregistrement; + //@Enumerated(EnumType.STRING) + //@JsonIgnore + //private StatutEnregistrement statutEnregistrement; } diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java index 6596d78..2080e42 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java @@ -40,15 +40,17 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - private float surface; private int nbrePiece; private int nbreHabitant; private int nbreMenage; private boolean enLocation; private float montantMensuelLoyer; - private int nbreMoisEnLocation; + private int nbreMoisLocation; private float montantLocatifAnnuelDeclare; + private Long valeurUniteLogementEstime; + private Long valeurUniteLogementReel; private float surfaceLouee; + private float SurfaceAuSol; private boolean sbee; private boolean soneb; private String numCompteurSbee; diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java index 006409d..dac307e 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java @@ -1,6 +1,9 @@ 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.infocad.metier.Tpe; import jakarta.persistence.*; @@ -11,6 +14,7 @@ import lombok.NoArgsConstructor; import org.hibernate.annotations.Where; import java.io.Serializable; +import java.time.LocalDate; import java.util.List; @EqualsAndHashCode(callSuper = true) @@ -27,6 +31,9 @@ public class UniteLogement extends BaseEntity implements Serializable { private String nul; private String numeroEtage; private String code; + @JsonFormat(pattern = "dd-MM-yyyy") + @JsonDeserialize(using = LocalDateDeserializer.class) + private LocalDate dateConstruction; @JsonIgnore @OneToMany(mappedBy = "uniteLogement") private List enqueteUniteLogements; diff --git a/src/main/java/io/gmss/fiscad/enums/StatusEnquete.java b/src/main/java/io/gmss/fiscad/enums/StatutEnquete.java similarity index 67% rename from src/main/java/io/gmss/fiscad/enums/StatusEnquete.java rename to src/main/java/io/gmss/fiscad/enums/StatutEnquete.java index d9f3de6..e4855c1 100755 --- a/src/main/java/io/gmss/fiscad/enums/StatusEnquete.java +++ b/src/main/java/io/gmss/fiscad/enums/StatutEnquete.java @@ -1,10 +1,9 @@ package io.gmss.fiscad.enums; -public enum StatusEnquete { +public enum StatutEnquete { EN_COURS, FINALISE, REJETE, VALIDE, - //SYNCHRONISE ECHEC } diff --git a/src/main/java/io/gmss/fiscad/enums/StatutEnregistrement.java b/src/main/java/io/gmss/fiscad/enums/StatutEnregistrement.java index 38f7881..123ba31 100644 --- a/src/main/java/io/gmss/fiscad/enums/StatutEnregistrement.java +++ b/src/main/java/io/gmss/fiscad/enums/StatutEnregistrement.java @@ -1,6 +1,9 @@ package io.gmss.fiscad.enums; public enum StatutEnregistrement { - NOUVELLE_INSERTION, - MISE_A_JOUR + SAISIE_EN_COURS, + SAISIE, + VALIDATION_EN_COURS, + VALIDE, + REJETE } diff --git a/src/main/java/io/gmss/fiscad/exceptions/ApplicationException.java b/src/main/java/io/gmss/fiscad/exceptions/ApplicationException.java new file mode 100755 index 0000000..f9214ae --- /dev/null +++ b/src/main/java/io/gmss/fiscad/exceptions/ApplicationException.java @@ -0,0 +1,11 @@ +package io.gmss.fiscad.exceptions; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.NOT_ACCEPTABLE) +public class ApplicationException extends RuntimeException { + public ApplicationException(String message) { + super(message); + } +} diff --git a/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java index d05ee95..c85dc36 100644 --- a/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java @@ -7,8 +7,8 @@ import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.decoupage.SecteurService; -import io.gmss.fiscad.paylaods.request.SecteurDecoupagePayload; -import io.gmss.fiscad.paylaods.request.SecteurPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.SecteurDecoupagePayload; +import io.gmss.fiscad.paylaods.request.synchronisation.SecteurPayload; import io.gmss.fiscad.repositories.decoupage.ArrondissementRepository; import io.gmss.fiscad.repositories.decoupage.QuartierRepository; import io.gmss.fiscad.repositories.decoupage.SecteurRepository; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java index dfab1de..21979b6 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java @@ -1,36 +1,47 @@ package io.gmss.fiscad.implementations.infocad.metier; -import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne; -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.*; import io.gmss.fiscad.entities.infocad.parametre.Bloc; +import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle; +import io.gmss.fiscad.entities.rfu.metier.DeclarationNc; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; +import io.gmss.fiscad.entities.rfu.parametre.Equipe; +import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; -import io.gmss.fiscad.enums.StatusEnquete; +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.infocad.metier.EnqueteService; +import io.gmss.fiscad.interfaces.infocad.metier.PieceService; +import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueParcelleService; +import io.gmss.fiscad.interfaces.rfu.metier.DeclarationNcService; +import io.gmss.fiscad.interfaces.rfu.parametre.CaracteristiqueService; import io.gmss.fiscad.interfaces.user.UserService; -import io.gmss.fiscad.paylaods.request.EnquetePayLoad; +//import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad ; +//import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb ; import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad; import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad; -import io.gmss.fiscad.paylaods.response.*; -import io.gmss.fiscad.paylaods.response.FicheResponse.*; +import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb; +import io.gmss.fiscad.paylaods.response.* ; +import io.gmss.fiscad.paylaods.response.FicheResponse.* ; import io.gmss.fiscad.repositories.decoupage.ArrondissementRepository; import io.gmss.fiscad.repositories.decoupage.CommuneRepository; import io.gmss.fiscad.repositories.decoupage.SecteurRepository; -import io.gmss.fiscad.repositories.infocad.metier.ActeurConcerneRepository; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository; +import io.gmss.fiscad.repositories.infocad.metier.*; import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; +import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository; import io.gmss.fiscad.repositories.rfu.metier.CaracteristiqueParcelleRepository; import io.gmss.fiscad.repositories.rfu.metier.EnqueteBatimentRepository; import io.gmss.fiscad.repositories.rfu.metier.EnqueteUniteLogementRepository; +import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository; +import io.gmss.fiscad.repositories.rfu.parametre.EquipeRepository; +import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.service.EntityFromPayLoadService; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; import jakarta.persistence.Query; @@ -65,36 +76,206 @@ public class EnqueteServiceImpl implements EnqueteService { private final EnqueteUniteLogementRepository enqueteUniteLogementRepository; private final SecteurRepository secteurRepository; private final StructureRepository structureRepository; + 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 ; @PersistenceContext private final EntityManager em; + @Override - public Enquete createEnquete(EnquetePayLoad enquetePayLoad) throws BadRequestException { - Optional optionalUser = userRepository.findById(enquetePayLoad.getUserId()); + public Enquete createEnquete(EnquetePayLoadWeb enquetePayLoadWeb) throws BadRequestException { + Parcelle parcelle=new Parcelle(); + Long rueId; + Optional optionalUser = userRepository.findById(enquetePayLoadWeb.getEnqueteurId()); if (!optionalUser.isPresent()) { - throw new BadRequestException("Impossible d'enregistrer une enquête avec un enquêteur inexistant"); + throw new BadRequestException("Echec de l'enregistrement : Enquêteur inexistant"); } - Optional optionalBloc = blocRepository.findById(enquetePayLoad.getBlocId()); - if (!optionalBloc.isPresent()) { - throw new BadRequestException("Impossible d'enregistrer une enquête avec un bloc inexistant"); + Optional optionalProprietaire = personneRepository.findById(enquetePayLoadWeb.getProprietaireId()); + if (!optionalProprietaire.isPresent()) { + throw new BadRequestException("Echec de l'enregistrement : Propriétaire inexistant"); } - Optional optionalParcelle = parcelleRepository.findById(enquetePayLoad.getParcelleId()); - if (!optionalParcelle.isPresent()) { - throw new BadRequestException("Impossible d'enregistrer une enquête avec une parcelle inexistante"); + + Optional optionalZoneRfu = zoneRfuRepository.findById(enquetePayLoadWeb.getZoneRfuId()); + if (!optionalZoneRfu.isPresent()) { + throw new BadRequestException("Echec de l'enregistrement : zone inexistante"); } + + Optional optionalRue = rueRepository.findById(enquetePayLoadWeb.getZoneRfuId()); + + if (optionalRue.isPresent()) { + rueId=optionalRue.get().getId(); + enquetePayLoadWeb.getParcellePayLoadWeb().setRueId(rueId); + } + + Optional optionalEquipe = equipeRepository.findById(enquetePayLoadWeb.getEquipeId()); + + ///enregistrement de la pacelle + try { + if (enquetePayLoadWeb.getParcellePayLoadWeb().getId() == null) { + parcelle = parcelleService.createParcelle(enquetePayLoadWeb.getParcellePayLoadWeb()); + } else { + parcelle = parcelleService.updateParcelle(enquetePayLoadWeb.getParcellePayLoadWeb().getId(),enquetePayLoadWeb.getParcellePayLoadWeb()); + } + }catch (Exception e){ + throw new ApplicationException("Echec de l'enregistrement : La parcelle non enregistrée."); + } + ////enregistrement de l'enquete Enquete enquete = new Enquete(); enquete.setDateEnquete(LocalDate.now()); - enquete.setBloc(optionalBloc.get()); + //enquete.setBloc(optionalBloc.get()); enquete.setUser(optionalUser.get()); - enquete.setParcelle(optionalParcelle.get()); - enquete.setLitige(enquetePayLoad.isLitige()); - enquete.setStatusEnquete(StatusEnquete.EN_COURS); - enquete.setObservationParticuliere(enquetePayLoad.getObservationParticuliere()); + enquete.setParcelle(parcelle); + enquete.setLitige(enquetePayLoadWeb.isLitige()); + enquete.setStatutEnquete(StatutEnquete.EN_COURS); + enquete.setObservationParticuliere(enquetePayLoadWeb.getObservation()); + enquete.setPersonne(optionalProprietaire.orElse(null)); + enquete.setZoneRfu(optionalZoneRfu.orElse(null)); + enquete.setAutreAdresse(enquetePayLoadWeb.getAutreAdresse()); + enquete.setAutreNumeroTitreFoncier(enquetePayLoadWeb.getAutreNumeroTitreFoncier()); + enquete.setNumeroTitreFoncier(enquetePayLoadWeb.getNumeroTitreFoncier()); + enquete.setEquipe(optionalEquipe.orElse(null)); + enquete.setDateDebutExcemption(enquetePayLoadWeb.getDateDebutExemption()); + enquete.setDateFinExcemption(enquetePayLoadWeb.getDateFinExemption()); + enquete.setNbreBatiment(enquetePayLoadWeb.getNbreBatiment()); + enquete.setNbrePiscine(enquetePayLoadWeb.getNbrePiscine()); + enquete.setNbreIndivisiaire(enquetePayLoadWeb.getNbreIndivisiaire()); + enquete.setNbreCoProprietaire(enquetePayLoadWeb.getNbreCoProprietaire()); + enquete.setNumEnterParcelle(enquetePayLoadWeb.getNumEnterParcelle()); + enquete.setNomRue(enquetePayLoadWeb.getNomRue()); + enquete.setNumRue(enquetePayLoadWeb.getNumRue()); + enquete.setSuperficie(enquetePayLoadWeb.getSuperficie()); + enquete.setValeurMensuelleLocation(enquetePayLoadWeb.getValeurMensuelleLocation()); + enquete.setValeurAnnuelleLocation(enquetePayLoadWeb.getValeurAnnuelleLocation()); + enquete.setValeurParcelleEstime(enquetePayLoadWeb.getValeurParcelleEstime()); + enquete.setValeurParcelleReel(enquetePayLoadWeb.getValeurParcelleReel()); + Enquete finalEnquete=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 enquete; + } + + @Override + public Enquete updateEnquete(Long id,EnquetePayLoadWeb enquetePayLoadWeb) throws NotFoundException { + if (enquetePayLoadWeb.getId() == null) { + throw new BadRequestException("Impossible de mettre à jour une enquête ayant un id null."); + } + if (!enqueteRepository.existsById(enquetePayLoadWeb.getId())) { + throw new NotFoundException("Impossible de trouver l'enquête que vous désirez modifier."); + } + + if (enquetePayLoadWeb.getParcellePayLoadWeb()==null) { + throw new BadRequestException("Impossible d'enregistrer une enquête avec une parcelle inexistante"); + } + + Parcelle parcelle=new Parcelle(); + Long rueId; + Optional optionalUser = userRepository.findById(enquetePayLoadWeb.getEnqueteurId()); + if (!optionalUser.isPresent()) { + throw new BadRequestException("Echec de l'enregistrement : Enquêteur inexistant"); + } + Optional optionalProprietaire = personneRepository.findById(enquetePayLoadWeb.getProprietaireId()); + if (!optionalProprietaire.isPresent()) { + throw new BadRequestException("Echec de l'enregistrement : Propriétaire inexistant"); + } + + Optional optionalZoneRfu = zoneRfuRepository.findById(enquetePayLoadWeb.getZoneRfuId()); + if (!optionalZoneRfu.isPresent()) { + throw new BadRequestException("Echec de l'enregistrement : zone inexistante"); + } + + Optional optionalRue = rueRepository.findById(enquetePayLoadWeb.getZoneRfuId()); + + if (optionalRue.isPresent()) { + rueId=optionalRue.get().getId(); + enquetePayLoadWeb.getParcellePayLoadWeb().setRueId(rueId); + } + + Optional optionalEquipe = equipeRepository.findById(enquetePayLoadWeb.getEquipeId()); + + ///enregistrement de la pacelle + try { + if (enquetePayLoadWeb.getParcellePayLoadWeb().getId() == null) { + parcelle = parcelleService.createParcelle(enquetePayLoadWeb.getParcellePayLoadWeb()); + } else { + parcelle = parcelleService.updateParcelle(enquetePayLoadWeb.getParcellePayLoadWeb().getId(),enquetePayLoadWeb.getParcellePayLoadWeb()); + } + }catch (Exception e){ + throw new ApplicationException("Echec de l'enregistrement : La parcelle non enregistrée."); + } + ////enregistrement de l'enquete + Enquete enquete = new Enquete(); + enquete.setDateEnquete(LocalDate.now()); + //enquete.setBloc(optionalBloc.get()); + enquete.setUser(optionalUser.get()); + enquete.setParcelle(parcelle); + enquete.setLitige(enquetePayLoadWeb.isLitige()); + enquete.setStatutEnquete(StatutEnquete.EN_COURS); + enquete.setObservationParticuliere(enquetePayLoadWeb.getObservation()); + enquete.setPersonne(optionalProprietaire.orElse(null)); + enquete.setZoneRfu(optionalZoneRfu.orElse(null)); + enquete.setAutreAdresse(enquetePayLoadWeb.getAutreAdresse()); + enquete.setAutreNumeroTitreFoncier(enquetePayLoadWeb.getAutreNumeroTitreFoncier()); + enquete.setNumeroTitreFoncier(enquetePayLoadWeb.getNumeroTitreFoncier()); + enquete.setEquipe(optionalEquipe.orElse(null)); + enquete.setDateDebutExcemption(enquetePayLoadWeb.getDateDebutExemption()); + enquete.setDateFinExcemption(enquetePayLoadWeb.getDateFinExemption()); + enquete.setNbreBatiment(enquetePayLoadWeb.getNbreBatiment()); + enquete.setNbrePiscine(enquetePayLoadWeb.getNbrePiscine()); + enquete.setNbreIndivisiaire(enquetePayLoadWeb.getNbreIndivisiaire()); + enquete.setNbreCoProprietaire(enquetePayLoadWeb.getNbreCoProprietaire()); + enquete.setNumEnterParcelle(enquetePayLoadWeb.getNumEnterParcelle()); + enquete.setNomRue(enquetePayLoadWeb.getNomRue()); + enquete.setNumRue(enquetePayLoadWeb.getNumRue()); + enquete.setSuperficie(enquetePayLoadWeb.getSuperficie()); + enquete.setValeurMensuelleLocation(enquetePayLoadWeb.getValeurMensuelleLocation()); + enquete.setValeurAnnuelleLocation(enquetePayLoadWeb.getValeurAnnuelleLocation()); + enquete.setValeurParcelleEstime(enquetePayLoadWeb.getValeurParcelleEstime()); + enquete.setValeurParcelleReel(enquetePayLoadWeb.getValeurParcelleReel()); return enqueteRepository.save(enquete); } + @Override public List getEnqueteCommuneArrondBloc() { return enqueteRepository.getEnqueteComArrondBloc(); @@ -196,36 +377,6 @@ public class EnqueteServiceImpl implements EnqueteService { return enqueteFiltreResponses; } - @Override - public Enquete updateEnquete(EnquetePayLoad enquetePayLoad) throws NotFoundException { - if (enquetePayLoad.getIdBackend() == null) { - throw new BadRequestException("Impossible de mettre à jour une enquête ayant un id null."); - } - if (!enqueteRepository.existsById(enquetePayLoad.getIdBackend())) { - throw new NotFoundException("Impossible de trouver l'enquête que vous désirez modifier."); - } - Optional optionalUser = userRepository.findById(enquetePayLoad.getUserId()); - if (!optionalUser.isPresent()) { - throw new BadRequestException("Impossible d'enregistrer une enquête avec un enquêteur inexistant"); - } - Optional optionalBloc = blocRepository.findById(enquetePayLoad.getBlocId()); - if (!optionalBloc.isPresent()) { - throw new BadRequestException("Impossible d'enregistrer une enquête avec un bloc inexistant"); - } - Optional optionalParcelle = parcelleRepository.findById(enquetePayLoad.getParcelleId()); - if (!optionalParcelle.isPresent()) { - throw new BadRequestException("Impossible d'enregistrer une enquête avec une parcelle inexistante"); - } - Enquete enquete = enqueteRepository.findById(enquetePayLoad.getParcelleId()).get(); - enquete.setBloc(optionalBloc.get()); - enquete.setUser(optionalUser.get()); - enquete.setParcelle(optionalParcelle.get()); - enquete.setLitige(enquetePayLoad.isLitige()); - enquete.setDateFinalisation(enquetePayLoad.getDateFinalisation()); - enquete.setStatusEnquete(enquetePayLoad.getStatusEnquete()); - enquete.setObservationParticuliere(enquetePayLoad.getObservationParticuliere()); - return enqueteRepository.save(enquete); - } @Override public void deleteEnquete(Long id) throws NotFoundException { @@ -267,7 +418,7 @@ public class EnqueteServiceImpl implements EnqueteService { } Enquete enquete = optionalEnquete.get(); enquete.setDateValidation(LocalDate.now()); - enquete.setStatusEnquete(StatusEnquete.VALIDE); + enquete.setStatutEnquete(StatutEnquete.VALIDE); enquete.setSynchronise(false); return enqueteRepository.save(enquete); } @@ -284,7 +435,7 @@ public class EnqueteServiceImpl implements EnqueteService { Enquete enquete = optionalEnquete.get(); enquete.setDateRejet(LocalDate.now()); enquete.setDescriptionMotifRejet(enqueteTraitementPayLoad.getMotifRejet()); - enquete.setStatusEnquete(StatusEnquete.REJETE); + enquete.setStatutEnquete(StatutEnquete.REJETE); enquete.setSynchronise(false); return enqueteRepository.save(enquete); } @@ -325,7 +476,7 @@ public class EnqueteServiceImpl implements EnqueteService { throw new NotFoundException("Impossible de trouver l'enquête que vous désirez finaliser."); } optionalEnquete.get().setDateFinalisation(LocalDate.now()); - optionalEnquete.get().setStatusEnquete(StatusEnquete.FINALISE); + optionalEnquete.get().setStatutEnquete(StatutEnquete.FINALISE); return enqueteRepository.save(optionalEnquete.get()); } @@ -340,7 +491,7 @@ public class EnqueteServiceImpl implements EnqueteService { } optionalEnquete.get().setDateLitigeResolu(LocalDate.now()); optionalEnquete.get().setLitige(false); - optionalEnquete.get().setStatusEnquete(StatusEnquete.EN_COURS); + optionalEnquete.get().setStatutEnquete(StatutEnquete.EN_COURS); return enqueteRepository.save(optionalEnquete.get()); } diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java index 7b06455..4f1858d 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java @@ -11,7 +11,7 @@ import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.metier.ParcelleGeomService; import io.gmss.fiscad.interfaces.synchronisation.SynchronisationService; -import io.gmss.fiscad.paylaods.request.UploadPayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.UploadPayLoad; import io.gmss.fiscad.paylaods.response.EnqueteCheckResponse; import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; import io.gmss.fiscad.repositories.infocad.metier.ParcelleGeomRepository; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java index b559b2d..c767ac6 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java @@ -2,84 +2,84 @@ package io.gmss.fiscad.implementations.infocad.metier; import io.gmss.fiscad.entities.decoupage.Quartier; 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.SituationGeographique; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.metier.ParcelleService; -import io.gmss.fiscad.paylaods.request.ParcellePayLoad; +import io.gmss.fiscad.paylaods.request.crudweb.ParcellePayLoadWeb; import io.gmss.fiscad.repositories.decoupage.QuartierRepository; import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository; +import io.gmss.fiscad.repositories.infocad.metier.RueRepository; import io.gmss.fiscad.repositories.infocad.parametre.NatureDomaineRepository; import io.gmss.fiscad.repositories.infocad.parametre.SituationGeographiqueRepository; import io.gmss.fiscad.service.GeometryService; +import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Value; 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; - +@Service +@AllArgsConstructor public class ParcelleServiceImpl implements ParcelleService { private final NatureDomaineRepository natureDomaineRepository; private final QuartierRepository quartierRepository; private final SituationGeographiqueRepository situationGeographiqueRepository; private final ParcelleRepository parcelleRepository; + private final RueRepository rueRepository; private final GeometryService geometryService; - @Value("${infocad.geom.srid}") - private String defaultSrid32631; - @Value("${infocad.geom.sridfixe}") - private String defaultSrid; +// @Value("${infocad.geom.srid}") +// private String defaultSrid32631; +// @Value("${infocad.geom.sridfixe}") +// private String defaultSrid; + - public ParcelleServiceImpl(NatureDomaineRepository natureDomaineRepository, QuartierRepository quartierRepository, SituationGeographiqueRepository situationGeographiqueRepository, ParcelleRepository parcelleRepository, GeometryService geometryService) { - this.natureDomaineRepository = natureDomaineRepository; - this.quartierRepository = quartierRepository; - this.situationGeographiqueRepository = situationGeographiqueRepository; - this.parcelleRepository = parcelleRepository; - this.geometryService = geometryService; - } @Override - public Parcelle createParcelle(ParcellePayLoad parcellePayLoad) throws BadRequestException { - Optional optionalNatureDomaine = natureDomaineRepository.findById(parcellePayLoad.getNatureDomaineId()); + public Parcelle createParcelle(ParcellePayLoadWeb parcellePayLoadWeb) throws BadRequestException { + Optional optionalNatureDomaine = natureDomaineRepository.findById(parcellePayLoadWeb.getNatureDomaineId()); if (!optionalNatureDomaine.isPresent()) { throw new BadRequestException("Impossible d'enregistrer une parcelle avec une nature de domaine inexistant"); } - Optional optionalQuartier = quartierRepository.findById(parcellePayLoad.getQuartierId()); + Optional optionalQuartier = quartierRepository.findById(parcellePayLoadWeb.getQuartierId()); if (!optionalQuartier.isPresent()) { throw new BadRequestException("Impossible d'enregistrer une parcelle avec un quartier/village inexistant"); } - Optional optionalSituationGeographique = situationGeographiqueRepository.findById(parcellePayLoad.getSituationGeographiqueId()); - if (!optionalSituationGeographique.isPresent()) { - throw new BadRequestException("Impossible d'enregistrer une parcelle avec une situation géographique inexistant"); - } - - Parcelle parcelle = getParcelle(parcellePayLoad, optionalSituationGeographique, optionalNatureDomaine); + Parcelle parcelle = new Parcelle(); + parcelle.setNatureDomaine(optionalNatureDomaine.orElse(null)); + parcelle.setQuartier(optionalQuartier.orElse(null)); + parcelle = getParcelleFromPayload(parcelle, parcellePayLoadWeb); return parcelleRepository.save(parcelle); } @Override - public Parcelle updateParcelle(ParcellePayLoad parcellePayLoad) throws NotFoundException { - Optional optionalParcelle = parcelleRepository.findById(parcellePayLoad.getIdBackend()); + public Parcelle updateParcelle(Long id, ParcellePayLoadWeb parcellePayLoadWeb) throws NotFoundException { + Optional optionalParcelle = parcelleRepository.findById(parcellePayLoadWeb.getId()); if (!optionalParcelle.isPresent()) { throw new NotFoundException("Impossible de trouver la parcelle que vous désirer modifier"); } - Optional optionalNatureDomaine = natureDomaineRepository.findById(parcellePayLoad.getNatureDomaineId()); + Optional optionalNatureDomaine = natureDomaineRepository.findById(parcellePayLoadWeb.getNatureDomaineId()); if (!optionalNatureDomaine.isPresent()) { throw new BadRequestException("Impossible d'enregistrer une parcelle avec une nature de domaine inexistante"); } - Optional optionalQuartier = quartierRepository.findById(parcellePayLoad.getQuartierId()); + Optional optionalQuartier = quartierRepository.findById(parcellePayLoadWeb.getQuartierId()); if (!optionalQuartier.isPresent()) { throw new BadRequestException("Impossible d'enregistrer une parcelle avec un quartier/village inexistant"); } - Optional optionalSituationGeographique = situationGeographiqueRepository.findById(parcellePayLoad.getSituationGeographiqueId()); - if (!optionalSituationGeographique.isPresent()) { - throw new BadRequestException("Impossible d'enregistrer une parcelle avec une situation géographique inexistant"); - } - - Parcelle parcelle = getParcelle(optionalParcelle.get(), parcellePayLoad, optionalSituationGeographique, optionalNatureDomaine); +// Optional 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); return parcelleRepository.save(parcelle); } @@ -112,74 +112,57 @@ public class ParcelleServiceImpl implements ParcelleService { } } - private Parcelle getParcelle(ParcellePayLoad parcellePayLoad, Optional optionalSituationGeographique, Optional optionalNatureDomaine) { - StringBuilder coordonnees = new StringBuilder(); - Parcelle parcelle = new Parcelle(); - parcelle.setP(parcellePayLoad.getP()); - parcelle.setI(parcellePayLoad.getI()); - parcelle.setQ(parcellePayLoad.getQ()); - parcelle.setNup(parcellePayLoad.getNup()); - parcelle.setLatitude(parcellePayLoad.getLatitude()); - parcelle.setLongitude(parcellePayLoad.getLongitude()); - //parcelle.setSituationGeographique(optionalSituationGeographique.get()); - parcelle.setSituationGeographique(parcellePayLoad.getSituationGeographique()); - parcelle.setNatureDomaine(optionalNatureDomaine.get()); - parcelle.setNupProvisoire(parcellePayLoad.getNupProvisoire()); - // parcelle.setGeomSrid(parcellePayLoad.getGeomSrid()); - //////////spatial -// try { -// Point point=null; -// if (parcellePayLoad.getLatitude() != null && parcellePayLoad.getLongitude() != null){ -// coordonnees.append(parcelle.getLongitude()).append(" ").append(parcelle.getLatitude()); -// point = geometryService.toGeometryPoint(coordonnees.toString(), parcelle.getGeomSrid());//Integer.parseInt(defaultSrid)); -// if(parcelle.getGeomSrid()==Integer.parseInt(defaultSrid32631)) { -// parcelle.setGeometry32631(point); -// parcelle. setGeometry(null); -// } -// if(parcelle.getGeomSrid()==Integer.parseInt(defaultSrid)) { -// parcelle.setGeometry(point); -// parcelle.setGeometry32631(null); -// } -// } -// }catch (Exception e){ -// -// } + private Parcelle getParcelleFromPayload(Parcelle parcelle, ParcellePayLoadWeb parcellePayLoadWeb) { + Optional optionalRue = rueRepository.findById(parcellePayLoadWeb.getRueId()); + 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()); + parcelle.setRue(optionalRue.orElse(null)); return parcelle; } - private Parcelle getParcelle(Parcelle parcelle, ParcellePayLoad parcellePayLoad, Optional optionalSituationGeographique, Optional optionalNatureDomaine) { - StringBuilder coordonnees = new StringBuilder(); - parcelle.setP(parcellePayLoad.getP()); - parcelle.setI(parcellePayLoad.getI()); - parcelle.setQ(parcellePayLoad.getQ()); - parcelle.setNup(parcellePayLoad.getNup()); - parcelle.setLatitude(parcellePayLoad.getLatitude()); - parcelle.setLongitude(parcellePayLoad.getLongitude()); - //parcelle.setSituationGeographique(optionalSituationGeographique.get()); - parcelle.setSituationGeographique(parcellePayLoad.getSituationGeographique()); - parcelle.setNatureDomaine(optionalNatureDomaine.get()); - parcelle.setNupProvisoire(parcellePayLoad.getNupProvisoire()); - //parcelle.setGeomSrid(parcellePayLoad.getGeomSrid()); - //////////spatial -// try { -// Point point=null; -// if (parcellePayLoad.getLatitude() != null && parcellePayLoad.getLongitude() != null && parcellePayLoad.getGeomSrid() != 0){ -// coordonnees.append(parcelle.getLongitude()).append(" ").append(parcelle.getLatitude()); -// point = geometryService.toGeometryPoint(coordonnees.toString(), parcelle.getGeomSrid());//Integer.parseInt(defaultSrid)); -// if(parcelle.getGeomSrid()==Integer.parseInt(defaultSrid32631)) { -// parcelle.setGeometry32631(point); -// parcelle.setGeometry(null); -// } -// if(parcelle.getGeomSrid()==Integer.parseInt(defaultSrid)) { -// parcelle.setGeometry(point); -// parcelle.setGeometry32631(null); -// } -// } -// }catch (Exception e){ -// -// } - return parcelle; - } +// private Parcelle getParcelle(Parcelle parcelle, ParcellePayLoadWeb parcellePayLoadWeb, Optional optionalSituationGeographique, Optional optionalNatureDomaine) { +// StringBuilder coordonnees = new StringBuilder(); +// 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.setSituationGeographique(optionalSituationGeographique.get()); +// parcelle.setSituationGeographique(parcellePayLoadWeb.getSituationGeographique()); +// parcelle.setNatureDomaine(optionalNatureDomaine.get()); +// parcelle.setNupProvisoire(parcellePayLoadWeb.getNupProvisoire()); +// //parcelle.setGeomSrid(parcellePayLoadWeb.getGeomSrid()); +// //////////spatial +//// try { +//// Point point=null; +//// if (parcellePayLoadWeb.getLatitude() != null && parcellePayLoadWeb.getLongitude() != null && parcellePayLoadWeb.getGeomSrid() != 0){ +//// coordonnees.append(parcelle.getLongitude()).append(" ").append(parcelle.getLatitude()); +//// point = geometryService.toGeometryPoint(coordonnees.toString(), parcelle.getGeomSrid());//Integer.parseInt(defaultSrid)); +//// if(parcelle.getGeomSrid()==Integer.parseInt(defaultSrid32631)) { +//// parcelle.setGeometry32631(point); +//// parcelle.setGeometry(null); +//// } +//// if(parcelle.getGeomSrid()==Integer.parseInt(defaultSrid)) { +//// parcelle.setGeometry(point); +//// parcelle.setGeometry32631(null); +//// } +//// } +//// }catch (Exception e){ +//// +//// } +// return parcelle; +// } } \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java index 75549ba..4936a89 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java @@ -1,16 +1,26 @@ package io.gmss.fiscad.implementations.infocad.metier; -import io.gmss.fiscad.entities.infocad.parametre.Personne; +import io.gmss.fiscad.entities.decoupage.Commune; +import io.gmss.fiscad.entities.decoupage.Nationalite; +import io.gmss.fiscad.entities.decoupage.Quartier; +import io.gmss.fiscad.entities.infocad.parametre.*; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.metier.PersonneService; import io.gmss.fiscad.paylaods.dto.*; +import io.gmss.fiscad.paylaods.request.crudweb.PersonnePayLoadWeb; +import io.gmss.fiscad.repositories.decoupage.CommuneRepository; +import io.gmss.fiscad.repositories.decoupage.NationaliteRepository; import io.gmss.fiscad.repositories.infocad.metier.MembreGroupeRepository; import io.gmss.fiscad.repositories.infocad.metier.PieceRepository; import io.gmss.fiscad.repositories.infocad.metier.UploadRepository; import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.repositories.infocad.parametre.ProfessionRepository; +import io.gmss.fiscad.repositories.infocad.parametre.SituationMatrimonialeRepository; +import io.gmss.fiscad.repositories.infocad.parametre.TypePersonneRepository; +import io.gmss.fiscad.service.EntityFromPayLoadService; import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; @@ -28,15 +38,41 @@ public class PersonneServiceImpl implements PersonneService { private final UploadRepository uploadRepository; private final PieceRepository pieceRepository; private final MembreGroupeRepository membreGroupeRepository; + private final TypePersonneRepository typePersonneRepository; + private final CommuneRepository communeRepository; + private final NationaliteRepository nationaliteRepository; + private final ProfessionRepository professionRepository; + private final SituationMatrimonialeRepository situationMatrimonialeRepository; + private final EntityFromPayLoadService entityFromPayLoadService; @Override - public Personne createPersonne(Personne personne) throws BadRequestException { - return null; + public Personne createPersonne(PersonnePayLoadWeb personnePayLoadWeb) throws BadRequestException { +// Optional optionalTypePersonne = typePersonneRepository.findById(personnePayLoadWeb.getTypePersonneId()); +// +// Optional optionalCommune = communeRepository.findById(personnePayLoadWeb.getCommuneId()); +// +// +// Optional optionalNationalite = nationaliteRepository.findById(personnePayLoadWeb.getNationaliteId()); +// +// Optional optionalQuartier = situationMatrimonialeRepository.findById(personnePayLoadWeb.getSituationMatrimonialeId()); +// +// Optional optionalProfession = professionRepository.findById(personnePayLoadWeb.getProfessionId()); +// + Personne personne = entityFromPayLoadService.getPersonneFromPayLoadWeb(personnePayLoadWeb); + return personneRepository.save(personne); } @Override - public Personne updatePersonne(Long id, Personne personne) throws NotFoundException { - return null; + public Personne updatePersonne(Long id, PersonnePayLoadWeb personnePayLoadWeb) throws NotFoundException { + if (personnePayLoadWeb.getId() == null) { + throw new BadRequestException("Impossible de mettre à jour une enquête ayant un id null."); + } + if (!personneRepository.existsById(personnePayLoadWeb.getId())) { + throw new NotFoundException("Impossible de trouver la personne que vous désirez modifier."); + } + + Personne personne = entityFromPayLoadService.getPersonneFromPayLoadWeb(personnePayLoadWeb); + return personneRepository.save(personne); } @Override @@ -99,7 +135,7 @@ public class PersonneServiceImpl implements PersonneService { if(mg.getTypeRepresentation() == null){ return new MembreGroupeDTO( mg.getId(), - new PersonneSimpleDTO(pRep.getId(), pRep.getNomOuSigle(), pRep.getPrenomOuRaisonSociale()), + new PersonneSimpleDTO(pRep.getId(), pRep.getNom(), pRep.getPrenom(),pRep.getRaisonSociale()), null, new PositionRepresentationDTO(mg.getPositionRepresentation().getId(), mg.getPositionRepresentation().getLibelle()), uploads @@ -107,7 +143,7 @@ public class PersonneServiceImpl implements PersonneService { }else{ return new MembreGroupeDTO( mg.getId(), - new PersonneSimpleDTO(pRep.getId(), pRep.getNomOuSigle(), pRep.getPrenomOuRaisonSociale()), + new PersonneSimpleDTO(pRep.getId(), pRep.getNom(), pRep.getPrenom(),pRep.getRaisonSociale()), new TypeRepresentationDTO(mg.getTypeRepresentation().getId(), mg.getTypeRepresentation().getLibelle()), new PositionRepresentationDTO(mg.getPositionRepresentation().getId(), mg.getPositionRepresentation().getLibelle()), uploads @@ -121,8 +157,9 @@ public class PersonneServiceImpl implements PersonneService { return new PersonneCompletDTO( personne.getId(), personne.getIfu(), - personne.getNomOuSigle(), - personne.getPrenomOuRaisonSociale(), + personne.getNom(), + personne.getPrenom(), + personne.getRaisonSociale(), personne.getNumRavip(), personne.getNpi(), personne.getDateNaissanceOuConsti(), diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PieceServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PieceServiceImpl.java index 28ea5c0..a019f02 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PieceServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PieceServiceImpl.java @@ -6,10 +6,11 @@ import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.metier.PieceService; 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; - +@Service public class PieceServiceImpl implements PieceService { @Override public Piece createPiece(Piece piece) throws BadRequestException { diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/RueServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/RueServiceImpl.java new file mode 100644 index 0000000..f35dc3d --- /dev/null +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/RueServiceImpl.java @@ -0,0 +1,43 @@ +package io.gmss.fiscad.implementations.infocad.metier; + +import io.gmss.fiscad.entities.infocad.metier.Rue; +import io.gmss.fiscad.exceptions.BadRequestException; +import io.gmss.fiscad.exceptions.NotFoundException; +import io.gmss.fiscad.interfaces.infocad.metier.RueService; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.Optional; + +public class RueServiceImpl implements RueService { + @Override + public Rue createRue(Rue rue) throws BadRequestException { + return null; + } + + @Override + public Rue updateRue(Long id, Rue rue) throws NotFoundException { + return null; + } + + @Override + public void deleteRue(Long id) throws NotFoundException { + + } + + @Override + public Page getRueList(Pageable pageable) { + return null; + } + + @Override + public List getRueList() { + return null; + } + + @Override + public Optional getRueById(Long id) { + return Optional.empty(); + } +} diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRueServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRueServiceImpl.java new file mode 100644 index 0000000..44b4c17 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRueServiceImpl.java @@ -0,0 +1,72 @@ +package io.gmss.fiscad.implementations.infocad.parametre; + +import io.gmss.fiscad.entities.infocad.parametre.TypeRue; +import io.gmss.fiscad.exceptions.BadRequestException; +import io.gmss.fiscad.exceptions.NotFoundException; +import io.gmss.fiscad.interfaces.infocad.parametre.TypeRueService; +import io.gmss.fiscad.repositories.infocad.parametre.TypeRueRepository; +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; + +@Service +public class TypeRueServiceImpl implements TypeRueService { + + private final TypeRueRepository typeRueRepository; + + public TypeRueServiceImpl(TypeRueRepository typeRueRepository) { + this.typeRueRepository = typeRueRepository; + } + + @Override + public TypeRue createTypeRue(TypeRue typeRue) throws BadRequestException { + if (typeRue.getId() != null) { + throw new BadRequestException("Impossible de créer un nouveau type de rue ayant un id non null."); + } + return typeRueRepository.save(typeRue); + } + + @Override + public TypeRue updateTypeRue(Long id, TypeRue typeRue) throws NotFoundException { + if (typeRue.getId() == null) { + throw new BadRequestException("Impossible de mettre à jour un nouveau type de rue ayant un id null."); + } + if (!typeRueRepository.existsById(typeRue.getId())) { + throw new NotFoundException("Impossible de trouver le type de rue spécifié dans notre base de données."); + } + return typeRueRepository.save(typeRue); + } + + @Override + public void deleteTypeRue(Long id) throws NotFoundException { + Optional typeRueOptional = typeRueRepository.findById(id); + if (typeRueOptional.isPresent()) { + typeRueRepository.deleteById(typeRueOptional.get().getId()); + } else { + throw new NotFoundException("Impossible de trouver le type de rue spécifié dans notre base de données."); + } + } + + @Override + public Page getTypeRueList(Pageable pageable) { + return typeRueRepository.findAll(pageable); + } + + @Override + public List getTypeRueList() { + return typeRueRepository.findAll(); + } + + @Override + public Optional getTypeRueById(Long id) { + if (typeRueRepository.existsById(id)) { + return typeRueRepository.findById(id); + } else { + throw new NotFoundException("Impossible de trouver le type de rue spécifié dans la base de données."); + } + + } +} diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java index 5644fb9..deb9de4 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java @@ -4,39 +4,44 @@ import io.gmss.fiscad.entities.rfu.metier.Batiment; 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.repositories.rfu.metier.BatimentRepository; +import io.gmss.fiscad.service.EntityFromPayLoadService; +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 BatimentServiceImpl implements BatimentService { private final BatimentRepository batimentRepository; + private final EntityFromPayLoadService entityFromPayLoadService; - public BatimentServiceImpl(BatimentRepository batimentRepository) { - this.batimentRepository = batimentRepository; - } @Override - public Batiment createBatiment(Batiment batiment) throws BadRequestException { - if (batiment.getId() != null) { + public Batiment createBatiment(BatimentPaylaodWeb batimentPaylaodWeb) throws BadRequestException { + if (batimentPaylaodWeb.getId() != null) { throw new BadRequestException("Impossible de créer un nouveau batiment ayant un id non null."); } + Batiment batiment= entityFromPayLoadService.getBatimentFromPayLoadWeb(batimentPaylaodWeb); + return batimentRepository.save(batiment); } @Override - public Batiment updateBatiment(Long id, Batiment batiment) throws NotFoundException { - if (batiment.getId() == null) { + public Batiment updateBatiment(Long id,BatimentPaylaodWeb batimentPaylaodWeb) throws NotFoundException { + if (batimentPaylaodWeb.getId() == null) { throw new BadRequestException("Impossible de mettre à jour un nouveau batiment ayant un id null."); } - if (!batimentRepository.existsById(batiment.getId())) { + if (!batimentRepository.existsById(batimentPaylaodWeb.getId())) { throw new NotFoundException("Impossible de trouver le batiment spécifié dans notre base de données."); } + Batiment batiment= entityFromPayLoadService.getBatimentFromPayLoadWeb(batimentPaylaodWeb); + return batimentRepository.save(batiment); } diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteActiviteServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteActiviteServiceImpl.java index 69b949b..345542a 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteActiviteServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteActiviteServiceImpl.java @@ -4,39 +4,53 @@ import io.gmss.fiscad.entities.rfu.metier.EnqueteActivite; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.metier.EnqueteActiviteService; +import io.gmss.fiscad.paylaods.request.crudweb.EnqueteActivitePayLoadWeb; import io.gmss.fiscad.repositories.rfu.metier.EnqueteActiviteRepository; +import io.gmss.fiscad.service.EntityFromPayLoadService; +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 EnqueteActiviteServiceImpl implements EnqueteActiviteService { private final EnqueteActiviteRepository enqueteActiviteRepository; - - public EnqueteActiviteServiceImpl(EnqueteActiviteRepository enqueteActiviteRepository) { - this.enqueteActiviteRepository = enqueteActiviteRepository; - } + private final EntityFromPayLoadService entityFromPayLoadService; @Override - public EnqueteActivite createEnqueteActivite(EnqueteActivite enqueteActivite) throws BadRequestException { - if (enqueteActivite.getId() != null) { - throw new BadRequestException("Impossible de créer une nouvelle activité ayant un id non null."); + public EnqueteActivite createEnqueteActivite(EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) throws BadRequestException { + if (enqueteActivitePayLoadWeb.getId() != null) { + throw new BadRequestException("Il ne s'agit pas ici d'une nouvelle activité : " + enqueteActivitePayLoadWeb.getId()); } + if (enqueteActivitePayLoadWeb.getPersonneId() != null) { + throw new BadRequestException("Il ne s'agit pas ici d'une nouvelle activité : " + enqueteActivitePayLoadWeb.getId()); + } + if (enqueteActivitePayLoadWeb.getId() != null) { + throw new BadRequestException("Il ne s'agit pas ici d'une nouvelle activité : " + enqueteActivitePayLoadWeb.getId()); + } + if (enqueteActivitePayLoadWeb.getId() != null) { + throw new BadRequestException("Il ne s'agit pas ici d'une nouvelle activité : " + enqueteActivitePayLoadWeb.getId()); + } + if (enqueteActivitePayLoadWeb.getId() != null) { + throw new BadRequestException("Il ne s'agit pas ici d'une nouvelle activité : " + enqueteActivitePayLoadWeb.getId()); + } + EnqueteActivite enqueteActivite = entityFromPayLoadService.getEnqueteActivitePayLoadWeb(enqueteActivitePayLoadWeb); return enqueteActiviteRepository.save(enqueteActivite); } @Override - public EnqueteActivite updateEnqueteActivite(Long id, EnqueteActivite enqueteActivite) throws NotFoundException { - if (enqueteActivite.getId() == null) { + public EnqueteActivite updateEnqueteActivite(Long id, EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) throws NotFoundException { + if (enqueteActivitePayLoadWeb.getId() == null) { throw new BadRequestException("Impossible de mettre à jour une nouvelle activité ayant un id null."); } - if (!enqueteActiviteRepository.existsById(enqueteActivite.getId())) { - throw new NotFoundException("Impossible de trouver la nouvelle activité spécifiée dans notre base de données."); + if (!enqueteActiviteRepository.existsById(enqueteActivitePayLoadWeb.getId())) { + throw new NotFoundException("Impossible de trouver l'enquête activité spécifiée dans notre base de données."); } + EnqueteActivite enqueteActivite = entityFromPayLoadService.getEnqueteActivitePayLoadWeb(enqueteActivitePayLoadWeb); return enqueteActiviteRepository.save(enqueteActivite); } diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java index c9fa7f8..1f47f1f 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java @@ -1,42 +1,161 @@ package io.gmss.fiscad.implementations.rfu.metier; +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.CaracteristiqueParcelle; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; +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.crudweb.EnqueteBatimentPayloadWeb; +import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.repositories.infocad.metier.UploadRepository; +import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; import io.gmss.fiscad.repositories.rfu.metier.EnqueteBatimentRepository; +import io.gmss.fiscad.service.EntityFromPayLoadService; +import lombok.AllArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; +import javax.swing.text.html.Option; 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; + - public EnqueteBatimentServiceImpl(EnqueteBatimentRepository enqueteBatimentRepository) { - this.enqueteBatimentRepository = enqueteBatimentRepository; - } @Override - public EnqueteBatiment createEnqueteBatiment(EnqueteBatiment enqueteBatiment) throws BadRequestException { - if (enqueteBatiment.getId() != null) { - throw new BadRequestException("Impossible de créer une nouvelle enquete de batiment ayant un id non null."); + public EnqueteBatiment createEnqueteBatiment(EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) throws BadRequestException { + EnqueteBatiment enqueteBatiment=new EnqueteBatiment(); + Batiment batiment=new Batiment(); + Enquete enquete=new Enquete(); + if(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb().getId()==null){ + batiment= batimentService.createBatiment(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb());//entityFromPayLoadService.getBatimentFromPayLoadWeb(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb())); + }else{ + batiment= batimentService.updateBatiment(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb().getId(),enqueteBatimentPayloadWeb.getBatimentPaylaodWeb());//entityFromPayLoadService.getBatimentFromPayLoadWeb(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb())); } - return enqueteBatimentRepository.save(enqueteBatiment); + + if(enqueteBatimentPayloadWeb.getEnqueteId()==null){ + throw new BadRequestException("Impossible de poursuivre l'enregistrement sans la précision de l'enquête"); + } + Optional optionalPersonne=Optional.empty(); + if(enqueteBatimentPayloadWeb.getPersonneId()!=null){ + optionalPersonne=personneRepository.findById(enqueteBatimentPayloadWeb.getPersonneId()); + } + + + Optional optionalEnquete = enqueteRepository.findById(enqueteBatimentPayloadWeb.getEnqueteId()); + enqueteBatiment.setEnquete(optionalEnquete.orElse(null)); + enqueteBatiment.setBatiment(batiment); + enqueteBatiment.setPersonne(optionalPersonne.orElse(null)); + enqueteBatiment.setAutreCaracteristiquePhysique(enqueteBatimentPayloadWeb.getAutreCaracteristiquePhysique()); + enqueteBatiment.setAutreMur(enqueteBatimentPayloadWeb.getAutreMur()); + enqueteBatiment.setAutreMenuisierie(enqueteBatimentPayloadWeb.getAutreMenuisierie()); + enqueteBatiment.setDateDebutExcemption(enqueteBatimentPayloadWeb.getDateDebutExcemption()); + enqueteBatiment.setDateFinExcemption(enqueteBatimentPayloadWeb.getDateFinExcemption()); + enqueteBatiment.setNbreHabitant(enqueteBatimentPayloadWeb.getNbreHabitant()); + enqueteBatiment.setNbreLotUnite(enqueteBatimentPayloadWeb.getNbreLotUnite()); + enqueteBatiment.setNbreMenage(enqueteBatimentPayloadWeb.getNbreMenage()); + enqueteBatiment.setNbreMoisLocation(enqueteBatimentPayloadWeb.getNbreMoisLocation()); + enqueteBatiment.setNbreUniteLocation(enqueteBatimentPayloadWeb.getNbreUniteLocation()); + enqueteBatiment.setNumCompteurSbee(enqueteBatimentPayloadWeb.getNumCompteurSbee()); + enqueteBatiment.setNumCompteurSoneb(enqueteBatimentPayloadWeb.getNumCompteurSoneb()); + enqueteBatiment.setSbee(enqueteBatimentPayloadWeb.isSbee()); + enqueteBatiment.setSoneb(enqueteBatimentPayloadWeb.isSoneb()); + enqueteBatiment.setSurfaceAuSol(enqueteBatimentPayloadWeb.getSurfaceAuSol()); + enqueteBatiment.setSurfaceLouee(enqueteBatimentPayloadWeb.getSurfaceLouee()); + enqueteBatiment.setMontantMensuelLocation(enqueteBatimentPayloadWeb.getMontantMensuelLocation()); + enqueteBatiment.setValeurBatimentReel(enqueteBatimentPayloadWeb.getValeurBatimentReel()); + enqueteBatiment.setValeurBatimentEstime(enqueteBatimentPayloadWeb.getValeurBatimentEstime()); + enqueteBatiment.setMontantLocatifAnnuelDeclare(enqueteBatimentPayloadWeb.getMontantLocatifAnnuelDeclare()); + enqueteBatiment= enqueteBatimentRepository.save(enqueteBatiment); + + //////Enregistrement des caractéristiques batiment + Long enqueteBatimentId = enqueteBatiment.getId(); + enqueteBatimentPayloadWeb.getCaracteristiqueBatimentPayloadWebs().forEach(caracteristiqueBatimentPayloadWeb -> { + caracteristiqueBatimentPayloadWeb.setEnqueteBatimentId(enqueteBatimentId); + CaracteristiqueBatiment caracteristiqueBatiment=entityFromPayLoadService.getCaracteristiqueBatimentFromPayLoadWeb(caracteristiqueBatimentPayloadWeb); + caracteristiqueBatimentService.createCaracteristiqueBatiment(caracteristiqueBatiment); + }); + + EnqueteBatiment finalEnqueteBatiment = enqueteBatiment; + enqueteBatimentPayloadWeb.getUploadPayLoadWebs().forEach(uploadPayLoadWeb -> { + optionalEnquete.ifPresent(value -> uploadPayLoadWeb.setEnqueteId(value.getId())); + Upload upload=entityFromPayLoadService.getUploadFromPayLoadWeb(uploadPayLoadWeb); + upload.setEnqueteBatiment(finalEnqueteBatiment); + uploadRepository.save(upload); + }); + + return enqueteBatiment ; } @Override - public EnqueteBatiment updateEnqueteBatiment(Long id, EnqueteBatiment enqueteBatiment) throws NotFoundException { - if (enqueteBatiment.getId() == null) { + public EnqueteBatiment 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."); } - if (!enqueteBatimentRepository.existsById(enqueteBatiment.getId())) { + if (!enqueteBatimentRepository.existsById(enqueteBatimentPayloadWeb.getId())) { throw new NotFoundException("Impossible de trouver la nouvelle enquete de batiment spécifiée dans notre base de données."); } + if(enqueteBatimentPayloadWeb.getEnqueteId()==null){ + throw new BadRequestException("Impossible de poursuivre l'enregistrement sans la précision de l'enquête"); + } + Optional optionalEnquete = enqueteRepository.findById(enqueteBatimentPayloadWeb.getEnqueteId()); + + EnqueteBatiment enqueteBatiment=new EnqueteBatiment(); + Batiment batiment=new Batiment(); + + if(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb().getId()==null){ + batiment= batimentService.createBatiment(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb());//entityFromPayLoadService.getBatimentFromPayLoadWeb(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb())); + }else{ + batiment= batimentService.updateBatiment(id,enqueteBatimentPayloadWeb.getBatimentPaylaodWeb());//entityFromPayLoadService.getBatimentFromPayLoadWeb(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb())); + } + + + Optional optionalPersonne=Optional.empty(); + if(enqueteBatimentPayloadWeb.getPersonneId()!=null){ + optionalPersonne=personneRepository.findById(enqueteBatimentPayloadWeb.getPersonneId()); + } + enqueteBatiment.setEnquete(optionalEnquete.orElse(null)); + enqueteBatiment.setBatiment(batiment); + enqueteBatiment.setPersonne(optionalPersonne.orElse(null)); + enqueteBatiment.setAutreCaracteristiquePhysique(enqueteBatimentPayloadWeb.getAutreCaracteristiquePhysique()); + enqueteBatiment.setAutreMur(enqueteBatimentPayloadWeb.getAutreMur()); + enqueteBatiment.setAutreMenuisierie(enqueteBatimentPayloadWeb.getAutreMenuisierie()); + enqueteBatiment.setDateDebutExcemption(enqueteBatimentPayloadWeb.getDateDebutExcemption()); + enqueteBatiment.setDateFinExcemption(enqueteBatimentPayloadWeb.getDateFinExcemption()); + enqueteBatiment.setNbreHabitant(enqueteBatimentPayloadWeb.getNbreHabitant()); + enqueteBatiment.setNbreLotUnite(enqueteBatimentPayloadWeb.getNbreLotUnite()); + enqueteBatiment.setNbreMenage(enqueteBatimentPayloadWeb.getNbreMenage()); + enqueteBatiment.setNbreMoisLocation(enqueteBatimentPayloadWeb.getNbreMoisLocation()); + enqueteBatiment.setNbreUniteLocation(enqueteBatimentPayloadWeb.getNbreUniteLocation()); + enqueteBatiment.setNumCompteurSbee(enqueteBatimentPayloadWeb.getNumCompteurSbee()); + enqueteBatiment.setNumCompteurSoneb(enqueteBatimentPayloadWeb.getNumCompteurSoneb()); + enqueteBatiment.setSbee(enqueteBatimentPayloadWeb.isSbee()); + enqueteBatiment.setSoneb(enqueteBatimentPayloadWeb.isSoneb()); + enqueteBatiment.setSurfaceAuSol(enqueteBatimentPayloadWeb.getSurfaceAuSol()); + enqueteBatiment.setSurfaceLouee(enqueteBatimentPayloadWeb.getSurfaceLouee()); + enqueteBatiment.setMontantMensuelLocation(enqueteBatimentPayloadWeb.getMontantMensuelLocation()); + enqueteBatiment.setValeurBatimentReel(enqueteBatimentPayloadWeb.getValeurBatimentReel()); + enqueteBatiment.setValeurBatimentEstime(enqueteBatimentPayloadWeb.getValeurBatimentEstime()); + enqueteBatiment.setMontantLocatifAnnuelDeclare(enqueteBatimentPayloadWeb.getMontantLocatifAnnuelDeclare()); + enqueteBatiment= enqueteBatimentRepository.save(enqueteBatiment); return enqueteBatimentRepository.save(enqueteBatiment); } diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java index a76dcf0..dc64650 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java @@ -1,43 +1,153 @@ package io.gmss.fiscad.implementations.rfu.metier; -import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; +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.*; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; +import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueUniteLogementService; import io.gmss.fiscad.interfaces.rfu.metier.EnqueteUniteLogementService; +import io.gmss.fiscad.interfaces.rfu.metier.UniteLogementService; +import io.gmss.fiscad.paylaods.request.crudweb.EnqueteUniteLogementPayloadWeb; +import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.repositories.infocad.metier.UploadRepository; +import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; import io.gmss.fiscad.repositories.rfu.metier.EnqueteUniteLogementRepository; +import io.gmss.fiscad.service.EntityFromPayLoadService; +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 EnqueteUniteLogementServiceImpl implements EnqueteUniteLogementService { private final EnqueteUniteLogementRepository enqueteUniteLogementRepository; + private final UniteLogementService uniteLogementService; + private final EntityFromPayLoadService entityFromPayLoadService ; + private final PersonneRepository personneRepository ; + private final EnqueteRepository enqueteRepository ; + private final UploadRepository uploadRepository ; + private final CaracteristiqueUniteLogementService caracteristiqueUniteLogementService ; + - public EnqueteUniteLogementServiceImpl(EnqueteUniteLogementRepository enqueteUniteLogementRepository) { - this.enqueteUniteLogementRepository = enqueteUniteLogementRepository; - } @Override - public EnqueteUniteLogement createEnqueteUniteLogement(EnqueteUniteLogement enqueteUniteLogement) throws BadRequestException { - if (enqueteUniteLogement.getId() != null) { - throw new BadRequestException("Impossible de créer une nouvelle enquete de d'unité de logement ayant un id non null."); + public EnqueteUniteLogement createEnqueteUniteLogement(EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) throws BadRequestException { + EnqueteUniteLogement enqueteUniteLogement=new EnqueteUniteLogement(); + UniteLogement uniteLogement=new UniteLogement(); + Enquete enquete=new Enquete(); + if(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb().getId()==null){ + uniteLogement = uniteLogementService.createUniteLogement(entityFromPayLoadService.getUniteLogementFromPayLoadWeb(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb())); + }else{ + uniteLogement = uniteLogementService.updateUniteLogement(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb().getId(),entityFromPayLoadService.getUniteLogementFromPayLoadWeb(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb())); } - return enqueteUniteLogementRepository.save(enqueteUniteLogement); + + if(enqueteUniteLogementPayloadWeb.getEnqueteId()==null){ + throw new BadRequestException("Impossible de poursuivre l'enregistrement sans la précision de l'enquête"); + } + + Optional optionalPersonne=Optional.empty(); + if(enqueteUniteLogementPayloadWeb.getPersonneId()!=null){ + optionalPersonne=personneRepository.findById(enqueteUniteLogementPayloadWeb.getPersonneId()); + } + + + Optional optionalEnquete = enqueteRepository.findById(enqueteUniteLogementPayloadWeb.getEnqueteId()); + enqueteUniteLogement.setEnquete(optionalEnquete.orElse(null)); + enqueteUniteLogement.setUniteLogement(uniteLogement); + enqueteUniteLogement.setPersonne(optionalPersonne.orElse(null)); + enqueteUniteLogement.setEnLocation(enqueteUniteLogementPayloadWeb.isEnLocation()); + enqueteUniteLogement.setDateDebutExcemption(enqueteUniteLogementPayloadWeb.getDateDebutExcemption()); + enqueteUniteLogement.setDateFinExcemption(enqueteUniteLogementPayloadWeb.getDateFinExcemption()); + enqueteUniteLogement.setNbreHabitant(enqueteUniteLogementPayloadWeb.getNbreHabitant()); + enqueteUniteLogement.setNbreMenage(enqueteUniteLogementPayloadWeb.getNbreMenage()); + enqueteUniteLogement.setNbreMoisLocation(enqueteUniteLogementPayloadWeb.getNbreMoisLocation()); + enqueteUniteLogement.setNumCompteurSbee(enqueteUniteLogementPayloadWeb.getNumCompteurSbee()); + enqueteUniteLogement.setNumCompteurSoneb(enqueteUniteLogementPayloadWeb.getNumCompteurSoneb()); + enqueteUniteLogement.setSbee(enqueteUniteLogementPayloadWeb.isSbee()); + enqueteUniteLogement.setSoneb(enqueteUniteLogementPayloadWeb.isSoneb()); + enqueteUniteLogement.setSurfaceAuSol(enqueteUniteLogementPayloadWeb.getSurfaceAuSol()); + enqueteUniteLogement.setSurfaceLouee(enqueteUniteLogementPayloadWeb.getSurfaceLouee()); + enqueteUniteLogement.setValeurUniteLogementEstime(enqueteUniteLogementPayloadWeb.getValeurUniteLogementEstime()); + enqueteUniteLogement.setValeurUniteLogementReel(enqueteUniteLogementPayloadWeb.getValeurUniteLogementReel()); + enqueteUniteLogement.setMontantLocatifAnnuelDeclare(enqueteUniteLogementPayloadWeb.getMontantLocatifAnnuelDeclare()); + enqueteUniteLogement.setMontantMensuelLoyer(enqueteUniteLogementPayloadWeb.getMontantMensuelLoyer()); + enqueteUniteLogement= enqueteUniteLogementRepository.save(enqueteUniteLogement); + + //////Enregistrement des caractéristiques batiment + Long enqueteUniteLogementId = enqueteUniteLogement.getId(); + enqueteUniteLogementPayloadWeb.getCaracteristiqueUniteLogementPayloadWebs().forEach(caracteristiqueUniteLogementPayloadWeb -> { + caracteristiqueUniteLogementPayloadWeb.setEnqueteUniteLogementId(enqueteUniteLogementId); + CaracteristiqueUniteLogement caracteristiqueUniteLogement=entityFromPayLoadService.getCaracteristiqueUniteLogementFromPayLoadWeb(caracteristiqueUniteLogementPayloadWeb); + caracteristiqueUniteLogementService.createCaracteristiqueUniteLogement(caracteristiqueUniteLogement); + }); + + ///////Enregistrement des pieces + EnqueteUniteLogement finalEnqueteUniteLogement = enqueteUniteLogement; + enqueteUniteLogementPayloadWeb.getUploadPayLoadWebs().forEach(uploadPayLoadWeb -> { + optionalEnquete.ifPresent(value -> uploadPayLoadWeb.setEnqueteId(value.getId())); + Upload upload=entityFromPayLoadService.getUploadFromPayLoadWeb(uploadPayLoadWeb); + upload.setEnqueteUniteLogement(finalEnqueteUniteLogement); + uploadRepository.save(upload); + }); + + return enqueteUniteLogement ; } @Override - public EnqueteUniteLogement updateEnqueteUniteLogement(Long id, EnqueteUniteLogement enqueteUniteLogement) throws NotFoundException { - if (enqueteUniteLogement.getId() == null) { + public EnqueteUniteLogement updateEnqueteUniteLogement(Long id, EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) throws NotFoundException { + if (enqueteUniteLogementPayloadWeb.getId() == null) { throw new BadRequestException("Impossible de mettre à jour une nouvelle enquete d'unité de logement ayant un id null."); } - if (!enqueteUniteLogementRepository.existsById(enqueteUniteLogement.getId())) { + + if (!enqueteUniteLogementRepository.existsById(enqueteUniteLogementPayloadWeb.getId())) { throw new NotFoundException("Impossible de trouver la nouvelle enquete d'unité de logement spécifiée dans notre base de données."); } - return enqueteUniteLogementRepository.save(enqueteUniteLogement); + EnqueteUniteLogement enqueteUniteLogement= new EnqueteUniteLogement(); + UniteLogement uniteLogement= new UniteLogement(); + + if(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb().getId()==null){ + uniteLogement = uniteLogementService.createUniteLogement(entityFromPayLoadService.getUniteLogementFromPayLoadWeb(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb())); + }else{ + uniteLogement = uniteLogementService.updateUniteLogement(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb().getId(),entityFromPayLoadService.getUniteLogementFromPayLoadWeb(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb())); + } + + if(enqueteUniteLogementPayloadWeb.getEnqueteId()==null){ + throw new BadRequestException("Impossible de poursuivre l'enregistrement sans la précision de l'enquête"); + } + + Optional optionalPersonne=Optional.empty(); + if(enqueteUniteLogementPayloadWeb.getPersonneId()!=null){ + optionalPersonne=personneRepository.findById(enqueteUniteLogementPayloadWeb.getPersonneId()); + } + Optional optionalEnquete = enqueteRepository.findById(enqueteUniteLogementPayloadWeb.getEnqueteId()); + + enqueteUniteLogement.setEnquete(optionalEnquete.orElse(null)); + enqueteUniteLogement.setUniteLogement(uniteLogement); + enqueteUniteLogement.setPersonne(optionalPersonne.orElse(null)); + enqueteUniteLogement.setEnLocation(enqueteUniteLogementPayloadWeb.isEnLocation()); + enqueteUniteLogement.setDateDebutExcemption(enqueteUniteLogementPayloadWeb.getDateDebutExcemption()); + enqueteUniteLogement.setDateFinExcemption(enqueteUniteLogementPayloadWeb.getDateFinExcemption()); + enqueteUniteLogement.setNbreHabitant(enqueteUniteLogementPayloadWeb.getNbreHabitant()); + enqueteUniteLogement.setNbreMenage(enqueteUniteLogementPayloadWeb.getNbreMenage()); + enqueteUniteLogement.setNbreMoisLocation(enqueteUniteLogementPayloadWeb.getNbreMoisLocation()); + enqueteUniteLogement.setNumCompteurSbee(enqueteUniteLogementPayloadWeb.getNumCompteurSbee()); + enqueteUniteLogement.setNumCompteurSoneb(enqueteUniteLogementPayloadWeb.getNumCompteurSoneb()); + enqueteUniteLogement.setSbee(enqueteUniteLogementPayloadWeb.isSbee()); + enqueteUniteLogement.setSoneb(enqueteUniteLogementPayloadWeb.isSoneb()); + enqueteUniteLogement.setSurfaceAuSol(enqueteUniteLogementPayloadWeb.getSurfaceAuSol()); + enqueteUniteLogement.setSurfaceLouee(enqueteUniteLogementPayloadWeb.getSurfaceLouee()); + enqueteUniteLogement.setValeurUniteLogementEstime(enqueteUniteLogementPayloadWeb.getValeurUniteLogementEstime()); + enqueteUniteLogement.setValeurUniteLogementReel(enqueteUniteLogementPayloadWeb.getValeurUniteLogementReel()); + enqueteUniteLogement.setMontantLocatifAnnuelDeclare(enqueteUniteLogementPayloadWeb.getMontantLocatifAnnuelDeclare()); + enqueteUniteLogement.setMontantMensuelLoyer(enqueteUniteLogementPayloadWeb.getMontantMensuelLoyer()); + enqueteUniteLogement= enqueteUniteLogementRepository.save(enqueteUniteLogement); + return enqueteUniteLogement; } @Override diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/EquipeServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/EquipeServiceImpl.java index 2a211a6..599b37a 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/EquipeServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/EquipeServiceImpl.java @@ -8,8 +8,8 @@ import io.gmss.fiscad.entities.rfu.parametre.Participer; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.parametre.EquipeService; -import io.gmss.fiscad.paylaods.request.EquipePayload; -import io.gmss.fiscad.paylaods.request.ParticiperPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.EquipePayload; +import io.gmss.fiscad.paylaods.request.synchronisation.ParticiperPayload; import io.gmss.fiscad.repositories.decoupage.SecteurRepository; import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; import io.gmss.fiscad.repositories.rfu.parametre.CampagneRepository; diff --git a/src/main/java/io/gmss/fiscad/implementations/synchronisation/RestaurationServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/synchronisation/RestaurationServiceImpl.java index ea24f89..e8c04f0 100644 --- a/src/main/java/io/gmss/fiscad/implementations/synchronisation/RestaurationServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/synchronisation/RestaurationServiceImpl.java @@ -4,6 +4,7 @@ import io.gmss.fiscad.entities.infocad.metier.Tpe; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.interfaces.synchronisation.RestaurationService; import io.gmss.fiscad.interfaces.user.UserService; +import io.gmss.fiscad.paylaods.request.synchronisation.UploadPayLoad; import io.gmss.fiscad.paylaods.response.restoration.*; import io.gmss.fiscad.repositories.infocad.metier.*; import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; @@ -43,7 +44,7 @@ public class RestaurationServiceImpl implements RestaurationService { @Override - public List getActeurConcernes(Long terminaleId) { + public List getActeurConcernes(Long terminaleId) { return acteurConcerneRepository.getActeurConcerneByTerminalId(terminaleId); } @@ -59,90 +60,90 @@ public class RestaurationServiceImpl implements RestaurationService { } @Override - public List getParcelle(Long terminaleId) { + public List getParcelle(Long terminaleId) { return parcelleRepository.getParcellesByTerminalId(terminaleId); } @Override - public List getPieces(Long terminaleId) { + public List getPieces(Long terminaleId) { return pieceRepository.getPiecesByTerminalId(terminaleId); } @Override - public List getMembreGroupe(Long terminaleId) { + public List getMembreGroupe(Long terminaleId) { return membreGroupeRepository.getMembreGroupeByTerminalId(terminaleId); } @Override - public List getUpload(Long terminaleId) { - List uploadPayLoads = uploadRepository.getUploadByTerminalId(terminaleId); + public List getUpload(Long terminaleId) { + List uploadPayLoadRestors = uploadRepository.getUploadByTerminalId(terminaleId); - List uploadPayLoadsOut = new ArrayList<>(); - uploadPayLoads.forEach(uploadPayLoad -> { - io.gmss.fiscad.paylaods.request.UploadPayLoad uploadPayLoadLocal = new io.gmss.fiscad.paylaods.request.UploadPayLoad(); - uploadPayLoadLocal.setTerminalId(uploadPayLoad.getTerminalId()); - String inputStream = getUploadFile(uploadPayLoad); + List uploadPayLoadsOut = new ArrayList<>(); + uploadPayLoadRestors.forEach(uploadPayLoadRestor -> { + UploadPayLoad uploadPayLoadLocal = new UploadPayLoad(); + uploadPayLoadLocal.setTerminalId(uploadPayLoadRestor.getTerminalId()); + String inputStream = getUploadFile(uploadPayLoadRestor); uploadPayLoadLocal.setFileBase64(inputStream); - uploadPayLoadLocal.setIdBackend(uploadPayLoad.getIdBackend()); - uploadPayLoadLocal.setPieceId(uploadPayLoad.getPieceId()); - uploadPayLoadLocal.setSynchronise(uploadPayLoad.getSynchronise()); - uploadPayLoadLocal.setMembreGroupeId(uploadPayLoad.getMembreGroupeId()); - uploadPayLoadLocal.setExternalKey(uploadPayLoad.getExternalKey()); - uploadPayLoadLocal.setBlocId(uploadPayLoad.getBlocId()); - uploadPayLoadLocal.setFilePath(uploadPayLoad.getFilePath()); - uploadPayLoadLocal.setEnqueteId(uploadPayLoad.getEnqueteId()); - uploadPayLoadLocal.setMax_numero_acteur_concerne_id(uploadPayLoad.getMax_numero_acteur_concerne_id()); - uploadPayLoadLocal.setMax_numero_piece_id(uploadPayLoad.getMax_numero_piece_id()); - uploadPayLoadLocal.setMax_numero_upload_id(uploadPayLoad.getMax_numero_upload_id()); - uploadPayLoadLocal.setName(uploadPayLoad.getName()); - uploadPayLoadLocal.setObservation(uploadPayLoad.getObservation()); + uploadPayLoadLocal.setIdBackend(uploadPayLoadRestor.getIdBackend()); + uploadPayLoadLocal.setPieceId(uploadPayLoadRestor.getPieceId()); + uploadPayLoadLocal.setSynchronise(uploadPayLoadRestor.getSynchronise()); + uploadPayLoadLocal.setMembreGroupeId(uploadPayLoadRestor.getMembreGroupeId()); + uploadPayLoadLocal.setExternalKey(uploadPayLoadRestor.getExternalKey()); + uploadPayLoadLocal.setBlocId(uploadPayLoadRestor.getBlocId()); + uploadPayLoadLocal.setFilePath(uploadPayLoadRestor.getFilePath()); + uploadPayLoadLocal.setEnqueteId(uploadPayLoadRestor.getEnqueteId()); + uploadPayLoadLocal.setMax_numero_acteur_concerne_id(uploadPayLoadRestor.getMax_numero_acteur_concerne_id()); + uploadPayLoadLocal.setMax_numero_piece_id(uploadPayLoadRestor.getMax_numero_piece_id()); + uploadPayLoadLocal.setMax_numero_upload_id(uploadPayLoadRestor.getMax_numero_upload_id()); + uploadPayLoadLocal.setName(uploadPayLoadRestor.getName()); + uploadPayLoadLocal.setObservation(uploadPayLoadRestor.getObservation()); uploadPayLoadsOut.add(uploadPayLoadLocal); }); return uploadPayLoadsOut; } @Override - public List getBatiment(Long terminalId) { + public List getBatiment(Long terminalId) { return batimentRepository.getBatimentByTerminalId(terminalId); } @Override - public List getEnqueteBatiment(Long terminalId) { + public List getEnqueteBatiment(Long terminalId) { return enqueteBatimentRepository.getEnqueteBatimentByTerminalId(terminalId); } @Override - public List getCaracateristiqueParcelle(Long terminalId) { + public List getCaracateristiqueParcelle(Long terminalId) { return caracteristiqueParcelleRepository.getCaracteristiqueParcelleByTerminalId(terminalId); } @Override - public List getCaracateristiqueBatiment(Long terminalId) { + public List getCaracateristiqueBatiment(Long terminalId) { return caracteristiqueBatimentRepository.getCaracteristiqueBatimentByTerminalId(terminalId); } @Override - public List getCaracateristiqueUniteLogement(Long terminalId) { + public List getCaracateristiqueUniteLogement(Long terminalId) { return caracteristiqueUniteLogementRepository.getCaracteristiqueUniteLogementByTerminalId(terminalId); } @Override - public List getEnqueteUniteLogement(Long terminalId) { + public List getEnqueteUniteLogement(Long terminalId) { return enqueteUniteLogementRepository.getEnqueteUniteLogementByTerminalId(terminalId); } @Override - public List getUniteLogement(Long terminalId) { + public List getUniteLogement(Long terminalId) { return uniteLogementRepository.getUniteLogementByTerminalId(terminalId); } - private String getUploadFile(UploadPayLoad uploadPayLoad) { + private String getUploadFile(UploadPayLoadRestor uploadPayLoadRestor) { try { - Resource resource = fileStorageService.loadFileAsResource(uploadPayLoad.getFileBackendName()); + Resource resource = fileStorageService.loadFileAsResource(uploadPayLoadRestor.getFileBackendName()); final var bytes = resource.getInputStream().readAllBytes(); return Base64.getEncoder().encodeToString(bytes); } catch (Exception e) { diff --git a/src/main/java/io/gmss/fiscad/implementations/synchronisation/SynchronisationServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/synchronisation/SynchronisationServiceImpl.java index e64d173..1856342 100644 --- a/src/main/java/io/gmss/fiscad/implementations/synchronisation/SynchronisationServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/synchronisation/SynchronisationServiceImpl.java @@ -1,50 +1,42 @@ package io.gmss.fiscad.implementations.synchronisation; -import io.gmss.fiscad.entities.decoupage.Commune; import io.gmss.fiscad.entities.decoupage.Nationalite; -import io.gmss.fiscad.entities.decoupage.Quartier; -import io.gmss.fiscad.entities.infocad.metier.*; +import io.gmss.fiscad.entities.infocad.metier.Enquete; import io.gmss.fiscad.entities.infocad.parametre.*; import io.gmss.fiscad.entities.metadata.*; -import io.gmss.fiscad.entities.rfu.metier.*; import io.gmss.fiscad.entities.rfu.parametre.Caracteristique; import io.gmss.fiscad.entities.rfu.parametre.TypeCaracteristique; -import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; -import io.gmss.fiscad.enums.*; -import io.gmss.fiscad.interfaces.infocad.metier.ParcelleGeomService; +import io.gmss.fiscad.enums.ProfileApp; +import io.gmss.fiscad.enums.TypeObjet; import io.gmss.fiscad.interfaces.synchronisation.SynchronisationService; import io.gmss.fiscad.interfaces.user.UserService; -import io.gmss.fiscad.paylaods.request.*; +import io.gmss.fiscad.paylaods.request.EnqueteAllDataPayload; import io.gmss.fiscad.paylaods.response.*; +import io.gmss.fiscad.paylaods.request.synchronisation.*; import io.gmss.fiscad.repositories.decoupage.*; -import io.gmss.fiscad.repositories.infocad.metier.*; +import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; import io.gmss.fiscad.repositories.infocad.parametre.*; import io.gmss.fiscad.repositories.metadata.*; -import io.gmss.fiscad.repositories.rfu.metier.*; import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository; import io.gmss.fiscad.repositories.rfu.parametre.TypeCaracteristiqueRepository; import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; -import io.gmss.fiscad.repositories.user.UserRepository; import io.gmss.fiscad.service.FileStorageService; import io.gmss.fiscad.service.worker.*; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.jpa.repository.Modifying; import org.springframework.scheduling.annotation.Async; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import io.gmss.fiscad.paylaods.request.synchronisation.*; -import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; -import java.util.function.ToDoubleBiFunction; @Service @RequiredArgsConstructor @@ -429,39 +421,39 @@ public class SynchronisationServiceImpl implements SynchronisationService { } @Override - public List syncCaracteristiqueBatiment(List caracteristiqueBatimentPaylods) { + public List syncCaracteristiqueBatiment(List CaracteristiqueBatimentPayloads) { List syncResponses = new ArrayList<>(); - if (caracteristiqueBatimentPaylods == null) { + if (CaracteristiqueBatimentPayloads == null) { SyncResponse syncResponse = new SyncResponse(null, null, false, "Aucune caracteristique de bâtiment à synchroniser"); syncResponses.add(syncResponse); return syncResponses; } - syncResponses = saveMobileData(caracteristiqueBatimentPaylods, TypeObjet.CARACTERISTIQUEBATIMENT); + syncResponses = saveMobileData(CaracteristiqueBatimentPayloads, TypeObjet.CARACTERISTIQUEBATIMENT); return syncResponses; } @Override - public List syncCaracteristiqueUniteLogement(List caracteristiqueUniteLogementPaylods) { + public List syncCaracteristiqueUniteLogement(List CaracteristiqueUniteLogementPayloads) { List syncResponses = new ArrayList<>(); - if (caracteristiqueUniteLogementPaylods == null) { + if (CaracteristiqueUniteLogementPayloads == null) { SyncResponse syncResponse = new SyncResponse(null, null, false, "Aucune caracteristique d'unité de logement à synchroniser"); syncResponses.add(syncResponse); return syncResponses; } - syncResponses = saveMobileData(caracteristiqueUniteLogementPaylods, TypeObjet.CARACTERISTIQUEUNITELOGEMENT); + syncResponses = saveMobileData(CaracteristiqueUniteLogementPayloads, TypeObjet.CARACTERISTIQUEUNITELOGEMENT); return syncResponses; } @Override - public List syncCaracteristiqueParcelle(List caracteristiqueParcellePaylods) { + public List syncCaracteristiqueParcelle(List CaracteristiqueParcellePayloads) { List syncResponses = new ArrayList<>(); - if (caracteristiqueParcellePaylods == null) { + if (CaracteristiqueParcellePayloads == null) { SyncResponse syncResponse = new SyncResponse(null, null, false, "Aucune caracteristique de parcelle à synchroniser"); syncResponses.add(syncResponse); return syncResponses; } - syncResponses = saveMobileData(caracteristiqueParcellePaylods, TypeObjet.CARACTERISTIQUEPARCELLE); + syncResponses = saveMobileData(CaracteristiqueParcellePayloads, TypeObjet.CARACTERISTIQUEPARCELLE); return syncResponses; } @Override @@ -885,32 +877,32 @@ public class SynchronisationServiceImpl implements SynchronisationService { } case CARACTERISTIQUEPARCELLE -> { payloads.forEach(payLoad -> { - CaracteristiqueParcellePaylod caracteristiqueParcellePaylod = (CaracteristiqueParcellePaylod) payLoad; - //caracteristiqueParcellePaylod.setIdBackend(null); + CaracteristiqueParcellePayload CaracteristiqueParcellePayload = (CaracteristiqueParcellePayload) payLoad; + //CaracteristiqueParcellePayload.setIdBackend(null); try { MobileDataCaracteristiqueParcelle mobileDataCaracteristiqueParcelle = new MobileDataCaracteristiqueParcelle(); Optional optionalMobileDataCaracteristiqueParcelle = Optional.empty(); - if (caracteristiqueParcellePaylod.getIdBackend() != null) { - optionalMobileDataCaracteristiqueParcelle = mobileDataCaracteristiqueParcelleRepository.findById(caracteristiqueParcellePaylod.getIdBackend()); + if (CaracteristiqueParcellePayload.getIdBackend() != null) { + optionalMobileDataCaracteristiqueParcelle = mobileDataCaracteristiqueParcelleRepository.findById(CaracteristiqueParcellePayload.getIdBackend()); if (optionalMobileDataCaracteristiqueParcelle.isPresent()) { mobileDataCaracteristiqueParcelle = optionalMobileDataCaracteristiqueParcelle.get(); } } else { - optionalMobileDataCaracteristiqueParcelle = mobileDataCaracteristiqueParcelleRepository.findFirstByTerminalIdAndExternalKey(caracteristiqueParcellePaylod.getTerminalId(), caracteristiqueParcellePaylod.getExternalKey()); + optionalMobileDataCaracteristiqueParcelle = mobileDataCaracteristiqueParcelleRepository.findFirstByTerminalIdAndExternalKey(CaracteristiqueParcellePayload.getTerminalId(), CaracteristiqueParcellePayload.getExternalKey()); if (optionalMobileDataCaracteristiqueParcelle.isPresent()) { mobileDataCaracteristiqueParcelle = optionalMobileDataCaracteristiqueParcelle.get(); } } - mobileDataCaracteristiqueParcelle.setTerminalId(caracteristiqueParcellePaylod.getTerminalId()); - mobileDataCaracteristiqueParcelle.setExternalKey(caracteristiqueParcellePaylod.getExternalKey()); + mobileDataCaracteristiqueParcelle.setTerminalId(CaracteristiqueParcellePayload.getTerminalId()); + mobileDataCaracteristiqueParcelle.setExternalKey(CaracteristiqueParcellePayload.getExternalKey()); mobileDataCaracteristiqueParcelle.setTraiter(false); - mobileDataCaracteristiqueParcelle.setCaracteristiqueParcellePaylod(caracteristiqueParcellePaylod); + mobileDataCaracteristiqueParcelle.setCaracteristiqueParcellePayload(CaracteristiqueParcellePayload); mobileDataCaracteristiqueParcelle = mobileDataCaracteristiqueParcelleRepository.save(mobileDataCaracteristiqueParcelle); SyncResponse syncResponse = new SyncResponse(); syncResponse.setObservation("Synchronisation effectuée avec succès pour " + TypeObjet.CARACTERISTIQUEPARCELLE.toString()); - syncResponse.setExternalKey(caracteristiqueParcellePaylod.getExternalKey()); + syncResponse.setExternalKey(CaracteristiqueParcellePayload.getExternalKey()); syncResponse.setSynchronise(true); syncResponse.setIdBackend(mobileDataCaracteristiqueParcelle.getId()); syncResponses.add(syncResponse); @@ -918,9 +910,9 @@ public class SynchronisationServiceImpl implements SynchronisationService { e.printStackTrace(); SyncResponse syncResponse = new SyncResponse(); syncResponse.setObservation("Synchronisation échouée pour " + TypeObjet.CARACTERISTIQUEPARCELLE.toString()); - syncResponse.setExternalKey(caracteristiqueParcellePaylod.getExternalKey()); + syncResponse.setExternalKey(CaracteristiqueParcellePayload.getExternalKey()); syncResponse.setSynchronise(false); - syncResponse.setIdBackend(caracteristiqueParcellePaylod.getIdBackend()); + syncResponse.setIdBackend(CaracteristiqueParcellePayload.getIdBackend()); syncResponses.add(syncResponse); } }); @@ -928,33 +920,33 @@ public class SynchronisationServiceImpl implements SynchronisationService { case CARACTERISTIQUEBATIMENT -> { payloads.forEach(payLoad -> { - CaracteristiqueBatimentPaylod caracteristiqueBatimentPaylod = (CaracteristiqueBatimentPaylod) payLoad; - //caracteristiqueBatimentPaylod.setIdBackend(null); + CaracteristiqueBatimentPayload CaracteristiqueBatimentPayload = (CaracteristiqueBatimentPayload) payLoad; + //CaracteristiqueBatimentPayload.setIdBackend(null); try { MobileDataCaracteristiqueBatiment mobileDataCaracteristiqueBatiment = new MobileDataCaracteristiqueBatiment(); Optional optionalMobileDataCaracteristiqueBatiment = Optional.empty(); - if (caracteristiqueBatimentPaylod.getIdBackend() != null) { - optionalMobileDataCaracteristiqueBatiment = mobileDataCaracteristiqueBatimentRepository.findById(caracteristiqueBatimentPaylod.getIdBackend()); + if (CaracteristiqueBatimentPayload.getIdBackend() != null) { + optionalMobileDataCaracteristiqueBatiment = mobileDataCaracteristiqueBatimentRepository.findById(CaracteristiqueBatimentPayload.getIdBackend()); if (optionalMobileDataCaracteristiqueBatiment.isPresent()) { mobileDataCaracteristiqueBatiment = optionalMobileDataCaracteristiqueBatiment.get(); } } else { - optionalMobileDataCaracteristiqueBatiment = mobileDataCaracteristiqueBatimentRepository.findFirstByTerminalIdAndExternalKey(caracteristiqueBatimentPaylod.getTerminalId(), caracteristiqueBatimentPaylod.getExternalKey()); + optionalMobileDataCaracteristiqueBatiment = mobileDataCaracteristiqueBatimentRepository.findFirstByTerminalIdAndExternalKey(CaracteristiqueBatimentPayload.getTerminalId(), CaracteristiqueBatimentPayload.getExternalKey()); if (optionalMobileDataCaracteristiqueBatiment.isPresent()) { mobileDataCaracteristiqueBatiment = optionalMobileDataCaracteristiqueBatiment.get(); } } - mobileDataCaracteristiqueBatiment.setTerminalId(caracteristiqueBatimentPaylod.getTerminalId()); - mobileDataCaracteristiqueBatiment.setExternalKey(caracteristiqueBatimentPaylod.getExternalKey()); + mobileDataCaracteristiqueBatiment.setTerminalId(CaracteristiqueBatimentPayload.getTerminalId()); + mobileDataCaracteristiqueBatiment.setExternalKey(CaracteristiqueBatimentPayload.getExternalKey()); mobileDataCaracteristiqueBatiment.setTraiter(false); - mobileDataCaracteristiqueBatiment.setCaracteristiqueBatimentPaylod(caracteristiqueBatimentPaylod); + mobileDataCaracteristiqueBatiment.setCaracteristiqueBatimentPayload(CaracteristiqueBatimentPayload); mobileDataCaracteristiqueBatiment = mobileDataCaracteristiqueBatimentRepository.save(mobileDataCaracteristiqueBatiment); SyncResponse syncResponse = new SyncResponse(); syncResponse.setObservation("Synchronisation effectuée avec succès pour " + TypeObjet.CARACTERISTIQUEBATIMENT.toString()); - syncResponse.setExternalKey(caracteristiqueBatimentPaylod.getExternalKey()); + syncResponse.setExternalKey(CaracteristiqueBatimentPayload.getExternalKey()); syncResponse.setSynchronise(true); syncResponse.setIdBackend(mobileDataCaracteristiqueBatiment.getId()); syncResponses.add(syncResponse); @@ -962,41 +954,41 @@ public class SynchronisationServiceImpl implements SynchronisationService { e.printStackTrace(); SyncResponse syncResponse = new SyncResponse(); syncResponse.setObservation("Synchronisation échouée pour " + TypeObjet.CARACTERISTIQUEBATIMENT.toString()); - syncResponse.setExternalKey(caracteristiqueBatimentPaylod.getExternalKey()); + syncResponse.setExternalKey(CaracteristiqueBatimentPayload.getExternalKey()); syncResponse.setSynchronise(false); - syncResponse.setIdBackend(caracteristiqueBatimentPaylod.getIdBackend()); + syncResponse.setIdBackend(CaracteristiqueBatimentPayload.getIdBackend()); syncResponses.add(syncResponse); } }); } case CARACTERISTIQUEUNITELOGEMENT -> { payloads.forEach(payLoad -> { - CaracteristiqueUniteLogementPaylod caracteristiqueUniteLogementPaylod = (CaracteristiqueUniteLogementPaylod) payLoad; - //caracteristiqueUniteLogementPaylod.setIdBackend(null); + CaracteristiqueUniteLogementPayload CaracteristiqueUniteLogementPayload = (CaracteristiqueUniteLogementPayload) payLoad; + //CaracteristiqueUniteLogementPayload.setIdBackend(null); try { MobileDataCaracteristiqueUniteLogement mobileDataCaracteristiqueUniteLogement = new MobileDataCaracteristiqueUniteLogement(); Optional optionalMobileDataCaracteristiqueUniteLogement = Optional.empty(); - if (caracteristiqueUniteLogementPaylod.getIdBackend() != null) { - optionalMobileDataCaracteristiqueUniteLogement = mobileDataCaracteristiqueUniteLogementRepository.findById(caracteristiqueUniteLogementPaylod.getIdBackend()); + if (CaracteristiqueUniteLogementPayload.getIdBackend() != null) { + optionalMobileDataCaracteristiqueUniteLogement = mobileDataCaracteristiqueUniteLogementRepository.findById(CaracteristiqueUniteLogementPayload.getIdBackend()); if (optionalMobileDataCaracteristiqueUniteLogement.isPresent()) { mobileDataCaracteristiqueUniteLogement = optionalMobileDataCaracteristiqueUniteLogement.get(); } } else { - optionalMobileDataCaracteristiqueUniteLogement = mobileDataCaracteristiqueUniteLogementRepository.findFirstByTerminalIdAndExternalKey(caracteristiqueUniteLogementPaylod.getTerminalId(), caracteristiqueUniteLogementPaylod.getExternalKey()); + optionalMobileDataCaracteristiqueUniteLogement = mobileDataCaracteristiqueUniteLogementRepository.findFirstByTerminalIdAndExternalKey(CaracteristiqueUniteLogementPayload.getTerminalId(), CaracteristiqueUniteLogementPayload.getExternalKey()); if (optionalMobileDataCaracteristiqueUniteLogement.isPresent()) { mobileDataCaracteristiqueUniteLogement = optionalMobileDataCaracteristiqueUniteLogement.get(); } } - mobileDataCaracteristiqueUniteLogement.setTerminalId(caracteristiqueUniteLogementPaylod.getTerminalId()); - mobileDataCaracteristiqueUniteLogement.setExternalKey(caracteristiqueUniteLogementPaylod.getExternalKey()); + mobileDataCaracteristiqueUniteLogement.setTerminalId(CaracteristiqueUniteLogementPayload.getTerminalId()); + mobileDataCaracteristiqueUniteLogement.setExternalKey(CaracteristiqueUniteLogementPayload.getExternalKey()); mobileDataCaracteristiqueUniteLogement.setTraiter(false); - mobileDataCaracteristiqueUniteLogement.setCaracteristiqueUniteLogementPaylod(caracteristiqueUniteLogementPaylod); + mobileDataCaracteristiqueUniteLogement.setCaracteristiqueUniteLogementPayload(CaracteristiqueUniteLogementPayload); mobileDataCaracteristiqueUniteLogement = mobileDataCaracteristiqueUniteLogementRepository.save(mobileDataCaracteristiqueUniteLogement); SyncResponse syncResponse = new SyncResponse(); syncResponse.setObservation("Synchronisation effectuée avec succès pour " + TypeObjet.CARACTERISTIQUEUNITELOGEMENT.toString()); - syncResponse.setExternalKey(caracteristiqueUniteLogementPaylod.getExternalKey()); + syncResponse.setExternalKey(CaracteristiqueUniteLogementPayload.getExternalKey()); syncResponse.setSynchronise(true); syncResponse.setIdBackend(mobileDataCaracteristiqueUniteLogement.getId()); syncResponses.add(syncResponse); @@ -1004,9 +996,9 @@ public class SynchronisationServiceImpl implements SynchronisationService { e.printStackTrace(); SyncResponse syncResponse = new SyncResponse(); syncResponse.setObservation("Synchronisation échouée pour " + TypeObjet.CARACTERISTIQUEUNITELOGEMENT.toString()); - syncResponse.setExternalKey(caracteristiqueUniteLogementPaylod.getExternalKey()); + syncResponse.setExternalKey(CaracteristiqueUniteLogementPayload.getExternalKey()); syncResponse.setSynchronise(false); - syncResponse.setIdBackend(caracteristiqueUniteLogementPaylod.getIdBackend()); + syncResponse.setIdBackend(CaracteristiqueUniteLogementPayload.getIdBackend()); syncResponses.add(syncResponse); } }); diff --git a/src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurService.java b/src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurService.java index b3dec14..6f83658 100644 --- a/src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurService.java @@ -3,7 +3,7 @@ package io.gmss.fiscad.interfaces.decoupage; import io.gmss.fiscad.entities.decoupage.Secteur; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; -import io.gmss.fiscad.paylaods.request.SecteurPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.SecteurPayload; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java index bc45ba6..c8bf13a 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java @@ -4,9 +4,9 @@ import io.gmss.fiscad.entities.infocad.metier.Enquete; import io.gmss.fiscad.entities.infocad.metier.EnqueteFiltreResponse; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; -import io.gmss.fiscad.paylaods.request.EnquetePayLoad; 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.response.EnqueteNonSyncResponse; import io.gmss.fiscad.paylaods.response.EnqueteResponse; import io.gmss.fiscad.paylaods.response.FicheEnqueteResponse; @@ -19,9 +19,9 @@ import java.util.Optional; public interface EnqueteService { - Enquete createEnquete(EnquetePayLoad enquetePayLoad) throws BadRequestException; + Enquete createEnquete(EnquetePayLoadWeb enquetePayLoad) throws BadRequestException; - Enquete updateEnquete(EnquetePayLoad enquetePayLoad) throws NotFoundException; + Enquete updateEnquete(Long id,EnquetePayLoadWeb enquete) throws NotFoundException; void deleteEnquete(Long id) throws NotFoundException; diff --git a/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleService.java index 26bce7a..9896b84 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleService.java @@ -3,7 +3,7 @@ package io.gmss.fiscad.interfaces.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; -import io.gmss.fiscad.paylaods.request.ParcellePayLoad; +import io.gmss.fiscad.paylaods.request.crudweb.ParcellePayLoadWeb; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -13,9 +13,9 @@ import java.util.Optional; public interface ParcelleService { - Parcelle createParcelle(ParcellePayLoad parcellePayLoad) throws BadRequestException; + Parcelle createParcelle(ParcellePayLoadWeb parcellePayLoadWeb) throws BadRequestException; - Parcelle updateParcelle(ParcellePayLoad parcellePayLoad) throws NotFoundException; + Parcelle updateParcelle(Long id,ParcellePayLoadWeb parcellePayLoadWeb) throws NotFoundException; void deleteParcelle(Long id) throws NotFoundException; diff --git a/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/PersonneService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/PersonneService.java index 8c3d14d..33dacd0 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/PersonneService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/PersonneService.java @@ -4,6 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.paylaods.dto.PersonneCompletDTO; +import io.gmss.fiscad.paylaods.request.crudweb.PersonnePayLoadWeb; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -12,9 +13,9 @@ import java.util.Optional; public interface PersonneService { - Personne createPersonne(Personne personne) throws BadRequestException; + Personne createPersonne(PersonnePayLoadWeb personnePayLoadWeb) throws BadRequestException; - Personne updatePersonne(Long id, Personne personne) throws NotFoundException; + Personne updatePersonne(Long id, PersonnePayLoadWeb personnePayLoadWeb) throws NotFoundException; void deletePersonne(Long id) throws NotFoundException; diff --git a/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/RueService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/RueService.java new file mode 100755 index 0000000..38243f9 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/RueService.java @@ -0,0 +1,25 @@ +package io.gmss.fiscad.interfaces.infocad.metier; + +import io.gmss.fiscad.entities.infocad.metier.Rue; +import io.gmss.fiscad.exceptions.BadRequestException; +import io.gmss.fiscad.exceptions.NotFoundException; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.Optional; + +public interface RueService { + + Rue createRue(Rue rue) throws BadRequestException; + + Rue updateRue(Long id, Rue rue) throws NotFoundException; + + void deleteRue(Long id) throws NotFoundException; + + Page getRueList(Pageable pageable); + + List getRueList(); + + Optional getRueById(Long id); +} diff --git a/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeRueService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeRueService.java new file mode 100755 index 0000000..41e5ad2 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeRueService.java @@ -0,0 +1,25 @@ +package io.gmss.fiscad.interfaces.infocad.parametre; + +import io.gmss.fiscad.entities.infocad.parametre.TypeRue; +import io.gmss.fiscad.exceptions.BadRequestException; +import io.gmss.fiscad.exceptions.NotFoundException; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.Optional; + +public interface TypeRueService { + + TypeRue createTypeRue(TypeRue typeRue) throws BadRequestException; + + TypeRue updateTypeRue(Long id, TypeRue typeRue) throws NotFoundException; + + void deleteTypeRue(Long id) throws NotFoundException; + + Page getTypeRueList(Pageable pageable); + + List getTypeRueList(); + + Optional getTypeRueById(Long id); +} diff --git a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/BatimentService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/BatimentService.java index 0ee1d30..422528f 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/BatimentService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/BatimentService.java @@ -3,6 +3,7 @@ package io.gmss.fiscad.interfaces.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.Batiment; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; +import io.gmss.fiscad.paylaods.request.crudweb.BatimentPaylaodWeb; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -11,9 +12,9 @@ import java.util.Optional; public interface BatimentService { - Batiment createBatiment(Batiment batiment) throws BadRequestException; + Batiment createBatiment(BatimentPaylaodWeb batimentPaylaodWeb) throws BadRequestException; - Batiment updateBatiment(Long id, Batiment batiment) throws NotFoundException; + Batiment updateBatiment(Long id,BatimentPaylaodWeb batimentPaylaodWeb) throws NotFoundException; void deleteBatiment(Long id) throws NotFoundException; diff --git a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueParcelleService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueParcelleService.java index 69cc46f..f0c2975 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueParcelleService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueParcelleService.java @@ -11,9 +11,9 @@ import java.util.Optional; public interface CaracteristiqueParcelleService { - CaracteristiqueParcelle createCaracteristiqueParcelle(CaracteristiqueParcelle batiment) throws BadRequestException; + CaracteristiqueParcelle createCaracteristiqueParcelle(CaracteristiqueParcelle caracteristiqueParcelle) throws BadRequestException; - CaracteristiqueParcelle updateCaracteristiqueParcelle(Long id, CaracteristiqueParcelle batiment) throws NotFoundException; + CaracteristiqueParcelle updateCaracteristiqueParcelle(Long id, CaracteristiqueParcelle caracteristiqueParcelle) throws NotFoundException; void deleteCaracteristiqueParcelle(Long id) throws NotFoundException; diff --git a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteActiviteService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteActiviteService.java index a2e7af3..172f026 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteActiviteService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteActiviteService.java @@ -3,6 +3,7 @@ package io.gmss.fiscad.interfaces.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.EnqueteActivite; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; +import io.gmss.fiscad.paylaods.request.crudweb.EnqueteActivitePayLoadWeb; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -11,9 +12,9 @@ import java.util.Optional; public interface EnqueteActiviteService { - EnqueteActivite createEnqueteActivite(EnqueteActivite enqueteActivite) throws BadRequestException; + EnqueteActivite createEnqueteActivite(EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) throws BadRequestException; - EnqueteActivite updateEnqueteActivite(Long id, EnqueteActivite enqueteActivite) throws NotFoundException; + EnqueteActivite updateEnqueteActivite(Long id, EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) throws NotFoundException; void deleteEnqueteActivite(Long id) throws NotFoundException; diff --git a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteBatimentService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteBatimentService.java index 1562552..16bb6ca 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteBatimentService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteBatimentService.java @@ -3,6 +3,7 @@ package io.gmss.fiscad.interfaces.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; +import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -11,9 +12,9 @@ import java.util.Optional; public interface EnqueteBatimentService { - EnqueteBatiment createEnqueteBatiment(EnqueteBatiment enqueteBatiment) throws BadRequestException; + EnqueteBatiment createEnqueteBatiment(EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) throws BadRequestException; - EnqueteBatiment updateEnqueteBatiment(Long id, EnqueteBatiment enqueteBatiment) throws NotFoundException; + EnqueteBatiment updateEnqueteBatiment(Long id, EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) throws NotFoundException; void deleteEnqueteBatiment(Long id) throws NotFoundException; diff --git a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteUniteLogementService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteUniteLogementService.java index 376c5cb..0574ef9 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteUniteLogementService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteUniteLogementService.java @@ -3,6 +3,7 @@ package io.gmss.fiscad.interfaces.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; +import io.gmss.fiscad.paylaods.request.crudweb.EnqueteUniteLogementPayloadWeb; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -11,9 +12,9 @@ import java.util.Optional; public interface EnqueteUniteLogementService { - EnqueteUniteLogement createEnqueteUniteLogement(EnqueteUniteLogement enqueteUniteLogement) throws BadRequestException; + EnqueteUniteLogement createEnqueteUniteLogement(EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) throws BadRequestException; - EnqueteUniteLogement updateEnqueteUniteLogement(Long id, EnqueteUniteLogement enqueteUniteLogement) throws NotFoundException; + EnqueteUniteLogement updateEnqueteUniteLogement(Long id, EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) throws NotFoundException; void deleteEnqueteUniteLogement(Long id) throws NotFoundException; diff --git a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/UniteLogementService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/UniteLogementService.java index a262091..279e980 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/UniteLogementService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/UniteLogementService.java @@ -13,7 +13,7 @@ public interface UniteLogementService { UniteLogement createUniteLogement(UniteLogement uniteLogement) throws BadRequestException; - UniteLogement updateUniteLogement(Long id, UniteLogement uniteLogement) throws NotFoundException; + UniteLogement updateUniteLogement(Long id,UniteLogement uniteLogement) throws NotFoundException; void deleteUniteLogement(Long id) throws NotFoundException; diff --git a/src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/EquipeService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/EquipeService.java index bc47f69..43b9d6e 100644 --- a/src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/EquipeService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/EquipeService.java @@ -3,7 +3,7 @@ package io.gmss.fiscad.interfaces.rfu.parametre; import io.gmss.fiscad.entities.rfu.parametre.Equipe; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; -import io.gmss.fiscad.paylaods.request.EquipePayload; +import io.gmss.fiscad.paylaods.request.synchronisation.EquipePayload; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/io/gmss/fiscad/interfaces/synchronisation/RestaurationService.java b/src/main/java/io/gmss/fiscad/interfaces/synchronisation/RestaurationService.java index af5063d..27eaf3b 100644 --- a/src/main/java/io/gmss/fiscad/interfaces/synchronisation/RestaurationService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/synchronisation/RestaurationService.java @@ -1,39 +1,40 @@ package io.gmss.fiscad.interfaces.synchronisation; import io.gmss.fiscad.entities.infocad.metier.Tpe; +import io.gmss.fiscad.paylaods.request.synchronisation.UploadPayLoad; import io.gmss.fiscad.paylaods.response.restoration.*; import java.util.List; public interface RestaurationService { - List getActeurConcernes(Long terminaleId); + List getActeurConcernes(Long terminaleId); List getEnquete(Long terminaleId); List getPersonne(Long terminaleId); - List getParcelle(Long terminaleId); + List getParcelle(Long terminaleId); - List getPieces(Long terminaleId); + List getPieces(Long terminaleId); - List getMembreGroupe(Long terminaleId); + List getMembreGroupe(Long terminaleId); - List getUpload(Long terminaleId); + List getUpload(Long terminaleId); - List getBatiment(Long terminalId); + List getBatiment(Long terminalId); - List getEnqueteBatiment(Long terminalId); + List getEnqueteBatiment(Long terminalId); - List getCaracateristiqueParcelle(Long terminalId); + List getCaracateristiqueParcelle(Long terminalId); - List getCaracateristiqueBatiment(Long terminalId); + List getCaracateristiqueBatiment(Long terminalId); - List getCaracateristiqueUniteLogement(Long terminalId); + List getCaracateristiqueUniteLogement(Long terminalId); - List getEnqueteUniteLogement(Long terminalId); + List getEnqueteUniteLogement(Long terminalId); - List getUniteLogement(Long terminalId); + List getUniteLogement(Long terminalId); public List getTpeListByCurrentUser(); diff --git a/src/main/java/io/gmss/fiscad/interfaces/synchronisation/SynchronisationService.java b/src/main/java/io/gmss/fiscad/interfaces/synchronisation/SynchronisationService.java index 0db4db6..ed7dffb 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/synchronisation/SynchronisationService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/synchronisation/SynchronisationService.java @@ -2,7 +2,10 @@ package io.gmss.fiscad.interfaces.synchronisation; import io.gmss.fiscad.entities.infocad.metier.Upload; import io.gmss.fiscad.entities.metadata.MobileDataUpload; -import io.gmss.fiscad.paylaods.request.*; +import io.gmss.fiscad.paylaods.request.EnqueteAllDataPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.*; + +import io.gmss.fiscad.paylaods.request.synchronisation.*; import io.gmss.fiscad.paylaods.response.ReferencesSyncResponses; import io.gmss.fiscad.paylaods.response.SyncEnqueteAllDataResponse; import io.gmss.fiscad.paylaods.response.SyncResponse; @@ -25,11 +28,11 @@ public interface SynchronisationService { public List syncUniteLogement(List uniteLogementPaylaods); - public List syncCaracteristiqueBatiment(List caracteristiqueBatimentPaylods); + public List syncCaracteristiqueBatiment(List CaracteristiqueBatimentPayloads); - public List syncCaracteristiqueParcelle(List caracteristiqueParcellePaylods); + public List syncCaracteristiqueParcelle(List CaracteristiqueParcellePayloads); - public List syncCaracteristiqueUniteLogement(List caracteristiqueUniteLogementPaylods); + public List syncCaracteristiqueUniteLogement(List CaracteristiqueUniteLogementPayloads); public List syncMembreGroupe(List membreGroupePayLoads); diff --git a/src/main/java/io/gmss/fiscad/paylaods/Critere.java b/src/main/java/io/gmss/fiscad/paylaods/Critere.java index 1a19aa3..a078875 100755 --- a/src/main/java/io/gmss/fiscad/paylaods/Critere.java +++ b/src/main/java/io/gmss/fiscad/paylaods/Critere.java @@ -1,7 +1,7 @@ package io.gmss.fiscad.paylaods; -import io.gmss.fiscad.enums.StatusEnquete; +import io.gmss.fiscad.enums.StatutEnquete; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -14,7 +14,7 @@ import java.util.Date; public class Critere { private String search; - private StatusEnquete status; + private StatutEnquete status; private Date startDate; private Date endDate; } diff --git a/src/main/java/io/gmss/fiscad/paylaods/StatusResponse.java b/src/main/java/io/gmss/fiscad/paylaods/StatusResponse.java index 2923bc2..46ad87f 100755 --- a/src/main/java/io/gmss/fiscad/paylaods/StatusResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/StatusResponse.java @@ -1,6 +1,6 @@ package io.gmss.fiscad.paylaods; -import io.gmss.fiscad.enums.StatusEnquete; +import io.gmss.fiscad.enums.StatutEnquete; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -10,5 +10,5 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class StatusResponse { - private StatusEnquete status; + private StatutEnquete status; } diff --git a/src/main/java/io/gmss/fiscad/paylaods/dto/PersonneCompletDTO.java b/src/main/java/io/gmss/fiscad/paylaods/dto/PersonneCompletDTO.java index 2a31fd1..52f2832 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/dto/PersonneCompletDTO.java +++ b/src/main/java/io/gmss/fiscad/paylaods/dto/PersonneCompletDTO.java @@ -13,6 +13,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.LocalDate; import java.util.List; @Data @@ -21,11 +22,12 @@ import java.util.List; public class PersonneCompletDTO { private Long id; private String ifu; - private String nomOuSigle; - private String prenomOuRaisonSociale; + private String nom; + private String prenom; + private String raisonSociale; private String numRavip; private String npi; - private String dateNaissanceOuConsti; + private LocalDate dateNaissanceOuConsti; private String lieuNaissance; private String tel1; private String tel2; diff --git a/src/main/java/io/gmss/fiscad/paylaods/dto/PersonneSimpleDTO.java b/src/main/java/io/gmss/fiscad/paylaods/dto/PersonneSimpleDTO.java index 7488557..be719f3 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/dto/PersonneSimpleDTO.java +++ b/src/main/java/io/gmss/fiscad/paylaods/dto/PersonneSimpleDTO.java @@ -11,4 +11,5 @@ public class PersonneSimpleDTO { private Long id; private String nom; private String prenom; + private String raisonSociale; } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteAllDataPayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteAllDataPayload.java index 6f334e4..67a4f27 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteAllDataPayload.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteAllDataPayload.java @@ -1,5 +1,6 @@ package io.gmss.fiscad.paylaods.request; +import io.gmss.fiscad.paylaods.request.synchronisation.*; import lombok.Data; import java.util.List; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/PersonnePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/PersonnePayLoad.java deleted file mode 100644 index 4ea2252..0000000 --- a/src/main/java/io/gmss/fiscad/paylaods/request/PersonnePayLoad.java +++ /dev/null @@ -1,79 +0,0 @@ -package io.gmss.fiscad.paylaods.request; - -import io.gmss.fiscad.entities.infocad.parametre.Personne; -import io.gmss.fiscad.enums.Categorie; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import lombok.Data; -import org.hibernate.annotations.ColumnDefault; - - -@Data -public class PersonnePayLoad { - private Long idBackend; - private String ifu; - private Long externalKey; - private String nomOuSigle; - private String prenomOuRaisonSociale; - private String numRavip; - private String npi; - private String dateNaissanceOuConsti; - private String lieuNaissance; - private String tel1; - private String tel2; - private String adresse; - @Enumerated(EnumType.STRING) - private Categorie categorie; - private Long situationMatrimonialeId; - private Long nationaliteId; - private Long typePersonneId; - private Long professionId; - private Long communeId; - private String observation; - private boolean synchronise; - private Long terminalId; - private Long personneId; - - ///////////////////////////// - @ColumnDefault("0") - private int haveRepresentant; - private String ravipQuestion; - private String age; - private String nomJeuneFille; - private String nomMere; - private String prenomMere; - private String indicatifTel1; - private String indicatifTel2; - private String sexe; - @ColumnDefault("0") - private int mustHaveRepresentant; - private String filePath; - - - @Override - public String toString() { - return "PersonnePayLoad{ " + - "idBackend=" + idBackend + - ", ifu='" + ifu + '\'' + - ", externalKey=" + externalKey + - ", nomOuSigle='" + nomOuSigle + '\'' + - ", prenomOuRaisonSociale='" + prenomOuRaisonSociale + '\'' + - ", numRavip='" + numRavip + '\'' + - ", npi='" + npi + '\'' + - ", dateNaissanceOuConsti='" + dateNaissanceOuConsti + '\'' + - ", lieuNaissance='" + lieuNaissance + '\'' + - ", tel1='" + tel1 + '\'' + - ", tel2='" + tel2 + '\'' + - ", adresse='" + adresse + '\'' + - ", categorie=" + categorie + - ", situationMatrimonialeId=" + situationMatrimonialeId + - ", nationaliteId=" + nationaliteId + - ", typePersonneId=" + typePersonneId + - ", professionId=" + professionId + - ", communeId=" + communeId + - ", Observation='" + observation + '\'' + - ", synchronise=" + synchronise + - ", terminalId=" + terminalId + - '}'; - } -} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java new file mode 100644 index 0000000..ab9f71d --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java @@ -0,0 +1,15 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import lombok.Data; + +import java.time.LocalDate; + +@Data +public class BatimentPaylaodWeb { + private Long id; + private String nub; + private String code; + private LocalDate dateConstruction; + private Long parcelleId; + private String observation; +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueBatimentPayloadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueBatimentPayloadWeb.java new file mode 100644 index 0000000..61073e3 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueBatimentPayloadWeb.java @@ -0,0 +1,12 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import lombok.Data; + +@Data +public class CaracteristiqueBatimentPayloadWeb { + private Long id; + private Long enqueteBatimentId; + private Long caracteristiqueId; + private String valeur; + private String observation; +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueParcellePayloadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueParcellePayloadWeb.java new file mode 100644 index 0000000..874cd8b --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueParcellePayloadWeb.java @@ -0,0 +1,12 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import lombok.Data; + +@Data +public class CaracteristiqueParcellePayloadWeb { + private Long id; + private Long enqueteId; + private Long caracteristiqueId; + private String valeur; + private String observation; +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueUniteLogementPayloadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueUniteLogementPayloadWeb.java new file mode 100644 index 0000000..842a6fd --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueUniteLogementPayloadWeb.java @@ -0,0 +1,12 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import lombok.Data; + +@Data +public class CaracteristiqueUniteLogementPayloadWeb { + private Long id; + private Long enqueteUniteLogementId; + private Long caracteristiqueId; + private String valeur; + private String observation; +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/DeclarationNcPayloadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/DeclarationNcPayloadWeb.java new file mode 100644 index 0000000..e3dd882 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/DeclarationNcPayloadWeb.java @@ -0,0 +1,18 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import lombok.Data; + +import java.time.LocalDate; +import java.util.List; + +@Data +public class DeclarationNcPayloadWeb { + private Long id; + private LocalDate dateDerniereDeclaration; + private String nc; + private Long structureId; + private Long enqueteId; + private Long personneId; + private String observation; + private List uploadPayLoadWebs; +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteActivitePayLoadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteActivitePayLoadWeb.java new file mode 100644 index 0000000..87d75b2 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteActivitePayLoadWeb.java @@ -0,0 +1,28 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import lombok.Data; + +import java.time.LocalDate; +import java.util.List; + +@Data +public class EnqueteActivitePayLoadWeb { + private Long id; + private Long ChiffreAffaire; // Todo : Revoir le nom de la variable 15/12/2015 + private String NumeroRccm; + private String observation; + private LocalDate dateDemarrage; + private LocalDate dateFin; + private LocalDate dateEnquete; + private boolean estDeclarer; + private String nc; + private Long enqueteId; + private Long structureId; + private Long personneId; + private Long batimentId; + private Long parcelleId; + private Long uniteLogementId; + private Long professionId; + private List uploadPayLoadWebs; +} + diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java new file mode 100644 index 0000000..d9bc6f6 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java @@ -0,0 +1,40 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment; +import lombok.Data; + +import java.time.LocalDate; +import java.util.List; + +@Data +public class EnqueteBatimentPayloadWeb { + private Long id; + private BatimentPaylaodWeb batimentPaylaodWeb ; + private List caracteristiqueBatimentPayloadWebs; + private List uploadPayLoadWebs; + private String observation; + private float surfaceAuSol; + private String autreMenuisierie; + private String autreMur; + private boolean sbee; + private String numCompteurSbee; + private boolean soneb; + private String numCompteurSoneb; + private int nbreLotUnite; + private int nbreUniteLocation; + private float surfaceLouee; + private int nbreMenage; + private int nbreHabitant; + private Long montantMensuelLocation; + private Long montantLocatifAnnuelDeclare; + + private Long valeurBatimentEstime; + private Long valeurBatimentReel; + private int nbreMoisLocation; + private String autreCaracteristiquePhysique; + private LocalDate dateDebutExcemption; + private LocalDate dateFinExcemption; + private Long enqueteId; + private Long personneId; + private Long EnqueteurId; +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnquetePayLoadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnquetePayLoadWeb.java new file mode 100644 index 0000000..698321e --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnquetePayLoadWeb.java @@ -0,0 +1,48 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import io.gmss.fiscad.enums.StatutEnquete; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import lombok.Data; + +import java.time.LocalDate; +import java.util.List; + +@Data +public class EnquetePayLoadWeb { + private Long id; + private LocalDate dateEnquete; + private LocalDate dateFinalisation; + private boolean litige; + private ParcellePayLoadWeb parcellePayLoadWeb; + private List caracteristiqueParcellePayloadWebs; + private List declarationNcPayloadWebs; + private List piecePayLoadWebs; + @Enumerated(EnumType.STRING) + private StatutEnquete statutEnquete; + private String descriptionMotifRejet; + private String observation; + private String numeroTitreFoncier; + private LocalDate dateTitreFoncier; + private String numEnterParcelle; + private String numRue; + private String nomRue; + private float precision; + private int nbreCoProprietaire; + private int nbreIndivisiaire; + private String autreAdresse; + private float superficie; + private int nbreBatiment; + private int nbrePiscine; + private LocalDate dateDebutExemption; + private LocalDate dateFinExemption; + private String autreNumeroTitreFoncier; + private Long EquipeId; + private Long zoneRfuId; + private Long proprietaireId; + private Long EnqueteurId; + private Long valeurMensuelleLocation; + private Long valeurAnnuelleLocation; + private Long valeurParcelleEstime; + private Long valeurParcelleReel; +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java new file mode 100644 index 0000000..57df9a0 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java @@ -0,0 +1,41 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import lombok.Data; + +import java.time.LocalDate; +import java.util.List; + +@Data +public class EnqueteUniteLogementPayloadWeb { + private Long id; + private UniteLogementPaylaodWeb uniteLogementPaylaodWeb ; + private List caracteristiqueUniteLogementPayloadWebs; + private List uploadPayLoadWebs; + private Long externalKey; + private Long terminalId; + private boolean synchronise; + private String observation; + private Long userId; + private float surface; + private int nbrePiece; + private int nbreHabitant; + private int nbreMenage; + private boolean enLocation; + private int nbreMoisLocation; + private Long montantMensuelLoyer; + private Long montantLocatifAnnuelDeclare; + private Long valeurUniteLogementEstime; + private Long valeurUniteLogementReel; + private float SurfaceAuSol; + private float surfaceLouee; + private boolean sbee; + private boolean soneb; + private String numCompteurSbee; + private String numCompteurSoneb; + private LocalDate dateDebutExcemption; + private LocalDate dateFinExcemption; + private Long enqueteId; + private Long uniteLogementId; + private Long personneId; + +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ParcellePayLoadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ParcellePayLoadWeb.java new file mode 100644 index 0000000..4007e7a --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ParcellePayLoadWeb.java @@ -0,0 +1,26 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import lombok.Data; + +@Data +public class ParcellePayLoadWeb { + private Long id; + private String q; + private String i; + private String p; + private String nup; + private String nupProvisoire; + private String numTitreFoncier; + private String longitude; + private String latitude; + private String altitude; + private String emplacement; + private Long situationGeographiqueId; + private Long natureDomaineId; + private Long quartierId; + private float superficie; + private String observation; + private Long typeDomaineId; + private String situationGeographique; + private Long rueId; +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/PersonnePayLoadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/PersonnePayLoadWeb.java new file mode 100644 index 0000000..dd34f0e --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/PersonnePayLoadWeb.java @@ -0,0 +1,48 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import io.gmss.fiscad.enums.Categorie; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import lombok.Data; +import org.hibernate.annotations.ColumnDefault; + +import java.time.LocalDate; + + +@Data +public class PersonnePayLoadWeb { + private Long id; + private String ifu; + private String nom; + private String prenom; + private String raisonSociale; + private String numRavip; + private String npi; + private LocalDate dateNaissanceOuConsti; + private String lieuNaissance; + private String tel1; + private String tel2; + private String adresse; + @Enumerated(EnumType.STRING) + private Categorie categorie; + private Long situationMatrimonialeId; + private Long nationaliteId; + private Long typePersonneId; + private Long professionId; + private Long communeId; + private String observation; + private Long personneId; + + ///////////////////////////// + @ColumnDefault("0") + private int haveRepresentant; + private String ravipQuestion; + private String age; + private String nomJeuneFille; + private String nomMere; + private String prenomMere; + private String indicatifTel1; + private String indicatifTel2; + private String sexe; + +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/PiecePayLoadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/PiecePayLoadWeb.java new file mode 100644 index 0000000..4b96c71 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/PiecePayLoadWeb.java @@ -0,0 +1,23 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import lombok.Data; + +import java.time.LocalDate; +import java.util.List; + +@Data +public class PiecePayLoadWeb { + private Long id; + private LocalDate dateExpiration; + private LocalDate dateEtablissement; + private String numeroPiece; + private String url; + private Long typePieceId; + private Long personneId; + private Long sourceDroitId; + private Long modeAcquisitionId; + private String observation; + private Long enqueteId; + private List uploadPayLoadWebs; +} + diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java new file mode 100644 index 0000000..89e7366 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java @@ -0,0 +1,16 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import lombok.Data; + +import java.time.LocalDate; + +@Data +public class UniteLogementPaylaodWeb { + private Long id; + private String nul; + private String numeroEtage; + private String code; + private Long batimentId; + private String observation; + private LocalDate dateConstruction; +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UploadPayLoadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UploadPayLoadWeb.java new file mode 100644 index 0000000..2a1fdb9 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UploadPayLoadWeb.java @@ -0,0 +1,24 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import lombok.Data; + +@Data +public class UploadPayLoadWeb { + private Long id; + private Long pieceId; + private String Observation; + private boolean synchronise; + //private String fileBase64; + ///////////////////////////////// + private String name; + private String filePath; + private Long enqueteId; + private Long enqueteBatimentId; + private Long personneId; + private Long enqueteUniteLogementId; + private Long declarationNcId; + private String reference; + private String description; + private String rename; +} + diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/ActeurConcernePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/ActeurConcernePayLoad.java similarity index 94% rename from src/main/java/io/gmss/fiscad/paylaods/request/ActeurConcernePayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/ActeurConcernePayLoad.java index 0c0ad63..ad5ec2a 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/ActeurConcernePayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/ActeurConcernePayLoad.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import io.gmss.fiscad.enums.RoleActeur; import io.gmss.fiscad.enums.TypeDroit; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/BatimentPaylaod.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/BatimentPaylaod.java similarity index 94% rename from src/main/java/io/gmss/fiscad/paylaods/request/BatimentPaylaod.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/BatimentPaylaod.java index b8dfdb9..dd8c0c8 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/BatimentPaylaod.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/BatimentPaylaod.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import lombok.Data; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueBatimentPaylod.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/CaracteristiqueBatimentPayload.java similarity index 84% rename from src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueBatimentPaylod.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/CaracteristiqueBatimentPayload.java index 04d20ba..9a50be9 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueBatimentPaylod.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/CaracteristiqueBatimentPayload.java @@ -1,9 +1,9 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import lombok.Data; @Data -public class CaracteristiqueBatimentPaylod { +public class CaracteristiqueBatimentPayload { private Long idBackend; private Long externalKey; private boolean synchronise; @@ -18,7 +18,7 @@ public class CaracteristiqueBatimentPaylod { @Override public String toString() { - return "CaracteristiqueBatimentPaylod{" + + return "CaracteristiqueBatimentPayload{" + "idBackend=" + idBackend + ", externalKey=" + externalKey + ", synchronise=" + synchronise + diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueParcellePaylod.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/CaracteristiqueParcellePayload.java similarity index 74% rename from src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueParcellePaylod.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/CaracteristiqueParcellePayload.java index bb116bb..834086d 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueParcellePaylod.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/CaracteristiqueParcellePayload.java @@ -1,9 +1,9 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import lombok.Data; @Data -public class CaracteristiqueParcellePaylod { +public class CaracteristiqueParcellePayload { private Long idBackend; private Long externalKey; private Long terminalId; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueUniteLogementPaylod.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/CaracteristiqueUniteLogementPayload.java similarity index 76% rename from src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueUniteLogementPaylod.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/CaracteristiqueUniteLogementPayload.java index f67cd8a..6d65335 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueUniteLogementPaylod.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/CaracteristiqueUniteLogementPayload.java @@ -1,9 +1,9 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import lombok.Data; @Data -public class CaracteristiqueUniteLogementPaylod { +public class CaracteristiqueUniteLogementPayload { private Long idBackend; private Long externalKey; private Long terminalId; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/CommentaireRequest.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/CommentaireRequest.java similarity index 83% rename from src/main/java/io/gmss/fiscad/paylaods/request/CommentaireRequest.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/CommentaireRequest.java index 4266492..691bc3d 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/CommentaireRequest.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/CommentaireRequest.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import io.gmss.fiscad.enums.Origine; import lombok.Data; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/DeclarationNcPayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/DeclarationNcPayload.java similarity index 94% rename from src/main/java/io/gmss/fiscad/paylaods/request/DeclarationNcPayload.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/DeclarationNcPayload.java index 2b6c0c8..befe33d 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/DeclarationNcPayload.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/DeclarationNcPayload.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteActivitePayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteActivitePayload.java similarity index 96% rename from src/main/java/io/gmss/fiscad/paylaods/request/EnqueteActivitePayload.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteActivitePayload.java index b7e35b5..9a15b42 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteActivitePayload.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteActivitePayload.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteBatimentPayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteBatimentPayload.java similarity index 90% rename from src/main/java/io/gmss/fiscad/paylaods/request/EnqueteBatimentPayload.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteBatimentPayload.java index 9e73f7e..7f7a590 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteBatimentPayload.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteBatimentPayload.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import lombok.Data; @@ -29,7 +29,7 @@ public class EnqueteBatimentPayload { private float surfaceLouee; private int nbreMenage; private int nbreHabitant; - private float valeurMensuelleLocation; + private Long valeurMensuelleLocation; private int nbreMoisLocation; private String autreCaracteristiquePhysique; private LocalDate dateDebutExcemption; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/EnquetePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnquetePayLoad.java similarity index 88% rename from src/main/java/io/gmss/fiscad/paylaods/request/EnquetePayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnquetePayLoad.java index 33da79b..c9b67ed 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/EnquetePayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnquetePayLoad.java @@ -1,7 +1,6 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; -import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; -import io.gmss.fiscad.enums.StatusEnquete; +import io.gmss.fiscad.enums.StatutEnquete; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import lombok.Data; @@ -13,7 +12,6 @@ public class EnquetePayLoad { private Long idBackend; private Long externalKey; private Long terminalId; - private LocalDate dateEnquete; private LocalDate dateFinalisation; private boolean litige; @@ -21,7 +19,7 @@ public class EnquetePayLoad { private Long parcelleId; private Long blocId; @Enumerated(EnumType.STRING) - private StatusEnquete statusEnquete; + private StatutEnquete statutEnquete; private String descriptionMotifRejet; private String observationParticuliere; private String observation; @@ -48,7 +46,7 @@ public class EnquetePayLoad { private int nbreCoProprietaire; private int nbreIndivisiaire; private String autreAdresse; - private String surface; + private float surface; private int nbreBatiment; private int nbrePiscine; private LocalDate dateDebutExcemption; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteUniteLogementPayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteUniteLogementPayload.java similarity index 93% rename from src/main/java/io/gmss/fiscad/paylaods/request/EnqueteUniteLogementPayload.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteUniteLogementPayload.java index e0c94f8..c53b802 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteUniteLogementPayload.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteUniteLogementPayload.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import lombok.Data; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/EquipePayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EquipePayload.java similarity index 88% rename from src/main/java/io/gmss/fiscad/paylaods/request/EquipePayload.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EquipePayload.java index 1af41e0..60a933b 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/EquipePayload.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EquipePayload.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/MembreGroupePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/MembreGroupePayLoad.java similarity index 90% rename from src/main/java/io/gmss/fiscad/paylaods/request/MembreGroupePayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/MembreGroupePayLoad.java index f7d3dc8..8e0bc1b 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/MembreGroupePayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/MembreGroupePayLoad.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import lombok.Data; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/ParcellePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/ParcellePayLoad.java similarity index 93% rename from src/main/java/io/gmss/fiscad/paylaods/request/ParcellePayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/ParcellePayLoad.java index 3c11bdd..734e6b0 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/ParcellePayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/ParcellePayLoad.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import lombok.Data; @@ -30,5 +30,4 @@ public class ParcellePayLoad { private String situationGeographique; private String autreNumeroTitreFoncier; // private int geomSrid; - } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/ParticiperPayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/ParticiperPayload.java similarity index 93% rename from src/main/java/io/gmss/fiscad/paylaods/request/ParticiperPayload.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/ParticiperPayload.java index e8df1e9..0a09b76 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/ParticiperPayload.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/ParticiperPayload.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/PersonnePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/PersonnePayLoad.java new file mode 100644 index 0000000..a87669b --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/PersonnePayLoad.java @@ -0,0 +1,57 @@ +package io.gmss.fiscad.paylaods.request.synchronisation; + +import io.gmss.fiscad.entities.infocad.parametre.Personne; +import io.gmss.fiscad.enums.Categorie; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import lombok.Data; +import org.hibernate.annotations.ColumnDefault; + +import java.time.LocalDate; + + +@Data +public class PersonnePayLoad { + private Long idBackend; + private String ifu; + private Long externalKey; + private String nom; + private String prenom; + private String raisonSociale; + private String numRavip; + private String npi; + private LocalDate dateNaissanceOuConsti; + private String lieuNaissance; + private String tel1; + private String tel2; + private String adresse; + @Enumerated(EnumType.STRING) + private Categorie categorie; + private Long situationMatrimonialeId; + private Long nationaliteId; + private Long typePersonneId; + private Long professionId; + private Long communeId; + private String observation; + private boolean synchronise; + private Long terminalId; + private Long personneId; + + ///////////////////////////// + @ColumnDefault("0") + private int haveRepresentant; + private String ravipQuestion; + private String age; + private String nomJeuneFille; + private String nomMere; + private String prenomMere; + private String indicatifTel1; + private String indicatifTel2; + private String sexe; + @ColumnDefault("0") + private int mustHaveRepresentant; + private String filePath; + + + +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/PiecePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/PiecePayLoad.java similarity index 92% rename from src/main/java/io/gmss/fiscad/paylaods/request/PiecePayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/PiecePayLoad.java index a3bcbb0..2173efa 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/PiecePayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/PiecePayLoad.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import lombok.Data; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/SecteurDecoupagePayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/SecteurDecoupagePayload.java similarity index 93% rename from src/main/java/io/gmss/fiscad/paylaods/request/SecteurDecoupagePayload.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/SecteurDecoupagePayload.java index 5db270e..64dcc13 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/SecteurDecoupagePayload.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/SecteurDecoupagePayload.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/SecteurPayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/SecteurPayload.java similarity index 88% rename from src/main/java/io/gmss/fiscad/paylaods/request/SecteurPayload.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/SecteurPayload.java index f5a3c82..b865647 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/SecteurPayload.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/SecteurPayload.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/UniteLogementPaylaod.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/UniteLogementPaylaod.java similarity index 87% rename from src/main/java/io/gmss/fiscad/paylaods/request/UniteLogementPaylaod.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/UniteLogementPaylaod.java index f89325d..ec77282 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/UniteLogementPaylaod.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/UniteLogementPaylaod.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import lombok.Data; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/UploadPayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/UploadPayLoad.java similarity index 93% rename from src/main/java/io/gmss/fiscad/paylaods/request/UploadPayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/UploadPayLoad.java index 230809c..f670273 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/UploadPayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/UploadPayLoad.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.request; +package io.gmss.fiscad.paylaods.request.synchronisation; import lombok.Data; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/EnqueteNonSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/EnqueteNonSyncResponse.java index 084d8a9..5c74bef 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/EnqueteNonSyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/EnqueteNonSyncResponse.java @@ -1,6 +1,6 @@ package io.gmss.fiscad.paylaods.response; -import io.gmss.fiscad.enums.StatusEnquete; +import io.gmss.fiscad.enums.StatutEnquete; public interface EnqueteNonSyncResponse { @@ -8,7 +8,7 @@ public interface EnqueteNonSyncResponse { public Long getExternalKey(); - public StatusEnquete getStatusEnquete(); + public StatutEnquete getStatusEnquete(); public String getMotif(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnquetesResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnquetesResponse.java index 3fb6973..7c717a8 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnquetesResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnquetesResponse.java @@ -14,7 +14,7 @@ import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; import io.gmss.fiscad.entities.rfu.parametre.Campagne; import io.gmss.fiscad.entities.rfu.parametre.Equipe; import io.gmss.fiscad.entities.user.User; -import io.gmss.fiscad.enums.StatusEnquete; +import io.gmss.fiscad.enums.StatutEnquete; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.persistence.Transient; @@ -38,7 +38,7 @@ public class FicheEnquetesResponse { private Campagne campagne; private Equipe equipe; @Enumerated(EnumType.STRING) - private StatusEnquete statusEnquete; + private StatutEnquete statutEnquete; @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateValidation; diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/ActeurConcernePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/ActeurConcernePayLoadRestor.java similarity index 94% rename from src/main/java/io/gmss/fiscad/paylaods/response/restoration/ActeurConcernePayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/ActeurConcernePayLoadRestor.java index a16c616..03db0a7 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/ActeurConcernePayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/ActeurConcernePayLoadRestor.java @@ -6,7 +6,7 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; -public interface ActeurConcernePayLoad { +public interface ActeurConcernePayLoadRestor { public Long getIdBackend(); public Long getExternalKey(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/BatimentPayload.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/BatimentPayloadRestor.java similarity index 93% rename from src/main/java/io/gmss/fiscad/paylaods/response/restoration/BatimentPayload.java rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/BatimentPayloadRestor.java index 2f496b1..fe4bdd5 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/BatimentPayload.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/BatimentPayloadRestor.java @@ -6,7 +6,7 @@ import io.gmss.fiscad.deserializer.LocalDateDeserializer; import java.time.LocalDate; -public interface BatimentPayload { +public interface BatimentPayloadRestor { public Long getIdBackend(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracateristiqueBatimentPayLoads.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracateristiqueBatimentPayLoadsRestor.java similarity index 82% rename from src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracateristiqueBatimentPayLoads.java rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracateristiqueBatimentPayLoadsRestor.java index 4e81f56..40948b0 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracateristiqueBatimentPayLoads.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracateristiqueBatimentPayLoadsRestor.java @@ -1,6 +1,6 @@ package io.gmss.fiscad.paylaods.response.restoration; -public interface CaracateristiqueBatimentPayLoads { +public interface CaracateristiqueBatimentPayLoadsRestor { public Long getIdBackend(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracateristiqueParcellePayLoads.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracateristiqueParcellePayLoadsRestor.java similarity index 82% rename from src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracateristiqueParcellePayLoads.java rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracateristiqueParcellePayLoadsRestor.java index e2e982b..bc7d7ea 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracateristiqueParcellePayLoads.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracateristiqueParcellePayLoadsRestor.java @@ -1,6 +1,6 @@ package io.gmss.fiscad.paylaods.response.restoration; -public interface CaracateristiqueParcellePayLoads { +public interface CaracateristiqueParcellePayLoadsRestor { public Long getIdBackend(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracteristiqueUniteLogementPayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracteristiqueUniteLogementPayLoad.java deleted file mode 100644 index e5ff37d..0000000 --- a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracteristiqueUniteLogementPayLoad.java +++ /dev/null @@ -1,4 +0,0 @@ -package io.gmss.fiscad.paylaods.response.restoration; - -public interface CaracteristiqueUniteLogementPayLoad { -} diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracteristiqueUniteLogementPayLoadRestor.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracteristiqueUniteLogementPayLoadRestor.java new file mode 100644 index 0000000..ce16d4d --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/CaracteristiqueUniteLogementPayLoadRestor.java @@ -0,0 +1,4 @@ +package io.gmss.fiscad.paylaods.response.restoration; + +public interface CaracteristiqueUniteLogementPayLoadRestor { +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnqueteBatimentPayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnqueteBatimentPayLoadRestor.java similarity index 96% rename from src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnqueteBatimentPayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnqueteBatimentPayLoadRestor.java index 97843ae..63adfa8 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnqueteBatimentPayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnqueteBatimentPayLoadRestor.java @@ -6,7 +6,7 @@ import io.gmss.fiscad.deserializer.LocalDateDeserializer; import java.time.LocalDate; -public interface EnqueteBatimentPayLoad { +public interface EnqueteBatimentPayLoadRestor { public Long getIdBackend(); public Long getExternalKey(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnquetePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnquetePayLoad.java index fba6c98..8265834 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnquetePayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnquetePayLoad.java @@ -3,7 +3,7 @@ package io.gmss.fiscad.paylaods.response.restoration; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.gmss.fiscad.deserializer.LocalDateDeserializer; -import io.gmss.fiscad.enums.StatusEnquete; +import io.gmss.fiscad.enums.StatutEnquete; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -31,7 +31,7 @@ public interface EnquetePayLoad { public Long getBlocId(); @Enumerated(EnumType.STRING) - public StatusEnquete getStatusEnquete(); + public StatutEnquete getStatusEnquete(); public String getDescriptionMotifRejet(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnqueteUniteLogementPayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnqueteUniteLogementPayLoadRestor.java similarity index 96% rename from src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnqueteUniteLogementPayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnqueteUniteLogementPayLoadRestor.java index cf88c3a..ebc4456 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnqueteUniteLogementPayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnqueteUniteLogementPayLoadRestor.java @@ -6,7 +6,7 @@ import io.gmss.fiscad.deserializer.LocalDateDeserializer; import java.time.LocalDate; -public interface EnqueteUniteLogementPayLoad { +public interface EnqueteUniteLogementPayLoadRestor { public Long getIdBackend(); public Long getExternalKey(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/MembreGroupePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/MembreGroupePayLoadRestor.java similarity index 92% rename from src/main/java/io/gmss/fiscad/paylaods/response/restoration/MembreGroupePayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/MembreGroupePayLoadRestor.java index 1753786..96157e1 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/MembreGroupePayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/MembreGroupePayLoadRestor.java @@ -1,6 +1,6 @@ package io.gmss.fiscad.paylaods.response.restoration; -public interface MembreGroupePayLoad { +public interface MembreGroupePayLoadRestor { public Long getIdBackend(); public Long getExternalKey(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/ParcellePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/ParcellePayLoadRestor.java similarity index 94% rename from src/main/java/io/gmss/fiscad/paylaods/response/restoration/ParcellePayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/ParcellePayLoadRestor.java index f62bd6c..5b31241 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/ParcellePayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/ParcellePayLoadRestor.java @@ -1,6 +1,6 @@ package io.gmss.fiscad.paylaods.response.restoration; -public interface ParcellePayLoad { +public interface ParcellePayLoadRestor { public Long getIdBackend(); public Long getExternalKey(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/PiecePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/PiecePayLoadRestor.java similarity index 96% rename from src/main/java/io/gmss/fiscad/paylaods/response/restoration/PiecePayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/PiecePayLoadRestor.java index dbedf81..8ebec9b 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/PiecePayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/PiecePayLoadRestor.java @@ -7,7 +7,7 @@ import io.gmss.fiscad.deserializer.LocalDateDeserializer; import java.time.LocalDate; -public interface PiecePayLoad { +public interface PiecePayLoadRestor { public Long getIdBackend(); public Long getExternalKey(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/UniteLogementPayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/UniteLogementPayLoadRestor.java similarity index 86% rename from src/main/java/io/gmss/fiscad/paylaods/response/restoration/UniteLogementPayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/UniteLogementPayLoadRestor.java index d857684..6cc4d42 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/UniteLogementPayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/UniteLogementPayLoadRestor.java @@ -1,6 +1,6 @@ package io.gmss.fiscad.paylaods.response.restoration; -public interface UniteLogementPayLoad { +public interface UniteLogementPayLoadRestor { public Long getIdBackend(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/UploadPayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/UploadPayLoadRestor.java similarity index 94% rename from src/main/java/io/gmss/fiscad/paylaods/response/restoration/UploadPayLoad.java rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/UploadPayLoadRestor.java index 1603a64..6062287 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/restoration/UploadPayLoad.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/UploadPayLoadRestor.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.paylaods.response.restoration; import org.springframework.web.multipart.MultipartFile; -public interface UploadPayLoad { +public interface UploadPayLoadRestor { public Long getIdBackend(); public Long getExternalKey(); diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ActeurConcerneRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ActeurConcerneRepository.java index bf00f61..bf79851 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ActeurConcerneRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ActeurConcerneRepository.java @@ -1,8 +1,7 @@ package io.gmss.fiscad.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne; -import io.gmss.fiscad.entities.infocad.parametre.Personne; -import io.gmss.fiscad.paylaods.response.restoration.ActeurConcernePayLoad; +import io.gmss.fiscad.paylaods.response.restoration.ActeurConcernePayLoadRestor; import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -42,6 +41,6 @@ public interface ActeurConcerneRepository extends JpaRepository getActeurConcerneByTerminalId(Long terminalId); + List getActeurConcerneByTerminalId(Long terminalId); } \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/MembreGroupeRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/MembreGroupeRepository.java index 2d8334d..07f6a3b 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/MembreGroupeRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/MembreGroupeRepository.java @@ -1,8 +1,7 @@ package io.gmss.fiscad.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.MembreGroupe; -import io.gmss.fiscad.entities.infocad.parametre.Personne; -import io.gmss.fiscad.paylaods.response.restoration.MembreGroupePayLoad; +import io.gmss.fiscad.paylaods.response.restoration.MembreGroupePayLoadRestor; import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -35,7 +34,7 @@ public interface MembreGroupeRepository extends JpaRepository getMembreGroupeByTerminalId(Long terminalId); + List getMembreGroupeByTerminalId(Long terminalId); List findByPersonneRepresantee_Id(Long id); diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleRepository.java index 9b1823a..955bbfe 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleRepository.java @@ -2,7 +2,7 @@ package io.gmss.fiscad.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.paylaods.response.StatistiqueTypeNombreResponse; -import io.gmss.fiscad.paylaods.response.restoration.ParcellePayLoad; +import io.gmss.fiscad.paylaods.response.restoration.ParcellePayLoadRestor; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -37,7 +37,7 @@ public interface ParcelleRepository extends JpaRepository { // " p.geom_srid as geomSrid " + " From parcelle p " + " where p.terminal_id = ?1", nativeQuery = true) - List getParcellesByTerminalId(Long terminalId); + List getParcellesByTerminalId(Long terminalId); List findAllByQuartier_Arrondissement_Commune_Id(Long communeId); Optional findFirstByNupProvisoire(String nump); diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java index 0709d3b..92f4cbc 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java @@ -1,8 +1,7 @@ package io.gmss.fiscad.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.Piece; -import io.gmss.fiscad.entities.infocad.parametre.Personne; -import io.gmss.fiscad.paylaods.response.restoration.PiecePayLoad; +import io.gmss.fiscad.paylaods.response.restoration.PiecePayLoadRestor; import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -49,7 +48,7 @@ public interface PieceRepository extends JpaRepository { " from piece p left join personne pp on p.personne_id = pp.id left join acteur_concerne ac on ac.id = p.personne_id " + " where p.terminal_id = ?1" , nativeQuery = true) - List getPiecesByTerminalId(Long terminalId); + List getPiecesByTerminalId(Long terminalId); List findByPersonne_Id(Long id); Optional findByMobileDataId(Long id); List findByPersonne_IdAndActeurConcerneIsNull(Long id); diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/RueRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/RueRepository.java new file mode 100755 index 0000000..7668bcb --- /dev/null +++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/RueRepository.java @@ -0,0 +1,15 @@ +package io.gmss.fiscad.repositories.infocad.metier; + +import io.gmss.fiscad.entities.infocad.metier.Rue; +import io.gmss.fiscad.entities.infocad.metier.Tpe; +import jakarta.transaction.Transactional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; +import java.util.Optional; + +public interface RueRepository extends JpaRepository { +} \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/UploadRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/UploadRepository.java index 86a400e..ff3b566 100644 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/UploadRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/UploadRepository.java @@ -1,10 +1,9 @@ package io.gmss.fiscad.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.Upload; -import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; -import io.gmss.fiscad.paylaods.response.restoration.UploadPayLoad; +import io.gmss.fiscad.paylaods.response.restoration.UploadPayLoadRestor; import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -60,7 +59,7 @@ public interface UploadRepository extends JpaRepository { " From upload u inner join public.piece p on p.id = u.piece_id" + " where u.terminal_id = ?1" , nativeQuery = true) - List getUploadByTerminalId(Long terminalId); + List getUploadByTerminalId(Long terminalId); @Transactional @Modifying diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeRueRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeRueRepository.java new file mode 100755 index 0000000..5ddfe9a --- /dev/null +++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeRueRepository.java @@ -0,0 +1,8 @@ +package io.gmss.fiscad.repositories.infocad.parametre; + +import io.gmss.fiscad.entities.infocad.parametre.TypePiece; +import io.gmss.fiscad.entities.infocad.parametre.TypeRue; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface TypeRueRepository extends JpaRepository { +} diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueBatimentRepository.java b/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueBatimentRepository.java index 149b412..4115525 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueBatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueBatimentRepository.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Optional; public interface MobileDataCaracteristiqueBatimentRepository extends JpaRepository { - //Optional findByCaracteristiqueBatimentPaylod_TerminalIdAndCaracteristiqueBatimentPaylod_ExternalKey(Long terminalId,Long externalKey); + //Optional findByCaracteristiqueBatimentPayload_TerminalIdAndCaracteristiqueBatimentPayload_ExternalKey(Long terminalId,Long externalKey); Optional findFirstByTerminalIdAndExternalKey(Long terminalId,Long ExternalKey); List findAllByTraiterIsFalseAndTerminalId(Long TerminalId); diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueParcelleRepository.java b/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueParcelleRepository.java index 909235c..cbce076 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueParcelleRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueParcelleRepository.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Optional; public interface MobileDataCaracteristiqueParcelleRepository extends JpaRepository { - //Optional findByCaracteristiqueParcellePaylod_TerminalIdAndCaracteristiqueParcellePaylod_ExternalKey(Long terminalId,Long externalKey); + //Optional findByCaracteristiqueParcellePayload_TerminalIdAndCaracteristiqueParcellePayload_ExternalKey(Long terminalId,Long externalKey); Optional findFirstByTerminalIdAndExternalKey(Long terminalId,Long ExternalKey); List findAllByTraiterIsFalseAndTerminalId(Long TerminalId); diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueUniteLogementRepository.java b/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueUniteLogementRepository.java index d0e2c75..44ce5f9 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueUniteLogementRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueUniteLogementRepository.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Optional; public interface MobileDataCaracteristiqueUniteLogementRepository extends JpaRepository { - //Optional findByCaracteristiqueUniteLogementPaylod_TerminalIdAndCaracteristiqueUniteLogementPaylod_ExternalKey(Long terminalId,Long externalKey); + //Optional findByCaracteristiqueUniteLogementPayload_TerminalIdAndCaracteristiqueUniteLogementPayload_ExternalKey(Long terminalId,Long externalKey); Optional findFirstByTerminalIdAndExternalKey(Long terminalId,Long ExternalKey); List findAllByTraiterIsFalseAndTerminalId(Long TerminalId); diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/BatimentRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/BatimentRepository.java index f42dcbc..0dc68aa 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/BatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/BatimentRepository.java @@ -1,8 +1,7 @@ package io.gmss.fiscad.repositories.rfu.metier; -import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.rfu.metier.Batiment; -import io.gmss.fiscad.paylaods.response.restoration.BatimentPayload; +import io.gmss.fiscad.paylaods.response.restoration.BatimentPayloadRestor; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -24,7 +23,7 @@ public interface BatimentRepository extends JpaRepository { " b.terminal_id as terminalId " + " FROM batiment b inner join parcelle p on b.id = b.parcelle_id " + " WHERE b.terminal_id = ?1", nativeQuery = true) - List getBatimentByTerminalId(Long terminalId); + List getBatimentByTerminalId(Long terminalId); void deleteByEnqueteId(Long enqueteId); diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java index ce896a1..9fbce11 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java @@ -1,9 +1,8 @@ package io.gmss.fiscad.repositories.rfu.metier; -import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; -import io.gmss.fiscad.paylaods.response.restoration.CaracateristiqueBatimentPayLoads; +import io.gmss.fiscad.paylaods.response.restoration.CaracateristiqueBatimentPayLoadsRestor; import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -40,5 +39,5 @@ public interface CaracteristiqueBatimentRepository extends JpaRepository getCaracteristiqueBatimentByTerminalId(Long terminalId); + List getCaracteristiqueBatimentByTerminalId(Long terminalId); } diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java index 2c2b215..7169dc6 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java @@ -1,9 +1,8 @@ package io.gmss.fiscad.repositories.rfu.metier; import io.gmss.fiscad.entities.infocad.metier.Enquete; -import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle; -import io.gmss.fiscad.paylaods.response.restoration.CaracateristiqueParcellePayLoads; +import io.gmss.fiscad.paylaods.response.restoration.CaracateristiqueParcellePayLoadsRestor; import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -33,5 +32,5 @@ public interface CaracteristiqueParcelleRepository extends JpaRepository getCaracteristiqueParcelleByTerminalId(Long terminalId); + List getCaracteristiqueParcelleByTerminalId(Long terminalId); } diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java index 6ba59e5..187a246 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java @@ -1,9 +1,8 @@ package io.gmss.fiscad.repositories.rfu.metier; -import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueUniteLogement; import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; -import io.gmss.fiscad.paylaods.response.restoration.CaracteristiqueUniteLogementPayLoad; +import io.gmss.fiscad.paylaods.response.restoration.CaracteristiqueUniteLogementPayLoadRestor; import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -37,5 +36,5 @@ public interface CaracteristiqueUniteLogementRepository extends JpaRepository getCaracteristiqueUniteLogementByTerminalId(Long terminalId); + List getCaracteristiqueUniteLogementByTerminalId(Long terminalId); } diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteActiviteRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteActiviteRepository.java index cb15367..617eba6 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteActiviteRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteActiviteRepository.java @@ -1,10 +1,7 @@ package io.gmss.fiscad.repositories.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.EnqueteActivite; -import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; -import io.gmss.fiscad.paylaods.response.restoration.EnqueteBatimentPayLoad; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; import java.util.List; import java.util.Optional; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteBatimentRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteBatimentRepository.java index 4dad393..50020af 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteBatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteBatimentRepository.java @@ -1,8 +1,7 @@ package io.gmss.fiscad.repositories.rfu.metier; -import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; -import io.gmss.fiscad.paylaods.response.restoration.EnqueteBatimentPayLoad; +import io.gmss.fiscad.paylaods.response.restoration.EnqueteBatimentPayLoadRestor; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -48,7 +47,7 @@ public interface EnqueteBatimentRepository extends JpaRepository getEnqueteBatimentByTerminalId(Long terminalId); + List getEnqueteBatimentByTerminalId(Long terminalId); void deleteAllByEnquete_Id(Long idEnquete); diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteUniteLogementRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteUniteLogementRepository.java index c4077b0..9b7f0d4 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteUniteLogementRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteUniteLogementRepository.java @@ -1,8 +1,7 @@ package io.gmss.fiscad.repositories.rfu.metier; -import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; -import io.gmss.fiscad.paylaods.response.restoration.EnqueteUniteLogementPayLoad; +import io.gmss.fiscad.paylaods.response.restoration.EnqueteUniteLogementPayLoadRestor; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -44,7 +43,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository getEnqueteUniteLogementByTerminalId(Long terminalId); + List getEnqueteUniteLogementByTerminalId(Long terminalId); void deleteAllByEnquete_id(Long id) ; } diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/ImpositionsTfuRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/ImpositionsTfuRepository.java index 1f60133..6ca0211 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/ImpositionsTfuRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/ImpositionsTfuRepository.java @@ -1,8 +1,6 @@ package io.gmss.fiscad.repositories.rfu.metier; -import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu; -import io.gmss.fiscad.paylaods.response.restoration.EnqueteBatimentPayLoad; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/UniteLogementRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/UniteLogementRepository.java index 80ca815..5f8231b 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/UniteLogementRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/UniteLogementRepository.java @@ -1,8 +1,7 @@ package io.gmss.fiscad.repositories.rfu.metier; -import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.rfu.metier.UniteLogement; -import io.gmss.fiscad.paylaods.response.restoration.UniteLogementPayLoad; +import io.gmss.fiscad.paylaods.response.restoration.UniteLogementPayLoadRestor; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -26,7 +25,7 @@ public interface UniteLogementRepository extends JpaRepository getUniteLogementByTerminalId(Long terminalId); + List getUniteLogementByTerminalId(Long terminalId); void deleteByEnqueteId(Long enqueteId); diff --git a/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java new file mode 100644 index 0000000..2ac6019 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java @@ -0,0 +1,325 @@ +package io.gmss.fiscad.service; + +import io.gmss.fiscad.entities.decoupage.Commune; +import io.gmss.fiscad.entities.decoupage.Nationalite; +import io.gmss.fiscad.entities.infocad.metier.Enquete; +import io.gmss.fiscad.entities.infocad.metier.Parcelle; +import io.gmss.fiscad.entities.infocad.metier.Piece; +import io.gmss.fiscad.entities.infocad.metier.Upload; +import io.gmss.fiscad.entities.infocad.parametre.*; +import io.gmss.fiscad.entities.rfu.metier.*; +import io.gmss.fiscad.entities.rfu.parametre.Caracteristique; +import io.gmss.fiscad.enums.TypeObjet; +import io.gmss.fiscad.paylaods.request.crudweb.*; +import io.gmss.fiscad.repositories.decoupage.CommuneRepository; +import io.gmss.fiscad.repositories.decoupage.NationaliteRepository; +import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository; +import io.gmss.fiscad.repositories.infocad.metier.PieceRepository; +import io.gmss.fiscad.repositories.infocad.parametre.*; +import io.gmss.fiscad.repositories.rfu.metier.*; +import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@AllArgsConstructor +@Service +public class EntityFromPayLoadService { + private final EnqueteRepository enqueteRepository; + private final TypePieceRepository typePieceRepository; + private final PieceRepository pieceRepository; + private final CaracteristiqueRepository caracteristiqueRepository; + private final ModeAcquisitionRepository modeAcquisitionRepository; + private final PersonneRepository personneRepository; + private final SourceDroitRepository sourceDroitRepository; + private final StructureRepository structureRepository; + private final EnqueteBatimentRepository enqueteBatimentRepository; + private final EnqueteUniteLogementRepository enqueteUniteLogementRepository; + private final DeclarationNcRepository declarationNcRepository; + private final ParcelleRepository parcelleRepository; + private final BatimentRepository batimentRepository; + private final UniteLogementRepository uniteLogementRepository; + private final SituationMatrimonialeRepository situationMatrimonialeRepository; + private final NationaliteRepository nationaliteRepository; + private final ProfessionRepository professionRepository; + private final TypePersonneRepository typePersonneRepository; + private final CommuneRepository communeRepository; + + public CaracteristiqueParcelle getCaracteristiqueParcelleFromPayLoadWeb(CaracteristiqueParcellePayloadWeb caracteristiqueParcellePayloadWeb){ + CaracteristiqueParcelle caracteristiqueParcelle=new CaracteristiqueParcelle(); + Optional optionalEnquete=Optional.empty(); + Optional optionalCaracteristique=Optional.empty(); + + if(caracteristiqueParcellePayloadWeb.getEnqueteId()!=null) + optionalEnquete=enqueteRepository.findById(caracteristiqueParcellePayloadWeb.getEnqueteId()); + if(caracteristiqueParcellePayloadWeb.getCaracteristiqueId()!=null) + optionalCaracteristique=caracteristiqueRepository.findById(caracteristiqueParcellePayloadWeb.getCaracteristiqueId()); + + caracteristiqueParcelle.setId(caracteristiqueParcellePayloadWeb.getId()); + caracteristiqueParcelle.setEnquete(optionalEnquete.orElse(null)); + caracteristiqueParcelle.setCaracteristique(optionalCaracteristique.orElse(null)); + caracteristiqueParcelle.setValeur(caracteristiqueParcellePayloadWeb.getValeur()); + return caracteristiqueParcelle; + } + + + public CaracteristiqueBatiment getCaracteristiqueBatimentFromPayLoadWeb(CaracteristiqueBatimentPayloadWeb caracteristiqueBatimentPayloadWeb){ + CaracteristiqueBatiment caracteristiqueBatiment=new CaracteristiqueBatiment(); + Optional optionalEnqueteBatiment=Optional.empty(); + Optional optionalCaracteristique=Optional.empty(); + + if(caracteristiqueBatimentPayloadWeb.getEnqueteBatimentId()!=null) + optionalEnqueteBatiment=enqueteBatimentRepository.findById(caracteristiqueBatimentPayloadWeb.getEnqueteBatimentId()); + if(caracteristiqueBatimentPayloadWeb.getCaracteristiqueId()!=null) + optionalCaracteristique=caracteristiqueRepository.findById(caracteristiqueBatimentPayloadWeb.getCaracteristiqueId()); + + caracteristiqueBatiment.setId(caracteristiqueBatimentPayloadWeb.getId()); + caracteristiqueBatiment.setEnqueteBatiment(optionalEnqueteBatiment.orElse(null)); + caracteristiqueBatiment.setCaracteristique(optionalCaracteristique.orElse(null)); + caracteristiqueBatiment.setValeur(caracteristiqueBatimentPayloadWeb.getValeur()); + caracteristiqueBatiment.setObservation(caracteristiqueBatimentPayloadWeb.getObservation()); + return caracteristiqueBatiment; + } + + + public CaracteristiqueUniteLogement getCaracteristiqueUniteLogementFromPayLoadWeb(CaracteristiqueUniteLogementPayloadWeb caracteristiqueUniteLogementPayloadWeb){ + CaracteristiqueUniteLogement caracteristiqueUniteLogement=new CaracteristiqueUniteLogement(); + Optional optionalEnqueteUniteLogement=Optional.empty(); + Optional optionalCaracteristique=Optional.empty(); + + if(caracteristiqueUniteLogementPayloadWeb.getEnqueteUniteLogementId()!=null) + optionalEnqueteUniteLogement=enqueteUniteLogementRepository.findById(caracteristiqueUniteLogementPayloadWeb.getEnqueteUniteLogementId()); + if(caracteristiqueUniteLogementPayloadWeb.getCaracteristiqueId()!=null) + optionalCaracteristique=caracteristiqueRepository.findById(caracteristiqueUniteLogementPayloadWeb.getCaracteristiqueId()); + + caracteristiqueUniteLogement.setId(caracteristiqueUniteLogementPayloadWeb.getId()); + caracteristiqueUniteLogement.setEnqueteUniteLogement(optionalEnqueteUniteLogement.orElse(null)); + caracteristiqueUniteLogement.setCaracteristique(optionalCaracteristique.orElse(null)); + caracteristiqueUniteLogement.setValeur(caracteristiqueUniteLogementPayloadWeb.getValeur()); + caracteristiqueUniteLogement.setObservation(caracteristiqueUniteLogementPayloadWeb.getObservation()); + return caracteristiqueUniteLogement; + } + + + public Piece getPieceFromPayLoadWeb(PiecePayLoadWeb piecePayLoadWeb){ + Piece piece=new Piece(); + Optional optionalEnquete=Optional.empty(); + Optional optionalTypePiece=Optional.empty(); + Optional optionalSourceDroit=Optional.empty(); + Optional optionalModeAcquisition=Optional.empty(); + Optional optionalPersonne=Optional.empty(); + + if(piecePayLoadWeb.getEnqueteId()!=null) + optionalEnquete=enqueteRepository.findById(piecePayLoadWeb.getEnqueteId()); + + if(piecePayLoadWeb.getTypePieceId()!=null) + optionalTypePiece=typePieceRepository.findById(piecePayLoadWeb.getTypePieceId()); + + if(piecePayLoadWeb.getSourceDroitId()!=null) + optionalSourceDroit=sourceDroitRepository.findById(piecePayLoadWeb.getSourceDroitId()); + + if(piecePayLoadWeb.getModeAcquisitionId()!=null) + optionalModeAcquisition=modeAcquisitionRepository.findById(piecePayLoadWeb.getModeAcquisitionId()); + + if(piecePayLoadWeb.getPersonneId()!=null) + optionalPersonne=personneRepository.findById(piecePayLoadWeb.getPersonneId()); + piece.setId(piecePayLoadWeb.getId()); + piece.setEnquete(optionalEnquete.orElse(null)); + piece.setTypePiece(optionalTypePiece.orElse(null)); + piece.setSourceDroit(optionalSourceDroit.orElse(null)); + piece.setModeAcquisition(optionalModeAcquisition.orElse(null)); + piece.setPersonne(optionalPersonne.orElse(null)); + piece.setDateExpiration(piecePayLoadWeb.getDateExpiration()); + piece.setDateEtablissement(piecePayLoadWeb.getDateEtablissement()); + piece.setObservation(piecePayLoadWeb.getObservation()); + piece.setNumeroPiece(piecePayLoadWeb.getNumeroPiece()); + return piece ; + } + + public DeclarationNc getDeclarationNcFromPayLoadWeb(DeclarationNcPayloadWeb declarationNcPayloadWeb){ + DeclarationNc declarationNc=new DeclarationNc(); + Optional optionalEnquete=Optional.empty(); + Optional optionalPersonne=Optional.empty(); + Optional optionalStructure=Optional.empty(); + if(declarationNcPayloadWeb.getEnqueteId()!=null) + optionalEnquete=enqueteRepository.findById(declarationNcPayloadWeb.getEnqueteId()); + if(declarationNcPayloadWeb.getPersonneId()!=null) + optionalPersonne=personneRepository.findById(declarationNcPayloadWeb.getPersonneId()); + if(declarationNcPayloadWeb.getStructureId()!=null) + optionalStructure=structureRepository.findById(declarationNcPayloadWeb.getStructureId()); + declarationNc.setId(declarationNcPayloadWeb.getId()); + declarationNc.setEnquete(optionalEnquete.orElse(null)); + declarationNc.setStructure(optionalStructure.orElse(null)); + declarationNc.setPersonne(optionalPersonne.orElse(null)); + declarationNc.setNc(declarationNcPayloadWeb.getNc()); + declarationNc.setDateDerniereDeclaration(declarationNcPayloadWeb.getDateDerniereDeclaration()); + return declarationNc ; + } + + public Upload getUploadFromPayLoadWeb(UploadPayLoadWeb uploadPayLoadWeb){ + Upload upload=new Upload(); + //Optional optionalEnquete=Optional.empty(); + Optional optionalDeclarationNc=Optional.empty(); + Optional optionalPersonne=Optional.empty(); + Optional optionalEnqueteBatiment=Optional.empty(); + Optional optionalEnqueteUniteLogement=Optional.empty(); + +// if(uploadPayLoadWeb.getEnqueteId()!=null) +// optionalEnquete=enqueteRepository.findById(uploadPayLoadWeb.getEnqueteId()); + if(uploadPayLoadWeb.getDeclarationNcId()!=null) + optionalDeclarationNc = declarationNcRepository.findById(uploadPayLoadWeb.getDeclarationNcId()); + if(uploadPayLoadWeb.getPersonneId()!=null) + optionalPersonne=personneRepository.findById(uploadPayLoadWeb.getPersonneId()); + if(uploadPayLoadWeb.getEnqueteBatimentId()!=null) + optionalEnqueteBatiment=enqueteBatimentRepository.findById(uploadPayLoadWeb.getEnqueteBatimentId()); + if(uploadPayLoadWeb.getEnqueteUniteLogementId()!=null) + optionalEnqueteUniteLogement=enqueteUniteLogementRepository.findById(uploadPayLoadWeb.getEnqueteUniteLogementId()); + upload.setId(uploadPayLoadWeb.getId()); + upload.setEnqueteId(uploadPayLoadWeb.getEnqueteId()); + upload.setEnqueteBatiment(optionalEnqueteBatiment.orElse(null)); + upload.setPersonne(optionalPersonne.orElse(null)); + upload.setEnqueteUniteLogement(optionalEnqueteUniteLogement.orElse(null)); + upload.setRename(uploadPayLoadWeb.getRename()); + upload.setDescription(uploadPayLoadWeb.getDescription()); + upload.setReference(uploadPayLoadWeb.getReference()); + upload.setDeclarationNc(optionalDeclarationNc.orElse(null)); + upload.setFileName(uploadPayLoadWeb.getName()); + upload.setName(uploadPayLoadWeb.getName()); + return upload ; + } + + public Batiment getBatimentFromPayLoadWeb(BatimentPaylaodWeb batimentPaylaodWeb){ + Batiment batiment=new Batiment(); + Optional optionalParcelle=Optional.empty(); + + if(batimentPaylaodWeb.getParcelleId()!=null) + optionalParcelle=parcelleRepository.findById(batimentPaylaodWeb.getParcelleId()); + + batiment.setId(batimentPaylaodWeb.getId()); + batiment.setParcelle(optionalParcelle.orElse(null)); + batiment.setId(batimentPaylaodWeb.getId()); + batiment.setCode(batimentPaylaodWeb.getCode()); + batiment.setNub(batimentPaylaodWeb.getNub()); + batiment.setDateConstruction(batimentPaylaodWeb.getDateConstruction()); + return batiment ; + } + + public UniteLogement getUniteLogementFromPayLoadWeb(UniteLogementPaylaodWeb uniteLogementPaylaodWeb){ + UniteLogement uniteLogement=new UniteLogement(); + Optional optionalBatiment=Optional.empty(); + if(uniteLogementPaylaodWeb.getBatimentId()!=null) + optionalBatiment=batimentRepository.findById(uniteLogementPaylaodWeb.getBatimentId()); + uniteLogement.setBatiment(optionalBatiment.orElse(null)); + uniteLogement.setId(uniteLogementPaylaodWeb.getId()); + uniteLogement.setCode(uniteLogementPaylaodWeb.getCode()); + uniteLogement.setNul(uniteLogementPaylaodWeb.getNul()); + uniteLogement.setDateConstruction(uniteLogementPaylaodWeb.getDateConstruction()); + uniteLogement.setNumeroEtage(uniteLogementPaylaodWeb.getNumeroEtage()); + return uniteLogement ; + } + + public Personne getPersonneFromPayLoadWeb(PersonnePayLoadWeb personnePayLoadWeb){ + Personne personne=new Personne(); + Optional optionalSituationMatrimoniale=Optional.empty(); + Optional optionalNationalite=Optional.empty(); + Optional optionalTypePersonne=Optional.empty(); + Optional optionalProfession=Optional.empty(); + Optional optionalCommune=Optional.empty(); + + if(personnePayLoadWeb.getSituationMatrimonialeId()!=null) + optionalSituationMatrimoniale=situationMatrimonialeRepository.findById(personnePayLoadWeb.getSituationMatrimonialeId()); + + if(personnePayLoadWeb.getProfessionId()!=null) + optionalProfession=professionRepository.findById(personnePayLoadWeb.getProfessionId()); + + if(personnePayLoadWeb.getTypePersonneId()!=null) + optionalTypePersonne=typePersonneRepository.findById(personnePayLoadWeb.getTypePersonneId()); + + if(personnePayLoadWeb.getNationaliteId()!=null) + optionalNationalite=nationaliteRepository.findById(personnePayLoadWeb.getNationaliteId()); + if(personnePayLoadWeb.getCommuneId()!=null) + optionalCommune=communeRepository.findById(personnePayLoadWeb.getCommuneId()); + personne.setId(personnePayLoadWeb.getId()); + personne.setSituationMatrimoniale(optionalSituationMatrimoniale.orElse(null)); + personne.setNationalite(optionalNationalite.orElse(null)); + personne.setTypePersonne(optionalTypePersonne.orElse(null)); + personne.setProfession(optionalProfession.orElse(null)); + personne.setCommune(optionalCommune.orElse(null)); + personne.setAdresse(personnePayLoadWeb.getAdresse()); + personne.setAge(personnePayLoadWeb.getAge()); + personne.setCategorie(personnePayLoadWeb.getCategorie()); + personne.setDateNaissanceOuConsti(personnePayLoadWeb.getDateNaissanceOuConsti()); + personne.setIfu(personnePayLoadWeb.getIfu()); + personne.setIndicatifTel1(personnePayLoadWeb.getIndicatifTel1()); + personne.setIndicatifTel2(personnePayLoadWeb.getIndicatifTel2()); + personne.setTel1(personnePayLoadWeb.getTel1()); + personne.setTel2(personnePayLoadWeb.getTel2()); + personne.setLieuNaissance(personnePayLoadWeb.getLieuNaissance()); + personne.setHaveRepresentant(personnePayLoadWeb.getHaveRepresentant()); + personne.setNomJeuneFille(personnePayLoadWeb.getNomJeuneFille()); + personne.setNomMere(personnePayLoadWeb.getNomMere()); + personne.setPrenomMere(personnePayLoadWeb.getPrenomMere()); + personne.setNom(personnePayLoadWeb.getNom()); + personne.setPrenom(personnePayLoadWeb.getPrenom()); + personne.setRaisonSociale(personnePayLoadWeb.getRaisonSociale()); + personne.setNpi(personnePayLoadWeb.getNpi()); + personne.setNumRavip(personnePayLoadWeb.getNumRavip()); + personne.setObservation(personnePayLoadWeb.getObservation()); + personne.setSexe(personnePayLoadWeb.getSexe()); + + return personne ; + } + + + public EnqueteActivite getEnqueteActivitePayLoadWeb(EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb){ + EnqueteActivite enqueteActivite=new EnqueteActivite(); + Optional optionalEnquete=Optional.empty(); + Optional optionalStructure=Optional.empty(); + Optional optionalPersonne=Optional.empty(); + Optional optionalBatiment=Optional.empty(); + Optional optionalUniteLogement=Optional.empty(); + Optional optionalParcelle=Optional.empty(); + Optional optionalProfession=Optional.empty(); + + + if(enqueteActivitePayLoadWeb.getBatimentId()!=null) + optionalBatiment=batimentRepository.findById(enqueteActivitePayLoadWeb.getBatimentId()); + + if(enqueteActivitePayLoadWeb.getEnqueteId()!=null) + optionalEnquete=enqueteRepository.findById(enqueteActivitePayLoadWeb.getEnqueteId()); + + if(enqueteActivitePayLoadWeb.getStructureId()!=null) + optionalStructure=structureRepository.findById(enqueteActivitePayLoadWeb.getStructureId()); + + if(enqueteActivitePayLoadWeb.getPersonneId()!=null) + optionalPersonne=personneRepository.findById(enqueteActivitePayLoadWeb.getPersonneId()); + + if(enqueteActivitePayLoadWeb.getUniteLogementId()!=null) + optionalUniteLogement=uniteLogementRepository.findById(enqueteActivitePayLoadWeb.getUniteLogementId()); + + if(enqueteActivitePayLoadWeb.getParcelleId()!=null) + optionalParcelle=parcelleRepository.findById(enqueteActivitePayLoadWeb.getParcelleId()); + + if(enqueteActivitePayLoadWeb.getProfessionId()!=null) + optionalProfession=professionRepository.findById(enqueteActivitePayLoadWeb.getProfessionId()); + + enqueteActivite.setBatiment(optionalBatiment.orElse(null)); + enqueteActivite.setUniteLogement(optionalUniteLogement.orElse(null)); + enqueteActivite.setPersonne(optionalPersonne.orElse(null)); + enqueteActivite.setEnquete(optionalEnquete.orElse(null)); + enqueteActivite.setProfession(optionalProfession.orElse(null)); + enqueteActivite.setParcelle(optionalParcelle.orElse(null)); + enqueteActivite.setStructure(optionalStructure.orElse(null)); + enqueteActivite.setBatiment(optionalBatiment.orElse(null)); + enqueteActivite.setNc(enqueteActivitePayLoadWeb.getNc()); + enqueteActivite.setDateEnquete(enqueteActivitePayLoadWeb.getDateEnquete()); + enqueteActivite.setEstDeclarer(enqueteActivitePayLoadWeb.isEstDeclarer()); + enqueteActivite.setNumeroRccm(enqueteActivitePayLoadWeb.getNumeroRccm()); + enqueteActivite.setDateDemarrage(enqueteActivitePayLoadWeb.getDateDemarrage()); + enqueteActivite.setDateFin(enqueteActivitePayLoadWeb.getDateFin()); + enqueteActivite.setChiffreAffaire(enqueteActivitePayLoadWeb.getChiffreAffaire()); + return enqueteActivite ; + } +} diff --git a/src/main/java/io/gmss/fiscad/service/worker/ActeurConcerneAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/ActeurConcerneAsyncWorker.java index d66758c..3a840b2 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/ActeurConcerneAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/ActeurConcerneAsyncWorker.java @@ -9,7 +9,7 @@ import io.gmss.fiscad.entities.infocad.parametre.TypeContestation; import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation; import io.gmss.fiscad.entities.metadata.MobileDataActeurConcerne; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.ActeurConcernePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.ActeurConcernePayLoad; import io.gmss.fiscad.repositories.infocad.metier.ActeurConcerneRepository; import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; import io.gmss.fiscad.repositories.infocad.metier.TpeRepository; diff --git a/src/main/java/io/gmss/fiscad/service/worker/BatimentAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/BatimentAsyncWorker.java index cb564f8..ac14971 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/BatimentAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/BatimentAsyncWorker.java @@ -10,8 +10,8 @@ import io.gmss.fiscad.entities.rfu.metier.Batiment; import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.BatimentPaylaod; -import io.gmss.fiscad.paylaods.request.EnquetePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.BatimentPaylaod; +import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; import io.gmss.fiscad.repositories.infocad.metier.*; import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; import io.gmss.fiscad.repositories.metadata.MobileDataBatimentRepository; diff --git a/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueBatimentAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueBatimentAsyncWorker.java index 08dc1d9..04dbc39 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueBatimentAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueBatimentAsyncWorker.java @@ -12,8 +12,8 @@ import io.gmss.fiscad.entities.rfu.parametre.Caracteristique; import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.CaracteristiqueBatimentPaylod; -import io.gmss.fiscad.paylaods.request.EnquetePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueBatimentPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; import io.gmss.fiscad.repositories.infocad.metier.*; import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; import io.gmss.fiscad.repositories.metadata.MobileDataCaracteristiqueBatimentRepository; @@ -41,24 +41,24 @@ public class CaracteristiqueBatimentAsyncWorker { private final LogService logService; // @Async("caracteristiqueBatimentExecutor") public void traitementAsyncCaracteristiqueBatiment(MobileDataCaracteristiqueBatiment mobileDataCaracteristiqueBatiment) { - CaracteristiqueBatimentPaylod caracteristiqueBatimentPaylod = mobileDataCaracteristiqueBatiment.getCaracteristiqueBatimentPaylod(); + CaracteristiqueBatimentPayload CaracteristiqueBatimentPayload = mobileDataCaracteristiqueBatiment.getCaracteristiqueBatimentPayload(); try { - if (caracteristiqueBatimentPaylod.getTerminalId() == null) { + if (CaracteristiqueBatimentPayload.getTerminalId() == null) { logService.logTraiementAsync(TypeObjet.CARACTERISTIQUEBATIMENT, "Problème de terminal", "terminal non fourni : ", mobileDataCaracteristiqueBatiment.getId()); return; } else { - Optional optionalTpe = tpeRepository.findById(caracteristiqueBatimentPaylod.getTerminalId()); + Optional optionalTpe = tpeRepository.findById(CaracteristiqueBatimentPayload.getTerminalId()); if (optionalTpe.isEmpty()) { logService.logTraiementAsync(TypeObjet.CARACTERISTIQUEBATIMENT, "Problème de terminal", "terminal inexistant : ", mobileDataCaracteristiqueBatiment.getId()); return; } } - if (caracteristiqueBatimentPaylod.getEnqueteBatimentId() == null) { + if (CaracteristiqueBatimentPayload.getEnqueteBatimentId() == null) { logService.logTraiementAsync(TypeObjet.CARACTERISTIQUEBATIMENT, "Problème de enquete batiment", "enquete non fourni : ", mobileDataCaracteristiqueBatiment.getId()); return; } else { - Optional optionalEnqueteBatiment = enqueteBatimentRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueBatimentPaylod.getEnqueteBatimentId(), caracteristiqueBatimentPaylod.getTerminalId()); + Optional optionalEnqueteBatiment = enqueteBatimentRepository.findFirstByExternalKeyAndTerminal_Id(CaracteristiqueBatimentPayload.getEnqueteBatimentId(), CaracteristiqueBatimentPayload.getTerminalId()); if (optionalEnqueteBatiment.isEmpty()) { logService.logTraiementAsync(TypeObjet.CARACTERISTIQUEBATIMENT, "Problème de enquete batiment", "L'enquete précisée n'existe pas : ", mobileDataCaracteristiqueBatiment.getId()); return; @@ -66,7 +66,7 @@ public class CaracteristiqueBatimentAsyncWorker { } CaracteristiqueBatiment caracteristiqueBatiment = new CaracteristiqueBatiment(); caracteristiqueBatiment.setMobileDataId(mobileDataCaracteristiqueBatiment.getId()); - caracteristiqueBatiment = getCaracteristiqueBatimentFromCaracteristiqueBatimentPayLoad(caracteristiqueBatiment, caracteristiqueBatimentPaylod); + caracteristiqueBatiment = getCaracteristiqueBatimentFromCaracteristiqueBatimentPayLoad(caracteristiqueBatiment, CaracteristiqueBatimentPayload); caracteristiqueBatimentRepository.save(caracteristiqueBatiment); mobileDataCaracteristiqueBatiment.setTraiter(true); mobileDataCaracteristiqueBatimentRepository.save(mobileDataCaracteristiqueBatiment); @@ -75,35 +75,35 @@ public class CaracteristiqueBatimentAsyncWorker { } } - private CaracteristiqueBatiment getCaracteristiqueBatimentFromCaracteristiqueBatimentPayLoad(CaracteristiqueBatiment caracteristiqueBatiment, CaracteristiqueBatimentPaylod caracteristiqueBatimentPaylod) { + private CaracteristiqueBatiment getCaracteristiqueBatimentFromCaracteristiqueBatimentPayLoad(CaracteristiqueBatiment caracteristiqueBatiment, CaracteristiqueBatimentPayload CaracteristiqueBatimentPayload) { - if (caracteristiqueBatimentPaylod.getEnqueteBatimentId() != null) { - Optional optionalEnqueteBatiment = enqueteBatimentRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueBatimentPaylod.getEnqueteBatimentId(), caracteristiqueBatimentPaylod.getTerminalId()); + if (CaracteristiqueBatimentPayload.getEnqueteBatimentId() != null) { + Optional optionalEnqueteBatiment = enqueteBatimentRepository.findFirstByExternalKeyAndTerminal_Id(CaracteristiqueBatimentPayload.getEnqueteBatimentId(), CaracteristiqueBatimentPayload.getTerminalId()); caracteristiqueBatiment.setEnqueteBatiment(optionalEnqueteBatiment.orElse(null)); } - if (caracteristiqueBatimentPaylod.getCaracteristiqueId() != null) { - Optional optionalCaracteristique = caracteristiqueRepository.findById(caracteristiqueBatimentPaylod.getCaracteristiqueId()); + if (CaracteristiqueBatimentPayload.getCaracteristiqueId() != null) { + Optional optionalCaracteristique = caracteristiqueRepository.findById(CaracteristiqueBatimentPayload.getCaracteristiqueId()); caracteristiqueBatiment.setCaracteristique(optionalCaracteristique.orElse(null)); } - if (caracteristiqueBatimentPaylod.getTerminalId() != null) { - Optional optionalTpe = tpeRepository.findById(caracteristiqueBatimentPaylod.getTerminalId()); + if (CaracteristiqueBatimentPayload.getTerminalId() != null) { + Optional optionalTpe = tpeRepository.findById(CaracteristiqueBatimentPayload.getTerminalId()); caracteristiqueBatiment.setTerminal(optionalTpe.orElse(null)); } - if (caracteristiqueBatimentPaylod.getTerminalId() != null && caracteristiqueBatimentPaylod.getEnqueteId() != null) { - Optional optionalEnquete = enqueteRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueBatimentPaylod.getEnqueteId(), caracteristiqueBatimentPaylod.getTerminalId()); + if (CaracteristiqueBatimentPayload.getTerminalId() != null && CaracteristiqueBatimentPayload.getEnqueteId() != null) { + Optional optionalEnquete = enqueteRepository.findFirstByExternalKeyAndTerminal_Id(CaracteristiqueBatimentPayload.getEnqueteId(), CaracteristiqueBatimentPayload.getTerminalId()); if (optionalEnquete.isPresent()) { caracteristiqueBatiment.setEnqueteId(optionalEnquete.get().getId()); } } - caracteristiqueBatiment.setEnqueteBatimentExternalKey(caracteristiqueBatimentPaylod.getEnqueteBatimentId()); - caracteristiqueBatiment.setEnqueteExternalKey(caracteristiqueBatimentPaylod.getEnqueteId()); - caracteristiqueBatiment.setValeur(caracteristiqueBatimentPaylod.getValeur()); - caracteristiqueBatiment.setExternalKey(caracteristiqueBatimentPaylod.getExternalKey()); + caracteristiqueBatiment.setEnqueteBatimentExternalKey(CaracteristiqueBatimentPayload.getEnqueteBatimentId()); + caracteristiqueBatiment.setEnqueteExternalKey(CaracteristiqueBatimentPayload.getEnqueteId()); + caracteristiqueBatiment.setValeur(CaracteristiqueBatimentPayload.getValeur()); + caracteristiqueBatiment.setExternalKey(CaracteristiqueBatimentPayload.getExternalKey()); return caracteristiqueBatiment; } diff --git a/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueParcelleAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueParcelleAsyncWorker.java index f556186..a004a07 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueParcelleAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueParcelleAsyncWorker.java @@ -11,8 +11,8 @@ import io.gmss.fiscad.entities.rfu.parametre.Caracteristique; import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.CaracteristiqueParcellePaylod; -import io.gmss.fiscad.paylaods.request.EnquetePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueParcellePayload; +import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; import io.gmss.fiscad.repositories.infocad.metier.*; import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; import io.gmss.fiscad.repositories.metadata.MobileDataCaracteristiqueParcelleRepository; @@ -39,25 +39,25 @@ public class CaracteristiqueParcelleAsyncWorker { private final LogService logService; //@Async("caracteristiqueParcelleExecutor") public void traitementAsyncCaracteristiqueParcelle(MobileDataCaracteristiqueParcelle mobileDataCaracteristiqueParcelle) { - CaracteristiqueParcellePaylod caracteristiqueParcellePaylod = mobileDataCaracteristiqueParcelle.getCaracteristiqueParcellePaylod(); + CaracteristiqueParcellePayload CaracteristiqueParcellePayload = mobileDataCaracteristiqueParcelle.getCaracteristiqueParcellePayload(); try { - if (caracteristiqueParcellePaylod.getTerminalId() == null) { + if (CaracteristiqueParcellePayload.getTerminalId() == null) { logService.logTraiementAsync(TypeObjet.CARACTERISTIQUEPARCELLE, "Problème de terminal", "terminal non fourni : ", mobileDataCaracteristiqueParcelle.getId()); return; } else { - Optional optionalTpe = tpeRepository.findById(caracteristiqueParcellePaylod.getTerminalId()); + Optional optionalTpe = tpeRepository.findById(CaracteristiqueParcellePayload.getTerminalId()); if (optionalTpe.isEmpty()) { logService.logTraiementAsync(TypeObjet.CARACTERISTIQUEPARCELLE, "Problème de terminal", "terminal inexistant : ", mobileDataCaracteristiqueParcelle.getId()); return; } } - if (caracteristiqueParcellePaylod.getEnqueteId() == null) { + if (CaracteristiqueParcellePayload.getEnqueteId() == null) { logService.logTraiementAsync(TypeObjet.CARACTERISTIQUEPARCELLE, "Problème de enquete", "enquete non fourni : ", mobileDataCaracteristiqueParcelle.getId()); return; } else { - Optional optionalEnquete = enqueteRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueParcellePaylod.getEnqueteId(), caracteristiqueParcellePaylod.getTerminalId()); + Optional optionalEnquete = enqueteRepository.findFirstByExternalKeyAndTerminal_Id(CaracteristiqueParcellePayload.getEnqueteId(), CaracteristiqueParcellePayload.getTerminalId()); if (optionalEnquete.isEmpty()) { logService.logTraiementAsync(TypeObjet.CARACTERISTIQUEPARCELLE, "Problème de enquete", "L'enquete précisée n'existe pas : ", mobileDataCaracteristiqueParcelle.getId()); return; @@ -65,7 +65,7 @@ public class CaracteristiqueParcelleAsyncWorker { } CaracteristiqueParcelle caracteristiqueParcelle = new CaracteristiqueParcelle(); caracteristiqueParcelle.setMobileDataId(mobileDataCaracteristiqueParcelle.getId()); - caracteristiqueParcelle = getCaracteristiqueParcelleFromCaracteristiqueParcellePayLoad(caracteristiqueParcelle, caracteristiqueParcellePaylod); + caracteristiqueParcelle = getCaracteristiqueParcelleFromCaracteristiqueParcellePayLoad(caracteristiqueParcelle, CaracteristiqueParcellePayload); caracteristiqueParcelleRepository.save(caracteristiqueParcelle); mobileDataCaracteristiqueParcelle.setTraiter(true); mobileDataCaracteristiqueParcelleRepository.save(mobileDataCaracteristiqueParcelle); @@ -74,27 +74,27 @@ public class CaracteristiqueParcelleAsyncWorker { } } - private CaracteristiqueParcelle getCaracteristiqueParcelleFromCaracteristiqueParcellePayLoad(CaracteristiqueParcelle caracteristiqueParcelle, CaracteristiqueParcellePaylod caracteristiqueParcellePaylod) { + private CaracteristiqueParcelle getCaracteristiqueParcelleFromCaracteristiqueParcellePayLoad(CaracteristiqueParcelle caracteristiqueParcelle, CaracteristiqueParcellePayload CaracteristiqueParcellePayload) { - if (caracteristiqueParcellePaylod.getEnqueteId() != null) { - Optional optionalEnquete = enqueteRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueParcellePaylod.getEnqueteId(), caracteristiqueParcellePaylod.getTerminalId()); + if (CaracteristiqueParcellePayload.getEnqueteId() != null) { + Optional optionalEnquete = enqueteRepository.findFirstByExternalKeyAndTerminal_Id(CaracteristiqueParcellePayload.getEnqueteId(), CaracteristiqueParcellePayload.getTerminalId()); caracteristiqueParcelle.setEnquete(optionalEnquete.orElse(null)); } - if (caracteristiqueParcellePaylod.getCaracteristiqueId() != null) { - Optional optionalCaracteristique = caracteristiqueRepository.findById(caracteristiqueParcellePaylod.getCaracteristiqueId()); + if (CaracteristiqueParcellePayload.getCaracteristiqueId() != null) { + Optional optionalCaracteristique = caracteristiqueRepository.findById(CaracteristiqueParcellePayload.getCaracteristiqueId()); caracteristiqueParcelle.setCaracteristique(optionalCaracteristique.orElse(null)); } - if (caracteristiqueParcellePaylod.getTerminalId() != null) { - Optional optionalTpe = tpeRepository.findById(caracteristiqueParcellePaylod.getTerminalId()); + if (CaracteristiqueParcellePayload.getTerminalId() != null) { + Optional optionalTpe = tpeRepository.findById(CaracteristiqueParcellePayload.getTerminalId()); caracteristiqueParcelle.setTerminal(optionalTpe.orElse(null)); } - caracteristiqueParcelle.setEnqueteExternalKey(caracteristiqueParcellePaylod.getEnqueteId()); - caracteristiqueParcelle.setValeur(caracteristiqueParcellePaylod.getValeur()); - caracteristiqueParcelle.setExternalKey(caracteristiqueParcellePaylod.getExternalKey()); + caracteristiqueParcelle.setEnqueteExternalKey(CaracteristiqueParcellePayload.getEnqueteId()); + caracteristiqueParcelle.setValeur(CaracteristiqueParcellePayload.getValeur()); + caracteristiqueParcelle.setExternalKey(CaracteristiqueParcellePayload.getExternalKey()); return caracteristiqueParcelle; } diff --git a/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueUniteLogementAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueUniteLogementAsyncWorker.java index 90fe988..d9271c1 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueUniteLogementAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueUniteLogementAsyncWorker.java @@ -10,8 +10,8 @@ import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; import io.gmss.fiscad.entities.rfu.parametre.Caracteristique; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.CaracteristiqueBatimentPaylod; -import io.gmss.fiscad.paylaods.request.CaracteristiqueUniteLogementPaylod; +import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueBatimentPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueUniteLogementPayload; import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; import io.gmss.fiscad.repositories.infocad.metier.TpeRepository; import io.gmss.fiscad.repositories.metadata.MobileDataCaracteristiqueBatimentRepository; @@ -41,24 +41,24 @@ public class CaracteristiqueUniteLogementAsyncWorker { private final LogService logService; //@Async("caracteristiqueUniteLogementExecutor") public void traitementAsyncCaracteristiqueUniteLogement(MobileDataCaracteristiqueUniteLogement mobileDataCaracteristiqueUniteLogement) { - CaracteristiqueUniteLogementPaylod caracteristiqueUniteLogementPaylod = mobileDataCaracteristiqueUniteLogement.getCaracteristiqueUniteLogementPaylod(); + CaracteristiqueUniteLogementPayload caracteristiqueUniteLogementPayload = mobileDataCaracteristiqueUniteLogement.getCaracteristiqueUniteLogementPayload(); try { - if (caracteristiqueUniteLogementPaylod.getTerminalId() == null) { + if (caracteristiqueUniteLogementPayload.getTerminalId() == null) { logService.logTraiementAsync(TypeObjet.CARACTERISTIQUEUNITELOGEMENT, "Problème de terminal", "terminal non fourni : ", mobileDataCaracteristiqueUniteLogement.getId()); return; } else { - Optional optionalTpe = tpeRepository.findById(caracteristiqueUniteLogementPaylod.getTerminalId()); + Optional optionalTpe = tpeRepository.findById(caracteristiqueUniteLogementPayload.getTerminalId()); if (optionalTpe.isEmpty()) { logService.logTraiementAsync(TypeObjet.CARACTERISTIQUEUNITELOGEMENT, "Problème de terminal", "terminal inexistant : ", mobileDataCaracteristiqueUniteLogement.getId()); return; } } - if (caracteristiqueUniteLogementPaylod.getEnqueteUniteLogementId() == null) { + if (caracteristiqueUniteLogementPayload.getEnqueteUniteLogementId() == null) { logService.logTraiementAsync(TypeObjet.CARACTERISTIQUEUNITELOGEMENT, "Problème de enquete unite logement", "enquete non fourni : ", mobileDataCaracteristiqueUniteLogement.getId()); return; } else { - Optional optionalEnqueteUniteLogement = enqueteUniteLogementRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueUniteLogementPaylod.getEnqueteUniteLogementId(), caracteristiqueUniteLogementPaylod.getTerminalId()); + Optional optionalEnqueteUniteLogement = enqueteUniteLogementRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueUniteLogementPayload.getEnqueteUniteLogementId(), caracteristiqueUniteLogementPayload.getTerminalId()); if (optionalEnqueteUniteLogement.isEmpty()) { logService.logTraiementAsync(TypeObjet.CARACTERISTIQUEUNITELOGEMENT, "Problème de enquete unite logement", "L'enquete précisée n'existe pas : ", mobileDataCaracteristiqueUniteLogement.getId()); return; @@ -66,7 +66,7 @@ public class CaracteristiqueUniteLogementAsyncWorker { } CaracteristiqueUniteLogement caracteristiqueUniteLogement = new CaracteristiqueUniteLogement(); caracteristiqueUniteLogement.setMobileDataId(mobileDataCaracteristiqueUniteLogement.getId()); - caracteristiqueUniteLogement = getCaracteristiqueUniteLogementFromCaracteristiqueUniteLogementPayLoad(caracteristiqueUniteLogement, caracteristiqueUniteLogementPaylod); + caracteristiqueUniteLogement = getCaracteristiqueUniteLogementFromCaracteristiqueUniteLogementPayLoad(caracteristiqueUniteLogement, caracteristiqueUniteLogementPayload); caracteristiqueUniteLogementRepository.save(caracteristiqueUniteLogement); mobileDataCaracteristiqueUniteLogement.setTraiter(true); mobileDataCaracteristiqueUniteLogementRepository.save(mobileDataCaracteristiqueUniteLogement); @@ -75,32 +75,32 @@ public class CaracteristiqueUniteLogementAsyncWorker { } } - private CaracteristiqueUniteLogement getCaracteristiqueUniteLogementFromCaracteristiqueUniteLogementPayLoad(CaracteristiqueUniteLogement caracteristiqueUniteLogement, CaracteristiqueUniteLogementPaylod caracteristiqueUniteLogementPaylod) { + private CaracteristiqueUniteLogement getCaracteristiqueUniteLogementFromCaracteristiqueUniteLogementPayLoad(CaracteristiqueUniteLogement caracteristiqueUniteLogement, CaracteristiqueUniteLogementPayload caracteristiqueUniteLogementPayload) { - if (caracteristiqueUniteLogementPaylod.getEnqueteUniteLogementId() != null) { - Optional optionalEnqueteUniteLogement = enqueteUniteLogementRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueUniteLogementPaylod.getEnqueteUniteLogementId(), caracteristiqueUniteLogementPaylod.getTerminalId()); + if (caracteristiqueUniteLogementPayload.getEnqueteUniteLogementId() != null) { + Optional optionalEnqueteUniteLogement = enqueteUniteLogementRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueUniteLogementPayload.getEnqueteUniteLogementId(), caracteristiqueUniteLogementPayload.getTerminalId()); caracteristiqueUniteLogement.setEnqueteUniteLogement(optionalEnqueteUniteLogement.orElse(null)); } - if (caracteristiqueUniteLogementPaylod.getCaracteristiqueId() != null) { - Optional optionalCaracteristique = caracteristiqueRepository.findById(caracteristiqueUniteLogementPaylod.getCaracteristiqueId()); + if (caracteristiqueUniteLogementPayload.getCaracteristiqueId() != null) { + Optional optionalCaracteristique = caracteristiqueRepository.findById(caracteristiqueUniteLogementPayload.getCaracteristiqueId()); caracteristiqueUniteLogement.setCaracteristique(optionalCaracteristique.orElse(null)); } - if (caracteristiqueUniteLogementPaylod.getTerminalId() != null) { - Optional optionalTpe = tpeRepository.findById(caracteristiqueUniteLogementPaylod.getTerminalId()); + if (caracteristiqueUniteLogementPayload.getTerminalId() != null) { + Optional optionalTpe = tpeRepository.findById(caracteristiqueUniteLogementPayload.getTerminalId()); caracteristiqueUniteLogement.setTerminal(optionalTpe.orElse(null)); } - if (caracteristiqueUniteLogementPaylod.getTerminalId() != null && caracteristiqueUniteLogementPaylod.getEnqueteId() != null) { - Optional optionalEnquete = enqueteRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueUniteLogementPaylod.getEnqueteId(), caracteristiqueUniteLogementPaylod.getTerminalId()); + if (caracteristiqueUniteLogementPayload.getTerminalId() != null && caracteristiqueUniteLogementPayload.getEnqueteId() != null) { + Optional optionalEnquete = enqueteRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueUniteLogementPayload.getEnqueteId(), caracteristiqueUniteLogementPayload.getTerminalId()); if (optionalEnquete.isPresent()) { caracteristiqueUniteLogement.setEnqueteId(optionalEnquete.get().getId()); } } - caracteristiqueUniteLogement.setEnqueteExternalKey(caracteristiqueUniteLogementPaylod.getEnqueteId()); - caracteristiqueUniteLogement.setEnqueteUniteLogementExternalKey(caracteristiqueUniteLogementPaylod.getEnqueteUniteLogementId()); - caracteristiqueUniteLogement.setValeur(caracteristiqueUniteLogementPaylod.getValeur()); - caracteristiqueUniteLogement.setExternalKey(caracteristiqueUniteLogementPaylod.getExternalKey()); + caracteristiqueUniteLogement.setEnqueteExternalKey(caracteristiqueUniteLogementPayload.getEnqueteId()); + caracteristiqueUniteLogement.setEnqueteUniteLogementExternalKey(caracteristiqueUniteLogementPayload.getEnqueteUniteLogementId()); + caracteristiqueUniteLogement.setValeur(caracteristiqueUniteLogementPayload.getValeur()); + caracteristiqueUniteLogement.setExternalKey(caracteristiqueUniteLogementPayload.getExternalKey()); return caracteristiqueUniteLogement; } } diff --git a/src/main/java/io/gmss/fiscad/service/worker/DeclarationNcAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/DeclarationNcAsyncWorker.java index 5773bda..a016c37 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/DeclarationNcAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/DeclarationNcAsyncWorker.java @@ -9,7 +9,7 @@ import io.gmss.fiscad.entities.rfu.metier.Batiment; import io.gmss.fiscad.entities.rfu.metier.DeclarationNc; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.DeclarationNcPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.DeclarationNcPayload; import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; import io.gmss.fiscad.repositories.infocad.metier.TpeRepository; import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; diff --git a/src/main/java/io/gmss/fiscad/service/worker/EnqueteActiviteAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/EnqueteActiviteAsyncWorker.java index b656287..dc76154 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/EnqueteActiviteAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/EnqueteActiviteAsyncWorker.java @@ -13,7 +13,7 @@ import io.gmss.fiscad.entities.rfu.metier.EnqueteActivite; import io.gmss.fiscad.entities.rfu.metier.UniteLogement; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.EnqueteActivitePayload; +import io.gmss.fiscad.paylaods.request.synchronisation.EnqueteActivitePayload; import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository; import io.gmss.fiscad.repositories.infocad.metier.TpeRepository; diff --git a/src/main/java/io/gmss/fiscad/service/worker/EnqueteAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/EnqueteAsyncWorker.java index 1a1d572..ace359c 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/EnqueteAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/EnqueteAsyncWorker.java @@ -4,25 +4,20 @@ import io.gmss.fiscad.entities.infocad.metier.*; import io.gmss.fiscad.entities.infocad.parametre.Bloc; import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.metadata.MobileDataEnquete; -import io.gmss.fiscad.entities.metadata.MobileDataUpload; -import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; -import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.EnquetePayLoad; -import io.gmss.fiscad.paylaods.request.UploadPayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.UploadPayLoad; import io.gmss.fiscad.repositories.infocad.metier.*; import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; import io.gmss.fiscad.repositories.metadata.MobileDataEnqueteRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataUploadRepository; import io.gmss.fiscad.repositories.rfu.metier.*; import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; import io.gmss.fiscad.repositories.user.UserRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; @@ -169,7 +164,7 @@ public class EnqueteAsyncWorker { enquete.setTerminal(optionalTpe.orElse(null)); } enquete.setParcelleExternalKey(enquetePayLoad.getParcelleId()); - enquete.setStatusEnquete(enquetePayLoad.getStatusEnquete()); + //enquete.setStatutEnquete(enquetePayLoad.getStatusEnquete()); enquete.setLitige(enquetePayLoad.isLitige()); enquete.setObservationParticuliere(enquetePayLoad.getObservationParticuliere()); enquete.setDateEnquete(enquetePayLoad.getDateEnquete()); @@ -195,7 +190,7 @@ public class EnqueteAsyncWorker { enquete.setNbreCoProprietaire(enquetePayLoad.getNbreCoProprietaire()); enquete.setNbreIndivisiaire(enquetePayLoad.getNbreIndivisiaire()); enquete.setAutreAdresse(enquetePayLoad.getAutreAdresse()); - enquete.setSurface(enquetePayLoad.getSurface()); + enquete.setSuperficie(enquetePayLoad.getSurface()); enquete.setNbreBatiment(enquetePayLoad.getNbreBatiment()); enquete.setNbrePiscine(enquetePayLoad.getNbrePiscine()); enquete.setDateDebutExcemption(enquetePayLoad.getDateDebutExcemption()); diff --git a/src/main/java/io/gmss/fiscad/service/worker/EnqueteBatimentAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/EnqueteBatimentAsyncWorker.java index 7de9f2a..5122dd5 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/EnqueteBatimentAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/EnqueteBatimentAsyncWorker.java @@ -12,8 +12,8 @@ import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.EnqueteBatimentPayload; -import io.gmss.fiscad.paylaods.request.EnquetePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.EnqueteBatimentPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; import io.gmss.fiscad.repositories.infocad.metier.*; import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; @@ -114,7 +114,7 @@ public class EnqueteBatimentAsyncWorker { enqueteBatiment.setSurfaceLouee(enqueteBatimentPayload.getSurfaceLouee()); enqueteBatiment.setNbreMenage(enqueteBatimentPayload.getNbreMenage()); enqueteBatiment.setNbreHabitant(enqueteBatimentPayload.getNbreHabitant()); - enqueteBatiment.setValeurMensuelleLocation(enqueteBatimentPayload.getValeurMensuelleLocation()); + enqueteBatiment.setMontantMensuelLocation(enqueteBatimentPayload.getValeurMensuelleLocation()); enqueteBatiment.setNbreMoisLocation(enqueteBatimentPayload.getNbreMoisLocation()); enqueteBatiment.setAutreCaracteristiquePhysique(enqueteBatimentPayload.getAutreCaracteristiquePhysique()); enqueteBatiment.setDateDebutExcemption(enqueteBatimentPayload.getDateDebutExcemption()); diff --git a/src/main/java/io/gmss/fiscad/service/worker/EnqueteUniteLogementAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/EnqueteUniteLogementAsyncWorker.java index 3aafbc0..9428e09 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/EnqueteUniteLogementAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/EnqueteUniteLogementAsyncWorker.java @@ -12,8 +12,8 @@ import io.gmss.fiscad.entities.rfu.metier.UniteLogement; import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.EnquetePayLoad; -import io.gmss.fiscad.paylaods.request.EnqueteUniteLogementPayload; +import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.EnqueteUniteLogementPayload; import io.gmss.fiscad.repositories.infocad.metier.*; import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; @@ -127,13 +127,13 @@ public class EnqueteUniteLogementAsyncWorker { enqueteUniteLogement.setUser(optionalUser.orElse(null)); } enqueteUniteLogement.setEnqueteExternalKey(enqueteUniteLogementPayload.getEnqueteId()); - enqueteUniteLogement.setSurface(enqueteUniteLogementPayload.getSurface()); + enqueteUniteLogement.setSurfaceAuSol(enqueteUniteLogementPayload.getSurface()); enqueteUniteLogement.setNbrePiece(enqueteUniteLogementPayload.getNbrePiece()); enqueteUniteLogement.setNbreHabitant(enqueteUniteLogementPayload.getNbreHabitant()); enqueteUniteLogement.setNbreMenage(enqueteUniteLogementPayload.getNbreMenage()); enqueteUniteLogement.setEnLocation(enqueteUniteLogementPayload.isEnLocation()); enqueteUniteLogement.setMontantMensuelLoyer(enqueteUniteLogementPayload.getMontantMensuelLoyer()); - enqueteUniteLogement.setNbreMoisEnLocation(enqueteUniteLogementPayload.getNbreMoisEnLocation()); + enqueteUniteLogement.setNbreMoisLocation(enqueteUniteLogementPayload.getNbreMoisEnLocation()); enqueteUniteLogement.setMontantLocatifAnnuelDeclare(enqueteUniteLogementPayload.getMontantLocatifAnnuelDeclare()); enqueteUniteLogement.setSurfaceLouee(enqueteUniteLogementPayload.getSurfaceLouee()); enqueteUniteLogement.setSbee(enqueteUniteLogementPayload.isSbee()); diff --git a/src/main/java/io/gmss/fiscad/service/worker/MembreGroupeAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/MembreGroupeAsyncWorker.java index e7062cb..3d13a75 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/MembreGroupeAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/MembreGroupeAsyncWorker.java @@ -10,8 +10,8 @@ import io.gmss.fiscad.entities.metadata.MobileDataMembreGroupe; import io.gmss.fiscad.entities.metadata.MobileDataPersonne; import io.gmss.fiscad.enums.Categorie; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.MembreGroupePayLoad; -import io.gmss.fiscad.paylaods.request.PersonnePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.MembreGroupePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.PersonnePayLoad; import io.gmss.fiscad.repositories.decoupage.CommuneRepository; import io.gmss.fiscad.repositories.decoupage.NationaliteRepository; import io.gmss.fiscad.repositories.infocad.metier.*; diff --git a/src/main/java/io/gmss/fiscad/service/worker/ParcelleAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/ParcelleAsyncWorker.java index 0a81485..ca85304 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/ParcelleAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/ParcelleAsyncWorker.java @@ -11,8 +11,8 @@ import io.gmss.fiscad.entities.metadata.MobileDataParcelle; import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.EnquetePayLoad; -import io.gmss.fiscad.paylaods.request.ParcellePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.ParcellePayLoad; import io.gmss.fiscad.repositories.decoupage.QuartierRepository; import io.gmss.fiscad.repositories.infocad.metier.*; import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; diff --git a/src/main/java/io/gmss/fiscad/service/worker/PersonneAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/PersonneAsyncWorker.java index 35b48b3..27f8782 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/PersonneAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/PersonneAsyncWorker.java @@ -10,8 +10,8 @@ import io.gmss.fiscad.entities.metadata.MobileDataActeurConcerne; import io.gmss.fiscad.entities.metadata.MobileDataPersonne; import io.gmss.fiscad.enums.Categorie; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.ActeurConcernePayLoad; -import io.gmss.fiscad.paylaods.request.PersonnePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.ActeurConcernePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.PersonnePayLoad; import io.gmss.fiscad.repositories.decoupage.CommuneRepository; import io.gmss.fiscad.repositories.decoupage.NationaliteRepository; import io.gmss.fiscad.repositories.infocad.metier.*; @@ -112,10 +112,11 @@ public class PersonneAsyncWorker { personne.setIfu(personnePayLoad.getIfu()); personne.setDateNaissanceOuConsti(personnePayLoad.getDateNaissanceOuConsti()); personne.setLieuNaissance(personnePayLoad.getLieuNaissance()); - personne.setNomOuSigle(personnePayLoad.getNomOuSigle()); + personne.setNom(personnePayLoad.getNom()); personne.setNpi(personnePayLoad.getNpi()); personne.setNumRavip(personnePayLoad.getNumRavip()); - personne.setPrenomOuRaisonSociale(personnePayLoad.getPrenomOuRaisonSociale()); + personne.setPrenom(personnePayLoad.getPrenom()); + personne.setRaisonSociale(personnePayLoad.getRaisonSociale()); personne.setTel1(personnePayLoad.getTel1()); personne.setTel2(personnePayLoad.getTel2()); personne.setExternalKey(personnePayLoad.getExternalKey()); diff --git a/src/main/java/io/gmss/fiscad/service/worker/PieceAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/PieceAsyncWorker.java index c517a3c..79f7b3d 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/PieceAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/PieceAsyncWorker.java @@ -11,8 +11,8 @@ import io.gmss.fiscad.entities.metadata.MobileDataPersonne; import io.gmss.fiscad.entities.metadata.MobileDataPiece; import io.gmss.fiscad.enums.Categorie; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.PersonnePayLoad; -import io.gmss.fiscad.paylaods.request.PiecePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.PersonnePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.PiecePayLoad; import io.gmss.fiscad.repositories.decoupage.CommuneRepository; import io.gmss.fiscad.repositories.decoupage.NationaliteRepository; import io.gmss.fiscad.repositories.infocad.metier.*; @@ -89,12 +89,12 @@ public class PieceAsyncWorker { } else { piece.setPersonne(null); } - if (piecePayLoad.getActeurConcerneId() != null) { - Optional optionalActeurConcerne = acteurConcerneRepository.findFirstByExternalKeyAndTerminal_Id(piecePayLoad.getActeurConcerneId(), piecePayLoad.getTerminalId()); - piece.setActeurConcerne(optionalActeurConcerne.orElse(null)); - } else { - piece.setActeurConcerne(null); - } +// if (piecePayLoad.getActeurConcerneId() != null) { +// Optional optionalActeurConcerne = acteurConcerneRepository.findFirstByExternalKeyAndTerminal_Id(piecePayLoad.getActeurConcerneId(), piecePayLoad.getTerminalId()); +// piece.setActeurConcerne(optionalActeurConcerne.orElse(null)); +// } else { +// piece.setActeurConcerne(null); +// } if (piecePayLoad.getModeAcquisitionId() != null) { Optional optionalModeAcquisition = modeAcquisitionRepository.findById(piecePayLoad.getModeAcquisitionId()); piece.setModeAcquisition(optionalModeAcquisition.orElse(null)); @@ -115,11 +115,11 @@ public class PieceAsyncWorker { if (piecePayLoad.getTerminalId() != null && piecePayLoad.getEnqueteId() != null) { Optional optionalEnquete = enqueteRepository.findFirstByExternalKeyAndTerminal_Id(piecePayLoad.getEnqueteId(), piecePayLoad.getTerminalId()); if (optionalEnquete.isPresent()) { - piece.setEnqueteId(optionalEnquete.get().getId()); + piece.setEnquete(optionalEnquete.get()); } } - piece.setActeurConcerneExternalKey(piecePayLoad.getActeurConcerneId()); + //piece.setActeurConcerneExternalKey(piecePayLoad.getActeurConcerneId()); piece.setPersonneExternalKey(piecePayLoad.getPersonneId()); piece.setEnqueteExternalKey(piecePayLoad.getEnqueteId()); piece.setNumeroPiece(piecePayLoad.getNumeroPiece()); @@ -128,7 +128,7 @@ public class PieceAsyncWorker { piece.setDateExpiration(piecePayLoad.getDateExpiration()); piece.setMax_numero_piece_id(piecePayLoad.getMax_numero_piece_id()); piece.setMax_numero_acteur_concerne_id(piecePayLoad.getMax_numero_acteur_concerne_id()); - piece.setEnqueteId(piecePayLoad.getEnqueteId()); + //piece.setEnqueteId(piecePayLoad.getEnqueteId()); piece.setBlocId(piecePayLoad.getBlocId()); piece.setEnqueteExternalKey(piecePayLoad.getEnqueteId()); return piece; diff --git a/src/main/java/io/gmss/fiscad/service/worker/UniteLogementAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/UniteLogementAsyncWorker.java index a3990cc..62005cb 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/UniteLogementAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/UniteLogementAsyncWorker.java @@ -11,8 +11,8 @@ import io.gmss.fiscad.entities.rfu.metier.UniteLogement; import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.EnquetePayLoad; -import io.gmss.fiscad.paylaods.request.UniteLogementPaylaod; +import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.UniteLogementPaylaod; import io.gmss.fiscad.repositories.infocad.metier.*; import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; import io.gmss.fiscad.repositories.metadata.MobileDataEnqueteRepository; diff --git a/src/main/java/io/gmss/fiscad/service/worker/UploadAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/UploadAsyncWorker.java index d03c4ee..30deddd 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/UploadAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/UploadAsyncWorker.java @@ -10,8 +10,8 @@ import io.gmss.fiscad.entities.metadata.MobileDataUpload; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.PiecePayLoad; -import io.gmss.fiscad.paylaods.request.UploadPayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.PiecePayLoad; +import io.gmss.fiscad.paylaods.request.synchronisation.UploadPayLoad; import io.gmss.fiscad.repositories.infocad.metier.*; import io.gmss.fiscad.repositories.infocad.parametre.ModeAcquisitionRepository; import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; diff --git a/src/main/resources/application-dgi.properties b/src/main/resources/application-dgi.properties index dd19eff..3fc31fe 100755 --- a/src/main/resources/application-dgi.properties +++ b/src/main/resources/application-dgi.properties @@ -1,17 +1,17 @@ server.port=8282 -io.gmss.fiscad.profile=${IO_GMSS_FISCAD_PROFILE} -#io.gmss.fiscad.profile=dgi +#io.gmss.fiscad.profile=${IO_GMSS_FISCAD_PROFILE} +io.gmss.fiscad.profile=dgi # TEST ENV #spring.datasource.url=jdbc:postgresql://vmi792116.contaboserver.net:5599/dgi_db #spring.datasource.username=infocad_user #spring.datasource.password=W5fwD({9*q53 # LOCAL ENV -#spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi -#spring.datasource.username=infocad_user -#spring.datasource.password=W5fwD({9*q53 +spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi +spring.datasource.username=infocad_user +spring.datasource.password=W5fwD({9*q53 # PROD ENVIRONNEMENT -spring.datasource.url=${SPRING_DATASOURCE_URL} -spring.datasource.username=${SPRING_DATASOURCE_USERNAME} -spring.datasource.password=${SPRING_DATASOURCE_PASSWORD} \ No newline at end of file +#spring.datasource.url=${SPRING_DATASOURCE_URL} +#spring.datasource.username=${SPRING_DATASOURCE_USERNAME} +#spring.datasource.password=${SPRING_DATASOURCE_PASSWORD} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4091e3e..e93a597 100755 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ -spring.profiles.active=${SPRING_PROFILES_ACTIVE} +#spring.profiles.active=${SPRING_PROFILES_ACTIVE} #spring.profiles.active=abomey -#spring.profiles.active=dgi +spring.profiles.active=dgi spring.jpa.properties.hibernate.id.new_generator_mappings=false spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true spring.jpa.open-in-view=false @@ -46,8 +46,11 @@ logging.file.name=/app/logs/fiscad.log #app.abs.env.defaultuser = fiscad_admin -app.default-user.username=${DEFAULT_USER_NAME} -app.default-user.password=${DEFAULT_USER_PASSWORD} +app.default-user.username=fiscad_admin +app.default-user.password=1234567890 + +#app.default-user.username=${DEFAULT_USER_NAME} +#app.default-user.password=${DEFAULT_USER_PASSWORD} app.upload.root=${file.upload_dir} app.upload.zips.received=${app.upload.root}/zips/received -- 2.49.1 From 47b92f9341dda4405da9709ac2ce2e95c65e17ae Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Tue, 13 Jan 2026 21:28:53 +0100 Subject: [PATCH 2/2] gestion des enregistrement par web --- .../infocad/metier/EnqueteController.java | 2 +- .../infocad/metier/PersonneController.java | 20 +- .../rfu/metier/EnqueteActiviteController.java | 179 ++++++++++++++++++ .../entities/infocad/metier/Enquete.java | 19 +- .../entities/infocad/parametre/Personne.java | 6 +- .../fiscad/entities/rfu/metier/Batiment.java | 3 + .../metier/CaracteristiqueUniteLogement.java | 5 +- .../entities/rfu/metier/EnqueteBatiment.java | 24 ++- .../rfu/metier/EnqueteUniteLogement.java | 12 +- .../rfu/parametre/Caracteristique.java | 1 + .../io/gmss/fiscad/entities/user/User.java | 1 + .../infocad/metier/EnqueteServiceImpl.java | 19 +- .../infocad/metier/ParcelleServiceImpl.java | 7 +- .../infocad/metier/PersonneServiceImpl.java | 4 +- .../metier/EnqueteBatimentServiceImpl.java | 1 + .../crudweb/EnqueteBatimentPayloadWeb.java | 1 + .../request/crudweb/EnquetePayLoadWeb.java | 4 +- .../EnqueteUniteLogementPayloadWeb.java | 3 - .../request/crudweb/UploadPayLoadWeb.java | 2 +- .../infocad/metier/PieceRepository.java | 12 +- .../service/EntityFromPayLoadService.java | 5 + src/main/resources/application-dgi.properties | 16 +- src/main/resources/application.properties | 12 +- 23 files changed, 298 insertions(+), 60 deletions(-) create mode 100644 src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteActiviteController.java diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java index 47d7d01..e680366 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java @@ -32,7 +32,7 @@ import java.util.List; @SecurityRequirement(name = "bearer") @Tag(name = "Enquête") @CrossOrigin(origins = "*") -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class EnqueteController { private final EnqueteService enqueteService; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java index c18cfed..0331d7c 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java @@ -21,11 +21,13 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.client.HttpClientErrorException; +import java.util.Optional; + @RestController @RequestMapping(value = "api/personne", produces = MediaType.APPLICATION_JSON_VALUE) @RequiredArgsConstructor -@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") +//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')") public class PersonneController { private static final Logger logger = LoggerFactory.getLogger(PersonneController.class); @@ -93,4 +95,20 @@ public class PersonneController { ); } } + + @GetMapping("/id/{id}") + public ResponseEntity getPersonneById(@PathVariable Long id) { + try{ + Optional optionalPersonne= personneService.getPersonneById(id); + return new ResponseEntity<>( + new ApiResponse<>(true, optionalPersonne.orElse(null), "Personne retrouvée avec succès."), + HttpStatus.OK + ); + }catch (Exception e){ + return new ResponseEntity<>( + new ApiResponse<>(false, e.getMessage()), + HttpStatus.OK + ); + } + } } diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteActiviteController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteActiviteController.java new file mode 100644 index 0000000..4530aa2 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteActiviteController.java @@ -0,0 +1,179 @@ +package io.gmss.fiscad.controllers.rfu.metier; + + +import io.gmss.fiscad.entities.rfu.metier.EnqueteActivite; +import io.gmss.fiscad.exceptions.*; +import io.gmss.fiscad.interfaces.rfu.metier.EnqueteActiviteService; +import io.gmss.fiscad.paylaods.ApiResponse; +import io.gmss.fiscad.paylaods.request.crudweb.EnqueteActivitePayLoadWeb ; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +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.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.client.HttpClientErrorException; + + +@RestController +@RequestMapping(value = "api/enquete-activite", produces = MediaType.APPLICATION_JSON_VALUE) +@SecurityRequirement(name = "bearer") +@Tag(name = "EnqueteActivite") +@CrossOrigin(origins = "*") +public class EnqueteActiviteController { + + private final EnqueteActiviteService enqueteActiviteService; + + private static final Logger logger = LoggerFactory.getLogger(EnqueteActiviteController.class); + + public EnqueteActiviteController(EnqueteActiviteService enqueteActiviteService) { + this.enqueteActiviteService = enqueteActiviteService; + } + + @PostMapping("/create") + public ResponseEntity createEnqueteActivite(@RequestBody @Valid @Validated EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) { + try { + EnqueteActivite enqueteActivite = enqueteActiviteService.createEnqueteActivite(enqueteActivitePayLoadWeb); + return new ResponseEntity<>( + new ApiResponse<>(true, enqueteActivite, "Enquete Activite 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}") + public ResponseEntity updateEnqueteActivite(@PathVariable Long id, @RequestBody EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) { + try { + return new ResponseEntity<>( + new ApiResponse<>(true, enqueteActiviteService.updateEnqueteActivite(id,enqueteActivitePayLoadWeb), "EnqueteActivite 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}") + public ResponseEntity deleteEnqueteActivite(@PathVariable Long id) { + try { + enqueteActiviteService.deleteEnqueteActivite(id); + return new ResponseEntity<>( + new ApiResponse<>(true, "Enquete Activite 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") + public ResponseEntity getAllEnqueteActiviteList() { + try { + return new ResponseEntity<>( + new ApiResponse<>(true, enqueteActiviteService.getEnqueteActiviteList(), "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 getAllEnqueteActivitePaged(@RequestParam int pageNo, @RequestParam int pageSize) { + try { + Pageable pageable = PageRequest.of(pageNo, pageSize); + return new ResponseEntity<>( + new ApiResponse<>(true, enqueteActiviteService.getEnqueteActiviteList(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("/id/{id}") + public ResponseEntity getEnqueteActiviteById(@PathVariable Long id) { + try { + return new ResponseEntity<>( + new ApiResponse<>(true, enqueteActiviteService.getEnqueteActiviteById(id), "EnqueteActivite 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); + } + } +} diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java index a0013fb..edd8642 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java @@ -2,6 +2,7 @@ package io.gmss.fiscad.entities.infocad.metier; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonManagedReference; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.gmss.fiscad.deserializer.LocalDateDeserializer; import io.gmss.fiscad.entities.BaseEntity; @@ -64,7 +65,7 @@ public class Enquete extends BaseEntity implements Serializable { @OneToMany(mappedBy = "enquete") private List acteurConcernes; - @JsonIgnore + //@JsonIgnore @ManyToOne private Parcelle parcelle; @@ -82,7 +83,7 @@ public class Enquete extends BaseEntity implements Serializable { @ManyToOne private Equipe equipe; - @JsonIgnore + // @JsonIgnore @ManyToOne @JoinColumn(name = "proprietaire_id") private Personne personne ; @@ -163,8 +164,8 @@ public class Enquete extends BaseEntity implements Serializable { private float superficie ; private int nbreBatiment; private int nbrePiscine; - private Long valeurMensuelleLocation; - private Long valeurAnnuelleLocation; + private Long montantMensuelleLocation; + private Long montantAnnuelleLocation; private Long valeurParcelleEstime; private Long valeurParcelleReel; @@ -178,9 +179,11 @@ public class Enquete extends BaseEntity implements Serializable { @JsonIgnore @OneToMany(mappedBy = "enquete") + @JsonManagedReference private List enqueteUniteLogements; @JsonIgnore + @JsonManagedReference @OneToMany(mappedBy = "enquete") private List enqueteBatiments; @@ -220,7 +223,7 @@ public class Enquete extends BaseEntity implements Serializable { public String getDepartement() { if (this.bloc != null) { Arrondissement arrondissement = this.bloc.getArrondissement(); - if (arrondissement != null) { + if (arrondissement != null && arrondissement.getCommune()!=null && arrondissement.getCommune().getDepartement()!=null) { return arrondissement.getCommune().getDepartement().getNom(); } else return ""; } else return ""; @@ -229,7 +232,7 @@ public class Enquete extends BaseEntity implements Serializable { public String getCommune() { if (this.bloc != null) { Arrondissement arrondissement = this.bloc.getArrondissement(); - if (arrondissement != null) { + if (arrondissement != null && arrondissement.getCommune()!=null) { return arrondissement.getCommune().getNom(); } else return ""; } else return ""; @@ -247,7 +250,7 @@ public class Enquete extends BaseEntity implements Serializable { public String getTypeDomaine() { if (this.parcelle != null) { NatureDomaine natureDomaine = this.parcelle.getNatureDomaine(); - if (natureDomaine != null) { + if (natureDomaine != null && natureDomaine.getTypeDomaine()!=null ) { return natureDomaine.getTypeDomaine().getLibelle(); } else return ""; } else return ""; @@ -260,7 +263,7 @@ public class Enquete extends BaseEntity implements Serializable { } public String getStructureEnqueteur() { - if (this.user != null) { + if (this.user != null && this.user.getStructure()!=null) { return this.user.getStructure().getNom(); } else return ""; } diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java index adf2fd0..6f63b09 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java @@ -21,6 +21,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) @@ -89,10 +90,11 @@ public class Personne extends BaseEntity implements Serializable { private Long mobileDataId; public List getUploads() { - return uploads.stream().filter(upload -> upload.getPiece() == null && upload.getMembreGroupe() == null).toList(); + + return uploads==null ? new ArrayList<>():uploads.stream().filter(upload -> upload.getPiece() == null && upload.getMembreGroupe() == null).toList(); } public List getPieces() { - return pieces.stream().filter(piece -> piece.getPersonne() != null).toList(); + return pieces==null ? new ArrayList<>():pieces.stream().filter(piece -> piece.getPersonne() != null).toList(); } } diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java index daa69e9..79b8010 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java @@ -34,10 +34,13 @@ public class Batiment extends BaseEntity implements Serializable { @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateConstruction; private Long idDerniereEnquete; + @JsonIgnore @ManyToOne private Parcelle parcelle; + private Long parcelleExternalKey; + @JsonIgnore @ManyToOne private Tpe terminal; diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java index c9b71cd..a2a1b28 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java @@ -30,9 +30,12 @@ public class CaracteristiqueUniteLogement extends BaseEntity implements Serializ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @ManyToOne + + + @ManyToOne(fetch = FetchType.LAZY) @JsonBackReference private EnqueteUniteLogement enqueteUniteLogement; + private Long enqueteUniteLogementExternalKey; @ManyToOne private Caracteristique caracteristique; diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java index 58dfa50..b9490c2 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java @@ -65,20 +65,30 @@ public class EnqueteBatiment extends BaseEntity implements Serializable { @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateFinExcemption; - @OneToOne - private Personne personne; - private Long personneExternalKey; + + //@JsonIgnore @ManyToOne - private Batiment batiment; - private Long batimentExternalKey; + private Personne personne; + + private Long personneExternalKey; @JsonIgnore - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) + @JsonBackReference + private Batiment batiment; + + private Long batimentExternalKey; + private Long nbreEtage; + + // @JsonIgnore + @ManyToOne(fetch = FetchType.LAZY) + @JsonBackReference private Enquete enquete; - @JsonManagedReference ///pour couper la récurcivité + @OneToMany(mappedBy = "enqueteBatiment") + @JsonManagedReference ///pour couper la récurcivité private List caracteristiqueBatiments; @JsonIgnore diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java index 2080e42..bdbda48 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java @@ -1,5 +1,6 @@ package io.gmss.fiscad.entities.rfu.metier; +import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonManagedReference; @@ -61,16 +62,25 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable { @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateFinExcemption; + @JsonIgnore - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) + @JsonBackReference private Enquete enquete; + + @ManyToOne private UniteLogement uniteLogement; + + private Long uniteLogementExternalKey; + @OneToOne private Personne personne; + private Long personneExternalKey; private Long mobileDataId; + @OneToMany(mappedBy = "enqueteUniteLogement") @JsonManagedReference private List caracteristiqueUniteLogements; diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Caracteristique.java b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Caracteristique.java index 01bea69..5d29776 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Caracteristique.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Caracteristique.java @@ -39,6 +39,7 @@ public class Caracteristique extends BaseEntity implements Serializable { private Tpe terminal; @ManyToOne private CategorieBatiment categorieBatiment; + @ManyToOne(fetch = FetchType.LAZY) private Arrondissement arrondissement; } diff --git a/src/main/java/io/gmss/fiscad/entities/user/User.java b/src/main/java/io/gmss/fiscad/entities/user/User.java index 4b635d9..983c223 100755 --- a/src/main/java/io/gmss/fiscad/entities/user/User.java +++ b/src/main/java/io/gmss/fiscad/entities/user/User.java @@ -52,6 +52,7 @@ public class User extends BaseEntity implements Serializable { inverseJoinColumns = @JoinColumn(name = "roles_id") ) private Set roles; + @ManyToOne private Structure structure; // @JsonIgnore diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java index 21979b6..aedeef7 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java @@ -110,11 +110,13 @@ public class EnqueteServiceImpl implements EnqueteService { throw new BadRequestException("Echec de l'enregistrement : zone inexistante"); } - Optional optionalRue = rueRepository.findById(enquetePayLoadWeb.getZoneRfuId()); + if(enquetePayLoadWeb.getZoneRfuId()!=null) { + Optional optionalRue = rueRepository.findById(enquetePayLoadWeb.getZoneRfuId()); - if (optionalRue.isPresent()) { - rueId=optionalRue.get().getId(); - enquetePayLoadWeb.getParcellePayLoadWeb().setRueId(rueId); + if (optionalRue.isPresent()) { + rueId = optionalRue.get().getId(); + enquetePayLoadWeb.getParcellePayLoadWeb().setRueId(rueId); + } } Optional optionalEquipe = equipeRepository.findById(enquetePayLoadWeb.getEquipeId()); @@ -127,6 +129,7 @@ public class EnqueteServiceImpl implements EnqueteService { parcelle = parcelleService.updateParcelle(enquetePayLoadWeb.getParcellePayLoadWeb().getId(),enquetePayLoadWeb.getParcellePayLoadWeb()); } }catch (Exception e){ + e.printStackTrace(); throw new ApplicationException("Echec de l'enregistrement : La parcelle non enregistrée."); } ////enregistrement de l'enquete @@ -154,8 +157,8 @@ public class EnqueteServiceImpl implements EnqueteService { enquete.setNomRue(enquetePayLoadWeb.getNomRue()); enquete.setNumRue(enquetePayLoadWeb.getNumRue()); enquete.setSuperficie(enquetePayLoadWeb.getSuperficie()); - enquete.setValeurMensuelleLocation(enquetePayLoadWeb.getValeurMensuelleLocation()); - enquete.setValeurAnnuelleLocation(enquetePayLoadWeb.getValeurAnnuelleLocation()); + enquete.setMontantMensuelleLocation(enquetePayLoadWeb.getMontantMensuelleLocation()); + enquete.setMontantAnnuelleLocation(enquetePayLoadWeb.getMontantAnnuelleLocation()); enquete.setValeurParcelleEstime(enquetePayLoadWeb.getValeurParcelleEstime()); enquete.setValeurParcelleReel(enquetePayLoadWeb.getValeurParcelleReel()); Enquete finalEnquete=enqueteRepository.save(enquete); @@ -268,8 +271,8 @@ public class EnqueteServiceImpl implements EnqueteService { enquete.setNomRue(enquetePayLoadWeb.getNomRue()); enquete.setNumRue(enquetePayLoadWeb.getNumRue()); enquete.setSuperficie(enquetePayLoadWeb.getSuperficie()); - enquete.setValeurMensuelleLocation(enquetePayLoadWeb.getValeurMensuelleLocation()); - enquete.setValeurAnnuelleLocation(enquetePayLoadWeb.getValeurAnnuelleLocation()); + enquete.setMontantMensuelleLocation(enquetePayLoadWeb.getMontantMensuelleLocation()); + enquete.setMontantAnnuelleLocation(enquetePayLoadWeb.getMontantAnnuelleLocation()); enquete.setValeurParcelleEstime(enquetePayLoadWeb.getValeurParcelleEstime()); enquete.setValeurParcelleReel(enquetePayLoadWeb.getValeurParcelleReel()); return enqueteRepository.save(enquete); diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java index c767ac6..6f41fa1 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java @@ -113,7 +113,10 @@ public class ParcelleServiceImpl implements ParcelleService { } private Parcelle getParcelleFromPayload(Parcelle parcelle, ParcellePayLoadWeb parcellePayLoadWeb) { - Optional optionalRue = rueRepository.findById(parcellePayLoadWeb.getRueId()); + if(parcellePayLoadWeb.getRueId()!=null) { + Optional optionalRue = rueRepository.findById(parcellePayLoadWeb.getRueId()); + parcelle.setRue(optionalRue.orElse(null)); + } parcelle.setP(parcellePayLoadWeb.getP()); parcelle.setI(parcellePayLoadWeb.getI()); parcelle.setQ(parcellePayLoadWeb.getQ()); @@ -126,7 +129,7 @@ public class ParcelleServiceImpl implements ParcelleService { parcelle.setAutreNumeroTitreFoncier(parcellePayLoadWeb.getNumTitreFoncier()); parcelle.setObservation(parcellePayLoadWeb.getObservation()); parcelle.setSuperficie(parcellePayLoadWeb.getSuperficie()); - parcelle.setRue(optionalRue.orElse(null)); + return parcelle; } diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java index 4936a89..ede8f93 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java @@ -92,7 +92,7 @@ public class PersonneServiceImpl implements PersonneService { @Override public Optional getPersonneById(Long id) { - return Optional.empty(); + return personneRepository.findById(id); } @Override @@ -109,7 +109,7 @@ public class PersonneServiceImpl implements PersonneService { .toList(); System.out.println(uploadsDirects.size()); // 3. Pièces et leurs Uploads - List pieces = pieceRepository.findByPersonne_IdAndActeurConcerneIsNull(id) + List pieces = pieceRepository.findByPersonne_IdAndEnqueteIsNull(id) .stream().map(piece -> { List uploads = piece.getUploads().stream() .map(u -> new UploadDTO(u.getId(), u.getExternalKey(), u.getObservation(), u.isSynchronise(), u.getFileName(), u.getOriginalFileName(), u.getURIFile(), u.getCheckSum(), u.getSize(), u.getMimeType())) diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java index 1f47f1f..e0a78c0 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java @@ -84,6 +84,7 @@ public class EnqueteBatimentServiceImpl implements EnqueteBatimentService { enqueteBatiment.setValeurBatimentReel(enqueteBatimentPayloadWeb.getValeurBatimentReel()); enqueteBatiment.setValeurBatimentEstime(enqueteBatimentPayloadWeb.getValeurBatimentEstime()); enqueteBatiment.setMontantLocatifAnnuelDeclare(enqueteBatimentPayloadWeb.getMontantLocatifAnnuelDeclare()); + enqueteBatiment.setNbreEtage(enqueteBatimentPayloadWeb.getNbreEtage()); enqueteBatiment= enqueteBatimentRepository.save(enqueteBatiment); //////Enregistrement des caractéristiques batiment diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java index d9bc6f6..9c6f39b 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java @@ -27,6 +27,7 @@ public class EnqueteBatimentPayloadWeb { private int nbreHabitant; private Long montantMensuelLocation; private Long montantLocatifAnnuelDeclare; + private Long nbreEtage; private Long valeurBatimentEstime; private Long valeurBatimentReel; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnquetePayLoadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnquetePayLoadWeb.java index 698321e..d250e13 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnquetePayLoadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnquetePayLoadWeb.java @@ -41,8 +41,8 @@ public class EnquetePayLoadWeb { private Long zoneRfuId; private Long proprietaireId; private Long EnqueteurId; - private Long valeurMensuelleLocation; - private Long valeurAnnuelleLocation; + private Long montantMensuelleLocation; + private Long montantAnnuelleLocation; private Long valeurParcelleEstime; private Long valeurParcelleReel; } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java index 57df9a0..9d77942 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java @@ -11,9 +11,6 @@ public class EnqueteUniteLogementPayloadWeb { private UniteLogementPaylaodWeb uniteLogementPaylaodWeb ; private List caracteristiqueUniteLogementPayloadWebs; private List uploadPayLoadWebs; - private Long externalKey; - private Long terminalId; - private boolean synchronise; private String observation; private Long userId; private float surface; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UploadPayLoadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UploadPayLoadWeb.java index 2a1fdb9..ae0cbad 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UploadPayLoadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UploadPayLoadWeb.java @@ -7,7 +7,7 @@ public class UploadPayLoadWeb { private Long id; private Long pieceId; private String Observation; - private boolean synchronise; + //private boolean synchronise; //private String fileBase64; ///////////////////////////////// private String name; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java index 92f4cbc..34cd5ae 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java @@ -12,10 +12,7 @@ import java.util.Optional; public interface PieceRepository extends JpaRepository { Optional findFirstByExternalKeyAndTerminal_Id(Long externalKey, Long terminalId); - @Query(nativeQuery = true, value = "delete from piece p where p.id in (select p.id " + - " from piece p inner join acteur_concerne a on a.id = p.acteur_concerne_id" + - " inner join enquete e on e.id = a.enquete_id" + - " where e.id = ?1)") + @Query(nativeQuery = true, value = "delete from piece p where p.enquete_id = ?1") @Modifying @Transactional void deletePieceByEnqueteId(Long enqueteId); @@ -27,7 +24,7 @@ public interface PieceRepository extends JpaRepository { @Query(value = "Select " + " p.id as idBackend, " + " p.external_key as externalKey, " + - " ac.external_key as acteurConcerneId, " + + // " ac.external_key as acteurConcerneId, " + " p.date_expiration as dateExpiration," + " p.numero_piece as numeroPiece," + " p.url," + @@ -45,13 +42,14 @@ public interface PieceRepository extends JpaRepository { " p.max_numero_piece_id, " + " p.max_numero_acteur_concerne_id, " + " p.bloc_id as blocId " + - " from piece p left join personne pp on p.personne_id = pp.id left join acteur_concerne ac on ac.id = p.personne_id " + + " from piece p left join personne pp on p.personne_id = pp.id " + " where p.terminal_id = ?1" , nativeQuery = true) List getPiecesByTerminalId(Long terminalId); List findByPersonne_Id(Long id); Optional findByMobileDataId(Long id); - List findByPersonne_IdAndActeurConcerneIsNull(Long id); + + List findByPersonne_IdAndEnqueteIsNull(Long id); } diff --git a/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java index 2ac6019..c74b281 100644 --- a/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java +++ b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java @@ -20,6 +20,8 @@ import io.gmss.fiscad.repositories.infocad.parametre.*; import io.gmss.fiscad.repositories.rfu.metier.*; import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository; import lombok.AllArgsConstructor; +import org.codehaus.groovy.transform.SourceURIASTTransformation; +import org.hibernate.event.spi.SaveOrUpdateEvent; import org.springframework.stereotype.Service; import java.util.Optional; @@ -72,6 +74,8 @@ public class EntityFromPayLoadService { if(caracteristiqueBatimentPayloadWeb.getEnqueteBatimentId()!=null) optionalEnqueteBatiment=enqueteBatimentRepository.findById(caracteristiqueBatimentPayloadWeb.getEnqueteBatimentId()); + + System.out.println("CARACT ID" + caracteristiqueBatimentPayloadWeb.getCaracteristiqueId()); if(caracteristiqueBatimentPayloadWeb.getCaracteristiqueId()!=null) optionalCaracteristique=caracteristiqueRepository.findById(caracteristiqueBatimentPayloadWeb.getCaracteristiqueId()); @@ -91,6 +95,7 @@ public class EntityFromPayLoadService { if(caracteristiqueUniteLogementPayloadWeb.getEnqueteUniteLogementId()!=null) optionalEnqueteUniteLogement=enqueteUniteLogementRepository.findById(caracteristiqueUniteLogementPayloadWeb.getEnqueteUniteLogementId()); + if(caracteristiqueUniteLogementPayloadWeb.getCaracteristiqueId()!=null) optionalCaracteristique=caracteristiqueRepository.findById(caracteristiqueUniteLogementPayloadWeb.getCaracteristiqueId()); diff --git a/src/main/resources/application-dgi.properties b/src/main/resources/application-dgi.properties index 3fc31fe..dd19eff 100755 --- a/src/main/resources/application-dgi.properties +++ b/src/main/resources/application-dgi.properties @@ -1,17 +1,17 @@ server.port=8282 -#io.gmss.fiscad.profile=${IO_GMSS_FISCAD_PROFILE} -io.gmss.fiscad.profile=dgi +io.gmss.fiscad.profile=${IO_GMSS_FISCAD_PROFILE} +#io.gmss.fiscad.profile=dgi # TEST ENV #spring.datasource.url=jdbc:postgresql://vmi792116.contaboserver.net:5599/dgi_db #spring.datasource.username=infocad_user #spring.datasource.password=W5fwD({9*q53 # LOCAL ENV -spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi -spring.datasource.username=infocad_user -spring.datasource.password=W5fwD({9*q53 +#spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi +#spring.datasource.username=infocad_user +#spring.datasource.password=W5fwD({9*q53 # PROD ENVIRONNEMENT -#spring.datasource.url=${SPRING_DATASOURCE_URL} -#spring.datasource.username=${SPRING_DATASOURCE_USERNAME} -#spring.datasource.password=${SPRING_DATASOURCE_PASSWORD} \ No newline at end of file +spring.datasource.url=${SPRING_DATASOURCE_URL} +spring.datasource.username=${SPRING_DATASOURCE_USERNAME} +spring.datasource.password=${SPRING_DATASOURCE_PASSWORD} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e93a597..579bcfd 100755 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ -#spring.profiles.active=${SPRING_PROFILES_ACTIVE} +spring.profiles.active=${SPRING_PROFILES_ACTIVE} #spring.profiles.active=abomey -spring.profiles.active=dgi +#spring.profiles.active=dgi spring.jpa.properties.hibernate.id.new_generator_mappings=false spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true spring.jpa.open-in-view=false @@ -46,11 +46,11 @@ logging.file.name=/app/logs/fiscad.log #app.abs.env.defaultuser = fiscad_admin -app.default-user.username=fiscad_admin -app.default-user.password=1234567890 +#app.default-user.username=fiscad_admin +#app.default-user.password=1234567890 -#app.default-user.username=${DEFAULT_USER_NAME} -#app.default-user.password=${DEFAULT_USER_PASSWORD} +app.default-user.username=${DEFAULT_USER_NAME} +app.default-user.password=${DEFAULT_USER_PASSWORD} app.upload.root=${file.upload_dir} app.upload.zips.received=${app.upload.root}/zips/received -- 2.49.1