From e0a211d8bd6007dfda6e4e8366300908f68d2c3d Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Thu, 19 Feb 2026 21:22:46 +0100 Subject: [PATCH 1/2] gestion revu de code en utilisant uniquement les DTO --- .../java/io/gmss/fiscad/entities/infocad/metier/Upload.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java index fcc4b59..15dc538 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java @@ -96,8 +96,7 @@ public class Upload extends BaseEntity implements Serializable { String url = this.serverContext() + fileName; System.out.println("url = " + url); // return url != null ? url.toLowerCase().startsWith("https") ? url : url.toLowerCase().replaceFirst("http", "https") : null; - return url ;//!= null ? url.toLowerCase().startsWith("https") ? url : url.toLowerCase().replaceFirst("http", "https") : null; - + return url != null ? url.toLowerCase().startsWith("https") ? url : url.toLowerCase().replaceFirst("http", "https") : null; } private String serverContext() { From 144a6af6f8694332579f40a771bc55a7bf1b527a Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Thu, 19 Feb 2026 21:37:28 +0100 Subject: [PATCH 2/2] gestion revu de code en utilisant uniquement les DTO --- .../CaracteristiqueBatimentPayloadWeb.java | 9 ++++++++- .../CaracteristiqueParcellePayloadWeb.java | 8 +++++++- ...aracteristiqueUniteLogementPayloadWeb.java | 8 +++++++- .../CaracteristiqueBatimentRepository.java | 20 ++++++++++++++----- .../CaracteristiqueParcelleRepository.java | 12 ++++++++--- ...aracteristiqueUniteLogementRepository.java | 20 ++++++++++++++----- 6 files changed, 61 insertions(+), 16 deletions(-) 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 9e55f3d..fb0e8e1 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 @@ -16,8 +16,12 @@ public class CaracteristiqueBatimentPayloadWeb { private String caracteristiqueLibelle; private String valeur; private String observation; + private Long typeCaracteristiqueId; + private String typeCaracteristiqueLibelle; - public CaracteristiqueBatimentPayloadWeb(Long id, Long enqueteBatimentId, LocalDate enqueteBatimentDateEnquete, Integer enqueteBatimentAnnee, Long caracteristiqueId, String caracteristiqueCode, String caracteristiqueLibelle, String valeur, String observation) { + public CaracteristiqueBatimentPayloadWeb(Long id, Long enqueteBatimentId, LocalDate enqueteBatimentDateEnquete, Integer enqueteBatimentAnnee, Long caracteristiqueId, String caracteristiqueCode, String caracteristiqueLibelle, String valeur, String observation, + Long typeCaracteristiqueId, + String typeCaracteristiqueLibelle) { this.id = id; this.enqueteBatimentId = enqueteBatimentId; this.enqueteBatimentDateEnquete = enqueteBatimentDateEnquete; @@ -27,5 +31,8 @@ public class CaracteristiqueBatimentPayloadWeb { this.caracteristiqueLibelle = caracteristiqueLibelle; this.valeur = valeur; this.observation = observation; + this.typeCaracteristiqueId = typeCaracteristiqueId; + this.typeCaracteristiqueLibelle = typeCaracteristiqueLibelle; + } } 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 bd64368..ff48942 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 @@ -16,8 +16,12 @@ public class CaracteristiqueParcellePayloadWeb { private String caracteristiqueLibelle; private String valeur; private String observation; + private Long typeCaracteristiqueId; + private String typeCaracteristiqueLibelle; - public CaracteristiqueParcellePayloadWeb(Long id, Long enqueteId, LocalDate enqueteDateEnquete, Integer enqueteAnnee, Long caracteristiqueId, String caracteristiqueCode, String caracteristiqueLibelle, String valeur, String observation) { + public CaracteristiqueParcellePayloadWeb(Long id, Long enqueteId, LocalDate enqueteDateEnquete, Integer enqueteAnnee, Long caracteristiqueId, String caracteristiqueCode, String caracteristiqueLibelle, String valeur, String observation, + Long typeCaracteristiqueId, + String typeCaracteristiqueLibelle) { this.id = id; this.enqueteId = enqueteId; this.enqueteDateEnquete = enqueteDateEnquete; @@ -27,5 +31,7 @@ public class CaracteristiqueParcellePayloadWeb { this.caracteristiqueLibelle = caracteristiqueLibelle; this.valeur = valeur; this.observation = observation; + this.typeCaracteristiqueId = typeCaracteristiqueId; + this.typeCaracteristiqueLibelle = typeCaracteristiqueLibelle; } } 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 0081f5a..ffa9be2 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 @@ -16,8 +16,12 @@ public class CaracteristiqueUniteLogementPayloadWeb { private String caracteristiqueLibelle; private String valeur; private String observation; + private Long typeCaracteristiqueId; + private String typeCaracteristiqueLibelle; - public CaracteristiqueUniteLogementPayloadWeb(Long id, Long enqueteUniteLogementId, LocalDate enqueteUniteLogementDateEnquete, Integer enqueteUniteLogementAnnee, Long caracteristiqueId, String caracteristiqueCode, String caracteristiqueLibelle, String valeur, String observation) { + public CaracteristiqueUniteLogementPayloadWeb(Long id, Long enqueteUniteLogementId, LocalDate enqueteUniteLogementDateEnquete, Integer enqueteUniteLogementAnnee, Long caracteristiqueId, String caracteristiqueCode, String caracteristiqueLibelle, String valeur, String observation, + Long typeCaracteristiqueId, + String typeCaracteristiqueLibelle) { this.id = id; this.enqueteUniteLogementId = enqueteUniteLogementId; this.enqueteUniteLogementDateEnquete = enqueteUniteLogementDateEnquete; @@ -27,5 +31,7 @@ public class CaracteristiqueUniteLogementPayloadWeb { this.caracteristiqueLibelle = caracteristiqueLibelle; this.valeur = valeur; this.observation = observation; + this.typeCaracteristiqueId = typeCaracteristiqueId; + this.typeCaracteristiqueLibelle = typeCaracteristiqueLibelle; } } diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueBatimentRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueBatimentRepository.java index 33ea7fa..f229c1f 100755 --- a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueBatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueBatimentRepository.java @@ -55,7 +55,9 @@ public interface CaracteristiqueBatimentRepository extends JpaRepository