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

Reviewed-on: #147

src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java

@@ -44,12 +44,11 @@ public class ImpositionsTfuController {
 
 
     @PostMapping("/create")
-    public ResponseEntity<?> createImpositionsTfu(@CurrentUser UserPrincipal currentUser,@RequestBody @Valid @Validated ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    public ResponseEntity<?> createImpositionsTfu(@CurrentUser UserPrincipal currentUser,@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
         try {
             if(currentUser==null){
-
                 return new ResponseEntity<>(
-                        new ApiResponse<>(true, null, "Vous n'etes pas autorisé à accéder à cette ressource."),
+                        new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."),
                         HttpStatus.OK
                 );
             }
@@ -57,7 +56,7 @@ public class ImpositionsTfuController {
 
             if(user.getStructure().getId()!=impositionsTfuPaylaodWeb.getStructureId()){
                 return new ResponseEntity<>(
-                        new ApiResponse<>(true, null, "Vous n'etes pas autorisé à accéder à cette ressource."),
+                        new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."),
                         HttpStatus.OK
                 );
             }

src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BaremRfuBatiPayloadWeb.java

@@ -24,10 +24,18 @@ public class BaremRfuBatiPayloadWeb {
     private String quartierCode;
     private String quartierNom;
 
+    private Long communeId;
+    private String communeCode;
+    private String communeNom;
+
     public BaremRfuBatiPayloadWeb(Long id, Long valeurLocative, Double tfuMetreCarre, Long tfuMinimum, Long categorieBatimentId, String categorieBatimentNom, String categorieBatimentStanding, Long arrondissementId, String arrondissementCode, String arrondissementNom,
                                   Long quartierId,
                                   String quartierCode,
-                                  String quartierNom ) {
+                                  String quartierNom,
+                                   Long communeId,
+                                   String communeCode,
+                                   String communeNom
+                                  ) {
         this.id = id;
         this.valeurLocative = valeurLocative;
         this.tfuMetreCarre = tfuMetreCarre;
@@ -41,5 +49,8 @@ public class BaremRfuBatiPayloadWeb {
         this.quartierId = quartierId;
         this.quartierCode = quartierCode;
         this.quartierNom = quartierNom;
+        this.communeId = communeId;
+        this.communeCode = communeCode;
+        this.communeNom = communeNom;
     }
 }

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/BaremRfuRepository.java

@@ -27,12 +27,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             a.nom,
             q.id,
             q.code,
-            q.nom
+            q.nom,
+            c.id,
+            c.code,
+            c.nom
         )
         FROM BaremRfuBati b
         LEFT JOIN b.categorieBatiment cb
         LEFT JOIN b.arrondissement a
         LEFT JOIN b.quartier q
+        LEFT JOIN a.commune c
     """)
     Page<BaremRfuBatiPayloadWeb> findAllPayloadPaged(Pageable pageable);
 
@@ -50,12 +54,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             a.nom,
             q.id,
             q.code,
-            q.nom
+            q.nom,
+            c.id,
+            c.code,
+            c.nom
         )
         FROM BaremRfuBati b
         LEFT JOIN b.categorieBatiment cb
         LEFT JOIN b.arrondissement a
         LEFT JOIN b.quartier q
+        LEFT JOIN a.commune c
     """)
     List<BaremRfuBatiPayloadWeb> findAllPayload();
 
@@ -73,12 +81,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             a.nom,
             q.id,
             q.code,
-            q.nom
+            q.nom,
+            c.id,
+            c.code,
+            c.nom
         )
         FROM BaremRfuBati b
         LEFT JOIN b.categorieBatiment cb
         LEFT JOIN b.arrondissement a
         LEFT JOIN b.quartier q
+        LEFT JOIN a.commune c
         WHERE a.id = :arrondissementId
     """)
     List<BaremRfuBatiPayloadWeb> findByArrondissementId(
@@ -99,12 +111,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             a.nom,
             q.id,
             q.code,
-            q.nom
+            q.nom,
+            c.id,
+            c.code,
+            c.nom
         )
         FROM BaremRfuBati b
         LEFT JOIN b.categorieBatiment cb
         LEFT JOIN b.arrondissement a
         LEFT JOIN b.quartier q
+        LEFT JOIN a.commune c
         WHERE b.id = :baremRfuBatiId
     """)
     Optional<BaremRfuBatiPayloadWeb> findByBaremRfuBatieId(
@@ -125,12 +141,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             a.nom,
             q.id,
             q.code,
-            q.nom
+            q.nom,
+            c.id,
+            c.code,
+            c.nom
         )
         FROM BaremRfuBati b
         LEFT JOIN b.categorieBatiment cb
         LEFT JOIN b.arrondissement a
         LEFT JOIN b.quartier q
+        LEFT JOIN a.commune c
         WHERE a.id = :arrondissementId
     """)
     Page<BaremRfuBatiPayloadWeb> findByArrondissementIdPaged(
@@ -152,12 +172,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             a.nom,
             q.id,
             q.code,
-            q.nom
+            q.nom,
+            c.id,
+            c.code,
+            c.nom
         )
         FROM BaremRfuBati b
         LEFT JOIN b.categorieBatiment cb
         LEFT JOIN b.arrondissement a
         LEFT JOIN b.quartier q
+        LEFT JOIN a.commune c
         WHERE a.id = :arrondissementId
         and cb.id = :categorieBatimentId
     """)
@@ -180,12 +204,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             a.nom,
             q.id,
             q.code,
-            q.nom
+            q.nom,
+            c.id,
+            c.code,
+            c.nom
         )
         FROM BaremRfuBati b
         LEFT JOIN b.categorieBatiment cb
         LEFT JOIN b.arrondissement a
         LEFT JOIN b.quartier q
+        LEFT JOIN a.commune c
         WHERE cb.id = :categorieBatimentId
     """)
     List<BaremRfuBatiPayloadWeb> findByCategorieBatiment(
@@ -207,12 +235,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             a.nom,
             q.id,
             q.code,
-            q.nom
+            q.nom,
+            c.id,
+            c.code,
+            c.nom
         )
         FROM BaremRfuBati b
         LEFT JOIN b.categorieBatiment cb
         LEFT JOIN b.arrondissement a
         LEFT JOIN b.quartier q
+        LEFT JOIN a.commune c
         WHERE cb.id = :categorieBatimentId
         and q.id = :quartierId
     """)