Merge pull request 'develop' (#166 ) from develop into main

Reviewed-on: #166
Merge pull request 'Generation tfu batie et non batie avec ressource de liste de données imposition' (#165 ) from features/crud_entites into develop
2026-03-12 20:02:24 +00:00 · 2026-03-12 20:01:27 +00:00 · 2026-03-12 19:35:02 +00:00 · 2026-03-12 19:34:04 +00:00 · 2026-03-12 11:28:15 +00:00 · 2026-03-12 11:27:12 +00:00
4 changed files with 11 additions and 31 deletions
--- a/src/main/java/io/gmss/fiscad/entities/decoupage/Quartier.java
+++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Quartier.java
@@ -29,8 +29,6 @@ public class Quartier extends BaseEntity implements Serializable {
    @ManyToOne
    private Arrondissement arrondissement;
    private String longitude;
    private String latitude;
 //    @JsonIgnore
 //    @OneToOne(mappedBy = "quartier")
 //    private Bloc bloc;
--- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/ParcelleGeom.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/ParcelleGeom.java
@@ -119,7 +119,7 @@ public class ParcelleGeom extends BaseEntity implements Serializable {
    private Quartier quartier ;
    @ColumnDefault("0")
-    private Integer  geomSrid;
+    private int  geomSrid;
    @JsonSerialize(using = GeometrySerializer.class)
    @JsonDeserialize(contentUsing = GeometryDeserializer.class)
    @Column(name = "geometry",columnDefinition = "geometry(Polygon,32631)")
--- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ParcelleGeomPaylaodWeb.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ParcelleGeomPaylaodWeb.java
@@ -90,7 +90,7 @@ public class ParcelleGeomPaylaodWeb {
    private String quartierCode ;
    private String quartierNom ;
-    private Integer  geomSrid;
+    private int  geomSrid;
    @JsonSerialize(using = GeometrySerializer.class)
    @JsonDeserialize(contentUsing = GeometryDeserializer.class)
    //@Column(name = "geometry",columnDefinition = "geometry(Polygon,32631)")
@@ -100,7 +100,7 @@ public class ParcelleGeomPaylaodWeb {
    private Long parcelleId;
-    public ParcelleGeomPaylaodWeb(Long id, String nup, String nupProvisoire, String longitude, String latitude, String numeroRue, String numeroEntreePorte, String codeInstad, String numeroEtatLieux, String numeroTitreFoncier, LocalDate dateTitreFoncier, Boolean batie, String npi, String ifu, String nom, String prenom, String raisonSociale, String nomEtPrenoms, String telephone, String adresse, String nomRepresentant, String prenomRepresentant, String raisonSocialeRepresentant, String nomEtPrenomsRepresentant, String telephoneRepresentant, String adresseRepresentant, String q, String zone, String ilot, String p, String qLotissement, String ilotLotissement, String pLotissement, String pointsPolygone, Integer superficie, String dateCollecte, SourceDonnee sourceDonnees, String observations, StatutParcelle statutParcelle, Long departementId, String departementCode, String departementNom, Long communeId, String communeCode, String communeNom, Long arrondissementId, String arrondissementCode, String arrondissementNom, Long quartierId, String quartierCode, String quartierNom, Integer geomSrid, Polygon geometry, String geometryString, Long parcelleId) {
+    public ParcelleGeomPaylaodWeb(Long id, String nup, String nupProvisoire, String longitude, String latitude, String numeroRue, String numeroEntreePorte, String codeInstad, String numeroEtatLieux, String numeroTitreFoncier, LocalDate dateTitreFoncier, Boolean batie, String npi, String ifu, String nom, String prenom, String raisonSociale, String nomEtPrenoms, String telephone, String adresse, String nomRepresentant, String prenomRepresentant, String raisonSocialeRepresentant, String nomEtPrenomsRepresentant, String telephoneRepresentant, String adresseRepresentant, String q, String zone, String ilot, String p, String qLotissement, String ilotLotissement, String pLotissement, String pointsPolygone, Integer superficie, String dateCollecte, SourceDonnee sourceDonnees, String observations, StatutParcelle statutParcelle, Long departementId, String departementCode, String departementNom, Long communeId, String communeCode, String communeNom, Long arrondissementId, String arrondissementCode, String arrondissementNom, Long quartierId, String quartierCode, String quartierNom, int geomSrid, Polygon geometry, String geometryString, Long parcelleId) {
        this.id = id;
        this.nup = nup;
        this.nupProvisoire = nupProvisoire;
--- a/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ParcelleGeomRepository.java
+++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ParcelleGeomRepository.java
@@ -128,9 +128,9 @@ public interface ParcelleGeomRepository extends JpaRepository<ParcelleGeom, Long
        pg.batie,
        pg.npi,
        pg.ifu,
-        pers.nom,
+        pg.nom,
-        pers.prenom,
+        pg.prenom,
-        pers.raisonSociale,
+        pg.raisonSociale,
        pg.nomEtPrenoms,
        pg.telephone,
        pg.adresse,
@@ -168,18 +168,9 @@ public interface ParcelleGeomRepository extends JpaRepository<ParcelleGeom, Long
        pg.geomSrid,
        pg.geometry,
        pg.geometryString,
-        parc.id
+        pg.parcelle.id
    )
    FROM ParcelleGeom pg
    LEFT JOIN pg.parcelle parc
    LEFT JOIN Enquete e
                ON e.parcelle = parc
                AND e.dateEnquete = (
                    SELECT MAX(e2.dateEnquete)
                    FROM Enquete e2
                    WHERE e2.parcelle = parc
                )
    LEFT JOIN e.personne pers
    LEFT JOIN pg.departement d
    LEFT JOIN pg.commune c
    LEFT JOIN pg.arrondissement a
@@ -205,9 +196,9 @@ public interface ParcelleGeomRepository extends JpaRepository<ParcelleGeom, Long
            pg.batie,
            pg.npi,
            pg.ifu,
-            pers.nom,
+            pg.nom,
-            pers.prenom,
+            pg.prenom,
-            pers.raisonSociale,
+            pg.raisonSociale,
            pg.nomEtPrenoms,
            pg.telephone,
            pg.adresse,
@@ -245,18 +236,9 @@ public interface ParcelleGeomRepository extends JpaRepository<ParcelleGeom, Long
            pg.geomSrid,
            pg.geometry,
            pg.geometryString,
-            parc.id
+            pg.parcelle.id
        )
        FROM ParcelleGeom pg
        LEFT JOIN pg.parcelle parc
        LEFT JOIN Enquete e
                    ON e.parcelle = parc
                    AND e.dateEnquete = (
                        SELECT MAX(e2.dateEnquete)
                        FROM Enquete e2
                        WHERE e2.parcelle = parc
                    )
        LEFT JOIN e.personne pers
        LEFT JOIN pg.departement d
        LEFT JOIN pg.commune c
        LEFT JOIN pg.arrondissement a