From c272257930a57cf27487b01a89390f2c363df06b Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Thu, 19 Feb 2026 08:50:46 +0100 Subject: [PATCH 1/3] gestion revu de code en utilisant uniquement les DTO --- .../java/io/gmss/fiscad/service/EntityFromPayLoadService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java index 2644d9c..e2f4618 100644 --- a/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java +++ b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java @@ -269,6 +269,8 @@ public class EntityFromPayLoadService { batiment.setId(batimentPaylaodWeb.getId()); batiment.setCode(batimentPaylaodWeb.getCode()); batiment.setNub(batimentPaylaodWeb.getNub()); + batiment.setSuperficieAuSol(batimentPaylaodWeb.getSuperficieSol()); + batiment.setSuperficieLouee(batimentPaylaodWeb.getSuperficieLouee()); batiment.setDateConstruction(batimentPaylaodWeb.getDateConstruction()); return batiment ; @@ -370,6 +372,8 @@ public class EntityFromPayLoadService { uniteLogement.setId(uniteLogementPaylaodWeb.getId()); uniteLogement.setCode(uniteLogementPaylaodWeb.getCode()); uniteLogement.setNul(uniteLogementPaylaodWeb.getNul()); + uniteLogement.setSuperficieAuSol(uniteLogementPaylaodWeb.getSuperficieSol()); + uniteLogement.setSuperficieLouee(uniteLogementPaylaodWeb.getSuperficieLouee()); uniteLogement.setDateConstruction(uniteLogementPaylaodWeb.getDateConstruction()); uniteLogement.setNumeroEtage(uniteLogementPaylaodWeb.getNumeroEtage()); return uniteLogement ; From 06fa55fe2a71e387622d0d2520aa4e6e924d016a Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Thu, 19 Feb 2026 11:23:28 +0100 Subject: [PATCH 2/3] gestion revu de code en utilisant uniquement les DTO --- .../entities/infocad/metier/Enquete.java | 5 + .../entities/rfu/metier/EnqueteBatiment.java | 5 + .../rfu/metier/EnqueteUniteLogement.java | 8 +- .../crudweb/ArrondissementPaylaodWeb.java | 2 + .../crudweb/AvoirFonctionPaylaodWeb.java | 3 +- .../CaracteristiqueBatimentPayloadWeb.java | 3 +- .../CaracteristiqueParcellePayloadWeb.java | 3 +- ...aracteristiqueUniteLogementPayloadWeb.java | 3 +- .../request/crudweb/CommunePaylaodWeb.java | 2 + .../crudweb/DepartementPaylaodWeb.java | 3 +- .../crudweb/EnqueteActivitePayLoadWeb.java | 3 +- .../crudweb/EnqueteBatimentPayloadWeb.java | 17 +- .../request/crudweb/EnquetePayLoadWeb.java | 17 +- .../EnqueteUniteLogementPayloadWeb.java | 18 +- .../request/crudweb/FonctionPaylaodWeb.java | 3 +- .../request/crudweb/PiecePayLoadWeb.java | 3 +- .../request/crudweb/ProfilePaylaodWeb.java | 3 +- .../request/crudweb/QuartierPaylaodWeb.java | 2 + .../crudweb/SecteurDecoupagePaylaodWeb.java | 3 +- .../request/crudweb/SecteurPaylaodWeb.java | 2 + .../request/crudweb/SectionPaylaodWeb.java | 2 + .../request/crudweb/StructurePaylaodWeb.java | 2 + .../crudweb/UniteLogementPaylaodWeb.java | 3 +- .../request/crudweb/UploadPayLoadWeb.java | 4 +- .../infocad/metier/EnqueteRepository.java | 160 ++++++++++-------- .../rfu/metier/EnqueteBatimentRepository.java | 30 +++- .../EnqueteUniteLogementRepository.java | 45 ++++- .../service/EntityFromPayLoadService.java | 12 ++ src/main/resources/application.properties | 4 +- 29 files changed, 268 insertions(+), 102 deletions(-) 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 ee88018..90ad216 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 @@ -197,6 +197,11 @@ public class Enquete extends BaseEntity implements Serializable { @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateFinExcemption; + + private String representantNom; + private String representantPrenom; + private String representantTel; + private String representantNpi; // // @JsonIgnore // @OneToMany(mappedBy = "enquete") 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 7c3b20a..7c6b532 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 @@ -96,6 +96,11 @@ public class EnqueteBatiment extends BaseEntity implements Serializable { private Long batimentExternalKey; private Long nbreEtage; + private String representantNom; + private String representantPrenom; + private String representantTel; + private String representantNpi; + // @JsonIgnore // @ManyToOne(fetch = FetchType.LAZY) // @JsonBackReference 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 9b783fc..216e25e 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 @@ -64,16 +64,22 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable { @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateFinExemption; - @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateEnquete; private String observation; private Long uniteLogementExternalKey; + private String representantNom; + private String representantPrenom; + private String representantTel; + private String representantNpi; + @ManyToOne private Exercice exercice; + + // @JsonIgnore // @ManyToOne(fetch = FetchType.LAZY) // @JsonBackReference diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ArrondissementPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ArrondissementPaylaodWeb.java index 8aa9bb1..814de3b 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ArrondissementPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ArrondissementPaylaodWeb.java @@ -1,7 +1,9 @@ package io.gmss.fiscad.paylaods.request.crudweb; import lombok.Data; +import lombok.NoArgsConstructor; +@NoArgsConstructor @Data public class ArrondissementPaylaodWeb { private Long id; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/AvoirFonctionPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/AvoirFonctionPaylaodWeb.java index 6cbb007..1362041 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/AvoirFonctionPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/AvoirFonctionPaylaodWeb.java @@ -7,9 +7,10 @@ import io.gmss.fiscad.enums.Titre; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDate; - +@NoArgsConstructor @Data public class AvoirFonctionPaylaodWeb { private Long id; 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 index cd96f1f..9e55f3d 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueBatimentPayloadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueBatimentPayloadWeb.java @@ -1,9 +1,10 @@ package io.gmss.fiscad.paylaods.request.crudweb; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDate; - +@NoArgsConstructor @Data public class CaracteristiqueBatimentPayloadWeb { private Long id; 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 index 1df3c9f..bd64368 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueParcellePayloadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueParcellePayloadWeb.java @@ -1,9 +1,10 @@ package io.gmss.fiscad.paylaods.request.crudweb; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDate; - +@NoArgsConstructor @Data public class CaracteristiqueParcellePayloadWeb { private Long id; 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 index bdef075..0081f5a 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueUniteLogementPayloadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueUniteLogementPayloadWeb.java @@ -1,9 +1,10 @@ package io.gmss.fiscad.paylaods.request.crudweb; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDate; - +@NoArgsConstructor @Data public class CaracteristiqueUniteLogementPayloadWeb { private Long id; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CommunePaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CommunePaylaodWeb.java index 1081bde..84cd170 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CommunePaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CommunePaylaodWeb.java @@ -1,7 +1,9 @@ package io.gmss.fiscad.paylaods.request.crudweb; import lombok.Data; +import lombok.NoArgsConstructor; +@NoArgsConstructor @Data public class CommunePaylaodWeb { private Long id; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/DepartementPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/DepartementPaylaodWeb.java index 9319842..30f7b52 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/DepartementPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/DepartementPaylaodWeb.java @@ -1,9 +1,10 @@ package io.gmss.fiscad.paylaods.request.crudweb; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDate; - +@NoArgsConstructor @Data public class DepartementPaylaodWeb { private Long id; 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 index 87d75b2..48088e5 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteActivitePayLoadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteActivitePayLoadWeb.java @@ -1,10 +1,11 @@ package io.gmss.fiscad.paylaods.request.crudweb; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDate; import java.util.List; - +@NoArgsConstructor @Data public class EnqueteActivitePayLoadWeb { private Long id; 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 fdaf694..0079420 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 @@ -7,10 +7,11 @@ import io.gmss.fiscad.enums.StatutEnquete; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDate; import java.util.List; - +@NoArgsConstructor @Data public class EnqueteBatimentPayloadWeb { private Long id; @@ -55,11 +56,19 @@ public class EnqueteBatimentPayloadWeb { private StatutEnquete statutEnquete; private Long exerciceId; private Integer exerciceAnnee; + private String representantNom; + private String representantPrenom; + private String representantTel; + private String representantNpi; public EnqueteBatimentPayloadWeb(Long id, String observation, String autreMenuisierie, String autreMur, boolean sbee, String numCompteurSbee, boolean soneb, String numCompteurSoneb, int nbreLotUnite, int nbreUniteLocation, Float superficieLouee, Float superficieAuSol, LocalDate dateEnquete, int nbreMenage, int nbreHabitant, Long montantMensuelLocation, Long montantLocatifAnnuelDeclare, Long nbreEtage, Long valeurBatimentEstime, Long valeurBatimentReel, int nbreMoisLocation, String autreCaracteristiquePhysique, LocalDate dateDebutExcemption, LocalDate dateFinExcemption, Long batimentId, String batimentNub, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Long enqueteurId, String enqueteurNom, String enqueteurPrenom, StatutEnquete statutEnquete, Long exerciceId, - Integer exerciceAnnee) { + Integer exerciceAnnee, + String representantNom, + String representantPrenom, + String representantTel, + String representantNpi) { this.id = id; this.observation = observation; this.autreMenuisierie = autreMenuisierie; @@ -96,5 +105,9 @@ public class EnqueteBatimentPayloadWeb { this.statutEnquete = statutEnquete; this.exerciceId = exerciceId; this.exerciceAnnee = exerciceAnnee; + this.representantNom = representantNom; + this.representantPrenom = representantPrenom; + this.representantTel = representantTel; + this.representantNpi = representantNpi; } } 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 93616a6..4289d93 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 @@ -4,10 +4,11 @@ import io.gmss.fiscad.enums.StatutEnquete; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDate; import java.util.List; - +@NoArgsConstructor @Data public class EnquetePayLoadWeb { private Long id; @@ -59,9 +60,17 @@ public class EnquetePayLoadWeb { private Integer exerviceAnnee; private Long modeAcquisitionId; private String modeAcquisitionLibelle; + private String representantNom; + private String representantPrenom; + private String representantTel; + private String representantNpi; public EnquetePayLoadWeb(Long id, LocalDate dateEnquete, LocalDate dateFinalisation, Boolean litige, StatutEnquete statutEnquete, String descriptionMotifRejet, String observation, String numeroTitreFoncier, LocalDate dateTitreFoncier, String numEntreeParcelle, String numRue, String nomRue, Float precision, Integer nbreCoProprietaire, Integer nbreIndivisiaire, String autreAdresse, Float superficie, Integer nbreBatiment, Integer nbrePiscine, LocalDate dateDebutExemption, LocalDate dateFinExemption, String autreNumeroTitreFoncier, Long montantMensuelleLocation, Long montantAnnuelleLocation, Long valeurParcelleEstime, Long valeurParcelleReel, Long zoneRfuId, String zoneRfuNom, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Long enqueteurId, String enqueteurNom, String enqueteurPrenom,Long parcelleId, String parcelleNup, String parcelleQ, String parcelleI, String parcelleP, Long exerviceId, Integer exerviceAnnee, - Long modeAcquisitionId,String modeAcquisitionLibelle) { + Long modeAcquisitionId,String modeAcquisitionLibelle, + String representantNom, + String representantPrenom, + String representantTel, + String representantNpi) { this.id = id; this.dateEnquete = dateEnquete; this.dateFinalisation = dateFinalisation; @@ -106,5 +115,9 @@ public class EnquetePayLoadWeb { this.exerviceAnnee = exerviceAnnee; this.modeAcquisitionId = modeAcquisitionId; this.modeAcquisitionLibelle = modeAcquisitionLibelle; + this.representantNom = representantNom; + this.representantTel = representantTel; + this.representantPrenom = representantPrenom; + this.representantNpi = representantNpi; } } 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 303f26e..01177da 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 @@ -4,10 +4,11 @@ import io.gmss.fiscad.enums.StatutEnquete; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDate; import java.util.List; - +@NoArgsConstructor @Data public class EnqueteUniteLogementPayloadWeb { private Long id; @@ -44,9 +45,18 @@ public class EnqueteUniteLogementPayloadWeb { private Integer exerciceAnnee; @Enumerated(EnumType.STRING) private StatutEnquete statutEnquete; + private String representantNom; + private String representantPrenom; + private String representantTel; + private String representantNpi; public EnqueteUniteLogementPayloadWeb(Long id, String observation, Integer nbrePiece, Integer nbreHabitant, Integer nbreMenage, Boolean enLocation, Integer nbreMoisLocation, Float montantMensuelLoyer, Float montantLocatifAnnuelDeclare, Long valeurUniteLogementEstime, Long valeurUniteLogementReel, Float superficieLouee, Float superficieAuSol, LocalDate dateEnquete, Boolean sbee, Boolean soneb, String numCompteurSbee, String numCompteurSoneb, LocalDate dateDebutExemption, LocalDate dateFinExemption, Long uniteLogementId, String uniteLogementNumeroEtage, String uniteLogementNul, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Long enqueteurId, String enqueteurNom, String enqueteurPrenom, Long exerciceId, Integer exerciceAnnee, - StatutEnquete statutEnquete) { + StatutEnquete statutEnquete, + String representantNom, + String representantPrenom, + String representantTel, + String representantNpi + ) { this.id = id; this.observation = observation; this.nbrePiece = nbrePiece; @@ -80,5 +90,9 @@ public class EnqueteUniteLogementPayloadWeb { this.exerciceId = exerciceId; this.exerciceAnnee = exerciceAnnee; this.statutEnquete = statutEnquete; + this.representantNom = representantNom; + this.representantPrenom = representantPrenom; + this.representantTel = representantTel; + this.representantNpi = representantNpi; } } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/FonctionPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/FonctionPaylaodWeb.java index 90fd116..c9fa886 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/FonctionPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/FonctionPaylaodWeb.java @@ -9,10 +9,11 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import lombok.NonNull; import java.time.LocalDate; - +@NoArgsConstructor @Data public class FonctionPaylaodWeb { private Long id; 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 index 724be2b..54519ee 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/PiecePayLoadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/PiecePayLoadWeb.java @@ -1,10 +1,11 @@ package io.gmss.fiscad.paylaods.request.crudweb; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDate; import java.util.List; - +@NoArgsConstructor @Data public class PiecePayLoadWeb { private Long id; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ProfilePaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ProfilePaylaodWeb.java index df77374..c4b27e8 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ProfilePaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ProfilePaylaodWeb.java @@ -8,10 +8,11 @@ import io.gmss.fiscad.enums.Titre; import io.gmss.fiscad.enums.UserProfile; import jakarta.persistence.*; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDate; import java.util.Set; - +@NoArgsConstructor @Data public class ProfilePaylaodWeb { private Long id; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/QuartierPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/QuartierPaylaodWeb.java index afb2bb0..b221c8b 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/QuartierPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/QuartierPaylaodWeb.java @@ -1,7 +1,9 @@ package io.gmss.fiscad.paylaods.request.crudweb; import lombok.Data; +import lombok.NoArgsConstructor; +@NoArgsConstructor @Data public class QuartierPaylaodWeb { private Long id; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SecteurDecoupagePaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SecteurDecoupagePaylaodWeb.java index f7b8722..136f9ac 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SecteurDecoupagePaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SecteurDecoupagePaylaodWeb.java @@ -12,9 +12,10 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDate; - +@NoArgsConstructor @Data public class SecteurDecoupagePaylaodWeb { private Long id; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SecteurPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SecteurPaylaodWeb.java index d24c51b..816a860 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SecteurPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SecteurPaylaodWeb.java @@ -4,7 +4,9 @@ import io.gmss.fiscad.enums.UserProfile; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import lombok.Data; +import lombok.NoArgsConstructor; +@NoArgsConstructor @Data public class SecteurPaylaodWeb { private Long id; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SectionPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SectionPaylaodWeb.java index 780e1a9..5b65023 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SectionPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SectionPaylaodWeb.java @@ -4,7 +4,9 @@ import io.gmss.fiscad.enums.UserProfile; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import lombok.Data; +import lombok.NoArgsConstructor; +@NoArgsConstructor @Data public class SectionPaylaodWeb { private Long id; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/StructurePaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/StructurePaylaodWeb.java index ec04170..3541812 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/StructurePaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/StructurePaylaodWeb.java @@ -4,7 +4,9 @@ import io.gmss.fiscad.entities.decoupage.Commune; import jakarta.persistence.ManyToOne; import jakarta.validation.constraints.NotNull; import lombok.Data; +import lombok.NoArgsConstructor; +@NoArgsConstructor @Data public class StructurePaylaodWeb { private Long id; 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 index 75a3e2a..81cda0a 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java @@ -1,9 +1,10 @@ package io.gmss.fiscad.paylaods.request.crudweb; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDate; - +@NoArgsConstructor @Data public class UniteLogementPaylaodWeb { private Long id; 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 5dad308..7aa6d1a 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 @@ -3,7 +3,7 @@ package io.gmss.fiscad.paylaods.request.crudweb; import jakarta.persistence.Transient; import lombok.Data; import lombok.NoArgsConstructor; - +@NoArgsConstructor @Data public class UploadPayLoadWeb { private Long id; @@ -30,8 +30,6 @@ public class UploadPayLoadWeb { private long size; private String mimeType; - public UploadPayLoadWeb() { - } public UploadPayLoadWeb(Long id, Long pieceId, String name, String filePath, Long enqueteBatimentId, Long personneId, Long enqueteUniteLogementId, Long declarationNcId, String reference, String description, String rename, String fileName,String originalFileName) { diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/EnqueteRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/EnqueteRepository.java index 5dac39a..4a5f2dd 100755 --- a/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/EnqueteRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/EnqueteRepository.java @@ -278,7 +278,11 @@ public interface EnqueteRepository extends JpaRepository { ex.id, ex.annee, ma.id, - ma.libelle + ma.libelle, + e.representantNom, + e.representantPrenom, + e.representantTel, + e.representantNpi ) FROM Enquete e LEFT JOIN e.zoneRfu zr @@ -335,7 +339,11 @@ public interface EnqueteRepository extends JpaRepository { ex.id, ex.annee, ma.id, - ma.libelle + ma.libelle, + e.representantNom, + e.representantPrenom, + e.representantTel, + e.representantNpi ) FROM Enquete e LEFT JOIN e.zoneRfu zr @@ -350,66 +358,70 @@ public interface EnqueteRepository extends JpaRepository { @Query( value = """ - SELECT new io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb( - e.id, - e.dateEnquete, - e.dateFinalisation, - e.litige, - e.statutEnquete, - e.descriptionMotifRejet, - e.observationParticuliere, - pa.numeroTitreFoncier, - pa.dateTitreFoncier, - e.numEntreeParcelle, - e.numRue, - e.nomRue, - e.precision, - e.nbreCoProprietaire, - e.nbreIndivisiaire, - e.autreAdresse, - e.superficie, - e.nbreBatiment, - e.nbrePiscine, - e.dateDebutExemption, - e.dateFinExemption, - pa.autreNumeroTitreFoncier, - e.montantMensuelleLocation, - e.montantAnnuelleLocation, - e.valeurParcelleEstime, - e.valeurParcelleReel, - zr.id, - zr.nom, - p.id, - p.nom, - p.prenom, - p.raisonSociale, - u.id, - u.nom, - u.prenom, - pa.id, - pa.nup, - pa.q, - pa.i, - pa.p, - ex.id, - ex.annee, - ma.id, - ma.libelle - ) - FROM Enquete e - LEFT JOIN e.zoneRfu zr - LEFT JOIN e.personne p - LEFT JOIN e.user u - LEFT JOIN e.parcelle pa - LEFT JOIN e.exercice ex - LEFT JOIN e.modeAcquisition ma - """, - countQuery = """ - SELECT COUNT(e) - FROM Enquete e - """ - ) - Page findAllEnquetesToDtoPageable(Pageable pageable); + SELECT new io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb( + e.id, + e.dateEnquete, + e.dateFinalisation, + e.litige, + e.statutEnquete, + e.descriptionMotifRejet, + e.observationParticuliere, + pa.numeroTitreFoncier, + pa.dateTitreFoncier, + e.numEntreeParcelle, + e.numRue, + e.nomRue, + e.precision, + e.nbreCoProprietaire, + e.nbreIndivisiaire, + e.autreAdresse, + e.superficie, + e.nbreBatiment, + e.nbrePiscine, + e.dateDebutExemption, + e.dateFinExemption, + pa.autreNumeroTitreFoncier, + e.montantMensuelleLocation, + e.montantAnnuelleLocation, + e.valeurParcelleEstime, + e.valeurParcelleReel, + zr.id, + zr.nom, + p.id, + p.nom, + p.prenom, + p.raisonSociale, + u.id, + u.nom, + u.prenom, + pa.id, + pa.nup, + pa.q, + pa.i, + pa.p, + ex.id, + ex.annee, + ma.id, + ma.libelle, + e.representantNom, + e.representantPrenom, + e.representantTel, + e.representantNpi + ) + FROM Enquete e + LEFT JOIN e.zoneRfu zr + LEFT JOIN e.personne p + LEFT JOIN e.user u + LEFT JOIN e.parcelle pa + LEFT JOIN e.exercice ex + LEFT JOIN e.modeAcquisition ma + """, + countQuery = """ + SELECT COUNT(e) + FROM Enquete e + """ + ) + Page findAllEnquetesToDtoPageable(Pageable pageable); @Query(""" SELECT new io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb( @@ -456,7 +468,11 @@ public interface EnqueteRepository extends JpaRepository { ex.id, ex.annee, ma.id, - ma.libelle + ma.libelle, + e.representantNom, + e.representantPrenom, + e.representantTel, + e.representantNpi ) FROM Enquete e LEFT JOIN e.zoneRfu zr @@ -518,7 +534,11 @@ public interface EnqueteRepository extends JpaRepository { ex.id, ex.annee, ma.id, - ma.libelle + ma.libelle, + e.representantNom, + e.representantPrenom, + e.representantTel, + e.representantNpi ) FROM Enquete e LEFT JOIN e.zoneRfu zr @@ -586,7 +606,11 @@ public interface EnqueteRepository extends JpaRepository { ex.id, ex.annee, ma.id, - ma.libelle + ma.libelle, + e.representantNom, + e.representantPrenom, + e.representantTel, + e.representantNpi ) FROM Enquete e LEFT JOIN e.zoneRfu zr @@ -647,7 +671,11 @@ public interface EnqueteRepository extends JpaRepository { ex.id, ex.annee, ma.id, - ma.libelle + ma.libelle, + e.representantNom, + e.representantPrenom, + e.representantTel, + e.representantNpi ) FROM Enquete e LEFT JOIN e.zoneRfu zr diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java index 8fffffc..e1fa5b5 100755 --- a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java @@ -96,7 +96,11 @@ public interface EnqueteBatimentRepository extends JpaRepository findEnqueteUniteLogementToDto(@Param("enqueteUniteLogementId") Long enqueteUniteLogementId); - // void deleteAllByEnquete_id(Long id) ; + // void deleteAllByEnquete_id(Long id) ; @Query(""" SELECT new io.gmss.fiscad.paylaods.request.crudweb.EnqueteUniteLogementPayloadWeb( eul.id, @@ -138,7 +143,11 @@ public interface EnqueteUniteLogementRepository extends JpaRepository Date: Thu, 19 Feb 2026 11:23:50 +0100 Subject: [PATCH 3/3] gestion revu de code en utilisant uniquement les DTO --- src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 17ab386..7a2dd25 100755 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ -#spring.profiles.active=${SPRING_PROFILES_ACTIVE} +spring.profiles.active=${SPRING_PROFILES_ACTIVE} #spring.profiles.active=abomey -spring.profiles.active=test +#spring.profiles.active=test spring.jpa.properties.hibernate.id.new_generator_mappings=false spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true spring.jpa.open-in-view=false