From 2a53e653c3cfa06396b7fe8cd22fb6b011ca1a7c Mon Sep 17 00:00:00 2001
From: Aurince AKAKPO <judaur2005@gmail.com>
Date: Fri, 20 Feb 2026 20:33:29 +0100
Subject: [PATCH] gestion revu de code en utilisant uniquement les DTO

---
 .../rfu/metier/UniteLogementController.java   | 23 +++++++++++++
 .../rfu/metier/UniteLogementServiceImpl.java  |  5 +++
 .../rfu/metier/UniteLogementService.java      |  2 ++
 .../crudweb/EnqueteBatimentPayloadWeb.java    |  2 +-
 .../rfu/metier/UniteLogementRepository.java   | 33 +++++++++++++++++++
 5 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java
index 0432599..59c1f51 100644
--- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java
@@ -224,4 +224,27 @@ public class UniteLogementController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
+
+    @GetMapping("/by-parcelle-id/{id}")
+    public ResponseEntity<?> getUniteLogementByParcelleId(@PathVariable Long id) {
+        try {
+            return new ResponseEntity<>(
+                    new ApiResponse<>(true, enqueteUniteLogementService.getUniteLogementListByParcelle(id), "Unite de  de logement 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/implementations/rfu/metier/UniteLogementServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/UniteLogementServiceImpl.java
index a5f9abf..8d79804 100644
--- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/UniteLogementServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/UniteLogementServiceImpl.java
@@ -86,4 +86,9 @@ public class UniteLogementServiceImpl implements UniteLogementService {
     public List<UniteLogementPaylaodWeb> getUniteLogementListByBatiment(Long batimentId) {
         return uniteLogementRepository.findUnitesLogementAvecOccupantCourantByBatimentToDto(batimentId);
     }
+
+    @Override
+    public List<UniteLogementPaylaodWeb> getUniteLogementListByParcelle(Long parcelleId) {
+        return uniteLogementRepository.findAllUnitesLogementAvecOccupantCourantByParcelleToDto(parcelleId);
+    }
 }
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 1fc4d44..9c90f42 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
@@ -28,4 +28,6 @@ public interface UniteLogementService {
     Page<UniteLogementPaylaodWeb> getUniteLogementListByBatimentPageable(Long batimentId, Pageable pageable);
 
     List<UniteLogementPaylaodWeb> getUniteLogementListByBatiment(Long batimentId);
+
+    List<UniteLogementPaylaodWeb> getUniteLogementListByParcelle(Long parcelleId);
 }
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 0079420..8b3c883 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
@@ -52,7 +52,7 @@ public class EnqueteBatimentPayloadWeb {
     private String enqueteurNom;
     private String enqueteurPrenom;
     @Enumerated(EnumType.STRING)
-    @JsonIgnore
+   // @JsonIgnore
     private StatutEnquete statutEnquete;
     private Long exerciceId;
     private Integer exerciceAnnee;
diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/UniteLogementRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/UniteLogementRepository.java
index 1c61408..b39c3ca 100755
--- a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/UniteLogementRepository.java
+++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/UniteLogementRepository.java
@@ -224,5 +224,38 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
             Pageable pageable
     );
 
+    @Query("""
+            SELECT new io.gmss.fiscad.paylaods.request.crudweb.UniteLogementPaylaodWeb(
+                ul.id,
+                ul.nul,
+                ul.numeroEtage,
+                ul.code,
+            
+                b.id,
+                eul.superficieAuSol,
+                eul.superficieLouee,
+                b.nub,
+                eul.observation,
+                ul.dateConstruction,
+            
+                per.id,
+                per.nom,
+                per.prenom,
+                per.raisonSociale,
+                eul.id
+            )
+            FROM UniteLogement ul
+            JOIN ul.batiment b
+            LEFT JOIN EnqueteUniteLogement eul
+                   ON eul.uniteLogement = ul
+                  AND eul.dateEnquete = (
+                        SELECT MAX(eul2.dateEnquete)
+                        FROM EnqueteUniteLogement eul2
+                        WHERE eul2.uniteLogement = ul
+                  )
+            LEFT JOIN eul.personne per
+            where b.parcelle.id = :parcelleId
+            """)
+    List<UniteLogementPaylaodWeb> findAllUnitesLogementAvecOccupantCourantByParcelleToDto(@Param("parcelleId") Long parcelleId);
 
 }
-- 
2.49.1