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

Reviewed-on: #120

.gitea/workflows/cd-main.yml

@@ -52,10 +52,8 @@ jobs:
           echo "JAVA_HOME=$JAVA_HOME" >> "$GITHUB_ENV"
 
       # 4) Checkout du dépôt
-      #- name: Checkout repository
-      #  uses: https://gitea.com/actions/checkout@v4 #actions/checkout@v4
       - name: Checkout repository
-        run: git clone ${{ gitea.server_url }}/${{ gitea.repository }} .
+        uses: actions/checkout@v4
 
       # 5) Informations de contexte (sans secrets)
       - name: Show context information

.gitea/workflows/ci-develop.yml

@@ -52,10 +52,8 @@ jobs:
           echo "JAVA_HOME=$JAVA_HOME" >> "$GITHUB_ENV"
 
       # 4) Checkout du dépôt
-      #- name: Checkout repository
-      #  uses: https://gitea.com/actions/checkout@v4 #actions/checkout@v4
       - name: Checkout repository
-        run: git clone ${{ gitea.server_url }}/${{ gitea.repository }} .
+        uses: actions/checkout@v4
 
       # 5) Création des secrets runtime (CI uniquement)
       - name: Create runtime secrets

src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java

@@ -315,31 +315,5 @@ public class SecteurController {
     }
 
 
-    @Operation(
-            summary = "recuperer tous les secteurs d'un departement",
-            description = "Permet de récuperer l'ensemble des secteurs du departement dont l'ID est fourni en path"
-    )
-    @GetMapping("/by-departement-id/{departementId}")
-    public ResponseEntity<?> getSecteurByDepartementId(@PathVariable Long departementId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurService.getListSecteurByDepartementId(departementId), "Secteur 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);
-        }
-    }
 
 }

src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java

@@ -2,7 +2,6 @@ package io.gmss.fiscad.controllers.infocad.metier;
 
 import io.gmss.fiscad.entities.infocad.metier.Enquete;
 import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
-import io.gmss.fiscad.entities.user.User;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
 import io.gmss.fiscad.paylaods.ApiResponse;
@@ -11,8 +10,6 @@ import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb;
 import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad;
 import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
 import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
-import io.gmss.fiscad.security.CurrentUser;
-import io.gmss.fiscad.security.UserPrincipal;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -483,8 +480,5 @@ public class EnqueteController {
 
 
 
-
-
-
 }
 

src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleController.java

@@ -388,33 +388,6 @@ public class ParcelleController {
 
 
 
-    @PutMapping("/syncrhonise-etat-batie-parcelle")
-    public ResponseEntity<?> putSynchroniseEtatBatieParcelle() {
-        try {
-            Integer nombreParcelleSync= parcelleService.majParcelleBatieNonbatie();
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true,nombreParcelleSync , "Parcelle mise à jour avec succes."),
-                    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);
-        }
-    }
-
-
-
 
 
 

src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleGeomController.java

@@ -20,7 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "ParcelleGeometrie")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class ParcelleGeomController {
 
     private final ParcelleGeomService parcelleGeomService;
@@ -63,24 +63,6 @@ public class ParcelleGeomController {
         );
     }
 
-
-    @GetMapping("/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getParcellesGeomsByQuartierId(@PathVariable Long quartierId) {
-        return new ResponseEntity<>(
-                new ApiResponse<>(true, parcelleGeomService.getParcelleGeomListByQuatierId(quartierId), "Liste des parcelle chargée avec succès."),
-                HttpStatus.OK
-        );
-    }
-
-    @GetMapping("/page/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getParcellesGeomsByQuartierIdPaged(@PathVariable Long quartierId,@RequestParam int pageNo, @RequestParam int pageSize) {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-        return new ResponseEntity<>(
-                new ApiResponse<>(true, parcelleGeomService.getParcelleGeomListByQuatierIdPaged(quartierId,pageable), "Liste des parcelle chargée avec succès."),
-                HttpStatus.OK
-        );
-    }
-
     @GetMapping("/by-arrondissement/{codeArrondissement}")
     public ResponseEntity<?> getParcellesGeomsByArrondissement(@PathVariable String codeArrondissement) {
         return new ResponseEntity<>(

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

@@ -167,11 +167,11 @@ public class CaracteristiqueBatimentController {
         }
     }
 
-    @GetMapping("/by-enquete-batiment-id/{enqueteBatimentId}")
-    public ResponseEntity<?> getCaracteristiqueBatimentByBatimentId(@PathVariable Long enqueteBatimentId) {
+    @GetMapping("/by-enquete-batiment-id/{batimentId}")
+    public ResponseEntity<?> getCaracteristiqueBatimentByBatimentId(@PathVariable Long enquteBatimentId) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueBatimentService.getCaracteristiqueBatimentListByEnqueteBatiment(enqueteBatimentId), "Caracteristique du batiment trouvée avec succès."),
+                    new ApiResponse<>(true, caracteristiqueBatimentService.getCaracteristiqueBatimentListByEnqueteBatiment(enquteBatimentId), "Caracteristique du batiment trouvée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -190,12 +190,12 @@ public class CaracteristiqueBatimentController {
         }
     }
 
-    @GetMapping("/page/by-enquete-batiment-id/{enqueteBatimentId}")
-    public ResponseEntity<?> getCaracteristiqueBatimentByEnqueteBatimentIdPaged(@PathVariable Long enqueteBatimentId,@RequestParam int pageNo, @RequestParam int pageSize) {
+    @GetMapping("/page/by-enquete-batiment-id/{batimentId}")
+    public ResponseEntity<?> getCaracteristiqueBatimentByEnqueteBatimentIdPaged(@PathVariable Long enquteBatimentId,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueBatimentService.getCaracteristiqueBatimentListByEnqueteBatimentPageable(enqueteBatimentId,pageable), "Caracteristique du batiment trouvée avec succès."),
+                    new ApiResponse<>(true, caracteristiqueBatimentService.getCaracteristiqueBatimentListByEnqueteBatimentPageable(enquteBatimentId,pageable), "Caracteristique du batiment trouvée avec succès."),
             HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

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

@@ -199,7 +199,7 @@ public class CaracteristiqueUniteLogementController {
         }
     }
 
-    @GetMapping("/page/by-enquete-ulo-id/{enqueteUloId}")
+    @GetMapping("/page//by-enquete-ulo-id/{enqueteUloId}")
     public ResponseEntity<?> getAllCaracteristiqueUniteLogementByEulPaged(@PathVariable Long enqueteUloId,@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);

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

@@ -7,10 +7,7 @@ import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.DonneesImpositionTfuService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
 import io.gmss.fiscad.persistence.repositories.rfu.metier.ImpositionsTfuRepository;
-import io.gmss.fiscad.security.CurrentUser;
-import io.gmss.fiscad.security.UserPrincipal;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -163,104 +160,6 @@ public class DonneesImpositionTfuController {
         }
     }
 
-
-    @GetMapping("/all-page/by-imposition-id/{impositionId}")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdPageable(impositionId, pageable), "Liste des caractéristiques chargé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);
-        }
-    }
-
-    @GetMapping("/all-page/by-imposition-id/non-batie/{impositionId}")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdNonBatiePaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdNonBatiePageable(impositionId, pageable), "Liste des caractéristiques chargé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);
-        }
-    }
-
-
-    @GetMapping("/all-page/by-imposition-id/batie-batiment/{impositionId}")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdBatieBatimentPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdBatieBatimentPageable(impositionId, pageable), "Liste des caractéristiques chargé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);
-        }
-    }
-
-    @GetMapping("/all-page/by-imposition-id/batie-unite-logement/{impositionId}")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdBatieUniteLogPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdBatieUniteLogPageable(impositionId, pageable), "Liste des caractéristiques chargé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);
-        }
-    }
-
     @GetMapping("/id/{id}")
     public ResponseEntity<?> getDonneesImpositionTfuById(@PathVariable Long id) {
         try {
@@ -283,91 +182,31 @@ public class DonneesImpositionTfuController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    @Operation(summary = "Générer les données fiscales TFU des parcelle baties")
-    @PostMapping("/generer-batie")
-    public ResponseEntity<?> genererDonneesFiscaleBatie(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    @Operation(summary = "Générer les données fiscales TFU")
+    @PostMapping("/generer")
+    public ResponseEntity<?> genererDonneesFiscale(@RequestBody ImpositionsTfu impositionsTfu) {
         try {
-            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
+            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfu.getId());
 
             if(optionalImpositionsTfu.isEmpty()){
                 return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "L'instance d'imposition n'est pas trouvée."),
+                        new ApiResponse<>(false, null, "L'imposition tfu n'est pas trouvée."),
                         HttpStatus.OK
                 );
             }
 
-            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.TFU_FNB_GENERE)){
+            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.CREE)){
                 return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "l'état actuel : "+optionalImpositionsTfu.get().getStatusAvis()+" ne permet pas cette opération."),
+                        new ApiResponse<>(false, null, "le statut actuel ne permet pas cette opération."),
                         HttpStatus.OK
                 );
             }
 
-           if(userPrincipal==null){
-               return new ResponseEntity<>(
-                       new ApiResponse<>(false, null, "Vous n'êtes pas autorisé à accéder à cette ressource"),
-                       HttpStatus.OK
-               );
-           }
-            impositionsTfuPaylaodWeb=donneesImpositionTfuService.genererDonneesFiscalesParcelleBatie(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId());
-
+            optionalImpositionsTfu.get().setStatusAvis(StatusAvis.GENERE);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true,impositionsTfuPaylaodWeb, "Données d'imposition des fonciers batis Générées avec succès."),
+                    new ApiResponse<>(true, donneesImpositionTfuService.genererDonneesFiscales(optionalImpositionsTfu.get()), "DonneesImpositionTfu 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);
-        }
-    }
-
-
-
-
-    @Operation(summary = "Générer les données fiscales TFU des parcelle baties")
-    @PostMapping("/generer-non-batie")
-    public ResponseEntity<?> genererDonneesImpositionNonBaties(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
-        try {
-            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
-
-            if(optionalImpositionsTfu.isEmpty()){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "L'instance d'imposition n'est pas trouvée."),
-                        HttpStatus.OK
-                );
-            }
-
-            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.GENERATION_AUTORISE)){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "l'état actuel : "+optionalImpositionsTfu.get().getStatusAvis()+" ne permet pas cette opération."),
-                        HttpStatus.OK
-                );
-            }
-
-            if(userPrincipal==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "Vous n'êtes pas autorisé à accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            }
-            impositionsTfuPaylaodWeb=donneesImpositionTfuService.genererDonneesFiscalesParcelleNonBatie(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId());
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true,impositionsTfuPaylaodWeb, "Données d'imposition pour les fonciers non batis Générées 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);

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

@@ -2,21 +2,12 @@ package io.gmss.fiscad.controllers.rfu.metier;
 
 
 import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
-import io.gmss.fiscad.entities.user.User;
-import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
 import io.gmss.fiscad.interfaces.rfu.metier.ImpositionsTfuService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
-import io.gmss.fiscad.security.CurrentUser;
-import io.gmss.fiscad.security.UserPrincipal;
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import jakarta.ws.rs.NotAcceptableException;
-import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.PageRequest;
@@ -30,7 +21,6 @@ import org.springframework.web.client.HttpClientErrorException;
 
 
 @RestController
-@AllArgsConstructor
 @RequestMapping(value = "api/impositions-tfu", produces = MediaType.APPLICATION_JSON_VALUE)
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Impositions TFU")
@@ -38,32 +28,41 @@ import org.springframework.web.client.HttpClientErrorException;
 public class ImpositionsTfuController {
 
     private final ImpositionsTfuService impositionsTfuService;
-    private final EnqueteService enqueteService;
     private static final Logger logger = LoggerFactory.getLogger(ImpositionsTfuController.class);
 
-
+    public ImpositionsTfuController(ImpositionsTfuService impositionsTfuService) {
+        this.impositionsTfuService = impositionsTfuService;
+    }
 
     @PostMapping("/create")
-    public ResponseEntity<?> createImpositionsTfu(@CurrentUser UserPrincipal currentUser,@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    public ResponseEntity<?> createImpositionsTfu(@RequestBody @Valid @Validated ImpositionsTfu impositionsTfu) {
         try {
-            if(currentUser==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."),
-                        HttpStatus.OK
-                );
-            }
-            User user=currentUser.getUser();
-
-            if(user.getStructure().getId()!=impositionsTfuPaylaodWeb.getStructureId()){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."),
-                        HttpStatus.OK
-                );
-            }
-
-            impositionsTfuPaylaodWeb = impositionsTfuService.createImpositionsTfu(impositionsTfuPaylaodWeb);
+            impositionsTfu = impositionsTfuService.createImpositionsTfu(impositionsTfu);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuPaylaodWeb, "Unite de logement créé avec succès."),
+                    new ApiResponse<>(true, impositionsTfu, "Unite de logement créé 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);
+        }
+    }
+
+    @PutMapping("/update/{id}")
+    public ResponseEntity<?> updateImpositionsTfu(@PathVariable Long id, @RequestBody ImpositionsTfu impositionsTfu) {
+        try {
+            return new ResponseEntity<>(
+                    new ApiResponse<>(true, impositionsTfuService.updateImpositionsTfu(id, impositionsTfu), "Unite de logement mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -83,27 +82,11 @@ public class ImpositionsTfuController {
     }
 
 
-    @PutMapping("/cloturer-enquete")
-    public ResponseEntity<?> cloturer(@CurrentUser UserPrincipal userPrincipal, @RequestBody  ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb ) {
+    @PutMapping("/valider/{id}")
+    public ResponseEntity<?> validerImpositionsTfu(@RequestBody ImpositionsTfu impositionsTfu) {
         try {
-
-            if(userPrincipal==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true, null, "Accès non autorisé"),
-                        HttpStatus.NOT_ACCEPTABLE
-                );
-            }
-
-
-            User user= userPrincipal.getUser();
-            if(user.getStructure().getId()!=impositionsTfuPaylaodWeb.getStructureId()){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous n'êtes pas autorisé à cloturer les enquetes du : "+user.getStructure().getNom()),
-                        HttpStatus.OK
-                );
-            }
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.cloturerImpositionsTfu(impositionsTfuPaylaodWeb), "enquete cloturées avec succès."),
+                    new ApiResponse<>(true, impositionsTfuService.validerImpositionsTfu(impositionsTfu), "Unite de logement mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -122,62 +105,11 @@ public class ImpositionsTfuController {
         }
     }
 
-//    @PutMapping("/update/{id}")
-//    public ResponseEntity<?> updateImpositionsTfu(@PathVariable Long id, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
-//        try {
-//            return new ResponseEntity<>(
-//                    new ApiResponse<>(true, impositionsTfuService.updateImpositionsTfu(id, impositionsTfuPaylaodWeb), "Unite de logement mise à jour 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);
-//        }
-//    }
-
-    @Operation(
-            summary = "Autoriser la génération des avis d'un centre",
-            description = "Permet d'autoriser la génération des avis d'un centre pour un exervice données"
-    )
-
-    @PutMapping("/autoriser-generation-avis")
-    public ResponseEntity<?> autoriserImpositionsTfu(@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    @PutMapping("/annuler/{id}")
+    public ResponseEntity<?> annulerImpositionsTfu(@PathVariable Long id, @RequestBody ImpositionsTfu impositionsTfu) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.autoriserGenerationImpositionsTfu(impositionsTfuPaylaodWeb), "Unite de logement mise à jour 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);
-        }
-    }
-
-    @PutMapping("/rejeter")
-    public ResponseEntity<?> annulerImpositionsTfu(@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.rejeterImpositionsTfu(impositionsTfuPaylaodWeb), "Unite de logement mise à jour avec succès."),
+                    new ApiResponse<>(true, impositionsTfuService.annulerImpositionsTfu(impositionsTfu), "Unite de logement mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -220,19 +152,11 @@ public class ImpositionsTfuController {
         }
     }
 
-    @GetMapping("/all/by-user")
-    public ResponseEntity<?> getAllImpositionsTfuList(@CurrentUser UserPrincipal userPrincipal) {
+    @GetMapping("/all")
+    public ResponseEntity<?> getAllImpositionsTfuList() {
         try {
-
-            if(userPrincipal==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true, null, "Vous n'êtes pas autorisé à acceder à cette ressource"),
-                        HttpStatus.OK
-                );
-            }
-            User user= userPrincipal.getUser();
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.getImpositionsTfuByUserIdIds(user.getId()), "Liste des Enquetes des unites Logements chargée avec succès."),
+                    new ApiResponse<>(true, impositionsTfuService.getImpositionsTfuList(), "Liste des Enquetes des unites Logements chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

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

@@ -224,27 +224,4 @@ 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);
-        }
-    }
 }

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuController.java

@@ -2,9 +2,8 @@ package io.gmss.fiscad.controllers.rfu.parametre;
 
 import io.gmss.fiscad.entities.rfu.parametre.BaremRfuBati;
 import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.rfu.parametre.BaremRfuBatiService;
+import io.gmss.fiscad.interfaces.rfu.parametre.BaremRfuService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuBatiPayloadWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -25,20 +24,20 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Barem Rfu")
 public class BaremRfuController {
-    private final BaremRfuBatiService baremRfuBatiService;
+    private final BaremRfuService baremRfuService;
     private static final Logger logger = LoggerFactory.getLogger(BaremRfuController.class);
 
-    public BaremRfuController(BaremRfuBatiService baremRfuBatiService) {
-        this.baremRfuBatiService = baremRfuBatiService;
+    public BaremRfuController(BaremRfuService baremRfuService) {
+        this.baremRfuService = baremRfuService;
     }
 
 
     @PostMapping("/create")
-    public ResponseEntity<?> createBaremRfu(@RequestBody @Valid @Validated BaremRfuBatiPayloadWeb baremRfuBatiPayloadWeb) {
+    public ResponseEntity<?> createBaremRfu(@RequestBody @Valid @Validated BaremRfuBati baremRfuBati) {
         try {
-            baremRfuBatiPayloadWeb = baremRfuBatiService.createBaremRfu(baremRfuBatiPayloadWeb);
+            baremRfuBati = baremRfuService.createBaremRfu(baremRfuBati);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiPayloadWeb, "BaremRfuBati créé avec  succès."),
+                    new ApiResponse<>(true, baremRfuBati, "BaremRfuBati créé avec  succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -58,10 +57,10 @@ public class BaremRfuController {
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateBaremRfu(@PathVariable Long id, @RequestBody BaremRfuBatiPayloadWeb baremRfuBatiPayloadWeb) {
+    public ResponseEntity<?> updateBaremRfu(@PathVariable Long id, @RequestBody BaremRfuBati baremRfuBati) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.updateBaremRfu(id, baremRfuBatiPayloadWeb), "BaremRfuBati mis à jour avec succès."),
+                    new ApiResponse<>(true, baremRfuService.updateBaremRfu(id, baremRfuBati), "BaremRfuBati mis à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -83,7 +82,7 @@ public class BaremRfuController {
     @DeleteMapping("/delete/{id}")
     public ResponseEntity<?> deleteBaremRfur(@PathVariable Long id) {
         try {
-            baremRfuBatiService.deleteBaremRfu(id);
+            baremRfuService.deleteBaremRfu(id);
             return new ResponseEntity<>(
                     new ApiResponse<>(true, "BaremRfuBati supprimée avec succès."),
                     HttpStatus.OK
@@ -108,7 +107,7 @@ public class BaremRfuController {
     public ResponseEntity<?> getAllBaremRfuList() {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.getBaremRfuList(), "Liste des baremRfus chargée avec succès."),
+                    new ApiResponse<>(true, baremRfuService.getBaremRfuList(), "Liste des baremRfus chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -133,7 +132,7 @@ public class BaremRfuController {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
 
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.getBaremRfuList(pageable), "Liste des baremRfus chargée avec succès."),
+                    new ApiResponse<>(true, baremRfuService.getBaremRfuList(pageable), "Liste des baremRfus chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -156,7 +155,7 @@ public class BaremRfuController {
     public ResponseEntity<?> getBaremRfuById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.getBaremRfuById(id), "BaremRfuBati trouvée avec succès."),
+                    new ApiResponse<>(true, baremRfuService.getBaremRfuById(id), "BaremRfuBati trouvée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -175,68 +174,13 @@ public class BaremRfuController {
         }
     }
 
-    @GetMapping("/by-categorie-batiment-id/{idCategorieBatiment}")
+    @GetMapping("/categorie-batiment/{idCategorieBatiment}")
     public ResponseEntity<?> getBaremRfuByType( //@Parameter(description = "ID de la catégorie de bâtiment", required = true)
                                                    @PathVariable Long idCategorieBatiment) {
 
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.getBaremRfuByCategorieBatiment(idCategorieBatiment), "Liste des baremRfu par categorie de batiments chargé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);
-        }
-    }
-
-
-    @GetMapping("/by-arrondissement-id/by-categorie-batiment-id/{idArrondissement}/{idCategorieBatiment}")
-    public ResponseEntity<?> getBaremRfuByArrondisementAndCategorie( //@Parameter(description = "ID de la catégorie de bâtiment", required = true)
-                                                @PathVariable Long idArrondissement,
-                                                @PathVariable Long idCategorieBatiment
-                                                ) {
-
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.getBaremRfuByArrondissementAndCategorieBatiment(idArrondissement,idCategorieBatiment), "Liste des baremRfu par categorie de batiments chargé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);
-        }
-    }
-
-    @GetMapping("/by-quartier-id/by-categorie-batiment-id/{idQuartier}/{idCategorieBatiment}")
-    public ResponseEntity<?> getBaremRfuByQuartierAndCategorie( //@Parameter(description = "ID de la catégorie de bâtiment", required = true)
-                                                                     @PathVariable Long idQuartier,
-                                                                     @PathVariable Long idCategorieBatiment
-    ) {
-
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.getBaremRfuByQuartierAndCategorieBatiment(idQuartier,idCategorieBatiment), "Liste des baremRfu par categorie de batiments chargée avec succès."),
+                    new ApiResponse<>(true, baremRfuService.getBaremRfuByType(idCategorieBatiment), "Liste des baremRfu par categorie de batiments chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuNonBatiController.java

@@ -4,7 +4,6 @@ import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.parametre.BaremRfuNonBatiService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -35,11 +34,11 @@ public class BaremRfuNonBatiController {
 
 
     @PostMapping("/create")
-    public ResponseEntity<?> createBaremRfuNonBati(@RequestBody BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) {
+    public ResponseEntity<?> createBaremRfuNonBati(@RequestBody @Valid @Validated BaremRfuNonBati baremRfuNonBati) {
         try {
-            baremRfuNonBatiPayloadWeb = baremRfuNonBatiService.createBaremRfuNonBati(baremRfuNonBatiPayloadWeb);
+            baremRfuNonBati = baremRfuNonBatiService.createBaremRfuNonBati(baremRfuNonBati);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuNonBatiPayloadWeb, "BaremRfuNonBati créé avec  succès."),
+                    new ApiResponse<>(true, baremRfuNonBati, "BaremRfuNonBati créé avec  succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -59,10 +58,10 @@ public class BaremRfuNonBatiController {
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateBaremRfuNonBati(@PathVariable Long id, @RequestBody BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) {
+    public ResponseEntity<?> updateBaremRfuNonBati(@PathVariable Long id, @RequestBody BaremRfuNonBati baremRfuNonBati) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuNonBatiService.updateBaremRfuNonBati(id, baremRfuNonBatiPayloadWeb), "BaremRfuNonBati mis à jour avec succès."),
+                    new ApiResponse<>(true, baremRfuNonBatiService.updateBaremRfuNonBati(id, baremRfuNonBati), "BaremRfuNonBati mis à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -157,31 +156,7 @@ public class BaremRfuNonBatiController {
     public ResponseEntity<?> getBaremRfuNonBatiById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuNonBatiService.getBaremRfuNonBatiById(id).orElse(null), "BaremRfuNonBati 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);
-        }
-    }
-
-
-    @GetMapping("/by-commune-id/by-zone-id/{communeId}/{zoneId}")
-    public ResponseEntity<?> getBaremRfuNonBatiByCommineAndZoneId(@PathVariable Long communeId, Long zoneId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuNonBatiService.getBaremRfuNonBatiByCommuneAndZoneId(communeId,zoneId).orElse(null), "BaremRfuNonBati trouvée avec succès."),
+                    new ApiResponse<>(true, baremRfuNonBatiService.getBaremRfuNonBatiById(id), "BaremRfuNonBati trouvée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/UsageController.java

@@ -1,180 +0,0 @@
-package io.gmss.fiscad.controllers.rfu.parametre;
-
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.rfu.parametre.UsageService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-
-@RestController
-@RequestMapping(value = "api/usage", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "Usage")
-public class UsageController {
-
-    private final UsageService usageService;
-    private static final Logger logger = LoggerFactory.getLogger(UsageController.class);
-
-    public UsageController(UsageService usageService) {
-        this.usageService = usageService;
-    }
-
-
-    @PostMapping("/create")
-    public ResponseEntity<?> createUsage(@RequestBody @Valid @Validated Usage usage) {
-        try {
-            usage = usageService.createUsage(usage);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, usage, "Usage créé 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);
-        }
-    }
-
-    @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateUsage(@PathVariable Long id, @RequestBody Usage usage) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, usageService.updateUsage(id, usage), "Usage mis à jour 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);
-        }
-    }
-
-    @DeleteMapping("/delete/{id}")
-    public ResponseEntity<?> deleteUsager(@PathVariable Long id) {
-        try {
-            usageService.deleteUsage(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "Usage supprimé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);
-        }
-    }
-
-    @GetMapping("/all")
-    public ResponseEntity<?> getAllUsageList() {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, usageService.getUsageList(), "Liste des usages chargé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);
-        }
-    }
-
-    @GetMapping("/all-paged")
-    public ResponseEntity<?> getAllUsagePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, usageService.getUsageList(pageable), "Liste des usages chargé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);
-        }
-    }
-
-    @GetMapping("/id/{id}")
-    public ResponseEntity<?> getUsageById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, usageService.getUsageById(id), "Usage 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);
-        }
-    }
-
-
-}
-

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;

src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java

@@ -188,7 +188,6 @@ public class Enquete extends BaseEntity implements Serializable {
     private Long montantAnnuelleLocation;
     private Long valeurParcelleEstime;
     private Long valeurParcelleReel;
-    private Long valeurParcelleCalcule;
     private String ncProprietaire;
 
     @JsonFormat(pattern = "dd-MM-yyyy")

src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java

@@ -1,15 +1,11 @@
 package io.gmss.fiscad.entities.infocad.metier;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.fiscad.deserializer.LocalDateDeserializer;
 import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.decoupage.Quartier;
 import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
 import io.gmss.fiscad.entities.infocad.parametre.TypeDomaine;
 import io.gmss.fiscad.entities.rfu.metier.Batiment;
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
 import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.ColumnDefault;
@@ -72,17 +68,6 @@ public class Parcelle extends BaseEntity implements Serializable {
     @ManyToOne
     private Rue rue ;
     private String numeroRue ;
-    private Boolean batie;
-    private Integer nombrePiscine;
-    @ManyToOne
-    private Usage usage;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateDebutExemption;
-
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateFinExemption;
   //  private String ncProprietaire ;
 //    @JsonIgnore
 //    @OneToMany(mappedBy = "parcelle")

src/main/java/io/gmss/fiscad/entities/infocad/metier/ParcelleGeom.java

@@ -10,7 +10,6 @@ import io.gmss.fiscad.entities.decoupage.Arrondissement;
 import io.gmss.fiscad.entities.decoupage.Commune;
 import io.gmss.fiscad.entities.decoupage.Departement;
 import io.gmss.fiscad.entities.decoupage.Quartier;
-import io.gmss.fiscad.enums.SourceDonnee;
 import io.gmss.fiscad.enums.StatutParcelle;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
@@ -25,7 +24,6 @@ import org.n52.jackson.datatype.jts.GeometryDeserializer;
 import org.n52.jackson.datatype.jts.GeometrySerializer;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 
 @EqualsAndHashCode(callSuper = true)
 @Entity
@@ -41,63 +39,27 @@ public class ParcelleGeom extends BaseEntity implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+    private String NomDepartement;
+    private String NomCommune;
+    private String NomArrondissement;
+    private String NomVillageQuartier;
+    private String codeBloc;
+    private String q;
+    private String ilot;
+    private String zone;
+    private String p;
     @Column(unique = true,nullable = true)
     private String nup;
     @Column(unique = true,nullable = true)
     private String nupProvisoire;
     private String longitude;
     private String latitude;
-    private String codeDepartement;
-    private String nomDepartement;
-    private String codeCommune;
-    private String nomCommune;
-    private String codeArrondissement;
-    private String nomArrondissement;
-    private String codeQuartierVillage;
-    private String nomVillageQuartier;
-    private String codeBloc;
-    private String numeroRue;
-    private String numeroEntreePorte;
-
-    private String codeInstad;
-    private String numeroEtatLieux;
-    private String numeroTitreFoncier;
-    private LocalDate dateTitreFoncier;
-    private Boolean batie ;
-
-    private String npi;
-    private String ifu;
-    private String nom;
-    private String prenom;
-    private String raisonSociale;
-    private String nomEtPrenoms;
-    private String telephone;
-    private String adresse;
-
-    private String nomRepresentant;
-    private String prenomRepresentant;
-    private String raisonSocialeRepresentant;
-    private String nomEtPrenomsRepresentant;
-    private String telephoneRepresentant;
-    private String adresseRepresentant;
-
-    private String q;
-    private String zone;
-    private String ilot;
-    private String p;
-
-    private String qLotissement;
-    private String ilotLotissement;
-    private String pLotissement;
-
     private String pointsPolygone;
     private Integer superficie;
-
+    private String nomEtPrenoms;
     private String dateCollecte;
-    @Enumerated(EnumType.STRING)
-    private SourceDonnee sourceDonnees;
+    private String sourceDonnees;
     private String observations;
-
     @Enumerated(EnumType.STRING)
     private StatutParcelle statutParcelle;
     private Long uploadId;
@@ -115,22 +77,35 @@ public class ParcelleGeom extends BaseEntity implements Serializable {
     private Arrondissement arrondissement;
 
     @ManyToOne //(fetch = FetchType.LAZY)
-    @JsonBackReference
+    //@JsonBackReference
     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)")
     private Polygon geometry;
     @Column(columnDefinition = "TEXT")
     private String geometryString;
+    private String codeInsae;
+    private String numeroEtatLieux;
+    private String numeroTitreFoncier;
+    private String telephone;
+    //private String codeParcelle;
+    //private String codeEquipe;
 
-    @JsonIgnore
-    @ManyToOne
-    @JsonBackReference
-    private Parcelle parcelle;
+    //private String elLot;
+    //private String elLettreParcelle;
+    //private String rfuQuartierOuZone;
+    //private String rfuIlot;
+    //private String rfuLettreParcelle;
+
+    //private String nomLotissement;
+    ////////////
+//    @JsonIgnore
+//    @OneToOne
+//    private Parcelle parcelle;
 //    @JsonSerialize(using = GeometrySerializer.class)
 //    @JsonDeserialize(contentUsing = GeometryDeserializer.class)
 //    @Column(name = "geom",columnDefinition = "geometry(Polygon,4326)")

src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java

@@ -96,7 +96,8 @@ 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() {

src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java

@@ -7,14 +7,11 @@ import io.gmss.fiscad.deserializer.LocalDateDeserializer;
 import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.infocad.metier.Parcelle;
 import io.gmss.fiscad.entities.infocad.metier.Tpe;
-import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment;
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.hibernate.Internal;
 import org.hibernate.annotations.Where;
 
 import java.io.Serializable;
@@ -39,40 +36,15 @@ public class Batiment extends BaseEntity implements Serializable {
     private Long idDerniereEnquete;
     private Float superficieLouee;
     private Float superficieAuSol;
-    private Integer nombreEtage;
-    private Integer nombrePiscine;
-    private Long montantLocatifAnnuelDeclare;
-    private Long montantLocatifAnnuelCalcule;
-    private Long montantLocatifAnnuelEstime;
-    private Long valeurBatimentEstime;
-    private Long valeurBatimentReel;
-    private Long valeurBatimentCalcule;
-    private Long montantMensuelLocation;
-    private Integer nbreUniteLogement;
-    private Integer idToitRfu;
 
     @JsonIgnore
     @ManyToOne
     private Parcelle parcelle;
 
-    @ManyToOne
-    private Usage usage;
-
-
-    @ManyToOne
-    private CategorieBatiment categorieBatiment ;
-
     @JsonIgnore
     @ManyToOne
     private Tpe terminal;
   //  private Long enqueteId;
     private Long mobileDataId;
     private Long parcelleExternalKey;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateDebutExemption;
-
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateFinExemption;
 }

src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java

@@ -47,5 +47,3 @@ public class CaracteristiqueUniteLogement extends BaseEntity implements Serializ
     private Long enqueteId;
     private Long mobileDataId;
 }
-
-

src/main/java/io/gmss/fiscad/entities/rfu/metier/DonneesImpositionTfu.java

@@ -8,9 +8,6 @@ import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.infocad.metier.Enquete;
 import io.gmss.fiscad.entities.infocad.metier.Parcelle;
 import io.gmss.fiscad.entities.infocad.metier.Tpe;
-import io.gmss.fiscad.entities.infocad.parametre.Structure;
-import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
-import io.gmss.fiscad.enums.NatureImpot;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -74,17 +71,11 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
     private int superficieParc;
     private Long superficieAuSolBat;
     private Long superficieAuSolUlog;
-    //private String batieOuiNon;
-    //private String exhonereOuiNon;
-    //private String batimentExhonereOuiNon;
-    //private String uniteLogementExhonereOuiNon;
-    private Boolean batie;
-    private Boolean exonere;
-    private Boolean batimentExonere;
-    private Boolean uniteLogementExonere;
+    private String batieOuiNon;
+    private String exhonereOuiNon;
+    private String batimentExhonereOuiNon;
+    private String uniteLogementExhonereOuiNon;
     private Long valeurLocativeAdm;
-    private Long valeurLocativeAdm70Pour100;
-    private Long valeurLocativeAdmMetreCarre;
     private Long montantLoyerAnnuel;
     private Long tfuMetreCarre;
     private Long tfuMinimum;
@@ -97,30 +88,14 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateEnquete;
     private Long enqueteId;
-    //private Long structureId;
-    @JsonIgnore
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "structure_id")
-    private Structure structure ;
-
+    private Long structureId;
     private Long secteurId;
-
-    //private Long zoneRfuId;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "zone_rfu_id")
-    private ZoneRfu zoneRfu ;
-
+    private Long zoneRfuId;
     @ColumnDefault("0")
-    private Long valeurAdminParcelleNb;
-    private Float tauxTfu;
-    private Float montantTaxe;
-    private Long valeurAdminParcelleNbMetreCarre;
+    private float tauxParcelleNonBati;
+    private Long valeurAdministrativeParcelleNonBati;
     @JsonIgnore
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "impositions_tfu_id", nullable = false)
-    private ImpositionsTfu impositionsTfu ;
-    @Enumerated(EnumType.STRING)
-    private NatureImpot natureImpot;
-    private Long valeurBatiment;
-    private Long valeurParcelle;
+    private ImpositionsTfu impositionsTfu;
 }

src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java

@@ -12,9 +12,7 @@ import io.gmss.fiscad.entities.infocad.metier.Tpe;
 import io.gmss.fiscad.entities.infocad.metier.Upload;
 import io.gmss.fiscad.entities.infocad.parametre.Personne;
 import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
-import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment;
 import io.gmss.fiscad.entities.rfu.parametre.Exercice;
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
 import io.gmss.fiscad.entities.user.User;
 import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.enums.StatutEnregistrement;
@@ -54,8 +52,6 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
     private Boolean soneb;
     private String numCompteurSoneb;
     private Integer nbreLotUnite;
-    private Integer nbreUniteLogement;
-    private Integer nbrePiece;
     private Integer nbreUniteLocation;
     private Float superficieLouee;
     private Float superficieAuSol;
@@ -63,12 +59,8 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
     private Integer nbreHabitant;
     private Long montantMensuelLocation;
     private Long montantLocatifAnnuelDeclare;
-    private Long montantLocatifAnnuelEstime;
-    private Long montantLocatifAnnuelCalcule;
     private Long valeurBatimentEstime;
     private Long valeurBatimentReel;
-    private Long valeurBatimentCalcule;
-    private Integer nombrePiscine;
     private Integer nbreMoisLocation;
     private String autreCaracteristiquePhysique;
     private String observation;
@@ -134,9 +126,4 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
     @Enumerated(EnumType.STRING)
     @JsonIgnore
     private StatutEnquete statutEnquete;
-    @ManyToOne
-    private CategorieBatiment categorieBatiment ;
-    @ManyToOne
-    private Usage usage ;
-
 }

src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java

@@ -11,9 +11,7 @@ import io.gmss.fiscad.entities.infocad.metier.Enquete;
 import io.gmss.fiscad.entities.infocad.metier.Tpe;
 import io.gmss.fiscad.entities.infocad.metier.Upload;
 import io.gmss.fiscad.entities.infocad.parametre.Personne;
-import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment;
 import io.gmss.fiscad.entities.rfu.parametre.Exercice;
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
 import io.gmss.fiscad.entities.user.User;
 import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.enums.StatutEnregistrement;
@@ -49,15 +47,11 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
     private Integer nbreHabitant;
     private Integer nbreMenage;
     private Boolean enLocation;
-    private Long montantMensuelLocation;
+    private Float montantMensuelLoyer;
     private Integer nbreMoisLocation;
-    private Long montantLocatifAnnuelDeclare;
-    private Long montantLocatifAnnuelCalcule;
-    private Long montantLocatifAnnuelEstime;
+    private Float montantLocatifAnnuelDeclare;
     private Long valeurUniteLogementEstime;
     private Long valeurUniteLogementReel;
-    private Long valeurUniteLogementCalcule;
-    private Integer nombrePiscine;
     private Float superficieLouee;
     private Float superficieAuSol;
     private Boolean sbee;
@@ -120,8 +114,5 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
     @JsonIgnore
     @Enumerated(EnumType.STRING)
     private StatutEnquete statutEnquete;
-    @ManyToOne
-    private CategorieBatiment categorieBatiment ;
-    @ManyToOne
-    private Usage usage ;
+
 }

src/main/java/io/gmss/fiscad/entities/rfu/metier/ImpositionsTfu.java

@@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.gmss.fiscad.deserializer.LocalDateDeserializer;
 import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.decoupage.Commune;
-import io.gmss.fiscad.entities.infocad.parametre.Structure;
 import io.gmss.fiscad.entities.rfu.parametre.Exercice;
 import io.gmss.fiscad.entities.rfu.parametre.Participer;
 import io.gmss.fiscad.enums.StatusAvis;
@@ -34,39 +33,24 @@ public class ImpositionsTfu extends BaseEntity implements Serializable {
     private Long id;
     @ManyToOne
     private Exercice exercice;
-
     @ManyToOne
     private Commune commune;
-
-    @ManyToOne
-    private Structure structure ;
-
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateGeneration;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateCloture;
-
-    private String referencePieceAdmin;
+    private String ReferencePieceAdmin;
     private String datePieceAdmin;
-
     @Enumerated(EnumType.STRING)
     private StatusAvis statusAvis;
-
-    private Integer nombreAvis;
-    private Integer nombreAvisFnb;
-    private Integer nombreAvisBatiment;
-    private Integer nombreAvisUniteLog;
-
+    private Long nombreAvis;
     @Column(columnDefinition = "TEXT")
     private String motif;
-
     @JsonIgnore
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     @JoinColumn(name = "impositions_tfu_id")
     private List<DonneesImpositionTfu> donneesImpositionTfus;
 
-
+    public  Long getNombreAvis(){
+        return donneesImpositionTfus==null?0l:donneesImpositionTfus.size();
+    }
 }

src/main/java/io/gmss/fiscad/entities/rfu/metier/SituationFiscaleParcelle.java

@@ -39,6 +39,7 @@ public class SituationFiscaleParcelle extends BaseEntity implements Serializable
     private Long montantDu ;
     private Long montantPaye ;
     private Long resteAPayer ;
+    private StatutParcelle etatFiscalParcelle ;
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateSync;

src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java

@@ -6,8 +6,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.gmss.fiscad.deserializer.LocalDateDeserializer;
 import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.infocad.metier.Tpe;
-import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment;
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -41,33 +39,13 @@ public class UniteLogement extends BaseEntity implements Serializable {
     private List<EnqueteUniteLogement> enqueteUniteLogements;
     @ManyToOne
     private Batiment batiment;
-    @ManyToOne
-    private Usage usage;
     private Long batimentExternalKey;
     private Long idDerniereEnquete;
     private Float SuperficieLouee;
     private Float SuperficieAuSol;
-    private Long montantMensuelLocation;
-    private Long montantLocatifAnnuelDeclare;
-    private Long montantLocatifAnnuelCalcule;
-    private Long valeurUniteLogementEstime;
-    private Long valeurUniteLogementReel;
-    private Long valeurUniteLogementCalcule;
-    private Integer nombrePiscine;
     @JsonIgnore
     @ManyToOne
     private Tpe terminal;
     private Long enqueteId;
     private Long mobileDataId;
-    @ManyToOne
-    private CategorieBatiment categorieBatiment ;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateDebutExemption;
-
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateFinExemption;
-    private Integer idToitRfu;
-    private Integer nombreEtage;
 }

src/main/java/io/gmss/fiscad/entities/rfu/parametre/BaremRfuBati.java

@@ -2,7 +2,6 @@ package io.gmss.fiscad.entities.rfu.parametre;
 
 import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.decoupage.Arrondissement;
-import io.gmss.fiscad.entities.decoupage.Quartier;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -29,6 +28,4 @@ public class BaremRfuBati extends BaseEntity implements Serializable {
     private CategorieBatiment categorieBatiment;
     @ManyToOne
     private Arrondissement arrondissement;
-    @ManyToOne
-    private Quartier quartier ;
 }

src/main/java/io/gmss/fiscad/entities/rfu/parametre/BaremRfuNonBati.java

@@ -23,9 +23,7 @@ public class BaremRfuNonBati extends BaseEntity implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private Long valeurAdministrative;
-    private Long valeurAdministrativeMetreCarre;
-    private Boolean auMetreCarre;
-    private Float taux;
+    private float taux;
     @ManyToOne
     private Commune commune;
     @ManyToOne

src/main/java/io/gmss/fiscad/entities/rfu/parametre/CategorieBatiment.java

@@ -23,5 +23,4 @@ public class CategorieBatiment extends BaseEntity implements Serializable {
     @Column(unique = true)
     private String code;
     private String nom;
-    private String standing;
 }

src/main/java/io/gmss/fiscad/entities/rfu/parametre/Usage.java

@@ -1,29 +0,0 @@
-package io.gmss.fiscad.entities.rfu.parametre;
-
-import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.enums.CategorieUsage;
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Where;
-
-import java.io.Serializable;
-
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Where(clause = " deleted = false")
-public class Usage extends BaseEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private String code;
-    private String nom;
-    @Enumerated(EnumType.STRING)
-    private CategorieUsage categorieUsage;
-}
-

src/main/java/io/gmss/fiscad/enums/CategorieUsage.java

@@ -1,8 +0,0 @@
-package io.gmss.fiscad.enums;
-
-public enum CategorieUsage {
-
-    HABITATION,
-    PROFESSIONNELLE,
-    MIXTE
-}

src/main/java/io/gmss/fiscad/enums/NatureImpot.java

@@ -1,6 +0,0 @@
-package io.gmss.fiscad.enums;
-
-public enum NatureImpot {
-    TFU,
-    IRF
-}

src/main/java/io/gmss/fiscad/enums/ParametersType.java

@@ -12,8 +12,5 @@ public enum ParametersType {
     CORPS_RESET_PASSWORD,
     OBJET_CREATE_ACCOUNT,
     CORPS_CREATE_ACCOUNT,
-    TOKEN_IFU_EN_LIGNE,
-    TAUX_TFU_HABITATION,
-    TAUX_TFU_PROFESSIONNELLE,
-    TAUX_DEFAUT_SUPERFICIE_AU_SOL;
+    TOKEN_IFU_EN_LIGNE ;
 }

src/main/java/io/gmss/fiscad/enums/SourceDonnee.java

@@ -1,7 +0,0 @@
-package io.gmss.fiscad.enums;
-
-public enum SourceDonnee {
-    RFU,
-    ANDF,
-    SIGIBE
-}

src/main/java/io/gmss/fiscad/enums/StatusAvis.java

@@ -1,11 +1,8 @@
 package io.gmss.fiscad.enums;
 
 public enum StatusAvis {
-    EN_COURS,
-    CLOTURE,
-    GENERATION_AUTORISE,
-    REJETE,
-    TFU_FNB_GENERE,
-    GENERE
-
+    CREE,
+    GENERE,
+    ANNULE,
+    VALIDE,
 }

src/main/java/io/gmss/fiscad/enums/StatutEnquete.java

@@ -2,7 +2,6 @@ package io.gmss.fiscad.enums;
 
 public enum StatutEnquete {
     EN_COURS,
-  //  DECLARATION,
     FINALISE,
     REJETE,
     VALIDE,

src/main/java/io/gmss/fiscad/enums/StatutParcelle.java

@@ -2,6 +2,9 @@ package io.gmss.fiscad.enums;
 
 public enum StatutParcelle {
     NON_ENQUETER,
-    AJOUR,
-    NON_AJOUR;
+    ENQUETER_NON_BATIE_AJOUR,
+    ENQUETER_BATIE_AJOUR,
+    ENQUETER_NON_BATIE_NON_AJOUR,
+    ENQUETER_BATIE_NON_AJOUR
+
 }

src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java

@@ -163,15 +163,8 @@ public class SecteurServiceImpl implements SecteurService {
                         secteurs.addAll(secteurRepository.findDistinctBySection_Id(avoirFonction.getFonction().getSection().getId()));
                     }else if(avoirFonction.getFonction().getStructure()!=null){
                         secteurs.addAll(secteurRepository.findDistinctBySection_Structure_Id(avoirFonction.getFonction().getStructure().getId()));
-                    }else if(avoirFonction.getFonction().getDepartement()!=null){
-                        secteurs.addAll(secteurRepository.findSectionsByDepartement(avoirFonction.getFonction().getDepartement().getId()));
                     }
                 });
         return secteurs;
     }
-
-    @Override
-    public List<Secteur> getListSecteurByDepartementId(Long departementId) {
-        return secteurRepository.findSectionsByDepartement(departementId);
-    }
 }

src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java

@@ -43,7 +43,6 @@ import io.gmss.fiscad.service.EntityFromPayLoadService;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.Query;
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.modelmapper.ModelMapper;
 import org.springframework.data.domain.Page;
@@ -349,7 +348,7 @@ public class EnqueteServiceImpl implements EnqueteService {
         Enquete enquete = optionalEnquete.get();
         enquete.setDateValidation(LocalDate.now());
         enquete.setStatutEnquete(StatutEnquete.VALIDE);
-        enquete.setSynchronise(true);
+        enquete.setSynchronise(false);
         return enqueteRepository.save(enquete);
     }
 
@@ -542,26 +541,4 @@ public class EnqueteServiceImpl implements EnqueteService {
     }
 
 
-    @Override
-    @Transactional
-    public int cloturerEnqueteParcelleBatimentUniteLogementByUserIdAndExerciceId(Long userId,Long exerciceId) {
-       Optional<User> optionalUser= userRepository.findById(userId);
-       int nbreEnquete=0;
-       if(optionalUser.isPresent() && optionalUser.get().getStructure()!=null){
-           Long structureId=optionalUser.get().getStructure().getId();
-           nbreEnquete=cloturerEnqueteParcelleBatimentUniteLogementByStructureIdAndExerciceId(structureId,exerciceId);
-       }
-        return nbreEnquete;
-    }
-
-    @Override
-    @Transactional
-    public int cloturerEnqueteParcelleBatimentUniteLogementByStructureIdAndExerciceId(Long structureId,Long exerciceId) {
-        Integer nombreParcelleImpacte=enqueteRepository.clotureEnqueteParcelle(structureId,exerciceId);
-        Integer nombreBatiment=enqueteBatimentRepository.clotureEnqueteBatiment(structureId,exerciceId);
-        Integer nombreUniteLogement=enqueteUniteLogementRepository.clotureEnqueteUniteLogement(structureId,exerciceId);
-        return nombreParcelleImpacte;
-    }
-
-
 }

src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java

@@ -8,7 +8,6 @@ import io.gmss.fiscad.entities.infocad.metier.Upload;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.infocad.metier.ParcelleGeomService;
-import io.gmss.fiscad.paylaods.request.crudweb.ParcelleGeomPaylaodWeb;
 import io.gmss.fiscad.paylaods.response.EnqueteCheckResponse;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleGeomRepository;
@@ -80,7 +79,6 @@ public class ParcelleGeomServiceImpl implements ParcelleGeomService {
         return n;
     }
 
-
     private Upload saveGeoJsonUpload(MultipartFile file,String reference,String desc) {
         Upload upload = new Upload();
         String fileName = fileStorageService.storeFile(file);
@@ -178,16 +176,6 @@ public class ParcelleGeomServiceImpl implements ParcelleGeomService {
         return parcelleGeomRepository.findAllByQuartier_Code(codeQuartier);
     }
 
-    @Override
-    public List<ParcelleGeomPaylaodWeb> getParcelleGeomListByQuatierId(Long quartierId) {
-        return parcelleGeomRepository.findAllByQuartierId(quartierId);
-    }
-
-    @Override
-    public Page<ParcelleGeomPaylaodWeb> getParcelleGeomListByQuatierIdPaged(Long quartierId, Pageable pageable) {
-        return  parcelleGeomRepository.findAllByQuartierIdPageable(quartierId,pageable);
-    }
-
     @Override
     public List<ParcelleGeom> getParcelleGeomListUnArrondissement(String codeArrondissement) {
         return parcelleGeomRepository.findAllByQuartier_Arrondissement_Code(codeArrondissement);
@@ -274,9 +262,4 @@ public class ParcelleGeomServiceImpl implements ParcelleGeomService {
     }
 
 
-    @Override
-    public int createParcelleGeomFromGeoJsonApi() throws BadRequestException {
-        return 0;
-    }
-
 }

src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java

@@ -22,7 +22,6 @@ import io.gmss.fiscad.persistence.repositories.infocad.parametre.SituationGeogra
 import io.gmss.fiscad.persistence.specification.ParcelleSpecification;
 import io.gmss.fiscad.service.GeometryService;
 import jakarta.persistence.Query;
-import jakarta.transaction.Transactional;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.*;
 import org.springframework.stereotype.Service;
@@ -194,13 +193,6 @@ public class ParcelleServiceImpl implements ParcelleService {
 
     }
 
-    @Override
-    @Transactional
-    public Integer majParcelleBatieNonbatie() {
-        return parcelleRepository.updateParcelleBatieTrue()+parcelleRepository.updateParcelleBatieFalse();
-    }
-
-
     private List<Long> getSecteurIdListForUser(Long userId) {
         List<Secteur> secteurs = secteurService.getListSecteurUserId(userId);
         List<Long> secteurIds = secteurs.stream()

src/main/java/io/gmss/fiscad/implementations/infocad/parametre/StructureServiceImpl.java

@@ -1,25 +1,20 @@
 package io.gmss.fiscad.implementations.infocad.parametre;
 
 import io.gmss.fiscad.entities.decoupage.Commune;
-import io.gmss.fiscad.entities.decoupage.Secteur;
 import io.gmss.fiscad.entities.decoupage.Section;
 import io.gmss.fiscad.entities.infocad.parametre.Structure;
-import io.gmss.fiscad.entities.user.AvoirFonction;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.infocad.parametre.StructureService;
 import io.gmss.fiscad.paylaods.request.crudweb.StructurePaylaodWeb;
 import io.gmss.fiscad.paylaods.response.StructureResponse;
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.StructureRepository;
-import io.gmss.fiscad.persistence.repositories.user.AvoirFonctionRepository;
 import io.gmss.fiscad.service.EntityFromPayLoadService;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 @AllArgsConstructor
@@ -28,7 +23,6 @@ public class StructureServiceImpl implements StructureService {
 
     private final StructureRepository structureRepository;
     private final EntityFromPayLoadService entityFromPayLoadService;
-    private final AvoirFonctionRepository avoirFonctionRepository;
 
     @Override
     public StructurePaylaodWeb createStructure(StructurePaylaodWeb structurePaylaodWeb) throws BadRequestException {
@@ -95,29 +89,5 @@ public class StructureServiceImpl implements StructureService {
         return structureRepository.findStructureToDtoById(id);
     }
 
-    @Override
-    public List<Structure> getListStructureUserId(Long userId) {
-        List<AvoirFonction> avoirFonctions= avoirFonctionRepository.findAvoirFonctionByUser_Id(userId);
-        List<Structure> structures = new ArrayList<>();
-        avoirFonctions.stream()
-                .filter(af -> af.getDateFin() == null || af.getDateFin().isAfter(LocalDate.now()))
-                .forEach(avoirFonction -> {
-                    if(avoirFonction.getFonction().getStructure()!=null){
-                        structures.addAll(List.of(avoirFonction.getFonction().getStructure()));
-                    }else if (avoirFonction.getFonction().getDepartement()!=null){
-                        structures.addAll(structureRepository.findDistinctByCommune_Departement_Id(avoirFonction.getFonction().getDepartement().getId()));
-                    }
-                });
-        return structures;
-    }
 
-
-
-//    public List<Long> getStructureIdListForUser(Long userId) {
-//        List<Structure> structures = secteurService.getListSecteurUserId(userId);
-//        List<Long> secteurIds = secteurs.stream()
-//                .map(Secteur::getId)
-//                .toList();
-//        return  secteurIds;
-//    }
 }

src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueBatimentServiceImpl.java

@@ -73,6 +73,7 @@ public class CaracteristiqueBatimentServiceImpl implements CaracteristiqueBatime
         return caracteristiqueBatimentRepository.findAllCaracteristiqueBatimentToDto();
     }
 
+
     @Override
     public Optional<CaracteristiqueBatimentPayloadWeb> getCaracteristiqueBatimentToDto(Long id) {
         if (caracteristiqueBatimentRepository.existsById(id)) {

src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java

@@ -4,12 +4,9 @@ import io.gmss.fiscad.entities.decoupage.Arrondissement;
 import io.gmss.fiscad.entities.rfu.metier.DonneesImpositionTfu;
 import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
 import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati;
-import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.rfu.metier.DonneesImpositionTfuService;
-import io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb;
-import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
 import io.gmss.fiscad.paylaods.response.DonneesImpositionTfuResponse;
 import io.gmss.fiscad.persistence.repositories.decoupage.ArrondissementRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository;
@@ -18,7 +15,6 @@ import io.gmss.fiscad.persistence.repositories.rfu.metier.DonneesImpositionTfuRe
 import io.gmss.fiscad.persistence.repositories.rfu.metier.ImpositionsTfuRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuNonBatiRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.ExerciceRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
 import jakarta.transaction.Transactional;
 import lombok.AllArgsConstructor;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -40,7 +36,6 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
     private final BaremRfuNonBatiRepository baremRfuNonBatiRepository;
     private final ExerciceRepository exerciceRepository;
     private final ArrondissementRepository arrondissementRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
 
 
 
@@ -96,43 +91,91 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
 
     @Override
     @Transactional
-    public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleNonBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId) {
-        Integer nb= donneesImpositionTfuRepository.genererDonneesTfuNonBatie(impositionsTfuPaylaodWeb.getId(),userId);
+    public Long genererDonneesFiscales(ImpositionsTfu impositionsTfu) {
+        List<DonneesImpositionTfuResponse> donneesImpositionTfuResponses= donneesImpositionTfuRepository.findAllDonneesImpositionTfu(impositionsTfu.getCommune().getId(),impositionsTfu.getExercice().getAnnee());
+        Long n=0l;
+        for (DonneesImpositionTfuResponse donneesImpositionTfuResponse: donneesImpositionTfuResponses){
+            DonneesImpositionTfu donneesImpositionTfu=new DonneesImpositionTfu();
+            donneesImpositionTfu.setImpositionsTfu(impositionsTfu);
+            donneesImpositionTfu.setZoneRfuId(donneesImpositionTfuResponse.getZoneRfuId());
+            donneesImpositionTfu.setCodeQuartierVillage(donneesImpositionTfuResponse.getCodeQuartierVillage());
+            donneesImpositionTfu.setNomQuartierVillage(donneesImpositionTfuResponse.getNomQuartierVillage());
+            donneesImpositionTfu.setCodeArrondissement(donneesImpositionTfuResponse.getCodeArrondissement());
+            donneesImpositionTfu.setNomArrondissement(donneesImpositionTfuResponse.getNomArrondissement());
+            donneesImpositionTfu.setCodeCommune(donneesImpositionTfuResponse.getCodeCommune());
+            donneesImpositionTfu.setNomCommune(donneesImpositionTfuResponse.getNomCommune());
+            donneesImpositionTfu.setCodeDepartement(donneesImpositionTfuResponse.getCodeDepartement());
+            donneesImpositionTfu.setNomDepartement(donneesImpositionTfuResponse.getNomDepartement());
+            donneesImpositionTfu.setQ(donneesImpositionTfuResponse.getQ());
+            donneesImpositionTfu.setIlot(donneesImpositionTfuResponse.getIlot());
+            donneesImpositionTfu.setParcelle(donneesImpositionTfuResponse.getParcelle());
+            donneesImpositionTfu.setLatitude(donneesImpositionTfuResponse.getLatitude());
+            donneesImpositionTfu.setLongitude(donneesImpositionTfuResponse.getLongitude());
+            donneesImpositionTfu.setNup(donneesImpositionTfuResponse.getNup());
+            donneesImpositionTfu.setNupProvisoire(donneesImpositionTfuResponse.getNupProvisoire());
+            donneesImpositionTfu.setSuperficieParc(donneesImpositionTfuResponse.getSuperficieParc());
+            donneesImpositionTfu.setAdresseProp(donneesImpositionTfuResponse.getAdresseProp());
+            donneesImpositionTfu.setAnnee(donneesImpositionTfuResponse.getAnnee());
+            donneesImpositionTfu.setAdresseSc(donneesImpositionTfuResponse.getAdresseSc());
+            donneesImpositionTfu.setBatieOuiNon(donneesImpositionTfuResponse.getBatieOuiNon());
+            donneesImpositionTfu.setTfuMinimum(donneesImpositionTfuResponse.getTfuMinimum());
+            donneesImpositionTfu.setCategorieBat(donneesImpositionTfuResponse.getCategorieBat());
+            donneesImpositionTfu.setDateEnquete(donneesImpositionTfuResponse.getDateEnquete());
+            donneesImpositionTfu.setEmailProp(donneesImpositionTfuResponse.getEmailProp());
+            donneesImpositionTfu.setEmailSc(donneesImpositionTfuResponse.getEmailSc());
+            donneesImpositionTfu.setMontantLoyerAnnuel(donneesImpositionTfuResponse.getMontantLoyerAnnuel());
+            donneesImpositionTfu.setEnqueteId(donneesImpositionTfuResponse.getEnqueteId());
+            donneesImpositionTfu.setExhonereOuiNon(donneesImpositionTfuResponse.getExhonereOuiNon());
+            donneesImpositionTfu.setIfu(donneesImpositionTfuResponse.getIfu());
+            donneesImpositionTfu.setNombreBat(donneesImpositionTfuResponse.getNombreBat());
+            donneesImpositionTfu.setNombrePiscine(donneesImpositionTfuResponse.getNombrePiscine());
+            donneesImpositionTfu.setNombreUlog(donneesImpositionTfuResponse.getNombreUlog());
+            donneesImpositionTfu.setNomProp(donneesImpositionTfuResponse.getNomProp());
+            donneesImpositionTfu.setNomSc(donneesImpositionTfuResponse.getNomSc());
+            donneesImpositionTfu.setNpi(donneesImpositionTfuResponse.getNpi());
+            donneesImpositionTfu.setNumBatiment(donneesImpositionTfuResponse.getNumBatiment()==null?"":donneesImpositionTfuResponse.getNumBatiment());
+            donneesImpositionTfu.setNumUniteLogement(donneesImpositionTfuResponse.getNumUniteLogement()==null?"":donneesImpositionTfuResponse.getNumUniteLogement());
+            donneesImpositionTfu.setPrenomProp(donneesImpositionTfuResponse.getPrenomProp());
+            donneesImpositionTfu.setPrenomSc(donneesImpositionTfuResponse.getPrenomSc());
+            donneesImpositionTfu.setRaisonSociale(donneesImpositionTfuResponse.getRaisonSociale());
+            donneesImpositionTfu.setSecteurId(donneesImpositionTfuResponse.getSecteurId());
+            donneesImpositionTfu.setStandingBat(donneesImpositionTfuResponse.getStandingBat());
+            donneesImpositionTfu.setStructureId(donneesImpositionTfuResponse.getStructureId());
+            donneesImpositionTfu.setSuperficieAuSolBat(donneesImpositionTfuResponse.getSuperficieAuSolBat());
+            donneesImpositionTfu.setSuperficieAuSolUlog(donneesImpositionTfuResponse.getSuperficieAuSolUlog());
+            donneesImpositionTfu.setTelProp(donneesImpositionTfuResponse.getTelProp());
+            donneesImpositionTfu.setTelSc(donneesImpositionTfuResponse.getTelSc());
+            donneesImpositionTfu.setTfuMetreCarre(donneesImpositionTfuResponse.getTfuMetreCarre());
+            donneesImpositionTfu.setTitreFoncier(donneesImpositionTfuResponse.getTitreFoncier());
+            donneesImpositionTfu.setValeurLocativeAdm(donneesImpositionTfuResponse.getValeurLocativeAdm());
+            donneesImpositionTfu.setBatimentExhonereOuiNon(donneesImpositionTfuResponse.getBatimentExhonereOuiNon());
+            donneesImpositionTfu.setUniteLogementExhonereOuiNon(donneesImpositionTfuResponse.getUniteLogementExhonereOuiNon());
+            try {
+                Optional<BaremRfuNonBati> baremRfuNonBatiOptional=baremRfuNonBatiRepository.findAllByCommune_IdAndZoneRfu_Id(impositionsTfu.getCommune().getId(),donneesImpositionTfu.getZoneRfuId());
+                 if(baremRfuNonBatiOptional.isPresent()){
+                     donneesImpositionTfu.setValeurAdministrativeParcelleNonBati(baremRfuNonBatiOptional.get().getValeurAdministrative());
+                     donneesImpositionTfu.setTauxParcelleNonBati(baremRfuNonBatiOptional.get().getTaux());
+                 }
 
-        ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
-        impositionsTfu.setStatusAvis(StatusAvis.TFU_FNB_GENERE);
-
-        impositionsTfu.setNombreAvisFnb(nb);
 
+                donneesImpositionTfuRepository.save(donneesImpositionTfu);
+                n++;
+            }catch (DataIntegrityViolationException e) {
+                if (e.getCause() instanceof org.hibernate.exception.ConstraintViolationException constraintEx &&
+                        constraintEx.getSQLException().getSQLState().equals("23505")) {
+                    System.out.println("Doublon détecté (clé unique) !");
+                } else {
+                    throw e;
+                }
+            }
+        }
         impositionsTfuRepository.save(impositionsTfu);
-
-        return impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
+        return n;
     }
 
     @Override
-    @Transactional
-    public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId) {
-
-        Integer nbb= donneesImpositionTfuRepository.genererDonneesTfuBatie(impositionsTfuPaylaodWeb.getId(),userId);
-
-        Integer nbulo= donneesImpositionTfuRepository.genererDonneesTfuBatieUniteLogement(impositionsTfuPaylaodWeb.getId(),userId);
-
-
-        ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
-        impositionsTfu.setStatusAvis(StatusAvis.GENERE);
-
-        impositionsTfu.setNombreAvis(nbb+nbulo+ (impositionsTfu.getNombreAvisFnb()==null?0:impositionsTfu.getNombreAvisFnb()));
-        impositionsTfu.setNombreAvisBatiment(nbb);
-        impositionsTfu.setNombreAvisUniteLog(nbulo);
-
-        impositionsTfuRepository.save(impositionsTfu);
-
-        return impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
-    }
-
-    @Override
-    public List<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImposition(Long impositionsId) {
-        return donneesImpositionTfuRepository.findAllByImpositionTfuId(impositionsId);
+    public List<DonneesImpositionTfu> getDonneesFiscalesByImposition(Long impositionsId) {
+        return donneesImpositionTfuRepository.findAllByImpositionsTfu_Id(impositionsId);
     }
 
     @Override
@@ -144,24 +187,4 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
             return null;
         }
     }
-
-    @Override
-    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdPageable(Long impositionsTfuId, Pageable pageable) {
-        return donneesImpositionTfuRepository.findAllByImpositionTfuIdPageable(impositionsTfuId,pageable);
-    }
-
-    @Override
-    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdNonBatiePageable(Long impositionsTfuId, Pageable pageable) {
-        return donneesImpositionTfuRepository.findAllByImpositionTfuIdNonBatiePageable(impositionsTfuId,pageable);
-    }
-
-    @Override
-    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdBatieBatimentPageable(Long impositionsTfuId, Pageable pageable) {
-        return donneesImpositionTfuRepository.findAllByImpositionTfuIdBatieBatimentPageable(impositionsTfuId,pageable);
-    }
-
-    @Override
-    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdBatieUniteLogPageable(Long impositionsTfuId, Pageable pageable) {
-        return donneesImpositionTfuRepository.findAllByImpositionTfuIdBatieUniteLogPageable(impositionsTfuId,pageable);
-    }
 }

src/main/java/io/gmss/fiscad/implementations/rfu/metier/ImpositionsTfuServiceImpl.java

@@ -1,154 +1,81 @@
 package io.gmss.fiscad.implementations.rfu.metier;
 
-import io.gmss.fiscad.entities.infocad.parametre.Structure;
 import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
 import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
-import io.gmss.fiscad.interfaces.infocad.parametre.StructureService;
 import io.gmss.fiscad.interfaces.rfu.metier.ImpositionsTfuService;
-import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
 import io.gmss.fiscad.persistence.repositories.rfu.metier.ImpositionsTfuRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
-import jakarta.transaction.Transactional;
-import jakarta.ws.rs.NotAcceptableException;
-import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-@AllArgsConstructor
+
 @Service
 public class ImpositionsTfuServiceImpl implements ImpositionsTfuService {
 
     private final ImpositionsTfuRepository impositionsTfuRepository;
-    private final StructureService structureService;
-    private final EntityFromPayLoadService entityFromPayLoadService;
-    private final EnqueteService enqueteService;
 
+    public ImpositionsTfuServiceImpl(ImpositionsTfuRepository impositionsTfuRepository) {
+        this.impositionsTfuRepository = impositionsTfuRepository;
+    }
 
-    /**
-     * Permet de créer pour un centre la synthèse de l'imposition de l'année en prélude de la
-     * génération des avis d'imposition
-     * @param impositionsTfuPaylaodWeb
-     * @return
-     * @throws BadRequestException
-     */
     @Override
-    @Transactional
-    public ImpositionsTfuPaylaodWeb createImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException {
-        if (impositionsTfuPaylaodWeb.getId() != null) {
+    public ImpositionsTfu createImpositionsTfu(ImpositionsTfu impositionsTfu) throws BadRequestException {
+        if (impositionsTfu.getId() != null) {
             throw new BadRequestException("Impossible de créer une nouvelle unité de logement ayant un id non null.");
         }
-        List<ImpositionsTfu> impositionsTfus=impositionsTfuRepository.getImpositionsTfuByStructureAndExercice(impositionsTfuPaylaodWeb.getStructureId(), impositionsTfuPaylaodWeb.getExerciceId());
+         List<ImpositionsTfu> impositionsTfus=impositionsTfuRepository.getImpositionsTfuByCommuneAndExercice(impositionsTfu.getCommune().getCode(),impositionsTfu.getExercice().getAnnee());
         if (!impositionsTfus.isEmpty()) {
             throw new BadRequestException("Une Imposition non annulée existe déjà");
         }
-        List<StatusAvis> statusAvis= new ArrayList<>();
-        statusAvis.add(StatusAvis.EN_COURS);
-        statusAvis.add(StatusAvis.CLOTURE);
-        statusAvis.add(StatusAvis.GENERATION_AUTORISE);
-
-        Optional<ImpositionsTfu> optionalImpositionsTfu= impositionsTfuRepository.findDistinctByStructure_IdAndExercice_IdAndStatusAvisIn(impositionsTfuPaylaodWeb.getStructureId(),impositionsTfuPaylaodWeb.getExerciceId(),statusAvis);
-
-        if(optionalImpositionsTfu.isPresent()){
-            throw new BadRequestException("Une Imposition est déjà dans le workflow");
-        }
-
-        ImpositionsTfu impositionsTfu=entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
-
-        impositionsTfu.setStatusAvis(StatusAvis.EN_COURS);
-
-        impositionsTfu =impositionsTfuRepository.save(impositionsTfu);
-
-        return  impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
+        impositionsTfu.setStatusAvis(StatusAvis.CREE);
+        impositionsTfu.setDateGeneration(LocalDate.now());
+        return impositionsTfuRepository.save(impositionsTfu);
     }
 
     @Override
-    public ImpositionsTfuPaylaodWeb rejeterImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException {
-        if (impositionsTfuPaylaodWeb.getId() == null) {
+    public ImpositionsTfu annulerImpositionsTfu(ImpositionsTfu impositionsTfu) throws BadRequestException {
+        if (impositionsTfu.getId() == null) {
             throw new BadRequestException("Impossible d'annuler une imposition ayant un id null.");
         }
-        if (!impositionsTfuRepository.existsById(impositionsTfuPaylaodWeb.getId())) {
+        if (!impositionsTfuRepository.existsById(impositionsTfu.getId())) {
             throw new NotFoundException("Impossible de trouver la nouvelle unité de logement spécifiée dans notre base de données.");
         }
-        ImpositionsTfu impositionsTfu= entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
-        if(!impositionsTfu.getStatusAvis().equals(StatusAvis.CLOTURE)){
-            throw new NotAcceptableException("L'état actuel :"+impositionsTfu.getStatusAvis()+"Ne permet pas de passer au l'état rejete");
-        }
-
-        impositionsTfu.setStatusAvis(StatusAvis.REJETE);
-        impositionsTfu =impositionsTfuRepository.save(impositionsTfu);
-        return  impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
-    }
-
-
-    @Override
-    @Transactional
-    public ImpositionsTfuPaylaodWeb cloturerImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException {
-        if (impositionsTfuPaylaodWeb.getId() == null) {
-            throw new BadRequestException("Impossible de cloturer une imposition ayant un id null.");
-        }
-        if (!impositionsTfuRepository.existsById(impositionsTfuPaylaodWeb.getId())) {
-            throw new NotFoundException("Impossible de trouver l'imposition spécifiée dans notre base de données.");
-        }
-
-        ImpositionsTfu impositionsTfu= entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
-
-        if(!impositionsTfu.getStatusAvis().equals(StatusAvis.EN_COURS) && !impositionsTfu.getStatusAvis().equals(StatusAvis.REJETE)){
-            throw new NotAcceptableException("L'état actuel :"+impositionsTfu.getStatusAvis()+"Ne permet pas de passer au l'état rejete");
-        }
-
-        impositionsTfu.setDateCloture(LocalDate.now());
-        enqueteService.cloturerEnqueteParcelleBatimentUniteLogementByStructureIdAndExerciceId(impositionsTfu.getStructure().getId(),impositionsTfu.getExercice().getId());
-        impositionsTfu.setStatusAvis(StatusAvis.CLOTURE);
-        impositionsTfu =impositionsTfuRepository.save(impositionsTfu);
-        return  impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
+        impositionsTfu.setStatusAvis(StatusAvis.ANNULE);
+        return impositionsTfuRepository.save(impositionsTfu);
     }
 
     @Override
-    public ImpositionsTfuPaylaodWeb autoriserGenerationImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException {
-        if (impositionsTfuPaylaodWeb.getId() == null) {
+    public ImpositionsTfu validerImpositionsTfu(ImpositionsTfu impositionsTfu) throws BadRequestException {
+        if (impositionsTfu.getId() == null) {
             throw new BadRequestException("Impossible de valider une imposition ayant un id null.");
         }
-        if (!impositionsTfuRepository.existsById(impositionsTfuPaylaodWeb.getId())) {
-            throw new NotFoundException("Impossible de trouver l'imposition spécifiée dans notre base de données.");
+        if (!impositionsTfuRepository.existsById(impositionsTfu.getId())) {
+            throw new NotFoundException("Impossible de trouver la nouvelle unité de logement spécifiée dans notre base de données.");
         }
-
-        ImpositionsTfu impositionsTfu= entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
-
-        if(!impositionsTfu.getStatusAvis().equals(StatusAvis.CLOTURE)){
-            throw new NotFoundException("L'état actuel : "+impositionsTfu.getStatusAvis()+ " ne permet pas de passer à l'état Autorisé");
-        }
-        impositionsTfu.setDateGeneration(LocalDate.now());
-        impositionsTfu.setStatusAvis(StatusAvis.GENERATION_AUTORISE);
-        impositionsTfu =impositionsTfuRepository.save(impositionsTfu);
-        return  impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
+        impositionsTfu.setStatusAvis(StatusAvis.VALIDE);
+        return impositionsTfuRepository.save(impositionsTfu);
     }
 
     @Override
-    public ImpositionsTfuPaylaodWeb updateImpositionsTfu(Long id, ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws NotFoundException {
-//        if (impositionsTfu.getId() == null) {
-//            throw new BadRequestException("Impossible de mettre à jour une nouvelle unité de logement ayant un id null.");
-//        }
-//        if (!impositionsTfuRepository.existsById(impositionsTfu.getId())) {
-//            throw new NotFoundException("Impossible de trouver la nouvelle unité de logement spécifiée dans notre base de données.");
-//        }
-        return null; // impositionsTfuRepository.save(impositionsTfu);
+    public ImpositionsTfu updateImpositionsTfu(Long id, ImpositionsTfu impositionsTfu) throws NotFoundException {
+        if (impositionsTfu.getId() == null) {
+            throw new BadRequestException("Impossible de mettre à jour une nouvelle unité de logement ayant un id null.");
+        }
+        if (!impositionsTfuRepository.existsById(impositionsTfu.getId())) {
+            throw new NotFoundException("Impossible de trouver la nouvelle unité de logement spécifiée dans notre base de données.");
+        }
+        return impositionsTfuRepository.save(impositionsTfu);
     }
 
     @Override
     public void deleteImpositionsTfu(Long id) throws NotFoundException {
         Optional<ImpositionsTfu> impositionsTfuOptional = impositionsTfuRepository.findById(id);
         if (impositionsTfuOptional.isPresent()) {
-            if(!impositionsTfuOptional.get().getStatusAvis().equals(StatusAvis.EN_COURS)){
-                throw new NotFoundException("L'état actuel : "+impositionsTfuOptional.get().getStatusAvis()+ " ne permet pas de supprimer");
-            }
             impositionsTfuRepository.deleteById(impositionsTfuOptional.get().getId());
         } else {
             throw new NotFoundException("Impossible de trouver la nouvelle unité de logement spécifiée dans notre base de données.");
@@ -167,22 +94,11 @@ public class ImpositionsTfuServiceImpl implements ImpositionsTfuService {
 
 
     @Override
-    public Optional<ImpositionsTfuPaylaodWeb> getImpositionsTfuById(Long id) {
+    public Optional<ImpositionsTfu> getImpositionsTfuById(Long id) {
         if (impositionsTfuRepository.existsById(id)) {
-            return impositionsTfuRepository.findByIdToDto(id);
+            return impositionsTfuRepository.findById(id);
         } else {
             throw new NotFoundException("Impossible de trouver la nouvelle unité de logement spécifiée dans la base de données.");
         }
     }
-
-    @Override
-    public List<ImpositionsTfuPaylaodWeb> getImpositionsTfuByUserIdIds(Long userId) {
-        System.out.println(userId);
-        List<Structure> structures = structureService.getListStructureUserId(userId);
-        List<Long> structureIds = structures.stream()
-                .map(Structure::getId)
-                .toList();
-        System.out.println(structureIds.get(0));
-        return impositionsTfuRepository.findByStructureIdsToDto(structureIds);
-    }
 }

src/main/java/io/gmss/fiscad/implementations/rfu/metier/UniteLogementServiceImpl.java

@@ -86,9 +86,4 @@ 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);
-    }
 }

src/main/java/io/gmss/fiscad/implementations/rfu/parametre/BaremRfuBatiServiceImpl.java

@@ -1,92 +0,0 @@
-package io.gmss.fiscad.implementations.rfu.parametre;
-
-import io.gmss.fiscad.entities.rfu.parametre.BaremRfuBati;
-import io.gmss.fiscad.exceptions.BadRequestException;
-import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.interfaces.rfu.parametre.BaremRfuBatiService;
-import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuBatiPayloadWeb;
-import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-@AllArgsConstructor
-@Service
-public class BaremRfuBatiServiceImpl implements BaremRfuBatiService {
-    private final BaremRfuRepository baremRfuRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
-
-
-
-    @Override
-    public BaremRfuBatiPayloadWeb createBaremRfu(BaremRfuBatiPayloadWeb baremRfuBatiPayloadWeb) throws BadRequestException {
-        if (baremRfuBatiPayloadWeb.getId() != null) {
-            throw new BadRequestException("Impossible de créer un nouvel bareme rfu ayant un id non null.");
-        }
-        BaremRfuBati baremRfuBati = entityFromPayLoadService.getBaremRfuBatiFromPayLoadWeb(baremRfuBatiPayloadWeb);
-        baremRfuBati = baremRfuRepository.save(baremRfuBati);
-        return baremRfuRepository.findByBaremRfuBatieId(baremRfuBati.getId()).orElse(null);
-    }
-
-    @Override
-    public BaremRfuBatiPayloadWeb updateBaremRfu(Long id, BaremRfuBatiPayloadWeb baremRfuBatiPayloadWeb) throws NotFoundException {
-        if (baremRfuBatiPayloadWeb.getId() == null) {
-            throw new BadRequestException("Impossible de mettre à jour une nouvel bareme rfu ayant un id null.");
-        }
-        if (!baremRfuRepository.existsById(baremRfuBatiPayloadWeb.getId())) {
-            throw new NotFoundException("Impossible de trouver le bareme spécifiée dans notre base de données.");
-        }
-        BaremRfuBati baremRfuBati = entityFromPayLoadService.getBaremRfuBatiFromPayLoadWeb(baremRfuBatiPayloadWeb);
-        baremRfuBati = baremRfuRepository.save(baremRfuBati);
-        return baremRfuRepository.findByBaremRfuBatieId(baremRfuBati.getId()).orElse(null);
-    }
-
-    @Override
-    public void deleteBaremRfu(Long id) throws NotFoundException {
-        Optional<BaremRfuBati> baremRfuOptional = baremRfuRepository.findById(id);
-        if (baremRfuOptional.isPresent()) {
-            baremRfuRepository.deleteById(baremRfuOptional.get().getId());
-        } else {
-            throw new NotFoundException("Impossible de trouver le Bareme spécifié dans notre base de données.");
-        }
-    }
-
-    @Override
-    public Page<BaremRfuBatiPayloadWeb> getBaremRfuList(Pageable pageable) {
-        return baremRfuRepository.findAllPayloadPaged(pageable);
-    }
-
-    @Override
-    public List<BaremRfuBatiPayloadWeb> getBaremRfuList() {
-        return baremRfuRepository.findAllPayload();
-    }
-
-    @Override
-    public List<BaremRfuBatiPayloadWeb> getBaremRfuByCategorieBatiment(Long idCategorieBatiment) {
-        return baremRfuRepository.findByCategorieBatiment(idCategorieBatiment);
-    }
-
-    @Override
-    public List<BaremRfuBatiPayloadWeb> getBaremRfuByArrondissement(Long idArrondissement) {
-        return baremRfuRepository.findByArrondissementId(idArrondissement);
-    }
-
-    @Override
-    public List<BaremRfuBatiPayloadWeb> getBaremRfuByArrondissementAndCategorieBatiment(Long IdArrondissement, Long IdCategorieBatiment) {
-        return baremRfuRepository.findByArrondissementAndCategorieBatiment(IdArrondissement,IdCategorieBatiment);
-    }
-
-    @Override
-    public List<BaremRfuBatiPayloadWeb> getBaremRfuByQuartierAndCategorieBatiment(Long idQuartier, Long IdCategorieBatiment) {
-        return baremRfuRepository.findByQuartierAndCategorieBatiment(idQuartier,IdCategorieBatiment);
-    }
-
-    @Override
-    public BaremRfuBatiPayloadWeb getBaremRfuById(Long id) {
-        return baremRfuRepository.findByBaremRfuBatieId(id).orElse(null);
-    }
-}

src/main/java/io/gmss/fiscad/implementations/rfu/parametre/BaremRfuNonBatiServiceImpl.java

@@ -4,42 +4,38 @@ import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.rfu.parametre.BaremRfuNonBatiService;
-import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuNonBatiRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
-import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Optional;
-@AllArgsConstructor
+
 @Service
 public class BaremRfuNonBatiServiceImpl implements BaremRfuNonBatiService {
     private final BaremRfuNonBatiRepository baremRfuNonBatiRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
+
+    public BaremRfuNonBatiServiceImpl(BaremRfuNonBatiRepository baremRfuNonBatiRepository) {
+        this.baremRfuNonBatiRepository = baremRfuNonBatiRepository;
+    }
 
     @Override
-    public BaremRfuNonBatiPayloadWeb createBaremRfuNonBati(BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) throws BadRequestException {
-        if (baremRfuNonBatiPayloadWeb.getId() != null) {
+    public BaremRfuNonBati createBaremRfuNonBati(BaremRfuNonBati baremRfuNonBati) throws BadRequestException {
+        if (baremRfuNonBati.getId() != null) {
             throw new BadRequestException("Impossible de créer une nouvelle campgne ayant un id non null.");
         }
-      BaremRfuNonBati baremRfuNonBati=  entityFromPayLoadService.getBaremRfuNonBatiFromPayLoadWeb(baremRfuNonBatiPayloadWeb);
-      baremRfuNonBati=baremRfuNonBatiRepository.save(baremRfuNonBati);
-      return baremRfuNonBatiRepository.findByIdToDto(baremRfuNonBati.getId()).orElse(null);
+        return baremRfuNonBatiRepository.save(baremRfuNonBati);
     }
     @Override
-    public BaremRfuNonBatiPayloadWeb updateBaremRfuNonBati(Long id, BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) throws NotFoundException {
-        if (baremRfuNonBatiPayloadWeb.getId() == null) {
+    public BaremRfuNonBati updateBaremRfuNonBati(Long id, BaremRfuNonBati baremRfuNonBati) throws NotFoundException {
+        if (baremRfuNonBati.getId() == null) {
             throw new BadRequestException("Impossible de mettre à jour une nouvelle baremRfuNonBati ayant un id null.");
         }
-        if (!baremRfuNonBatiRepository.existsById(baremRfuNonBatiPayloadWeb.getId())) {
+        if (!baremRfuNonBatiRepository.existsById(baremRfuNonBati.getId())) {
             throw new NotFoundException("Impossible de trouver la baremRfuNonBati spécifiée dans notre base de données.");
         }
-        BaremRfuNonBati baremRfuNonBati=  entityFromPayLoadService.getBaremRfuNonBatiFromPayLoadWeb(baremRfuNonBatiPayloadWeb);
-        baremRfuNonBati=baremRfuNonBatiRepository.save(baremRfuNonBati);
-        return baremRfuNonBatiRepository.findByIdToDto(baremRfuNonBati.getId()).orElse(null);
+        return baremRfuNonBatiRepository.save(baremRfuNonBati);
     }
 
     @Override
@@ -52,27 +48,20 @@ public class BaremRfuNonBatiServiceImpl implements BaremRfuNonBatiService {
         }
     }
     @Override
-    public Page<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiList(Pageable pageable) {
-        return baremRfuNonBatiRepository.findAllPayloadToDtoPaged(pageable);
+    public Page<BaremRfuNonBati> getBaremRfuNonBatiList(Pageable pageable) {
+        return baremRfuNonBatiRepository.findAll(pageable);
     }
 
     @Override
-    public List<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiList() {
-        return baremRfuNonBatiRepository.findAllPayloadToDto();
+    public List<BaremRfuNonBati> getBaremRfuNonBatiList() {
+        return baremRfuNonBatiRepository.findAll();
     }
 
 
 
     @Override
-    public Optional<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiById(Long id) {
-        return baremRfuNonBatiRepository.findByIdToDto(id);
+    public Optional<BaremRfuNonBati> getBaremRfuNonBatiById(Long id) {
+        return baremRfuNonBatiRepository.findById(id);
     }
-
-
-    @Override
-    public Optional<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiByCommuneAndZoneId(Long communeId,Long zoneId) {
-        return baremRfuNonBatiRepository.findByCommuneAndZoneToDto(communeId,zoneId);
-    }
-
 }
 

src/main/java/io/gmss/fiscad/implementations/rfu/parametre/BaremRfuServiceImpl.java

@@ -0,0 +1,70 @@
+package io.gmss.fiscad.implementations.rfu.parametre;
+
+import io.gmss.fiscad.entities.rfu.parametre.BaremRfuBati;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.rfu.parametre.BaremRfuService;
+import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuRepository;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+@Service
+public class BaremRfuServiceImpl implements BaremRfuService {
+    private final BaremRfuRepository baremRfuRepository;
+
+    public BaremRfuServiceImpl(BaremRfuRepository baremRfuRepository) {
+        this.baremRfuRepository = baremRfuRepository;
+    }
+
+    @Override
+    public BaremRfuBati createBaremRfu(BaremRfuBati baremRfuBati) throws BadRequestException {
+        if (baremRfuBati.getId() != null) {
+            throw new BadRequestException("Impossible de créer un nouvel bareme rfu ayant un id non null.");
+        }
+        return baremRfuRepository.save(baremRfuBati);
+    }
+
+    @Override
+    public BaremRfuBati updateBaremRfu(Long id, BaremRfuBati baremRfuBati) throws NotFoundException {
+        if (baremRfuBati.getId() == null) {
+            throw new BadRequestException("Impossible de mettre à jour une nouvel bareme rfu ayant un id null.");
+        }
+        if (!baremRfuRepository.existsById(baremRfuBati.getId())) {
+            throw new NotFoundException("Impossible de trouver le bareme spécifiée dans notre base de données.");
+        }
+        return baremRfuRepository.save(baremRfuBati);
+    }
+
+    @Override
+    public void deleteBaremRfu(Long id) throws NotFoundException {
+        Optional<BaremRfuBati> baremRfuOptional = baremRfuRepository.findById(id);
+        if (baremRfuOptional.isPresent()) {
+            baremRfuRepository.deleteById(baremRfuOptional.get().getId());
+        } else {
+            throw new NotFoundException("Impossible de trouver le Bareme spécifié dans notre base de données.");
+        }
+    }
+
+    @Override
+    public Page<BaremRfuBati> getBaremRfuList(Pageable pageable) {
+        return baremRfuRepository.findAll(pageable);
+    }
+
+    @Override
+    public List<BaremRfuBati> getBaremRfuList() {
+        return baremRfuRepository.findAll();
+    }
+
+    @Override
+    public List<BaremRfuBati> getBaremRfuByType(Long idCategorieBatiment) {
+        return baremRfuRepository.findAllByCategorieBatiment_Id(idCategorieBatiment);
+    }
+
+    @Override
+    public Optional<BaremRfuBati> getBaremRfuById(Long id) {
+        return baremRfuRepository.findById(id);
+    }
+}

src/main/java/io/gmss/fiscad/implementations/rfu/parametre/UsageServiceImpl.java

@@ -1,67 +0,0 @@
-package io.gmss.fiscad.implementations.rfu.parametre;
-
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
-import io.gmss.fiscad.exceptions.BadRequestException;
-import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.interfaces.rfu.parametre.UsageService;
-import io.gmss.fiscad.persistence.repositories.rfu.parametre.UsageRepository;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-
-@Service
-public class UsageServiceImpl implements UsageService {
-    private final UsageRepository usageRepository;
-
-    public UsageServiceImpl(UsageRepository usageRepository) {
-        this.usageRepository = usageRepository;
-    }
-
-    @Override
-    public Usage createUsage(Usage usage) throws BadRequestException {
-        if (usage.getId() != null) {
-            throw new BadRequestException("Impossible de créer une nouvelle campgne ayant un id non null.");
-        }
-        return usageRepository.save(usage);
-    }
-    @Override
-    public Usage updateUsage(Long id, Usage usage) throws NotFoundException {
-        if (usage.getId() == null) {
-            throw new BadRequestException("Impossible de mettre à jour une nouvelle usage ayant un id null.");
-        }
-        if (!usageRepository.existsById(usage.getId())) {
-            throw new NotFoundException("Impossible de trouver la usage spécifiée dans notre base de données.");
-        }
-        return usageRepository.save(usage);
-    }
-
-    @Override
-    public void deleteUsage(Long id) throws NotFoundException {
-        Optional<Usage> usageOptional = usageRepository.findById(id);
-        if (usageOptional.isPresent()) {
-            usageRepository.deleteById(usageOptional.get().getId());
-        } else {
-            throw new NotFoundException("Impossible de trouver la usage spécifiée dans notre base de données.");
-        }
-    }
-    @Override
-    public Page<Usage> getUsageList(Pageable pageable) {
-        return usageRepository.findAll(pageable);
-    }
-
-    @Override
-    public List<Usage> getUsageList() {
-        return usageRepository.findAll();
-    }
-
-
-
-    @Override
-    public Optional<Usage> getUsageById(Long id) {
-        return usageRepository.findById(id);
-    }
-}
-

src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurService.java

@@ -32,5 +32,4 @@ public interface SecteurService {
     Optional<SecteurPaylaodWeb> getSecteurById(Long id);
 
     List<Secteur> getListSecteurUserId(Long userId) ;
-    List<Secteur> getListSecteurByDepartementId(Long departementId) ;
 }

src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java

@@ -58,6 +58,5 @@ public interface EnqueteService {
 
     public List<EnqueteNonSyncResponse> getEnqueteValideNonSynch(Long terminalId);
 
-    int cloturerEnqueteParcelleBatimentUniteLogementByStructureIdAndExerciceId(Long strucutreId,Long exerciceId);
-    int cloturerEnqueteParcelleBatimentUniteLogementByUserIdAndExerciceId(Long userId,Long exerciceId);
+
 }

src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleGeomService.java

@@ -6,7 +6,6 @@ import io.gmss.fiscad.entities.infocad.metier.ParcelleGeom;
 import io.gmss.fiscad.entities.infocad.metier.Upload;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.paylaods.request.crudweb.ParcelleGeomPaylaodWeb;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
@@ -16,15 +15,12 @@ import java.util.Optional;
 
 public interface ParcelleGeomService {
     int createParcelleFromGeoJsonFile(MultipartFile file,String reference,String description) throws BadRequestException;
-    int createParcelleGeomFromGeoJsonApi() throws BadRequestException;
     ParcelleGeom createOnParcelleFromGeoJson(JsonNode jsonNode, Upload upload) throws BadRequestException;
     ParcelleGeom updateParcelleGeom(MultipartFile file) throws NotFoundException;
     void deleteParcelle(Long id) throws NotFoundException;
     Page<ParcelleGeom> getParcelleGeomList(Pageable pageable);
     List<ParcelleGeom> getParcelleGeomList();
     List<ParcelleGeom> getParcelleGeomListUnQuatier(String codeQuartier);
-    List<ParcelleGeomPaylaodWeb> getParcelleGeomListByQuatierId(Long quartierId);
-    Page<ParcelleGeomPaylaodWeb> getParcelleGeomListByQuatierIdPaged(Long quartierId,Pageable pageable);
     public List<ParcelleGeom> getParcelleGeomListUnArrondissement(String codeArrondissement);
 
     Optional<ParcelleGeom> getParcelleGeomById(Long id);

src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleService.java

@@ -35,5 +35,4 @@ public interface ParcelleService {
     Page<ParcellePayLoadWeb> getParcelleListByRuePageableToDto(Long userId,Long rueId,Pageable pageable);
 
     Page<ParcellePayLoadWeb> getParcelleByMultiFiltre(Long userId, FiltreParcelle filtreParcelle, Pageable pageable);
-    Integer majParcelleBatieNonbatie();
  }

src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/StructureService.java

@@ -1,8 +1,6 @@
 package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.fiscad.entities.decoupage.Secteur;
 import io.gmss.fiscad.entities.infocad.parametre.Structure;
-import io.gmss.fiscad.entities.user.AvoirFonction;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.paylaods.request.crudweb.StructurePaylaodWeb;
@@ -10,8 +8,6 @@ import io.gmss.fiscad.paylaods.response.StructureResponse;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
-import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -35,6 +31,4 @@ public interface StructureService {
     //List<StructureResponse> getStructuresByArrondissement(Long arrondissementID);
 
 
-    public List<Structure> getListStructureUserId(Long userId) ;
-
 }

src/main/java/io/gmss/fiscad/interfaces/rfu/metier/DonneesImpositionTfuService.java

@@ -4,8 +4,6 @@ import io.gmss.fiscad.entities.rfu.metier.DonneesImpositionTfu;
 import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb;
-import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -13,6 +11,8 @@ import java.util.List;
 import java.util.Optional;
 
 public interface DonneesImpositionTfuService {
+
+
     DonneesImpositionTfu createDonneesImpositionTfu(DonneesImpositionTfu donneesImpositionTfu) throws BadRequestException;
 
     DonneesImpositionTfu updateDonneesImpositionTfu(Long id, DonneesImpositionTfu donneesImpositionTfu) throws NotFoundException;
@@ -25,17 +25,7 @@ public interface DonneesImpositionTfuService {
 
     Optional<DonneesImpositionTfu> getDonneesImpositionTfuById(Long id);
 
-    ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb,Long userId);
-    ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleNonBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb,Long userId);
-    List<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImposition(Long  impositionsId);
+    Long genererDonneesFiscales(ImpositionsTfu impositionsTfu);
+    List<DonneesImpositionTfu> getDonneesFiscalesByImposition(Long  impositionsId);
     List<DonneesImpositionTfu> getDonneesFiscalesByImpositionArrondissement(Long  impositionsId,Long arrondissementId);
-    Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdPageable(Long  impositionsTfuId, Pageable pageable);
-
-
-    Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdNonBatiePageable(Long  impositionsTfuId, Pageable pageable);
-    Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdBatieBatimentPageable(Long  impositionsTfuId, Pageable pageable);
-    Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdBatieUniteLogPageable(Long  impositionsTfuId, Pageable pageable);
-
-
-
 }

src/main/java/io/gmss/fiscad/interfaces/rfu/metier/ImpositionsTfuService.java

@@ -3,7 +3,6 @@ package io.gmss.fiscad.interfaces.rfu.metier;
 import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -12,12 +11,11 @@ import java.util.Optional;
 
 public interface ImpositionsTfuService {
 
-    ImpositionsTfuPaylaodWeb createImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException;
-    ImpositionsTfuPaylaodWeb rejeterImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException;
-    ImpositionsTfuPaylaodWeb cloturerImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException;
-    ImpositionsTfuPaylaodWeb autoriserGenerationImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException;
+    ImpositionsTfu createImpositionsTfu(ImpositionsTfu impositionsTfu) throws BadRequestException;
+    ImpositionsTfu annulerImpositionsTfu(ImpositionsTfu impositionsTfu) throws BadRequestException;
+    ImpositionsTfu validerImpositionsTfu(ImpositionsTfu impositionsTfu) throws BadRequestException;
 
-    ImpositionsTfuPaylaodWeb updateImpositionsTfu(Long id, ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws NotFoundException;
+    ImpositionsTfu updateImpositionsTfu(Long id, ImpositionsTfu impositionsTfu) throws NotFoundException;
 
     void deleteImpositionsTfu(Long id) throws NotFoundException;
 
@@ -25,6 +23,5 @@ public interface ImpositionsTfuService {
 
     List<ImpositionsTfu> getImpositionsTfuList();
 
-    Optional<ImpositionsTfuPaylaodWeb> getImpositionsTfuById(Long id);
-    List<ImpositionsTfuPaylaodWeb> getImpositionsTfuByUserIdIds(Long userId);
+    Optional<ImpositionsTfu> getImpositionsTfuById(Long id);
 }

src/main/java/io/gmss/fiscad/interfaces/rfu/metier/UniteLogementService.java

@@ -28,6 +28,4 @@ public interface UniteLogementService {
     Page<UniteLogementPaylaodWeb> getUniteLogementListByBatimentPageable(Long batimentId, Pageable pageable);
 
     List<UniteLogementPaylaodWeb> getUniteLogementListByBatiment(Long batimentId);
-
-    List<UniteLogementPaylaodWeb> getUniteLogementListByParcelle(Long parcelleId);
 }

src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/BaremRfuBatiService.java

@@ -1,32 +0,0 @@
-package io.gmss.fiscad.interfaces.rfu.parametre;
-
-import io.gmss.fiscad.entities.rfu.parametre.BaremRfuBati;
-import io.gmss.fiscad.exceptions.BadRequestException;
-import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuBatiPayloadWeb;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-import java.util.List;
-import java.util.Optional;
-
-public interface BaremRfuBatiService {
-
-    BaremRfuBatiPayloadWeb createBaremRfu(BaremRfuBatiPayloadWeb baremRfuBati) throws BadRequestException;
-
-    BaremRfuBatiPayloadWeb updateBaremRfu(Long id, BaremRfuBatiPayloadWeb baremRfuBati) throws NotFoundException;
-
-    void deleteBaremRfu(Long id) throws NotFoundException;
-
-    Page<BaremRfuBatiPayloadWeb> getBaremRfuList(Pageable pageable);
-
-    List<BaremRfuBatiPayloadWeb> getBaremRfuList();
-
-    List<BaremRfuBatiPayloadWeb> getBaremRfuByCategorieBatiment(Long IdCategorieBatiment);
-    List<BaremRfuBatiPayloadWeb> getBaremRfuByArrondissement(Long IdArrondissement);
-    List<BaremRfuBatiPayloadWeb> getBaremRfuByArrondissementAndCategorieBatiment(Long IdArrondissement,Long IdCategorieBatiment);
-    List<BaremRfuBatiPayloadWeb> getBaremRfuByQuartierAndCategorieBatiment(Long idQuartier,Long IdCategorieBatiment);
-
-    BaremRfuBatiPayloadWeb getBaremRfuById(Long id);
-}
-

src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/BaremRfuNonBatiService.java

@@ -3,7 +3,6 @@ package io.gmss.fiscad.interfaces.rfu.parametre;
 import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -12,18 +11,17 @@ import java.util.Optional;
 
 public interface BaremRfuNonBatiService {
 
-    BaremRfuNonBatiPayloadWeb createBaremRfuNonBati(BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) throws BadRequestException;
+    BaremRfuNonBati createBaremRfuNonBati(BaremRfuNonBati baremRfuNonBati) throws BadRequestException;
 
-    BaremRfuNonBatiPayloadWeb updateBaremRfuNonBati(Long id, BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) throws NotFoundException;
+    BaremRfuNonBati updateBaremRfuNonBati(Long id, BaremRfuNonBati baremRfuNonBati) throws NotFoundException;
 
     void deleteBaremRfuNonBati(Long id) throws NotFoundException;
 
-    Page<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiList(Pageable pageable);
+    Page<BaremRfuNonBati> getBaremRfuNonBatiList(Pageable pageable);
 
-    List<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiList();
+    List<BaremRfuNonBati> getBaremRfuNonBatiList();
 
 
-    Optional<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiById(Long id);
-    Optional<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiByCommuneAndZoneId(Long communeId,Long zoneId);
+    Optional<BaremRfuNonBati> getBaremRfuNonBatiById(Long id);
 }
 

src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/BaremRfuService.java

@@ -0,0 +1,28 @@
+package io.gmss.fiscad.interfaces.rfu.parametre;
+
+import io.gmss.fiscad.entities.rfu.parametre.BaremRfuBati;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface BaremRfuService {
+
+    BaremRfuBati createBaremRfu(BaremRfuBati baremRfuBati) throws BadRequestException;
+
+    BaremRfuBati updateBaremRfu(Long id, BaremRfuBati baremRfuBati) throws NotFoundException;
+
+    void deleteBaremRfu(Long id) throws NotFoundException;
+
+    Page<BaremRfuBati> getBaremRfuList(Pageable pageable);
+
+    List<BaremRfuBati> getBaremRfuList();
+
+    List<BaremRfuBati> getBaremRfuByType(Long IdCategorieBatiment);
+
+    Optional<BaremRfuBati> getBaremRfuById(Long id);
+}
+

src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/UsageService.java

@@ -1,27 +0,0 @@
-package io.gmss.fiscad.interfaces.rfu.parametre;
-
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
-import io.gmss.fiscad.exceptions.BadRequestException;
-import io.gmss.fiscad.exceptions.NotFoundException;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-import java.util.List;
-import java.util.Optional;
-
-public interface UsageService {
-
-    Usage createUsage(Usage usage) throws BadRequestException;
-
-    Usage updateUsage(Long id, Usage usage) throws NotFoundException;
-
-    void deleteUsage(Long id) throws NotFoundException;
-
-    Page<Usage> getUsageList(Pageable pageable);
-
-    List<Usage> getUsageList();
-
-
-    Optional<Usage> getUsageById(Long id);
-}
-

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

@@ -1,56 +0,0 @@
-package io.gmss.fiscad.paylaods.request.crudweb;
-
-import io.gmss.fiscad.entities.decoupage.Arrondissement;
-import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment;
-import jakarta.persistence.ManyToOne;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@NoArgsConstructor
-@Data
-public class BaremRfuBatiPayloadWeb {
-    private Long id;
-    private Long valeurLocative;
-    private Double tfuMetreCarre;
-    private Long tfuMinimum;
-    private Long categorieBatimentId;
-    private String categorieBatimentNom;
-    private String categorieBatimentStanding;
-    private Long arrondissementId;
-    private String arrondissementCode;
-    private String arrondissementNom;
-
-    private Long quartierId;
-    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,
-                                   Long communeId,
-                                   String communeCode,
-                                   String communeNom
-                                  ) {
-        this.id = id;
-        this.valeurLocative = valeurLocative;
-        this.tfuMetreCarre = tfuMetreCarre;
-        this.tfuMinimum = tfuMinimum;
-        this.categorieBatimentId = categorieBatimentId;
-        this.categorieBatimentNom = categorieBatimentNom;
-        this.categorieBatimentStanding = categorieBatimentStanding;
-        this.arrondissementId = arrondissementId;
-        this.arrondissementCode = arrondissementCode;
-        this.arrondissementNom = arrondissementNom;
-        this.quartierId = quartierId;
-        this.quartierCode = quartierCode;
-        this.quartierNom = quartierNom;
-        this.communeId = communeId;
-        this.communeCode = communeCode;
-        this.communeNom = communeNom;
-    }
-}

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

@@ -1,47 +0,0 @@
-package io.gmss.fiscad.paylaods.request.crudweb;
-
-import io.gmss.fiscad.entities.decoupage.Commune;
-import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
-import jakarta.persistence.ManyToOne;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@NoArgsConstructor
-@Data
-public class BaremRfuNonBatiPayloadWeb {
-    private Long id;
-    private Long valeurAdministrative;
-    private float taux;
-    private Long communeId;
-    private String communeCode;
-    private String communeNom;
-    private Long zoneRfuId;
-    private String zoneRfuCode;
-    private String zoneRfuNom;
-    private Long valeurAdministrativeMetreCarre;
-    private Boolean auMetreCarre;
-
-    public BaremRfuNonBatiPayloadWeb(Long id,
-                                     Long valeurAdministrative,
-                                     Float taux,
-                                     Long communeId,
-                                     String communeCode,
-                                     String communeNom,
-                                     Long zoneRfuId,
-                                     String zoneRfuCode,
-                                     String zoneRfuNom,
-                                     Long valeurAdministrativeMetreCarre,
-                                     Boolean auMetreCarre) {
-        this.id = id;
-        this.valeurAdministrative = valeurAdministrative;
-        this.taux = taux;
-        this.communeId = communeId;
-        this.communeCode = communeCode;
-        this.communeNom = communeNom;
-        this.zoneRfuId = zoneRfuId;
-        this.zoneRfuCode = zoneRfuCode;
-        this.zoneRfuNom = zoneRfuNom;
-        this.valeurAdministrativeMetreCarre = valeurAdministrativeMetreCarre;
-        this.auMetreCarre = auMetreCarre;
-    }
-}

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

@@ -20,55 +20,11 @@ public class BatimentPaylaodWeb {
     private String personneNom;
     private String personnePrenom;
     private String personneRaisonSociale;
-    private Float superficieAuSol;
+    private Float superficieSol;
     private Float superficieLouee;
     private Long enqueteBatiementCourantId;
-    private Long categorieBatimentId;
-    private String categorieBatimentCode;
-    private String categorieBatimentStanding;
-    private Integer nombrePiscine;
-    private Long montantLocatifAnnuelDeclare;
-    private Long montantLocatifAnnuelCalcule;
-    private Long montantLocatifAnnuelEstime;
-    private Long valeurBatimentEstime;
-    private Long valeurBatimentReel;
-    private Long valeurBatimentCalcule;
-    private Long montantMensuelLocation;
-    private Long usageId;
-    private String usageNom;
-    private Integer nbreUniteLogement;
 
-    public BatimentPaylaodWeb(Long id,
-                              String nub,
-                              String code,
-                              LocalDate dateConstruction,
-                              Long parcelleId,
-                              String parcelleNup,
-                              String parcelleQ,
-                              String parcelleI,
-                              String parcelleP,
-                              Long personneId,
-                              String personneNom,
-                              String personnePrenom,
-                              String personneRaisonSociale,
-                              Float superficieAuSol,
-                              Float superficieLouee,
-                              Long enqueteBatiementCourantId,
-                              Long categorieBatimentId,
-                              String categorieBatimentCode,
-                              String categorieBatimentStanding,
-                              Integer nombrePiscine,
-                              Long montantLocatifAnnuelDeclare,
-                             Long montantLocatifAnnuelCalcule,
-                             Long valeurBatimentEstime,
-                             Long valeurBatimentReel,
-                             Long montantMensuelLocation,
-                               Long usageId,
-                             String usageNom,
-                             Long montantLocatifAnnuelEstime,
-                              Long valeurBatimentCalcule,
-                              Integer nbreUniteLogement
-                              ) {
+    public BatimentPaylaodWeb(Long id, String nub, String code, LocalDate dateConstruction, Long parcelleId, String parcelleNup, String parcelleQ, String parcelleI, String parcelleP, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Float superficieSol, Float superficieLouee,Long enqueteBatiementCourantId) {
         this.id = id;
         this.nub = nub;
         this.code = code;
@@ -82,23 +38,8 @@ public class BatimentPaylaodWeb {
         this.personneNom = personneNom;
         this.personnePrenom = personnePrenom;
         this.personneRaisonSociale = personneRaisonSociale;
-        this.superficieAuSol = superficieAuSol ;
+        this.superficieSol = superficieSol ;
         this.superficieLouee = superficieLouee ;
         this.enqueteBatiementCourantId = enqueteBatiementCourantId ;
-        this.categorieBatimentId = categorieBatimentId ;
-        this.categorieBatimentCode = categorieBatimentCode ;
-        this.categorieBatimentStanding = categorieBatimentStanding ;
-        this.nombrePiscine = nombrePiscine ;
-        this.montantLocatifAnnuelDeclare = montantLocatifAnnuelDeclare ;
-        this.montantLocatifAnnuelCalcule = montantLocatifAnnuelCalcule ;
-        this.valeurBatimentEstime = valeurBatimentEstime ;
-        this.valeurBatimentReel = valeurBatimentReel ;
-        this.montantMensuelLocation = montantMensuelLocation ;
-        this.usageId = usageId ;
-        this.usageNom = usageNom ;
-        this.montantLocatifAnnuelEstime = montantLocatifAnnuelEstime ;
-        this.valeurBatimentCalcule = valeurBatimentCalcule ;
-        this.nbreUniteLogement = nbreUniteLogement ;
-
     }
 }

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

@@ -16,12 +16,8 @@ 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,
-                                              Long typeCaracteristiqueId,
-                                              String typeCaracteristiqueLibelle) {
+    public CaracteristiqueBatimentPayloadWeb(Long id, Long enqueteBatimentId, LocalDate enqueteBatimentDateEnquete, Integer enqueteBatimentAnnee, Long caracteristiqueId, String caracteristiqueCode, String caracteristiqueLibelle, String valeur, String observation) {
         this.id = id;
         this.enqueteBatimentId = enqueteBatimentId;
         this.enqueteBatimentDateEnquete = enqueteBatimentDateEnquete;
@@ -31,8 +27,5 @@ public class CaracteristiqueBatimentPayloadWeb {
         this.caracteristiqueLibelle = caracteristiqueLibelle;
         this.valeur = valeur;
         this.observation = observation;
-        this.typeCaracteristiqueId = typeCaracteristiqueId;
-        this.typeCaracteristiqueLibelle = typeCaracteristiqueLibelle;
-
     }
 }

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

@@ -16,12 +16,8 @@ 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,
-                                             Long typeCaracteristiqueId,
-                                              String typeCaracteristiqueLibelle) {
+    public CaracteristiqueParcellePayloadWeb(Long id, Long enqueteId, LocalDate enqueteDateEnquete, Integer enqueteAnnee, Long caracteristiqueId, String caracteristiqueCode, String caracteristiqueLibelle, String valeur, String observation) {
         this.id = id;
         this.enqueteId = enqueteId;
         this.enqueteDateEnquete = enqueteDateEnquete;
@@ -31,7 +27,5 @@ public class CaracteristiqueParcellePayloadWeb {
         this.caracteristiqueLibelle = caracteristiqueLibelle;
         this.valeur = valeur;
         this.observation = observation;
-        this.typeCaracteristiqueId = typeCaracteristiqueId;
-        this.typeCaracteristiqueLibelle = typeCaracteristiqueLibelle;
     }
 }

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

@@ -16,12 +16,8 @@ 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,
-                                                   Long typeCaracteristiqueId,
-                                                   String typeCaracteristiqueLibelle) {
+    public CaracteristiqueUniteLogementPayloadWeb(Long id, Long enqueteUniteLogementId, LocalDate enqueteUniteLogementDateEnquete, Integer enqueteUniteLogementAnnee, Long caracteristiqueId, String caracteristiqueCode, String caracteristiqueLibelle, String valeur, String observation) {
         this.id = id;
         this.enqueteUniteLogementId = enqueteUniteLogementId;
         this.enqueteUniteLogementDateEnquete = enqueteUniteLogementDateEnquete;
@@ -31,7 +27,5 @@ public class CaracteristiqueUniteLogementPayloadWeb {
         this.caracteristiqueLibelle = caracteristiqueLibelle;
         this.valeur = valeur;
         this.observation = observation;
-        this.typeCaracteristiqueId = typeCaracteristiqueId;
-        this.typeCaracteristiqueLibelle = typeCaracteristiqueLibelle;
     }
 }

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

@@ -1,201 +0,0 @@
-package io.gmss.fiscad.paylaods.request.crudweb;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.gmss.fiscad.enums.NatureImpot;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDate;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.time.LocalDate;
-@NoArgsConstructor
-@Data
-public class DonneesImpositionPaylaodWeb {
-        private Long id;
-        private Long annee;
-        private String codeDepartement;
-        private String nomDepartement;
-        private String codeCommune;
-        private String nomCommune;
-        private String codeArrondissement;
-        private String nomArrondissement;
-        private String codeQuartierVillage;
-        private String nomQuartierVillage;
-        private String q;
-        private String ilot;
-        private String parcelle;
-        private String nup;
-        private String titreFoncier;
-        private String numBatiment;
-        private String numUniteLogement;
-        private String ifu;
-        private String npi;
-        private String telProp;
-        private String emailProp;
-        private String nomProp;
-        private String prenomProp;
-        private String raisonSociale;
-        private String adresseProp;
-        private String telRep;
-        private String emailRep;
-        private String nomRep;
-        private String prenomRep;
-        private String adresseRep;
-        private String longitude;
-        private String latitude;
-        private Integer superficieParc;
-        private Long superficieAuSolBat;
-        private Long superficieAuSolUlog;
-        private Boolean batie;
-        private Boolean exonere;
-        private Boolean batimentExonere;
-        private Boolean uniteLogementExonere;
-        private Long valeurLocativeAdm;
-        private Long valeurBatiment;
-        private Long valeurParcelle;
-        private Long montantLoyerAnnuel;
-        private Long tfuMetreCarre;
-        private Long tfuMinimum;
-        private String standingBat;
-        private String categorieBat;
-        private Long nombrePiscine;
-        private Long nombreUlog;
-        private Long nombreBat;
-        @JsonFormat(pattern = "yyyy-MM-dd")
-        private LocalDate dateEnquete;
-        private Long serviceId;
-        private String serviceCode;
-        private Long zoneRfuId;
-        private String zoneRfuNom;
-        private Float tauxTfu;
-        private Long valeurAdminParcelleNb;
-        @Enumerated(EnumType.STRING)
-        private NatureImpot natureImpot;
-        private Long valeurLocativeAdmMetreCarre;
-        private Long valeurAdminParcelleNbMetreCarre;
-        private Float montantTaxe;
-
-    public DonneesImpositionPaylaodWeb(Long id,
-                                       Long annee,
-                                       String codeDepartement,
-                                       String nomDepartement,
-                                       String codeCommune,
-                                       String nomCommune,
-                                       String codeArrondissement,
-                                       String nomArrondissement,
-                                       String codeQuartierVillage,
-                                       String nomQuartierVillage,
-                                       String q, String ilot,
-                                       String parcelle,
-                                       String nup,
-                                       String titreFoncier,
-                                       String numBatiment,
-                                       String numUniteLogement,
-                                       String ifu,
-                                       String npi,
-                                       String telProp,
-                                       String emailProp,
-                                       String nomProp,
-                                       String prenomProp,
-                                       String raisonSociale,
-                                       String adresseProp,
-                                       String telRep,
-                                       String emailRep,
-                                       String nomRep,
-                                       String prenomRep,
-                                       String adresseRep,
-                                       String longitude,
-                                       String latitude,
-                                       Integer superficieParc,
-                                       Long superficieAuSolBat,
-                                       Long superficieAuSolUlog,
-                                        Boolean batie,
-                                         Boolean exonere,
-                                         Boolean batimentExonere,
-                                         Boolean uniteLogementExonere,
-                                       Long valeurLocativeAdm,
-                                       Long montantLoyerAnnuel,
-                                       Long tfuMetreCarre,
-                                       Long tfuMinimum,
-                                       String standingBat,
-                                       String categorieBat,
-                                       Long nombrePiscine,
-                                       Long nombreUlog,
-                                       Long nombreBat,
-                                       LocalDate dateEnquete,
-                                       Long serviceId,
-                                       Long zoneRfuId,
-                                       Long valeurAdministrativeParcelleNonBati,
-                                       NatureImpot natureImpot,
-                                       String serviceCode,
-                                       String zoneRfuNom,
-                                        Long valeurBatiment,
-                                         Long valeurParcelle,
-                                        Long valeurLocativeAdmMetreCarre,
-                                        Long valeurAdministrativeParcelleNonBatiAuMetreCarre,
-                                        Float montantTaxe
-                                        ) {
-        this.id = id;
-        this.annee = annee;
-        this.codeDepartement = codeDepartement;
-        this.nomDepartement = nomDepartement;
-        this.codeCommune = codeCommune;
-        this.nomCommune = nomCommune;
-        this.codeArrondissement = codeArrondissement;
-        this.nomArrondissement = nomArrondissement;
-        this.codeQuartierVillage = codeQuartierVillage;
-        this.nomQuartierVillage = nomQuartierVillage;
-        this.q = q;
-        this.ilot = ilot;
-        this.parcelle = parcelle;
-        this.nup = nup;
-        this.titreFoncier = titreFoncier;
-        this.numBatiment = numBatiment;
-        this.numUniteLogement = numUniteLogement;
-        this.ifu = ifu;
-        this.npi = npi;
-        this.telProp = telProp;
-        this.emailProp = emailProp;
-        this.nomProp = nomProp;
-        this.prenomProp = prenomProp;
-        this.raisonSociale = raisonSociale;
-        this.adresseProp = adresseProp;
-        this.telRep = telRep;
-        this.emailRep = emailRep;
-        this.nomRep = nomRep;
-        this.prenomRep = prenomRep;
-        this.adresseRep = adresseRep;
-        this.longitude = longitude;
-        this.latitude = latitude;
-        this.superficieParc = superficieParc;
-        this.superficieAuSolBat = superficieAuSolBat;
-        this.superficieAuSolUlog = superficieAuSolUlog;
-        this.batie = batie;
-        this.exonere = exonere;
-        this.batimentExonere = batimentExonere;
-        this.uniteLogementExonere = uniteLogementExonere;
-        this.valeurLocativeAdm = valeurLocativeAdm;
-        this.montantLoyerAnnuel = montantLoyerAnnuel;
-        this.tfuMetreCarre = tfuMetreCarre;
-        this.tfuMinimum = tfuMinimum;
-        this.standingBat = standingBat;
-        this.categorieBat = categorieBat;
-        this.nombrePiscine = nombrePiscine;
-        this.nombreUlog = nombreUlog;
-        this.nombreBat = nombreBat;
-        this.dateEnquete = dateEnquete;
-        this.serviceId = serviceId;
-        this.zoneRfuId = zoneRfuId;
-        this.valeurAdminParcelleNb = valeurAdministrativeParcelleNonBati;
-        this.natureImpot = natureImpot;
-        this.serviceCode = serviceCode;
-        this.zoneRfuNom = zoneRfuNom;
-        this.valeurBatiment = valeurBatiment;
-        this.valeurParcelle = valeurParcelle;
-        this.valeurLocativeAdmMetreCarre = valeurLocativeAdmMetreCarre;
-        this.valeurAdminParcelleNbMetreCarre = valeurAdministrativeParcelleNonBatiAuMetreCarre;
-        this.montantTaxe = montantTaxe;
-    }
-}

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;
@@ -60,13 +60,6 @@ public class EnqueteBatimentPayloadWeb {
     private String representantPrenom;
     private String representantTel;
     private String representantNpi;
-    private Long categorieBatimentId;
-    private String categorieBatimentCode;
-    private String categorieBatimentStanding;
-    private Integer nombrePiscine;
-    private Long montantLocatifAnnuelCalcule;
-    private Long usageId;
-    private String usageNom;
 
     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,
@@ -75,15 +68,7 @@ public class EnqueteBatimentPayloadWeb {
                                      String representantNom,
                                      String representantPrenom,
                                      String representantTel,
-                                     String representantNpi,
-                                     Long categorieBatimentId,
-                                     String categorieBatimentCode,
-                                     String categorieBatimentStanding,
-                                     Integer nombrePiscine,
-                                     Long montantLocatifAnnuelCalcule,
-                                     Long usageId,
-                                     String usageNom
-                                     ) {
+                                     String representantNpi) {
         this.id = id;
         this.observation = observation;
         this.autreMenuisierie = autreMenuisierie;
@@ -124,12 +109,5 @@ public class EnqueteBatimentPayloadWeb {
         this.representantPrenom = representantPrenom;
         this.representantTel = representantTel;
         this.representantNpi = representantNpi;
-        this.categorieBatimentId = categorieBatimentId;
-        this.categorieBatimentCode = categorieBatimentCode;
-        this.categorieBatimentStanding = categorieBatimentStanding;
-        this.nombrePiscine = nombrePiscine;
-        this.montantLocatifAnnuelCalcule = montantLocatifAnnuelCalcule;
-        this.usageId = usageId ;
-        this.usageNom = usageNom ;
     }
 }

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

@@ -18,8 +18,8 @@ public class EnqueteUniteLogementPayloadWeb {
     private Integer nbreMenage;
     private Boolean enLocation;
     private Integer nbreMoisLocation;
-    private Long montantMensuelLocation;
-    private Long montantLocatifAnnuelDeclare;
+    private Float montantMensuelLoyer;
+    private Float montantLocatifAnnuelDeclare;
     private Long valeurUniteLogementEstime;
     private Long valeurUniteLogementReel;
     private Float superficieLouee;
@@ -49,26 +49,13 @@ public class EnqueteUniteLogementPayloadWeb {
     private String representantPrenom;
     private String representantTel;
     private String representantNpi;
-    private Long categorieBatimentId;
-    private String categorieBatimentCode;
-    private String categorieBatimentStanding;
-    private Long montantLocatifAnnuelCalcule;
-    private Integer nombrePiscine;
-    private Long usageId;
-    private String usageNom;
-    public EnqueteUniteLogementPayloadWeb(Long id, String observation, Integer nbrePiece, Integer nbreHabitant, Integer nbreMenage, Boolean enLocation, Integer nbreMoisLocation, Long montantMensuelLocation, Long 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,
+
+    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,
         String representantNom,
         String representantPrenom,
         String representantTel,
-        String representantNpi,
-        Long categorieBatimentId,
-        String categorieBatimentCode,
-        String categorieBatimentStanding,
-        Integer nombrePiscine,
-        Long montantLocatifAnnuelCalcule,
-        Long usageId,
-        String usageNom
+        String representantNpi
         ) {
         this.id = id;
         this.observation = observation;
@@ -77,7 +64,7 @@ public class EnqueteUniteLogementPayloadWeb {
         this.nbreMenage = nbreMenage;
         this.enLocation = enLocation;
         this.nbreMoisLocation = nbreMoisLocation;
-        this.montantMensuelLocation = montantMensuelLocation;
+        this.montantMensuelLoyer = montantMensuelLoyer;
         this.montantLocatifAnnuelDeclare = montantLocatifAnnuelDeclare;
         this.valeurUniteLogementEstime = valeurUniteLogementEstime;
         this.valeurUniteLogementReel = valeurUniteLogementReel;
@@ -107,12 +94,5 @@ public class EnqueteUniteLogementPayloadWeb {
         this.representantPrenom = representantPrenom;
         this.representantTel = representantTel;
         this.representantNpi = representantNpi;
-        this.categorieBatimentId = categorieBatimentId;
-        this.categorieBatimentCode = categorieBatimentCode;
-        this.categorieBatimentStanding = categorieBatimentStanding;
-        this.nombrePiscine = nombrePiscine;
-        this.montantLocatifAnnuelCalcule = montantLocatifAnnuelCalcule;
-        this.usageId = usageId ;
-        this.usageNom = usageNom ;
     }
 }

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

@@ -1,64 +0,0 @@
-package io.gmss.fiscad.paylaods.request.crudweb;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.fiscad.deserializer.LocalDateDeserializer;
-import io.gmss.fiscad.entities.decoupage.Commune;
-import io.gmss.fiscad.entities.infocad.parametre.Structure;
-import io.gmss.fiscad.entities.rfu.parametre.Exercice;
-import io.gmss.fiscad.enums.NatureImpot;
-import io.gmss.fiscad.enums.StatusAvis;
-import jakarta.persistence.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDate;
-
-@NoArgsConstructor
-@Data
-public class ImpositionsTfuPaylaodWeb {
-    private Long id;
-    private LocalDate dateGeneration;
-    private LocalDate dateCloture;
-    private String referencePieceAdmin;
-    private String datePieceAdmin;
-    @Enumerated(EnumType.STRING)
-    private StatusAvis statusAvis;
-    private Integer nombreAvis;
-    private Integer nombreAvisFnb;
-    private Integer nombreAvisBatiment;
-    private Integer nombreAvisUniteLog;
-    @Column(columnDefinition = "TEXT")
-    private String motif;
-    private Long exerciceId;
-    private Integer exerciceAnnee;
-    private Long communeId;
-    private String communeCode;
-    private String communeNom;
-    private Long structureId ;
-    private String structureNom ;
-    public ImpositionsTfuPaylaodWeb(Long id, LocalDate dateGeneration, LocalDate dateCloture, String referencePieceAdmin, String datePieceAdmin, StatusAvis statusAvis, Integer nombreAvis, String motif, Long exerciceId, Integer exerciceAnnee, Long communeId, String communeCode, String communeNom, Long structureId, String structureNom,
-                                    Integer nombreAvisFnb,
-                                    Integer nombreAvisBatiment,
-                                    Integer nombreAvisUniteLog
-                                    ) {
-        this.id = id;
-        this.dateGeneration = dateGeneration;
-        this.dateCloture = dateCloture;
-        this.referencePieceAdmin = referencePieceAdmin;
-        this.datePieceAdmin = datePieceAdmin;
-        this.statusAvis = statusAvis;
-        this.nombreAvis = nombreAvis;
-        this.motif = motif;
-        this.exerciceId = exerciceId;
-        this.exerciceAnnee = exerciceAnnee;
-        this.communeId = communeId;
-        this.communeCode = communeCode;
-        this.communeNom = communeNom;
-        this.structureId = structureId;
-        this.structureNom = structureNom;
-        this.nombreAvisFnb = nombreAvisFnb;
-        this.nombreAvisBatiment = nombreAvisBatiment;
-        this.nombreAvisUniteLog = nombreAvisUniteLog;
-    }
-}

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

@@ -1,160 +0,0 @@
-package io.gmss.fiscad.paylaods.request.crudweb;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.gmss.fiscad.entities.decoupage.Arrondissement;
-import io.gmss.fiscad.entities.decoupage.Commune;
-import io.gmss.fiscad.entities.decoupage.Departement;
-import io.gmss.fiscad.entities.decoupage.Quartier;
-import io.gmss.fiscad.entities.infocad.metier.Parcelle;
-import io.gmss.fiscad.enums.SourceDonnee;
-import io.gmss.fiscad.enums.StatutParcelle;
-import jakarta.persistence.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.ColumnDefault;
-import org.locationtech.jts.geom.Polygon;
-import org.n52.jackson.datatype.jts.GeometryDeserializer;
-import org.n52.jackson.datatype.jts.GeometrySerializer;
-
-import java.time.LocalDate;
-
-@NoArgsConstructor
-@Data
-public class ParcelleGeomPaylaodWeb {
-    private Long id;
-    private String nup;
-    private String nupProvisoire;
-    private String longitude;
-    private String latitude;
-    private String numeroRue;
-    private String numeroEntreePorte;
-
-    private String codeInstad;
-    private String numeroEtatLieux;
-    private String numeroTitreFoncier;
-    private LocalDate dateTitreFoncier;
-    private Boolean batie ;
-
-    private String npi;
-    private String ifu;
-    private String nom;
-    private String prenom;
-    private String raisonSociale;
-    private String nomEtPrenoms;
-    private String telephone;
-    private String adresse;
-
-    private String nomRepresentant;
-    private String prenomRepresentant;
-    private String raisonSocialeRepresentant;
-    private String nomEtPrenomsRepresentant;
-    private String telephoneRepresentant;
-    private String adresseRepresentant;
-
-    private String q;
-    private String zone;
-    private String ilot;
-    private String p;
-
-    private String qLotissement;
-    private String ilotLotissement;
-    private String pLotissement;
-
-    private String pointsPolygone;
-    private Integer superficie;
-
-    private String dateCollecte;
-    @Enumerated(EnumType.STRING)
-    private SourceDonnee sourceDonnees;
-    private String observations;
-    @Enumerated(EnumType.STRING)
-    private StatutParcelle statutParcelle;
-
-    private Long departementId;
-    private String departementCode;
-    private String departementNom;
-
-    private Long communeId;
-    private String communeCode;
-    private String communeNom;
-
-    private Long arrondissementId;
-    private String arrondissementCode;
-    private String arrondissementNom;
-
-
-    private Long quartierId ;
-    private String quartierCode ;
-    private String quartierNom ;
-
-    private Integer  geomSrid;
-    @JsonSerialize(using = GeometrySerializer.class)
-    @JsonDeserialize(contentUsing = GeometryDeserializer.class)
-    //@Column(name = "geometry",columnDefinition = "geometry(Polygon,32631)")
-    private Polygon geometry;
-    //@Column(columnDefinition = "TEXT")
-    private String geometryString;
-
-    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) {
-        this.id = id;
-        this.nup = nup;
-        this.nupProvisoire = nupProvisoire;
-        this.longitude = longitude;
-        this.latitude = latitude;
-        this.numeroRue = numeroRue;
-        this.numeroEntreePorte = numeroEntreePorte;
-        this.codeInstad = codeInstad;
-        this.numeroEtatLieux = numeroEtatLieux;
-        this.numeroTitreFoncier = numeroTitreFoncier;
-        this.dateTitreFoncier = dateTitreFoncier;
-        this.batie = batie;
-        this.npi = npi;
-        this.ifu = ifu;
-        this.nom = nom;
-        this.prenom = prenom;
-        this.raisonSociale = raisonSociale;
-        this.nomEtPrenoms = nomEtPrenoms;
-        this.telephone = telephone;
-        this.adresse = adresse;
-        this.nomRepresentant = nomRepresentant;
-        this.prenomRepresentant = prenomRepresentant;
-        this.raisonSocialeRepresentant = raisonSocialeRepresentant;
-        this.nomEtPrenomsRepresentant = nomEtPrenomsRepresentant;
-        this.telephoneRepresentant = telephoneRepresentant;
-        this.adresseRepresentant = adresseRepresentant;
-        this.q = q;
-        this.zone = zone;
-        this.ilot = ilot;
-        this.p = p;
-        this.qLotissement = qLotissement;
-        this.ilotLotissement = ilotLotissement;
-        this.pLotissement = pLotissement;
-        this.pointsPolygone = pointsPolygone;
-        this.superficie = superficie;
-        this.dateCollecte = dateCollecte;
-        this.sourceDonnees = sourceDonnees;
-        this.observations = observations;
-        this.statutParcelle = statutParcelle;
-        this.departementId = departementId;
-        this.departementCode = departementCode;
-        this.departementNom = departementNom;
-        this.communeId = communeId;
-        this.communeCode = communeCode;
-        this.communeNom = communeNom;
-        this.arrondissementId = arrondissementId;
-        this.arrondissementCode = arrondissementCode;
-        this.arrondissementNom = arrondissementNom;
-        this.quartierId = quartierId;
-        this.quartierCode = quartierCode;
-        this.quartierNom = quartierNom;
-        this.geomSrid = geomSrid;
-        this.geometry = geometry;
-        this.geometryString = geometryString;
-        this.parcelleId = parcelleId;
-    }
-}

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

@@ -12,7 +12,7 @@ public class UniteLogementPaylaodWeb {
     private String numeroEtage;
     private String code;
     private Long batimentId;
-    private Float superficieAuSol;
+    private Float superficieSol;
     private Float superficieLouee;
     private String batimentNub;
     private String observation;
@@ -22,41 +22,14 @@ public class UniteLogementPaylaodWeb {
     private String personnePrenom;
     private String personneRaisonSociale;
     private Long enqueteUniteLogementCourantId;
-    private Long categorieBatimentId;
-    private String categorieBatimentCode;
-    private String categorieBatimentStanding;
-    private Long montantMensuelLocation;
-    private Long montantLocatifAnnuelDeclare;
-    private Long montantLocatifAnnuelCalcule;
-    private Long montantLocatifAnnuelEstime;
-    private Long valeurUniteLogementEstime;
-    private Long valeurUniteLogementReel;
-    private Long valeurUniteLogementCalcule;
-    private Integer nombrePiscine;
-    private Long usageId;
-    private String usageNom;
 
-    public UniteLogementPaylaodWeb(Long id, String nul, String numeroEtage, String code, Long batimentId, Float superficieAuSol, Float superficieLouee, String batimentNub, String observation, LocalDate dateConstruction, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale,Long enqueteUniteLogementCourantId,
-                                    Long categorieBatimentId,
-                                     String categorieBatimentCode,
-                                     String categorieBatimentStanding,
-                                    Long montantMensuelLocation,
-                                     Long montantLocatifAnnuelDeclare,
-                                     Long montantLocatifAnnuelCalcule,
-                                     Long valeurUniteLogementEstime,
-                                     Long valeurUniteLogementReel,
-                                     Integer nombrePiscine,
-                                     Long usageId,
-                                     String usageNom,
-                                    Long montantLocatifAnnuelEstime,
-                                    Long valeurUniteLogementCalcule
-                                     ) {
+    public UniteLogementPaylaodWeb(Long id, String nul, String numeroEtage, String code, Long batimentId, Float superficieSol, Float superficieLouee, String batimentNub, String observation, LocalDate dateConstruction, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale,Long enqueteUniteLogementCourantId) {
         this.id = id;
         this.nul = nul;
         this.numeroEtage = numeroEtage;
         this.code = code;
         this.batimentId = batimentId;
-        this.superficieAuSol = superficieAuSol;
+        this.superficieSol = superficieSol;
         this.superficieLouee = superficieLouee;
         this.batimentNub = batimentNub;
         this.observation = observation;
@@ -66,18 +39,5 @@ public class UniteLogementPaylaodWeb {
         this.personnePrenom = personnePrenom;
         this.personneRaisonSociale = personneRaisonSociale;
         this.enqueteUniteLogementCourantId = enqueteUniteLogementCourantId;
-        this.categorieBatimentId = categorieBatimentId;
-        this.categorieBatimentCode = categorieBatimentCode;
-        this.categorieBatimentStanding = categorieBatimentStanding;
-        this.montantMensuelLocation = montantMensuelLocation;
-        this.montantLocatifAnnuelDeclare = montantLocatifAnnuelDeclare;
-        this.montantLocatifAnnuelCalcule = montantLocatifAnnuelCalcule;
-        this.valeurUniteLogementEstime = valeurUniteLogementEstime;
-        this.valeurUniteLogementReel = valeurUniteLogementReel;
-        this.nombrePiscine = nombrePiscine;
-        this.usageId = usageId ;
-        this.usageNom = usageNom ;
-        this.montantLocatifAnnuelEstime = montantLocatifAnnuelEstime ;
-        this.valeurUniteLogementCalcule = valeurUniteLogementCalcule ;
     }
 }

src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteUniteLogementPayload.java

@@ -17,9 +17,9 @@ public class EnqueteUniteLogementPayload {
     private int nbreHabitant;
     private int nbreMenage;
     private boolean enLocation;
-    private Long montantMensuelLocation;
+    private float montantMensuelLoyer;
     private int nbreMoisEnLocation;
-    private Long montantLocatifAnnuelDeclare;
+    private float montantLocatifAnnuelDeclare;
     private float surfaceLouee;
     private boolean sbee;
     private boolean soneb;

src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/SecteurRepository.java

@@ -186,19 +186,5 @@ public interface SecteurRepository extends JpaRepository<Secteur, Long> {
     Optional<SecteurPaylaodWeb> findSecteurToDtoById(@Param("idSecteur") Long idSecteur);
 
 
-    @Query("""
-             SELECT new io.gmss.fiscad.entities.decoupage.Secteur(
-                  sec.id,
-                  sec.code,
-                  sec.nom,
-                  secti 
-            )
-            FROM Secteur sec
-            LEFT JOIN sec.section secti
-            LEFT JOIN secti.structure st
-            LEFT JOIN st.commune com
-            LEFT JOIN com.departement dep
-            WHERE dep.id = :idDepartement
-            """)
-     List<Secteur> findSectionsByDepartement(@Param("idDepartement") Long idDepartement);
+
 }

src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/EnqueteRepository.java

@@ -13,7 +13,6 @@ import io.gmss.fiscad.paylaods.response.synchronisation.EnqueteNonSyncResponse;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -23,26 +22,6 @@ import java.util.Optional;
 public interface EnqueteRepository extends JpaRepository<Enquete, Long> {
      Optional<Enquete> findFirstByCodeParcelle(String codeParcelle);
     Optional<Enquete> findByMobileDataId(Long id);
-
-    @Modifying
-    @Query("""
-        UPDATE Enquete e
-        SET e.statutEnquete = 'CLOTURE'
-        WHERE EXISTS (
-            SELECT 1
-            FROM Parcelle p 
-            JOIN p.quartier q 
-            JOIN SecteurDecoupage cd on cd.quartier.id=q.id
-            JOIN cd.secteur s 
-            JOIN s.section sect 
-            JOIN sect.structure stru
-            WHERE e.parcelle.id=p.id
-            AND stru.id= :structureId
-        )
-        AND e.exercice.id = :exerciceId
-    """)
-    Integer clotureEnqueteParcelle(@Param("structureId") Long structureId,@Param("exerciceId") Long exerciceId);
-
     @Query(value = "select distinct " +
             " e.id," +
             " e.parcelle_id as parcelleId," +

src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ParcelleGeomRepository.java

@@ -1,14 +1,10 @@
 package io.gmss.fiscad.persistence.repositories.infocad.metier;
 
 import io.gmss.fiscad.entities.infocad.metier.ParcelleGeom;
-import io.gmss.fiscad.paylaods.request.crudweb.ParcelleGeomPaylaodWeb;
 import jakarta.transaction.Transactional;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
@@ -16,9 +12,7 @@ import java.util.Optional;
 public interface ParcelleGeomRepository extends JpaRepository<ParcelleGeom, Long> {
 
     List<ParcelleGeom> findAllByQuartier_Code(String code);
-    List<ParcelleGeom> findAllByQuartier_Id(Long quartierId);
     List<ParcelleGeom> findAllByQuartier_Arrondissement_Code(String code);
-    List<ParcelleGeom> findAllByQuartier_Arrondissement_Id(Long arrondissementId);
 
     Optional<ParcelleGeom> findFirstByNupProvisoire(String numProvisoir);
     @Modifying
@@ -79,198 +73,6 @@ public interface ParcelleGeomRepository extends JpaRepository<ParcelleGeom, Long
     void majCentroidParcelle();
 
 
-    @Modifying
-    @Transactional
-    @Query(value = """
-             update parcelle_geom pg
-              set parcelle_id = p.id,statut_parcelle='NON_AJOUR'
-              from parcelle p
-              where upper(p.q)=upper(pg.q)
-              and upper(p.i)=upper(pg.ilot)
-              and upper(p.p)=upper(pg.p)
-              and parcelle_is is null;
-            """,nativeQuery = true)
-    void majParcelleId();
 
 
-    @Modifying
-    @Transactional
-    @Query(value = """
-            UPDATE parcelle_geom p
-              SET batie = true
-              WHERE EXISTS (
-                      SELECT 1
-                      FROM Batiment b
-                      WHERE b.parcelle_id = p.parcelle_id
-              )
-              and p.parcelle_id is not null;
-            """,nativeQuery = true)
-    void majParcelleBatie();
-
-
-
-
-
-
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.ParcelleGeomPaylaodWeb(
-        pg.id,
-        pg.nup,
-        pg.nupProvisoire,
-        pg.longitude,
-        pg.latitude,
-        pg.numeroRue,
-        pg.numeroEntreePorte,
-        pg.codeInstad,
-        pg.numeroEtatLieux,
-        pg.numeroTitreFoncier,
-        pg.dateTitreFoncier,
-        pg.batie,
-        pg.npi,
-        pg.ifu,
-        pers.nom,
-        pers.prenom,
-        pers.raisonSociale,
-        pg.nomEtPrenoms,
-        pg.telephone,
-        pg.adresse,
-        pg.nomRepresentant,
-        pg.prenomRepresentant,
-        pg.raisonSocialeRepresentant,
-        pg.nomEtPrenomsRepresentant,
-        pg.telephoneRepresentant,
-        pg.adresseRepresentant,
-        pg.q,
-        pg.zone,
-        pg.ilot,
-        pg.p,
-        pg.qLotissement,
-        pg.ilotLotissement,
-        pg.pLotissement,
-        pg.pointsPolygone,
-        pg.superficie,
-        pg.dateCollecte,
-        pg.sourceDonnees,
-        pg.observations,
-        pg.statutParcelle,
-        d.id,
-        d.code,
-        d.nom,
-        c.id,
-        c.code,
-        c.nom,
-        a.id,
-        a.code,
-        a.nom,
-        q.id,
-        q.code,
-        q.nom,
-        pg.geomSrid,
-        pg.geometry,
-        pg.geometryString,
-        parc.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
-    LEFT JOIN pg.quartier q
-    WHERE q.id = :quartierId
-""")
-    List<ParcelleGeomPaylaodWeb> findAllByQuartierId(@Param("quartierId") Long quartierId);
-
-    @Query(
-            value = """
-        SELECT new io.gmss.fiscad.paylaods.request.crudweb.ParcelleGeomPaylaodWeb(
-            pg.id,
-            pg.nup,
-            pg.nupProvisoire,
-            pg.longitude,
-            pg.latitude,
-            pg.numeroRue,
-            pg.numeroEntreePorte,
-            pg.codeInstad,
-            pg.numeroEtatLieux,
-            pg.numeroTitreFoncier,
-            pg.dateTitreFoncier,
-            pg.batie,
-            pg.npi,
-            pg.ifu,
-            pers.nom,
-            pers.prenom,
-            pers.raisonSociale,
-            pg.nomEtPrenoms,
-            pg.telephone,
-            pg.adresse,
-            pg.nomRepresentant,
-            pg.prenomRepresentant,
-            pg.raisonSocialeRepresentant,
-            pg.nomEtPrenomsRepresentant,
-            pg.telephoneRepresentant,
-            pg.adresseRepresentant,
-            pg.q,
-            pg.zone,
-            pg.ilot,
-            pg.p,
-            pg.qLotissement,
-            pg.ilotLotissement,
-            pg.pLotissement,
-            pg.pointsPolygone,
-            pg.superficie,
-            pg.dateCollecte,
-            pg.sourceDonnees,
-            pg.observations,
-            pg.statutParcelle,
-            d.id,
-            d.code,
-            d.nom,
-            c.id,
-            c.code,
-            c.nom,
-            a.id,
-            a.code,
-            a.nom,
-            q.id,
-            q.code,
-            q.nom,
-            pg.geomSrid,
-            pg.geometry,
-            pg.geometryString,
-            parc.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
-        LEFT JOIN pg.quartier q
-        WHERE q.id = :quartierId
-        """,
-            countQuery = """
-        SELECT COUNT(pg)
-        FROM ParcelleGeom pg
-        WHERE pg.quartier.id = :quartierId
-        """
-    )
-    Page<ParcelleGeomPaylaodWeb> findAllByQuartierIdPageable(
-            @Param("quartierId") Long quartierId,
-            Pageable pageable
-    );
 }

src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ParcelleRepository.java

@@ -11,7 +11,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -21,32 +20,6 @@ import java.util.Optional;
 public interface ParcelleRepository extends JpaRepository<Parcelle, Long>, JpaSpecificationExecutor<Parcelle>, ParcelleRepositoryCustom {
     Optional<Parcelle> findFirstByExternalKeyAndTerminal_Id(Long externalKey, Long TerminalId);
     Optional<Parcelle> findByMobileDataId(Long id);
-
-
-    @Modifying
-    @Query("""
-        UPDATE Parcelle p
-        SET p.batie = TRUE
-        WHERE EXISTS (
-            SELECT 1
-            FROM Batiment b
-            WHERE b.parcelle.id = p.id
-        )
-    """)
-    Integer updateParcelleBatieTrue();
-
-    @Modifying
-    @Query("""
-        UPDATE Parcelle p
-        SET p.batie = FALSE
-        WHERE NOT EXISTS (
-            SELECT 1
-            FROM Batiment b
-            WHERE b.parcelle.id = p.id
-        )
-    """)
-    Integer updateParcelleBatieFalse();
-
     @Query(value = "Select  " +
             " p.id as idBackend, " +
             " p.external_key as externalKey, " +

src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/StructureRepository.java

@@ -174,6 +174,4 @@ public interface StructureRepository extends JpaRepository<Structure, Long> {
             """)
     Page<StructurePaylaodWeb> findAllStructureByCommuneToDtoPageable(@Param("communeId") Long communeId, Pageable pageable);
 
-
-    List<Structure> findDistinctByCommune_Departement_Id(Long departementId);
 }

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/BatimentRepository.java

@@ -33,7 +33,6 @@ public interface BatimentRepository extends JpaRepository<Batiment, Long> {
 
     Long countByParcelle_Quartier_CodeLike(String codeQuartier);
 
-
     @Query("""
             SELECT new io.gmss.fiscad.paylaods.request.crudweb.BatimentPaylaodWeb(
                 b.id,
@@ -51,25 +50,10 @@ public interface BatimentRepository extends JpaRepository<Batiment, Long> {
                 per.raisonSociale,
                 eb.superficieAuSol,
                 eb.superficieLouee,
-                eb.id,
-                cb.id,
-                cb.code,
-                cb.standing, 
-                eb.nombrePiscine,
-                eb.montantLocatifAnnuelDeclare,
-                eb.montantLocatifAnnuelCalcule,
-                eb.valeurBatimentEstime,
-                eb.valeurBatimentReel,
-                eb.montantMensuelLocation,
-                us.id,
-                us.nom,
-                eb.montantLocatifAnnuelEstime,
-                eb.valeurBatimentCalcule,
-                eb.nbreUniteLogement
+                eb.id
             )
             FROM Batiment b
             JOIN b.parcelle p
-            LEFT JOIN b.categorieBatiment cb
             LEFT JOIN EnqueteBatiment eb
                    ON eb.batiment = b
                   AND eb.dateEnquete = (
@@ -78,7 +62,6 @@ public interface BatimentRepository extends JpaRepository<Batiment, Long> {
                         WHERE eb2.batiment = b
                   )
             LEFT JOIN eb.personne per
-            LEFT JOIN eb.usage us
             WHERE b.id = :batimentId
             """)
     Optional<BatimentPaylaodWeb> findBatimentAvecOccupantCourantToDto(@Param("batimentId") Long batimentId);
@@ -100,25 +83,10 @@ public interface BatimentRepository extends JpaRepository<Batiment, Long> {
                 per.raisonSociale,
                 eb.superficieAuSol,
                 eb.superficieLouee,
-                eb.id,
-                cb.id,
-                cb.code,
-                cb.standing, 
-                eb.nombrePiscine,
-                eb.montantLocatifAnnuelDeclare,
-                eb.montantLocatifAnnuelCalcule,
-                eb.valeurBatimentEstime,
-                eb.valeurBatimentReel,
-                eb.montantMensuelLocation,
-                us.id,
-                us.nom,
-                eb.montantLocatifAnnuelEstime,
-                eb.valeurBatimentCalcule,
-                eb.nbreUniteLogement
+                eb.id
             )
             FROM Batiment b
             JOIN b.parcelle p
-            LEFT JOIN b.categorieBatiment cb
             LEFT JOIN EnqueteBatiment eb
                    ON eb.batiment = b
                   AND eb.dateEnquete = (
@@ -127,7 +95,6 @@ public interface BatimentRepository extends JpaRepository<Batiment, Long> {
                         WHERE eb2.batiment = b
                   )
             LEFT JOIN eb.personne per
-            LEFT JOIN eb.usage us
             """)
     List<BatimentPaylaodWeb> findAllBatimentsAvecOccupantCourantToDto();
 
@@ -150,25 +117,10 @@ public interface BatimentRepository extends JpaRepository<Batiment, Long> {
                     per.raisonSociale,
                     eb.superficieAuSol,
                     eb.superficieLouee,
-                    eb.id,
-                    cb.id,
-                    cb.code,
-                    cb.standing , 
-                eb.nombrePiscine,
-                eb.montantLocatifAnnuelDeclare,
-                eb.montantLocatifAnnuelCalcule,
-                eb.valeurBatimentEstime,
-                eb.valeurBatimentReel,
-                eb.montantMensuelLocation ,
-                us.id,
-                us.nom,
-                eb.montantLocatifAnnuelEstime,
-                eb.valeurBatimentCalcule,
-                eb.nbreUniteLogement
+                    eb.id
                 )
                 FROM Batiment b
                 JOIN b.parcelle p
-                LEFT JOIN b.categorieBatiment cb
                 LEFT JOIN EnqueteBatiment eb
                        ON eb.batiment = b
                       AND eb.dateEnquete = (
@@ -177,7 +129,6 @@ public interface BatimentRepository extends JpaRepository<Batiment, Long> {
                             WHERE eb2.batiment = b
                       )
                 LEFT JOIN eb.personne per
-                LEFT JOIN eb.usage us
                 """,
                         countQuery = """
                 SELECT COUNT(b)
@@ -205,25 +156,10 @@ public interface BatimentRepository extends JpaRepository<Batiment, Long> {
                 per.raisonSociale,
                 eb.superficieAuSol,
                 eb.superficieLouee,
-                eb.id,
-                cb.id,
-                cb.code,
-                cb.standing, 
-                eb.nombrePiscine,
-                eb.montantLocatifAnnuelDeclare,
-                eb.montantLocatifAnnuelCalcule,
-                eb.valeurBatimentEstime,
-                eb.valeurBatimentReel,
-                eb.montantMensuelLocation ,
-                us.id,
-                us.nom,
-                eb.montantLocatifAnnuelEstime,
-                eb.valeurBatimentCalcule,
-                eb.nbreUniteLogement
+                eb.id
             )
             FROM Batiment b
             JOIN b.parcelle p
-            LEFT JOIN b.categorieBatiment cb
             LEFT JOIN EnqueteBatiment eb
                    ON eb.batiment = b
                   AND eb.dateEnquete = (
@@ -232,7 +168,6 @@ public interface BatimentRepository extends JpaRepository<Batiment, Long> {
                         WHERE eb2.batiment = b
                   )
             LEFT JOIN eb.personne per
-            LEFT JOIN eb.usage us
             WHERE p.id = :parcelleId
             """)
     List<BatimentPaylaodWeb> findAllBatimentsAvecOccupantCourantByParcelleToDto(
@@ -259,25 +194,10 @@ public interface BatimentRepository extends JpaRepository<Batiment, Long> {
                         per.raisonSociale,
                         eb.superficieAuSol,
                         eb.superficieLouee,
-                        eb.id,
-                        cb.id,
-                        cb.code,
-                        cb.standing, 
-                eb.nombrePiscine,
-                eb.montantLocatifAnnuelDeclare,
-                eb.montantLocatifAnnuelCalcule,
-                eb.valeurBatimentEstime,
-                eb.valeurBatimentReel,
-                eb.montantMensuelLocation,
-                us.id,
-                us.nom ,
-                eb.montantLocatifAnnuelEstime,
-                eb.valeurBatimentCalcule,
-                eb.nbreUniteLogement
+                        eb.id
                     )
                     FROM Batiment b
                     JOIN b.parcelle p
-                    LEFT JOIN b.categorieBatiment cb
                     LEFT JOIN EnqueteBatiment eb
                            ON eb.batiment = b
                           AND eb.dateEnquete = (
@@ -286,7 +206,6 @@ public interface BatimentRepository extends JpaRepository<Batiment, Long> {
                                 WHERE eb2.batiment = b
                           )
                     LEFT JOIN eb.personne per
-                    LEFT JOIN eb.usage us
                     WHERE p.id = :parcelleId
                     """,
                     countQuery = """

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueBatimentRepository.java

@@ -55,14 +55,12 @@ public interface CaracteristiqueBatimentRepository extends JpaRepository<Caracte
                  ca.code,
                  ca.libelle,
                  cb.valeur,
-                 cb.observation,
-                 ca.typeCaracteristique.id,
-                 ca.typeCaracteristique.libelle
+                 cb.observation
             )
             FROM CaracteristiqueBatiment cb
-            LEFT JOIN cb.caracteristique ca
-            LEFT JOIN cb.enqueteBatiment eb
-            LEFT JOIN eb.exercice ex
+            JOIN cb.caracteristique ca
+            JOIN cb.enqueteBatiment eb
+            JOIN eb.exercice ex
             WHERE cb.id = :caracteristiqueBatimentId
             """)
     Optional<CaracteristiqueBatimentPayloadWeb> findCaracteristiqueBatimentToDto(@Param("caracteristiqueBatimentId") Long caracteristiqueBatimentId);
@@ -97,9 +95,7 @@ public interface CaracteristiqueBatimentRepository extends JpaRepository<Caracte
                  ca.code,
                  ca.libelle,
                  cb.valeur,
-                 cb.observation,
-                 ca.typeCaracteristique.id,
-                 ca.typeCaracteristique.libelle
+                 cb.observation
             )
             FROM CaracteristiqueBatiment cb
             JOIN cb.caracteristique ca
@@ -118,14 +114,13 @@ public interface CaracteristiqueBatimentRepository extends JpaRepository<Caracte
                  ca.code,
                  ca.libelle,
                  cb.valeur,
-                 cb.observation,
-                 ca.typeCaracteristique.id,
-                 ca.typeCaracteristique.libelle
+                 cb.observation
             )
             FROM CaracteristiqueBatiment cb
             JOIN cb.caracteristique ca
             JOIN cb.enqueteBatiment eb
             JOIN eb.exercice ex
+            WHERE eb.id = :enqueteBatimentId
             """,
             countQuery = """
              SELECT COUNT(distinct  cb)
@@ -148,9 +143,7 @@ public interface CaracteristiqueBatimentRepository extends JpaRepository<Caracte
                  ca.code,
                  ca.libelle,
                  cb.valeur,
-                 cb.observation,
-                 ca.typeCaracteristique.id,
-                 ca.typeCaracteristique.libelle
+                 cb.observation
             )
             FROM CaracteristiqueBatiment cb
             JOIN cb.caracteristique ca
@@ -170,9 +163,7 @@ public interface CaracteristiqueBatimentRepository extends JpaRepository<Caracte
                  ca.code,
                  ca.libelle,
                  cb.valeur,
-                 cb.observation,
-                 ca.typeCaracteristique.id,
-                 ca.typeCaracteristique.libelle
+                 cb.observation
             )
             FROM CaracteristiqueBatiment cb
             JOIN cb.caracteristique ca

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueParcelleRepository.java

@@ -49,9 +49,7 @@ public interface CaracteristiqueParcelleRepository extends JpaRepository<Caracte
                  ca.code,
                  ca.libelle,
                  cp.valeur,
-                 cp.observation,
-                 ca.typeCaracteristique.id,
-                 ca.typeCaracteristique.libelle
+                 cp.observation
             )
             FROM CaracteristiqueParcelle cp
             JOIN cp.caracteristique ca
@@ -71,9 +69,7 @@ public interface CaracteristiqueParcelleRepository extends JpaRepository<Caracte
                  ca.code,
                  ca.libelle,
                  cp.valeur,
-                 cp.observation,
-                 ca.typeCaracteristique.id,
-                 ca.typeCaracteristique.libelle
+                 cp.observation
             )
             FROM CaracteristiqueParcelle cp
             JOIN cp.caracteristique ca
@@ -93,9 +89,7 @@ public interface CaracteristiqueParcelleRepository extends JpaRepository<Caracte
                  ca.code,
                  ca.libelle,
                  cp.valeur,
-                 cp.observation,
-                 ca.typeCaracteristique.id,
-                 ca.typeCaracteristique.libelle
+                 cp.observation
             )
             FROM CaracteristiqueParcelle cp
             JOIN cp.caracteristique ca

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java

@@ -53,15 +53,13 @@ public interface CaracteristiqueUniteLogementRepository extends JpaRepository<Ca
                  ca.code,
                  ca.libelle,
                  cul.valeur,
-                 cul.observation,
-                 ca.typeCaracteristique.id,
-                 ca.typeCaracteristique.libelle
+                 cul.observation
             )
             FROM CaracteristiqueUniteLogement cul
             LEFT JOIN cul.caracteristique ca
             LEFT JOIN cul.enqueteUniteLogement eul
             LEFT JOIN eul.exercice ex
-            WHERE cul.enqueteUniteLogement.id = :caracteristiqueUniteLogementId
+            WHERE cul.id = :caracteristiqueUniteLogementId
             """)
     Optional<CaracteristiqueUniteLogementPayloadWeb> findCaracteristiqueUniteLogementToDto(@Param("caracteristiqueUniteLogementId") Long caracteristiqueUniteLogementId);
 
@@ -75,15 +73,13 @@ public interface CaracteristiqueUniteLogementRepository extends JpaRepository<Ca
                  ca.code,
                  ca.libelle,
                  cul.valeur,
-                 cul.observation,
-                 ca.typeCaracteristique.id,
-                 ca.typeCaracteristique.libelle
+                 cul.observation
             )
             FROM CaracteristiqueUniteLogement cul
             LEFT JOIN cul.caracteristique ca
             LEFT JOIN cul.enqueteUniteLogement eul
             LEFT JOIN eul.exercice ex
-            WHERE cul.enqueteUniteLogement.id = :enqueteUniteLogementId
+            WHERE cul.id = :enqueteUniteLogementId
             """)
     List<CaracteristiqueUniteLogementPayloadWeb> findAllCaracteristiqueUniteLogementByEnqueteUloToDto(@Param("enqueteUniteLogementId") Long enqueteUniteLogementId);
 
@@ -97,9 +93,7 @@ public interface CaracteristiqueUniteLogementRepository extends JpaRepository<Ca
                  ca.code,
                  ca.libelle,
                  cul.valeur,
-                 cul.observation,
-                 ca.typeCaracteristique.id,
-                 ca.typeCaracteristique.libelle
+                 cul.observation
             )
             FROM CaracteristiqueUniteLogement cul
             LEFT JOIN cul.caracteristique ca
@@ -118,9 +112,7 @@ public interface CaracteristiqueUniteLogementRepository extends JpaRepository<Ca
                  ca.code,
                  ca.libelle,
                  cul.valeur,
-                 cul.observation,
-                 ca.typeCaracteristique.id,
-                 ca.typeCaracteristique.libelle
+                 cul.observation
             )
             FROM CaracteristiqueUniteLogement cul
             LEFT JOIN cul.caracteristique ca
@@ -148,9 +140,7 @@ public interface CaracteristiqueUniteLogementRepository extends JpaRepository<Ca
                  ca.code,
                  ca.libelle,
                  cul.valeur,
-                 cul.observation,
-                 ca.typeCaracteristique.id,
-                 ca.typeCaracteristique.libelle
+                 cul.observation
             )
             FROM CaracteristiqueUniteLogement cul
             LEFT JOIN cul.caracteristique ca

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java

@@ -2,13 +2,9 @@ package io.gmss.fiscad.persistence.repositories.rfu.metier;
 
 import io.gmss.fiscad.entities.infocad.parametre.Personne;
 import io.gmss.fiscad.entities.rfu.metier.DonneesImpositionTfu;
-import io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb;
 import io.gmss.fiscad.paylaods.response.DonneesImpositionTfuResponse;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
@@ -123,411 +119,9 @@ public interface DonneesImpositionTfuRepository extends JpaRepository<DonneesImp
         """, nativeQuery = true)
     List<DonneesImpositionTfuResponse> findAllDonneesImpositionTfu(Long communeId, int annee);
 
+    List<DonneesImpositionTfu> findAllByImpositionsTfu_Id(Long impositionId);
     List<DonneesImpositionTfu> findAllByImpositionsTfu_IdAndCodeArrondissement(Long impositionId,String arrondissementCode);
 
 
-    @Query("""
-SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
-        d.id,
-        d.annee,
-        d.codeDepartement,
-        d.nomDepartement,
-        d.codeCommune,
-        d.nomCommune,
-        d.codeArrondissement,
-        d.nomArrondissement,
-        d.codeQuartierVillage,
-        d.nomQuartierVillage,
-        d.q,
-        d.ilot,
-        d.parcelle,
-        d.nup,
-        d.titreFoncier,
-        d.numBatiment,
-        d.numUniteLogement,
-        d.ifu,
-        d.npi,
-        d.telProp,
-        d.emailProp,
-        d.nomProp,
-        d.prenomProp,
-        d.raisonSociale,
-        d.adresseProp,
-        d.telSc,
-        d.emailSc,
-        d.nomSc,
-        d.prenomSc,
-        d.adresseSc,
-        d.longitude,
-        d.latitude,
-        d.superficieParc,
-        d.superficieAuSolBat,
-        d.superficieAuSolUlog,
-        d.batie,
-        d.exonere,
-        d.batimentExonere,
-        d.uniteLogementExonere,
-        d.valeurLocativeAdm,
-        d.montantLoyerAnnuel,
-        d.tfuMetreCarre,
-        d.tfuMinimum,
-        d.standingBat,
-        d.categorieBat,
-        d.nombrePiscine,
-        d.nombreUlog,
-        d.nombreBat,
-        d.dateEnquete,
-        s.id,
-        z.id,
-        d.valeurAdminParcelleNb,
-        d.natureImpot,
-        s.code,
-        z.nom,
-        d.valeurBatiment,
-        d.valeurParcelle,
-        d.valeurLocativeAdmMetreCarre,
-        d.valeurAdminParcelleNbMetreCarre,
-        d.montantTaxe
-        )
-        FROM DonneesImpositionTfu d
-        JOIN d.impositionsTfu itfu
-        LEFT join d.structure s 
-        LEFT join d.zoneRfu z
-        WHERE itfu.id = :impositionTfuId
-        order by d.nomProp,d.nomProp asc
-        """)
-    List<DonneesImpositionPaylaodWeb> findAllByImpositionTfuId(
-            Long impositionTfuId
-    );
-
-
-    @Query("""
-SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
-        d.id,
-        d.annee,
-        d.codeDepartement,
-        d.nomDepartement,
-        d.codeCommune,
-        d.nomCommune,
-        d.codeArrondissement,
-        d.nomArrondissement,
-        d.codeQuartierVillage,
-        d.nomQuartierVillage,
-        d.q,
-        d.ilot,
-        d.parcelle,
-        d.nup,
-        d.titreFoncier,
-        d.numBatiment,
-        d.numUniteLogement,
-        d.ifu,
-        d.npi,
-        d.telProp,
-        d.emailProp,
-        d.nomProp,
-        d.prenomProp,
-        d.raisonSociale,
-        d.adresseProp,
-        d.telSc,
-        d.emailSc,
-        d.nomSc,
-        d.prenomSc,
-        d.adresseSc,
-        d.longitude,
-        d.latitude,
-        d.superficieParc,
-        d.superficieAuSolBat,
-        d.superficieAuSolUlog,
-        d.batie,
-        d.exonere,
-        d.batimentExonere,
-        d.uniteLogementExonere,
-        d.valeurLocativeAdm,
-        d.montantLoyerAnnuel,
-        d.tfuMetreCarre,
-        d.tfuMinimum,
-        d.standingBat,
-        d.categorieBat,
-        d.nombrePiscine,
-        d.nombreUlog,
-        d.nombreBat,
-        d.dateEnquete,
-        s.id,
-        z.id,
-        d.valeurAdminParcelleNb,
-        d.natureImpot,
-        s.code,
-        z.nom,
-        d.valeurBatiment,
-        d.valeurParcelle,
-        d.valeurLocativeAdmMetreCarre,
-        d.valeurAdminParcelleNbMetreCarre,
-        d.montantTaxe
-        )
-        FROM DonneesImpositionTfu d
-        JOIN d.impositionsTfu itfu
-        LEFT join d.structure s 
-        LEFT join d.zoneRfu z
-        WHERE itfu.id = :impositionTfuId
-        order by d.nomProp,d.nomProp asc
-        """)
-    Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdPageable(
-            Long impositionTfuId,
-            Pageable pageable
-    );
-
-
-    @Query("""
-SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
-        d.id,
-        d.annee,
-        d.codeDepartement,
-        d.nomDepartement,
-        d.codeCommune,
-        d.nomCommune,
-        d.codeArrondissement,
-        d.nomArrondissement,
-        d.codeQuartierVillage,
-        d.nomQuartierVillage,
-        d.q,
-        d.ilot,
-        d.parcelle,
-        d.nup,
-        d.titreFoncier,
-        d.numBatiment,
-        d.numUniteLogement,
-        d.ifu,
-        d.npi,
-        d.telProp,
-        d.emailProp,
-        d.nomProp,
-        d.prenomProp,
-        d.raisonSociale,
-        d.adresseProp,
-        d.telSc,
-        d.emailSc,
-        d.nomSc,
-        d.prenomSc,
-        d.adresseSc,
-        d.longitude,
-        d.latitude,
-        d.superficieParc,
-        d.superficieAuSolBat,
-        d.superficieAuSolUlog,
-        d.batie,
-        d.exonere,
-        d.batimentExonere,
-        d.uniteLogementExonere,
-        d.valeurLocativeAdm,
-        d.montantLoyerAnnuel,
-        d.tfuMetreCarre,
-        d.tfuMinimum,
-        d.standingBat,
-        d.categorieBat,
-        d.nombrePiscine,
-        d.nombreUlog,
-        d.nombreBat,
-        d.dateEnquete,
-        s.id,
-        z.id,
-        d.valeurAdminParcelleNb,
-        d.natureImpot,
-        s.code,
-        z.nom,
-        d.valeurBatiment,
-        d.valeurParcelle,
-        d.valeurLocativeAdmMetreCarre,
-        d.valeurAdminParcelleNbMetreCarre,
-        d.montantTaxe
-        )
-        FROM DonneesImpositionTfu d
-        JOIN d.impositionsTfu itfu
-        LEFT join d.structure s 
-        LEFT join d.zoneRfu z
-        WHERE itfu.id = :impositionTfuId
-        and d.batie is true
-        and d.numUniteLogement is null
-        order by d.nomProp,d.nomProp asc
-        """)
-    Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdBatieBatimentPageable(
-            Long impositionTfuId,
-            Pageable pageable
-    );
-
-    @Query("""
-SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
-        d.id,
-        d.annee,
-        d.codeDepartement,
-        d.nomDepartement,
-        d.codeCommune,
-        d.nomCommune,
-        d.codeArrondissement,
-        d.nomArrondissement,
-        d.codeQuartierVillage,
-        d.nomQuartierVillage,
-        d.q,
-        d.ilot,
-        d.parcelle,
-        d.nup,
-        d.titreFoncier,
-        d.numBatiment,
-        d.numUniteLogement,
-        d.ifu,
-        d.npi,
-        d.telProp,
-        d.emailProp,
-        d.nomProp,
-        d.prenomProp,
-        d.raisonSociale,
-        d.adresseProp,
-        d.telSc,
-        d.emailSc,
-        d.nomSc,
-        d.prenomSc,
-        d.adresseSc,
-        d.longitude,
-        d.latitude,
-        d.superficieParc,
-        d.superficieAuSolBat,
-        d.superficieAuSolUlog,
-        d.batie,
-        d.exonere,
-        d.batimentExonere,
-        d.uniteLogementExonere,
-        d.valeurLocativeAdm,
-        d.montantLoyerAnnuel,
-        d.tfuMetreCarre,
-        d.tfuMinimum,
-        d.standingBat,
-        d.categorieBat,
-        d.nombrePiscine,
-        d.nombreUlog,
-        d.nombreBat,
-        d.dateEnquete,
-        s.id,
-        z.id,
-        d.valeurAdminParcelleNb,
-        d.natureImpot,
-        s.code,
-        z.nom,
-        d.valeurBatiment,
-        d.valeurParcelle,
-        d.valeurLocativeAdmMetreCarre,
-        d.valeurAdminParcelleNbMetreCarre,
-        d.montantTaxe
-        )
-        FROM DonneesImpositionTfu d
-        JOIN d.impositionsTfu itfu
-        LEFT join d.structure s 
-        LEFT join d.zoneRfu z
-        WHERE itfu.id = :impositionTfuId
-        and d.batie is true
-        and d.numUniteLogement is not null
-        order by d.nomProp,d.nomProp asc
-        """)
-    Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdBatieUniteLogPageable(
-            Long impositionTfuId,
-            Pageable pageable
-    );
-
-
-    @Query("""
-SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
-        d.id,
-        d.annee,
-        d.codeDepartement,
-        d.nomDepartement,
-        d.codeCommune,
-        d.nomCommune,
-        d.codeArrondissement,
-        d.nomArrondissement,
-        d.codeQuartierVillage,
-        d.nomQuartierVillage,
-        d.q,
-        d.ilot,
-        d.parcelle,
-        d.nup,
-        d.titreFoncier,
-        d.numBatiment,
-        d.numUniteLogement,
-        d.ifu,
-        d.npi,
-        d.telProp,
-        d.emailProp,
-        d.nomProp,
-        d.prenomProp,
-        d.raisonSociale,
-        d.adresseProp,
-        d.telSc,
-        d.emailSc,
-        d.nomSc,
-        d.prenomSc,
-        d.adresseSc,
-        d.longitude,
-        d.latitude,
-        d.superficieParc,
-        d.superficieAuSolBat,
-        d.superficieAuSolUlog,
-        d.batie,
-        d.exonere,
-        d.batimentExonere,
-        d.uniteLogementExonere,
-        d.valeurLocativeAdm,
-        d.montantLoyerAnnuel,
-        d.tfuMetreCarre,
-        d.tfuMinimum,
-        d.standingBat,
-        d.categorieBat,
-        d.nombrePiscine,
-        d.nombreUlog,
-        d.nombreBat,
-        d.dateEnquete,
-        s.id,
-        z.id,
-        d.valeurAdminParcelleNb,
-        d.natureImpot,
-        s.code,
-        z.nom,
-        d.valeurBatiment,
-        d.valeurParcelle,
-        d.valeurLocativeAdmMetreCarre,
-        d.valeurAdminParcelleNbMetreCarre,
-        d.montantTaxe
-        )
-        FROM DonneesImpositionTfu d
-        JOIN d.impositionsTfu itfu
-        LEFT join d.structure s 
-        LEFT join d.zoneRfu z
-        WHERE itfu.id = :impositionTfuId
-        and d.batie is false
-        order by d.nomProp,d.nomProp asc
-        """)
-    Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdNonBatiePageable(
-            Long impositionTfuId,
-            Pageable pageable
-    );
-
-    @Query(value = "SELECT generer_donnees_imposition_tfu_batie(:structureId, :impositionId)", nativeQuery = true)
-    Integer genererDonneesTfuBatie(
-            @Param("structureId") Long structureId,
-            @Param("impositionId") Long impositionId
-    );
-
-
-    @Query(value = "SELECT generer_donnees_imposition_tfu_batie_unite_logement(:structureId, :impositionId)", nativeQuery = true)
-    Integer genererDonneesTfuBatieUniteLogement(
-            @Param("structureId") Long structureId,
-            @Param("impositionId") Long impositionId
-    );
-
-
-    @Query(value = "SELECT generer_donnees_imposition_tfu_non_batie(:structureId, :impositionId)", nativeQuery = true)
-    Integer genererDonneesTfuNonBatie(
-            @Param("structureId") Long structureId,
-            @Param("impositionId") Long impositionId
-    );
-
-
 
 }

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java

@@ -6,7 +6,6 @@ import io.gmss.fiscad.paylaods.response.restoration.EnqueteBatimentPayLoadRestor
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -20,26 +19,6 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
 
     //List<EnqueteBatiment> findAllByEnquete_Id(Long enqueteId);
 
-    @Modifying
-    @Query("""
-        UPDATE EnqueteBatiment eb
-        SET eb.statutEnquete = 'CLOTURE'
-        WHERE EXISTS (
-            SELECT 1
-            FROM Parcelle p 
-            JOIN p.quartier q 
-            JOIN SecteurDecoupage cd on cd.quartier.id=q.id
-            JOIN cd.secteur s 
-            JOIN s.section sect 
-            JOIN sect.structure stru
-            WHERE eb.batiment.parcelle.id=p.id
-            AND stru.id= :structureId
-        )
-        AND eb.exercice.id = :exerciceId
-    """)
-    Integer clotureEnqueteBatiment(@Param("structureId") Long structureId,@Param("exerciceId") Long exerciceId);
-
-
     @Query(
             nativeQuery = true,
             value = "select eb.id as idBackend, " +
@@ -121,22 +100,13 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
                 eb.representantNom,
                 eb.representantPrenom,
                 eb.representantTel,
-                eb.representantNpi,
-                    cb.id,
-                    cb.code,
-                    cb.standing,
-                    eb.nombrePiscine,
-                    eb.montantLocatifAnnuelCalcule,
-                us.id,
-                us.nom
+                eb.representantNpi
             )
             FROM EnqueteBatiment eb
             LEFT JOIN eb.batiment b
             LEFT JOIN eb.personne p
             LEFT JOIN eb.user u
             LEFT JOIN eb.exercice ex
-            LEFT JOIN eb.categorieBatiment cb
-            LEFT JOIN eb.usage us
             Where eb.id = :enqueteBatimentId
             """)
     Optional<EnqueteBatimentPayloadWeb> findEnqueteBatimentByIdToDto(@Param("enqueteBatimentId") Long enqueteBatimentId);
@@ -185,22 +155,13 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
                 eb.representantNom,
                 eb.representantPrenom,
                 eb.representantTel,
-                eb.representantNpi,
-                    cb.id,
-                    cb.code,
-                    cb.standing,
-                    eb.nombrePiscine,
-                    eb.montantLocatifAnnuelCalcule,
-                us.id,
-                us.nom
+                eb.representantNpi
             )
             FROM EnqueteBatiment eb
             LEFT JOIN eb.batiment b
             LEFT JOIN eb.personne p
             LEFT JOIN eb.user u
             LEFT JOIN eb.exercice ex
-            LEFT JOIN eb.categorieBatiment cb
-            LEFT JOIN eb.usage us
             """)
     List<EnqueteBatimentPayloadWeb> findAllEnqueteBatimentToDto();
 
@@ -249,22 +210,13 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
                 eb.representantNom,
                 eb.representantPrenom,
                 eb.representantTel,
-                eb.representantNpi,
-                    cb.id,
-                    cb.code,
-                    cb.standing,
-                    eb.nombrePiscine,
-                    eb.montantLocatifAnnuelCalcule,
-                us.id,
-                us.nom
+                eb.representantNpi
                 )
                 FROM EnqueteBatiment eb
                 LEFT JOIN eb.batiment b
                 LEFT JOIN eb.personne p
                 LEFT JOIN eb.user u
                 LEFT JOIN eb.exercice ex
-                LEFT JOIN eb.categorieBatiment cb
-                LEFT JOIN eb.usage us
                 """,
                         countQuery = """
                 SELECT COUNT(eb)
@@ -319,22 +271,13 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
                 eb.representantNom,
                 eb.representantPrenom,
                 eb.representantTel,
-                eb.representantNpi,
-                    cb.id,
-                    cb.code,
-                    cb.standing,
-                    eb.nombrePiscine,
-                    eb.montantLocatifAnnuelCalcule,
-                us.id,
-                us.nom
+                eb.representantNpi
         )
         FROM EnqueteBatiment eb
         LEFT JOIN eb.batiment b
         LEFT JOIN eb.personne p
         LEFT JOIN eb.user u
         LEFT JOIN eb.exercice ex
-        LEFT JOIN eb.categorieBatiment cb
-        LEFT JOIN eb.usage us
         WHERE b.id = :batimentId
         """)
     List<EnqueteBatimentPayloadWeb> findAllByBatimentToDto(
@@ -386,22 +329,13 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
                 eb.representantNom,
                 eb.representantPrenom,
                 eb.representantTel,
-                eb.representantNpi,
-                    cb.id,
-                    cb.code,
-                    cb.standing,
-                    eb.nombrePiscine,
-                    eb.montantLocatifAnnuelCalcule,
-                us.id,
-                us.nom
+                eb.representantNpi
                 )
                 FROM EnqueteBatiment eb
                 LEFT JOIN eb.batiment b
                 LEFT JOIN eb.personne p
                 LEFT JOIN eb.user u
                 LEFT JOIN eb.exercice ex
-                LEFT JOIN eb.categorieBatiment cb
-                LEFT JOIN eb.usage us
                 WHERE b.id = :batimentId
                 """,
                         countQuery = """

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteUniteLogementRepository.java

@@ -6,7 +6,6 @@ import io.gmss.fiscad.paylaods.response.restoration.EnqueteUniteLogementPayLoadR
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -19,24 +18,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
     Optional<EnqueteUniteLogement> findByMobileDataId(Long id);
 
     //List<EnqueteUniteLogement> findAllByEnquete_Id(Long id);
-    @Modifying
-    @Query("""
-        UPDATE EnqueteUniteLogement eul
-        SET eul.statutEnquete = 'CLOTURE'
-        WHERE EXISTS (
-            SELECT 1
-            FROM Parcelle p 
-            JOIN p.quartier q 
-            JOIN SecteurDecoupage cd on cd.quartier.id=q.id
-            JOIN cd.secteur s 
-            JOIN s.section sect 
-            JOIN sect.structure stru
-            WHERE eul.uniteLogement.batiment.parcelle.id=p.id
-            AND stru.id= :structureId
-        )
-        AND eul.exercice.id = :exerciceId
-    """)
-    Integer clotureEnqueteUniteLogement(@Param("structureId") Long structureId,@Param("exerciceId") Long exerciceId);
+
     @Query(nativeQuery = true,
             value = "select eul.id as idBackend, " +
                     "eul.terminal_id as terminalId, " +
@@ -78,7 +60,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
                 eul.nbreMenage,
                 eul.enLocation,
                 eul.nbreMoisLocation,
-                eul.montantMensuelLocation,
+                eul.montantMensuelLoyer,
                 eul.montantLocatifAnnuelDeclare,
                 eul.valeurUniteLogementEstime,
                 eul.valeurUniteLogementReel,
@@ -111,22 +93,14 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
                 eul.representantNom,
                 eul.representantPrenom,
                 eul.representantTel,
-                eul.representantNpi,
-                cb.id,
-                cb.code,
-                cb.standing,
-                eul.nombrePiscine, 
-                eul.montantLocatifAnnuelCalcule,
-                us.id,
-                us.nom   
+                eul.representantNpi
+                
             )
             FROM EnqueteUniteLogement eul
             LEFT JOIN eul.uniteLogement ul
             LEFT JOIN eul.personne p
             LEFT JOIN eul.user u
             LEFT JOIN eul.exercice ex
-            LEFT JOIN eul.categorieBatiment cb
-            LEFT JOIN eul.usage us
             WHERE eul.id = :enqueteUniteLogementId
         """)
     Optional<EnqueteUniteLogementPayloadWeb> findEnqueteUniteLogementToDto(@Param("enqueteUniteLogementId") Long enqueteUniteLogementId);
@@ -140,7 +114,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
                 eul.nbreMenage,
                 eul.enLocation,
                 eul.nbreMoisLocation,
-                eul.montantMensuelLocation,
+                eul.montantMensuelLoyer,
                 eul.montantLocatifAnnuelDeclare,
                 eul.valeurUniteLogementEstime,
                 eul.valeurUniteLogementReel,
@@ -173,22 +147,13 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
                 eul.representantNom,
                 eul.representantPrenom,
                 eul.representantTel,
-                eul.representantNpi,
-                cb.id,
-                cb.code,
-                cb.standing,
-                eul.nombrePiscine, 
-                eul.montantLocatifAnnuelCalcule,
-                us.id,
-                us.nom   
+                eul.representantNpi
             )
             FROM EnqueteUniteLogement eul
             LEFT JOIN eul.uniteLogement ul
             LEFT JOIN eul.personne p
             LEFT JOIN eul.user u
             LEFT JOIN eul.exercice ex
-            LEFT JOIN eul.categorieBatiment cb
-            LEFT JOIN eul.usage us
         """)
    List<EnqueteUniteLogementPayloadWeb> findAllEnqueteUniteLogementToDto();
 
@@ -203,7 +168,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
                         eul.nbreMenage,
                         eul.enLocation,
                         eul.nbreMoisLocation,
-                        eul.montantMensuelLocation,
+                        eul.montantMensuelLoyer,
                         eul.montantLocatifAnnuelDeclare,
                         eul.valeurUniteLogementEstime,
                         eul.valeurUniteLogementReel,
@@ -236,22 +201,13 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
                 eul.representantNom,
                 eul.representantPrenom,
                 eul.representantTel,
-                eul.representantNpi,
-                cb.id,
-                cb.code,
-                cb.standing,
-                eul.nombrePiscine, 
-                eul.montantLocatifAnnuelCalcule,
-                us.id,
-                us.nom    
+                eul.representantNpi
                     )
                     FROM EnqueteUniteLogement eul
                     LEFT JOIN eul.uniteLogement ul
                     LEFT JOIN eul.personne p
                     LEFT JOIN eul.user u
                     LEFT JOIN eul.exercice ex
-                    LEFT JOIN eul.categorieBatiment cb
-                    LEFT JOIN eul.usage us
                     """,
                             countQuery = """
                     SELECT COUNT(eul)
@@ -272,7 +228,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
             eul.nbreMenage,
             eul.enLocation,
             eul.nbreMoisLocation,
-            eul.montantMensuelLocation,
+            eul.montantMensuelLoyer,
             eul.montantLocatifAnnuelDeclare,
             eul.valeurUniteLogementEstime,
             eul.valeurUniteLogementReel,
@@ -305,22 +261,13 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
                 eul.representantNom,
                 eul.representantPrenom,
                 eul.representantTel,
-                eul.representantNpi,
-                cb.id,
-                cb.code,
-                cb.standing,
-                eul.nombrePiscine, 
-                eul.montantLocatifAnnuelCalcule,
-                us.id,
-                us.nom    
+                eul.representantNpi
         )
         FROM EnqueteUniteLogement eul
         LEFT JOIN eul.uniteLogement ul
         LEFT JOIN eul.personne p
         LEFT JOIN eul.user u
         LEFT JOIN eul.exercice ex
-        LEFT JOIN eul.categorieBatiment cb
-        LEFT JOIN eul.usage us
         WHERE ul.id = :uniteLogementId
         """)
     List<EnqueteUniteLogementPayloadWeb> findAllByUniteLogementToDto(
@@ -337,7 +284,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
         eul.nbreMenage,
         eul.enLocation,
         eul.nbreMoisLocation,
-        eul.montantMensuelLocation,
+        eul.montantMensuelLoyer,
         eul.montantLocatifAnnuelDeclare,
         eul.valeurUniteLogementEstime,
         eul.valeurUniteLogementReel,
@@ -370,22 +317,13 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
                 eul.representantNom,
                 eul.representantPrenom,
                 eul.representantTel,
-                eul.representantNpi,
-                cb.id,
-                cb.code,
-                cb.standing,
-                eul.nombrePiscine, 
-                eul.montantLocatifAnnuelCalcule,
-                us.id,
-                us.nom    
+                eul.representantNpi
     )
     FROM EnqueteUniteLogement eul
     LEFT JOIN eul.uniteLogement ul
     LEFT JOIN eul.personne p
     LEFT JOIN eul.user u
     LEFT JOIN eul.exercice ex
-    LEFT JOIN eul.categorieBatiment cb
-    LEFT JOIN eul.usage us
     WHERE ul.id = :uniteLogementId
     """,
             countQuery = """
@@ -408,7 +346,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
                 eul.nbreMenage,
                 eul.enLocation,
                 eul.nbreMoisLocation,
-                eul.montantMensuelLocation,
+                eul.montantMensuelLoyer,
                 eul.montantLocatifAnnuelDeclare,
                 eul.valeurUniteLogementEstime,
                 eul.valeurUniteLogementReel,
@@ -441,22 +379,13 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
                 eul.representantNom,
                 eul.representantPrenom,
                 eul.representantTel,
-                eul.representantNpi,
-                cb.id,
-                cb.code,
-                cb.standing,
-                eul.nombrePiscine, 
-                eul.montantLocatifAnnuelCalcule,
-                us.id,
-                us.nom    
+                eul.representantNpi
             )
             FROM EnqueteUniteLogement eul
             LEFT JOIN eul.uniteLogement ul
             LEFT JOIN eul.personne p
             LEFT JOIN eul.user u
             LEFT JOIN eul.exercice ex
-            LEFT JOIN eul.categorieBatiment cb
-            LEFT JOIN eul.usage us
             WHERE ex.id = :exerciceId
             """)
     List<EnqueteUniteLogementPayloadWeb> findAllByExerciceToDto(
@@ -473,7 +402,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
                     eul.nbreMenage,
                     eul.enLocation,
                     eul.nbreMoisLocation,
-                    eul.montantMensuelLocation,
+                    eul.montantMensuelLoyer,
                     eul.montantLocatifAnnuelDeclare,
                     eul.valeurUniteLogementEstime,
                     eul.valeurUniteLogementReel,
@@ -503,25 +432,16 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
                     ex.id,
                     ex.annee,
                     eul.statutEnquete,
-                    eul.representantNom,
-                    eul.representantPrenom,
-                    eul.representantTel,
-                    eul.representantNpi,
-                    cb.id,
-                    cb.code,
-                    cb.standing,
-                    eul.nombrePiscine, 
-                eul.montantLocatifAnnuelCalcule ,
-                us.id,
-                us.nom   
+                eul.representantNom,
+                eul.representantPrenom,
+                eul.representantTel,
+                eul.representantNpi
                 )
                 FROM EnqueteUniteLogement eul
                 LEFT JOIN eul.uniteLogement ul
                 LEFT JOIN eul.personne p
                 LEFT JOIN eul.user u
                 LEFT JOIN eul.exercice ex
-                LEFT JOIN eul.categorieBatiment cb
-                LEFT JOIN eul.usage us
                 WHERE ex.id = :exerciceId
                 """,
                         countQuery = """

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/ImpositionsTfuRepository.java

@@ -1,13 +1,8 @@
 package io.gmss.fiscad.persistence.repositories.rfu.metier;
 
 import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
-import io.gmss.fiscad.enums.StatusAvis;
-import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
@@ -16,9 +11,6 @@ import java.util.Optional;
 public interface ImpositionsTfuRepository extends JpaRepository<ImpositionsTfu, Long> {
 
     Optional<ImpositionsTfu> findAllByCommune_IdAndExercice_Id(Long communeId,Long ExerciceId);
-
-    Optional<ImpositionsTfu> findDistinctByStructure_IdAndExercice_IdAndStatusAvisIn(Long structureId, Long exerciceId, List<StatusAvis> statusAvis);
-
     @Query(value = "select i.* " +
             " from impositions_tfu i " +
             " inner join commune c on c.id=i.commune_id" +
@@ -27,171 +19,4 @@ public interface ImpositionsTfuRepository extends JpaRepository<ImpositionsTfu,
             " and c.code= ?1 and e.annee = ?2 " +
             " and i.deleted is false ", nativeQuery = true)
     List<ImpositionsTfu> getImpositionsTfuByCommuneAndExercice(String codeCommnune,int annee);
-
-    @Query(value = "select i.* " +
-            " from impositions_tfu i " +
-            " inner join commune c on c.id=i.commune_id" +
-            " inner join exercice e on e.id=i.exercice_id" +
-            " inner join structure s on s.id=i.structure_id" +
-            " where status_avis in ('VALIDE','CREE','GENERE') " +
-            " and s.id= ?1 and e.id = ?2 " +
-            " and i.deleted is false ", nativeQuery = true)
-    List<ImpositionsTfu> getImpositionsTfuByStructureAndExercice(Long structureId,Long exerciceId);
-
-
-    @Query("""
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb(
-                i.id,
-                i.dateGeneration,
-                i.dateCloture,
-                i.referencePieceAdmin,
-                i.datePieceAdmin,
-                i.statusAvis,
-                i.nombreAvis,
-                i.motif,
-                e.id,
-                e.annee,
-                c.id,
-                c.code,
-                c.nom,
-                s.id,
-                s.nom,
-                i.nombreAvisFnb,
-                i.nombreAvisBatiment,
-                i.nombreAvisUniteLog
-            )
-            FROM ImpositionsTfu i
-            LEFT JOIN i.exercice e
-            LEFT JOIN i.commune c
-            LEFT JOIN i.structure s
-            WHERE i.id= :impositionId
-            """)
-    Optional<ImpositionsTfuPaylaodWeb> findByIdToDto(@Param("impositionId") Long impositionId);
-    @Query("""
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb(
-                i.id,
-                i.dateGeneration,
-                i.dateCloture,
-                i.referencePieceAdmin,
-                i.datePieceAdmin,
-                i.statusAvis,
-                i.nombreAvis,
-                i.motif,
-                e.id,
-                e.annee,
-                c.id,
-                c.code,
-                c.nom,
-                s.id,
-                s.nom,
-                i.nombreAvisFnb,
-                i.nombreAvisBatiment,
-                i.nombreAvisUniteLog
-            )
-            FROM ImpositionsTfu i
-            LEFT JOIN i.exercice e
-            LEFT JOIN i.commune c
-            LEFT JOIN i.structure s
-            """)
-    List<ImpositionsTfuPaylaodWeb> findAllPayloadToDto();
-
-
-    @Query(
-            value = """
-                SELECT new io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb(
-                    i.id,
-                    i.dateGeneration,
-                    i.dateCloture,
-                    i.referencePieceAdmin,
-                    i.datePieceAdmin,
-                    i.statusAvis,
-                    i.nombreAvis,
-                    i.motif,
-                    e.id,
-                    e.annee,
-                    c.id,
-                    c.code,
-                    c.nom,
-                    s.id,
-                    s.nom,
-                i.nombreAvisFnb,
-                i.nombreAvisBatiment,
-                i.nombreAvisUniteLog
-                )
-                FROM ImpositionsTfu i
-                LEFT JOIN i.exercice e
-                LEFT JOIN i.commune c
-                LEFT JOIN i.structure s
-                """,
-                            countQuery = """
-                SELECT COUNT(i)
-                FROM ImpositionsTfu i
-                LEFT JOIN i.exercice e
-                LEFT JOIN i.commune c
-                LEFT JOIN i.structure s
-                """
-                    )
-    Page<ImpositionsTfuPaylaodWeb> findAllPayloadToDto(Pageable pageable);
-
-
-    @Query("""
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb(
-                i.id,
-                i.dateGeneration,
-                i.dateCloture,
-                i.referencePieceAdmin,
-                i.datePieceAdmin,
-                i.statusAvis,
-                i.nombreAvis,
-                i.motif,
-                e.id,
-                e.annee,
-                c.id,
-                c.code,
-                c.nom,
-                s.id,
-                s.nom,
-                i.nombreAvisFnb,
-                i.nombreAvisBatiment,
-                i.nombreAvisUniteLog
-            )
-            FROM ImpositionsTfu i
-            LEFT JOIN i.exercice e
-            LEFT JOIN i.commune c
-            LEFT JOIN i.structure s
-            WHERE s.id in (:structureIds)
-            """)
-    List<ImpositionsTfuPaylaodWeb> findByStructureIdsToDto(@Param("structureIds") List<Long> structureIds);
-
-
-
-    @Query("""
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb(
-                i.id,
-                i.dateGeneration,
-                i.dateCloture,
-                i.referencePieceAdmin,
-                i.datePieceAdmin,
-                i.statusAvis,
-                i.nombreAvis,
-                i.motif,
-                e.id,
-                e.annee,
-                c.id,
-                c.code,
-                c.nom,
-                s.id,
-                s.nom,
-                i.nombreAvisFnb,
-                i.nombreAvisBatiment,
-                i.nombreAvisUniteLog
-            )
-            FROM ImpositionsTfu i
-            LEFT JOIN i.exercice e
-            LEFT JOIN i.commune c
-            LEFT JOIN i.structure s
-            LEFT JOIN c.departement d
-            WHERE d.id= :departementId
-            """)
-    List<ImpositionsTfuPaylaodWeb> findByDepartementIdToDto(@Param("departementId") Long departementId);
 }

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/UniteLogementRepository.java

@@ -53,24 +53,10 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
                 per.nom,
                 per.prenom,
                 per.raisonSociale,
-                eul.id,
-                cb.id,
-                cb.code,
-                cb.standing ,
-                        eul.montantMensuelLocation,
-                        eul.montantLocatifAnnuelDeclare,
-                        eul.montantLocatifAnnuelCalcule,
-                        eul.valeurUniteLogementEstime,
-                        eul.valeurUniteLogementReel,
-                        eul.nombrePiscine,
-                us.id,
-                us.nom ,
-                eul.montantLocatifAnnuelEstime,
-                eul.valeurUniteLogementCalcule
+                eul.id
             )
             FROM UniteLogement ul
             JOIN ul.batiment b
-            LEFT JOIN ul.categorieBatiment cb
             LEFT JOIN EnqueteUniteLogement eul
                    ON eul.uniteLogement = ul
                   AND eul.dateEnquete = (
@@ -79,7 +65,6 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
                         WHERE eul2.uniteLogement = ul
                   )
             LEFT JOIN eul.personne per
-            LEFT JOIN eul.user us
             WHERE ul.id = :uniteLogementId
             """)
     Optional<UniteLogementPaylaodWeb> findUniteLogementAvecOccupantCourantToDto(@Param("uniteLogementId") Long uniteLogementId);
@@ -102,24 +87,10 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
                 per.nom,
                 per.prenom,
                 per.raisonSociale,
-                eul.id,
-                cb.id,
-                cb.code,
-                cb.standing,
-                        eul.montantMensuelLocation,
-                        eul.montantLocatifAnnuelDeclare,
-                        eul.montantLocatifAnnuelCalcule,
-                        eul.valeurUniteLogementEstime,
-                        eul.valeurUniteLogementReel,
-                        eul.nombrePiscine  ,
-                us.id,
-                us.nom,
-                eul.montantLocatifAnnuelEstime ,
-                eul.valeurUniteLogementCalcule
+                eul.id
             )
             FROM UniteLogement ul
             JOIN ul.batiment b
-            LEFT JOIN ul.categorieBatiment cb
             LEFT JOIN EnqueteUniteLogement eul
                    ON eul.uniteLogement = ul
                   AND eul.dateEnquete = (
@@ -128,7 +99,6 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
                         WHERE eul2.uniteLogement = ul
                   )
             LEFT JOIN eul.personne per
-            LEFT JOIN eul.usage us
             """)
     List<UniteLogementPaylaodWeb> findAllUnitesLogementAvecOccupantCourantToDto();
 
@@ -152,24 +122,10 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
                         per.nom,
                         per.prenom,
                         per.raisonSociale,
-                        eul.id,
-                        cb.id,
-                        cb.code,
-                        cb.standing,
-                        eul.montantMensuelLocation,
-                        eul.montantLocatifAnnuelDeclare,
-                        eul.montantLocatifAnnuelCalcule,
-                        eul.valeurUniteLogementEstime,
-                        eul.valeurUniteLogementReel,
-                        eul.nombrePiscine,
-                us.id,
-                us.nom ,
-                eul.montantLocatifAnnuelEstime ,
-                eul.valeurUniteLogementCalcule
+                        eul.id
                     )
                     FROM UniteLogement ul
                     JOIN ul.batiment b
-                    LEFT JOIN ul.categorieBatiment cb
                     LEFT JOIN EnqueteUniteLogement eul
                            ON eul.uniteLogement = ul
                           AND eul.dateEnquete = (
@@ -178,7 +134,6 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
                                 WHERE eul2.uniteLogement = ul
                           )
                     LEFT JOIN eul.personne per
-                    LEFT JOIN eul.usage us
                     """,
                     countQuery = """
                     SELECT COUNT(ul)
@@ -207,24 +162,10 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
                 per.nom,
                 per.prenom,
                 per.raisonSociale,
-                eul.id,
-                cb.id,
-                cb.code,
-                cb.standing,
-                        eul.montantMensuelLocation,
-                        eul.montantLocatifAnnuelDeclare,
-                        eul.montantLocatifAnnuelCalcule,
-                        eul.valeurUniteLogementEstime,
-                        eul.valeurUniteLogementReel,
-                        eul.nombrePiscine ,
-                us.id,
-                us.nom,
-                eul.montantLocatifAnnuelEstime ,
-                eul.valeurUniteLogementCalcule  
+                eul.id
             )
             FROM UniteLogement ul
             JOIN ul.batiment b
-            LEFT JOIN ul.categorieBatiment cb
             LEFT JOIN EnqueteUniteLogement eul
                    ON eul.uniteLogement = ul
                   AND eul.dateEnquete = (
@@ -233,7 +174,6 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
                         WHERE eul2.uniteLogement = ul
                   )
             LEFT JOIN eul.personne per
-            LEFT JOIN eul.usage us
             WHERE b.id = :batimentId
             """)
     List<UniteLogementPaylaodWeb> findUnitesLogementAvecOccupantCourantByBatimentToDto(
@@ -259,24 +199,10 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
                         per.nom,
                         per.prenom,
                         per.raisonSociale,
-                        eul.id,
-                        cb.id,
-                        cb.code,
-                        cb.standing,
-                        eul.montantMensuelLocation,
-                        eul.montantLocatifAnnuelDeclare,
-                        eul.montantLocatifAnnuelCalcule,
-                        eul.valeurUniteLogementEstime,
-                        eul.valeurUniteLogementReel,
-                        eul.nombrePiscine ,
-                us.id,
-                us.nom ,
-                eul.montantLocatifAnnuelEstime ,
-                eul.valeurUniteLogementCalcule 
+                        eul.id
                     )
                     FROM UniteLogement ul
                     JOIN ul.batiment b
-                    LEFT JOIN ul.categorieBatiment cb
                     LEFT JOIN EnqueteUniteLogement eul
                            ON eul.uniteLogement = ul
                           AND eul.dateEnquete = (
@@ -285,7 +211,6 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
                                 WHERE eul2.uniteLogement = ul
                           )
                     LEFT JOIN eul.personne per
-                    LEFT JOIN eul.usage us
                     WHERE b.id = :batimentId
                     """,
                             countQuery = """
@@ -299,53 +224,5 @@ 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,
-                cb.id,
-                cb.code,
-                cb.standing,
-                        eul.montantMensuelLocation,
-                        eul.montantLocatifAnnuelDeclare,
-                        eul.montantLocatifAnnuelCalcule,
-                        eul.valeurUniteLogementEstime,
-                        eul.valeurUniteLogementReel,
-                        eul.nombrePiscine  ,
-                us.id,
-                us.nom,
-                eul.montantLocatifAnnuelEstime,
-                eul.valeurUniteLogementCalcule  
-            )
-            FROM UniteLogement ul
-            JOIN ul.batiment b
-            LEFT JOIN ul.categorieBatiment cb
-            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
-            LEFT JOIN eul.usage us
-            where b.parcelle.id = :parcelleId
-            """)
-    List<UniteLogementPaylaodWeb> findAllUnitesLogementAvecOccupantCourantByParcelleToDto(@Param("parcelleId") Long parcelleId);
 
 }

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

@@ -2,146 +2,11 @@ package io.gmss.fiscad.persistence.repositories.rfu.parametre;
 
 import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati;
 import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
-import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
-import java.util.List;
 import java.util.Optional;
 
 public interface BaremRfuNonBatiRepository extends JpaRepository<BaremRfuNonBati, Long> {
 Optional<BaremRfuNonBati> findAllByCommune_IdAndZoneRfu_Id(Long communeId,Long zoneRfuId);
-
-    @Query(
-            value = """
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb(
-                b.id,
-                b.valeurAdministrative,
-                b.taux,
-                c.id,
-                c.code,
-                c.nom,
-                z.id,
-                z.code,
-                z.nom,
-                b.valeurAdministrativeMetreCarre,
-                b.auMetreCarre
-            )
-            FROM BaremRfuNonBati b
-            LEFT JOIN b.commune c
-            LEFT JOIN b.zoneRfu z
-            """,
-                        countQuery = """
-            SELECT COUNT(b)
-            FROM BaremRfuNonBati b
-            """
-                )
-    Page<BaremRfuNonBatiPayloadWeb> findAllPayloadToDtoPaged(Pageable pageable);
-
-    @Query(
-            """
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb(
-                b.id,
-                b.valeurAdministrative,
-                b.taux,
-                c.id,
-                c.code,
-                c.nom,
-                z.id,
-                z.code,
-                z.nom,
-                b.valeurAdministrativeMetreCarre,
-                b.auMetreCarre
-            )
-            FROM BaremRfuNonBati b
-            LEFT JOIN b.commune c
-            LEFT JOIN b.zoneRfu z
-            """
-    )
-    List<BaremRfuNonBatiPayloadWeb> findAllPayloadToDto();
-
-
-    @Query(
-                    """
-                    SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb(
-                        b.id,
-                        b.valeurAdministrative,
-                        b.taux,
-                        c.id,
-                        c.code,
-                        c.nom,
-                        z.id,
-                        z.code,
-                        z.nom,
-                b.valeurAdministrativeMetreCarre,
-                b.auMetreCarre
-                    )
-                    FROM BaremRfuNonBati b
-                    LEFT JOIN b.commune c
-                    LEFT JOIN b.zoneRfu z
-                    WHERE c.id = :communeId
-                    """
-                )
-    List<BaremRfuNonBatiPayloadWeb> findByCommuneToDto(
-            @Param("communeId") Long communeId
-    );
-
-
-    @Query(
-            """
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb(
-                b.id,
-                b.valeurAdministrative,
-                b.taux,
-                c.id,
-                c.code,
-                c.nom,
-                z.id,
-                z.code,
-                z.nom,
-                b.valeurAdministrativeMetreCarre,
-                b.auMetreCarre
-            )
-            FROM BaremRfuNonBati b
-            LEFT JOIN b.commune c
-            LEFT JOIN b.zoneRfu z
-            WHERE b.id = :BaremNonBatiId
-            """
-    )
-    Optional<BaremRfuNonBatiPayloadWeb> findByIdToDto(
-            @Param("BaremNonBatiId") Long BaremNonBatiId
-    );
-
-
-
-    @Query(
-            value = """
-                SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb(
-                    b.id,
-                    b.valeurAdministrative,
-                    b.taux,
-                    c.id,
-                    c.code,
-                    c.nom,
-                    z.id,
-                    z.code,
-                    z.nom,
-                b.valeurAdministrativeMetreCarre,
-                b.auMetreCarre
-                )
-                FROM BaremRfuNonBati b
-                LEFT JOIN b.commune c
-                LEFT JOIN b.zoneRfu z
-                WHERE (:communeId IS NULL OR c.id = :communeId)
-                AND (:zoneId IS NULL OR z.id = :zoneId)
-                """
-                    )
-    Optional<BaremRfuNonBatiPayloadWeb> findByCommuneAndZoneToDto(
-            @Param("communeId") Long communeId,
-            @Param("zoneId") Long zoneId
-    );
 }
 

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

@@ -1,256 +1,11 @@
 package io.gmss.fiscad.persistence.repositories.rfu.parametre;
 
 import io.gmss.fiscad.entities.rfu.parametre.BaremRfuBati;
-import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuBatiPayloadWeb;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
-import java.util.Optional;
 
 public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
-   /// List<BaremRfuBati> findAllByCategorieBatiment_Id(Long idCategorieBat);
-    @Query("""
-        SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuBatiPayloadWeb(
-            b.id,
-            b.valeurLocative,
-            b.tfuMetreCarre,
-            b.tfuMinimum,
-            cb.id,
-            cb.nom,
-            cb.standing,
-            a.id,
-            a.code,
-            a.nom,
-            q.id,
-            q.code,
-            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);
-
-    @Query("""
-        SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuBatiPayloadWeb(
-            b.id,
-            b.valeurLocative,
-            b.tfuMetreCarre,
-            b.tfuMinimum,
-            cb.id,
-            cb.nom,
-            cb.standing,
-            a.id,
-            a.code,
-            a.nom,
-            q.id,
-            q.code,
-            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();
-
-    @Query("""
-        SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuBatiPayloadWeb(
-            b.id,
-            b.valeurLocative,
-            b.tfuMetreCarre,
-            b.tfuMinimum,
-            cb.id,
-            cb.nom,
-            cb.standing,
-            a.id,
-            a.code,
-            a.nom,
-            q.id,
-            q.code,
-            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(
-            @Param("arrondissementId") Long arrondissementId
-    );
-
-    @Query("""
-        SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuBatiPayloadWeb(
-            b.id,
-            b.valeurLocative,
-            b.tfuMetreCarre,
-            b.tfuMinimum,
-            cb.id,
-            cb.nom,
-            cb.standing,
-            a.id,
-            a.code,
-            a.nom,
-            q.id,
-            q.code,
-            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(
-            @Param("baremRfuBatiId") Long id
-    );
-
-    @Query("""
-        SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuBatiPayloadWeb(
-            b.id,
-            b.valeurLocative,
-            b.tfuMetreCarre,
-            b.tfuMinimum,
-            cb.id,
-            cb.nom,
-            cb.standing,
-            a.id,
-            a.code,
-            a.nom,
-            q.id,
-            q.code,
-            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(
-            @Param("arrondissementId") Long arrondissementId,
-            Pageable pageable
-    );
-
-    @Query("""
-        SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuBatiPayloadWeb(
-            b.id,
-            b.valeurLocative,
-            b.tfuMetreCarre,
-            b.tfuMinimum,
-            cb.id,
-            cb.nom,
-            cb.standing,
-            a.id,
-            a.code,
-            a.nom,
-            q.id,
-            q.code,
-            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
-    """)
-    List<BaremRfuBatiPayloadWeb> findByArrondissementAndCategorieBatiment(
-            @Param("arrondissementId") Long arrondissementId,
-            @Param("categorieBatimentId") Long categorieBatimentId
-    );
-
-    @Query("""
-        SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuBatiPayloadWeb(
-            b.id,
-            b.valeurLocative,
-            b.tfuMetreCarre,
-            b.tfuMinimum,
-            cb.id,
-            cb.nom,
-            cb.standing,
-            a.id,
-            a.code,
-            a.nom,
-            q.id,
-            q.code,
-            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(
-            @Param("categorieBatimentId") Long categorieBatimentId
-    );
-
-
- @Query("""
-        SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuBatiPayloadWeb(
-            b.id,
-            b.valeurLocative,
-            b.tfuMetreCarre,
-            b.tfuMinimum,
-            cb.id,
-            cb.nom,
-            cb.standing,
-            a.id,
-            a.code,
-            a.nom,
-            q.id,
-            q.code,
-            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
-    """)
- List<BaremRfuBatiPayloadWeb> findByQuartierAndCategorieBatiment(
-         @Param("quartierId") Long quartierId,
-         @Param("categorieBatimentId") Long categorieBatimentId
- );
+    List<BaremRfuBati> findAllByCategorieBatiment_Id(Long idCategorieBat);
 }
 

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

@@ -1,14 +0,0 @@
-package io.gmss.fiscad.persistence.repositories.rfu.parametre;
-
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
-import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
-import io.gmss.fiscad.paylaods.response.synchronisation.ZoneRfuSyncResponse;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.List;
-
-public interface UsageRepository extends JpaRepository<Usage, Long> {
-
-}
-

src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java

@@ -1,6 +1,5 @@
 package io.gmss.fiscad.service;
 
-import io.gmss.fiscad.controllers.rfu.metier.ImpositionsTfuController;
 import io.gmss.fiscad.entities.decoupage.*;
 import io.gmss.fiscad.entities.infocad.metier.Enquete;
 import io.gmss.fiscad.entities.infocad.metier.Parcelle;
@@ -8,7 +7,9 @@ import io.gmss.fiscad.entities.infocad.metier.Piece;
 import io.gmss.fiscad.entities.infocad.metier.Upload;
 import io.gmss.fiscad.entities.infocad.parametre.*;
 import io.gmss.fiscad.entities.rfu.metier.*;
-import io.gmss.fiscad.entities.rfu.parametre.*;
+import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
+import io.gmss.fiscad.entities.rfu.parametre.Exercice;
+import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
 import io.gmss.fiscad.entities.user.AvoirFonction;
 import io.gmss.fiscad.entities.user.Fonction;
 import io.gmss.fiscad.entities.user.Profile;
@@ -24,8 +25,6 @@ import io.gmss.fiscad.persistence.repositories.infocad.metier.PieceRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.UploadRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.*;
 import io.gmss.fiscad.persistence.repositories.rfu.metier.*;
-import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuNonBatiRepository;
-import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.CaracteristiqueRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.ExerciceRepository;
 import io.gmss.fiscad.persistence.repositories.user.AvoirFonctionRepository;
@@ -74,9 +73,6 @@ public class EntityFromPayLoadService {
     private final AvoirFonctionRepository avoirFonctionRepository;
     private final EnqueteActiviteRepository enqueteActiviteRepository;
     private final ExerciceRepository exerciceRepository ;
-    private final BaremRfuRepository baremRfuRepository ;
-    private final BaremRfuNonBatiRepository baremRfuNonBatiRepository ;
-    private final ImpositionsTfuRepository impositionsTfuRepository ;
 
 
     public CaracteristiqueParcelle getCaracteristiqueParcelleFromPayLoadWeb(CaracteristiqueParcellePayloadWeb caracteristiqueParcellePayloadWeb){
@@ -264,11 +260,6 @@ public class EntityFromPayLoadService {
         if(batimentPaylaodWeb.getId()!=null)
             batiment = batimentRepository.findById(batimentPaylaodWeb.getId()).orElse(new Batiment());
 
-        if (batimentPaylaodWeb.getCategorieBatimentId() != null) {
-            CategorieBatiment categorieBatiment = new CategorieBatiment();
-            categorieBatiment.setId(batimentPaylaodWeb.getCategorieBatimentId());
-            batiment.setCategorieBatiment(categorieBatiment);
-        }
 
         if(batimentPaylaodWeb.getParcelleId()!=null)
             optionalParcelle=parcelleRepository.findById(batimentPaylaodWeb.getParcelleId());
@@ -278,7 +269,7 @@ public class EntityFromPayLoadService {
         batiment.setId(batimentPaylaodWeb.getId());
         batiment.setCode(batimentPaylaodWeb.getCode());
         batiment.setNub(batimentPaylaodWeb.getNub());
-        batiment.setSuperficieAuSol(batimentPaylaodWeb.getSuperficieAuSol());
+        batiment.setSuperficieAuSol(batimentPaylaodWeb.getSuperficieSol());
         batiment.setSuperficieLouee(batimentPaylaodWeb.getSuperficieLouee());
         batiment.setDateConstruction(batimentPaylaodWeb.getDateConstruction());
 
@@ -374,20 +365,14 @@ public class EntityFromPayLoadService {
         if(uniteLogementPaylaodWeb.getId()!=null)
             uniteLogement = uniteLogementRepository.findById(uniteLogementPaylaodWeb.getId()).orElse(new UniteLogement());
 
-        if (uniteLogementPaylaodWeb.getCategorieBatimentId() != null) {
-            CategorieBatiment categorieBatiment = new CategorieBatiment();
-            categorieBatiment.setId(uniteLogementPaylaodWeb.getCategorieBatimentId());
-            uniteLogement.setCategorieBatiment(categorieBatiment);
-        }
 
         if(uniteLogementPaylaodWeb.getBatimentId()!=null)
             optionalBatiment=batimentRepository.findById(uniteLogementPaylaodWeb.getBatimentId());
-
         uniteLogement.setBatiment(optionalBatiment.orElse(null));
         uniteLogement.setId(uniteLogementPaylaodWeb.getId());
         uniteLogement.setCode(uniteLogementPaylaodWeb.getCode());
         uniteLogement.setNul(uniteLogementPaylaodWeb.getNul());
-        uniteLogement.setSuperficieAuSol(uniteLogementPaylaodWeb.getSuperficieAuSol());
+        uniteLogement.setSuperficieAuSol(uniteLogementPaylaodWeb.getSuperficieSol());
         uniteLogement.setSuperficieLouee(uniteLogementPaylaodWeb.getSuperficieLouee());
         uniteLogement.setDateConstruction(uniteLogementPaylaodWeb.getDateConstruction());
         uniteLogement.setNumeroEtage(uniteLogementPaylaodWeb.getNumeroEtage());
@@ -629,18 +614,6 @@ public class EntityFromPayLoadService {
             eul.setExercice(exercice);
         }
 
-        if (enqueteUniteLogementPayloadWeb.getCategorieBatimentId() != null) {
-            CategorieBatiment categorieBatiment = new CategorieBatiment();
-            categorieBatiment.setId(enqueteUniteLogementPayloadWeb.getCategorieBatimentId());
-            eul.setCategorieBatiment(categorieBatiment);
-        }
-
-        if (enqueteUniteLogementPayloadWeb.getUsageId() != null) {
-            Usage usage = new Usage();
-            usage.setId(enqueteUniteLogementPayloadWeb.getUsageId());
-            eul.setUsage(usage);
-        }
-
 
         eul.setId(enqueteUniteLogementPayloadWeb.getId());
         eul.setObservation(enqueteUniteLogementPayloadWeb.getObservation());
@@ -649,7 +622,7 @@ public class EntityFromPayLoadService {
         eul.setNbreMenage(enqueteUniteLogementPayloadWeb.getNbreMenage());
         eul.setEnLocation(enqueteUniteLogementPayloadWeb.getEnLocation());
         eul.setNbreMoisLocation(enqueteUniteLogementPayloadWeb.getNbreMoisLocation());
-        eul.setMontantMensuelLocation(enqueteUniteLogementPayloadWeb.getMontantMensuelLocation());
+        eul.setMontantMensuelLoyer(enqueteUniteLogementPayloadWeb.getMontantMensuelLoyer());
         eul.setMontantLocatifAnnuelDeclare(enqueteUniteLogementPayloadWeb.getMontantLocatifAnnuelDeclare());
         eul.setValeurUniteLogementEstime(enqueteUniteLogementPayloadWeb.getValeurUniteLogementEstime());
         eul.setValeurUniteLogementReel(enqueteUniteLogementPayloadWeb.getValeurUniteLogementReel());
@@ -666,13 +639,7 @@ public class EntityFromPayLoadService {
         eul.setRepresentantPrenom(enqueteUniteLogementPayloadWeb.getRepresentantPrenom());
         eul.setRepresentantTel(enqueteUniteLogementPayloadWeb.getRepresentantTel());
         eul.setRepresentantNpi(enqueteUniteLogementPayloadWeb.getRepresentantNpi());
-        eul.setNombrePiscine(enqueteUniteLogementPayloadWeb.getNombrePiscine());
-       // eul.setStatutEnquete(StatutEnquete.EN_COURS);
-        //if(!enqueteUniteLogementPayloadWeb.getStatutEnquete().equals(StatutEnquete.DECLARATION)){
-            eul.setStatutEnquete(StatutEnquete.EN_COURS);
-//        }else{
-//            eul.setStatutEnquete(enqueteUniteLogementPayloadWeb.getStatutEnquete());
-//        }
+        eul.setStatutEnquete(StatutEnquete.EN_COURS);
 
         return eul;
     }
@@ -709,18 +676,6 @@ public class EntityFromPayLoadService {
             enqueteBatiment.setExercice(exercice);
         }
 
-        if (enqueteBatimentPayloadWeb.getCategorieBatimentId() != null) {
-            CategorieBatiment categorieBatiment = new CategorieBatiment();
-            categorieBatiment.setId(enqueteBatimentPayloadWeb.getCategorieBatimentId());
-            enqueteBatiment.setCategorieBatiment(categorieBatiment);
-        }
-
-        if (enqueteBatimentPayloadWeb.getUsageId() != null) {
-            Usage usage = new Usage();
-            usage.setId(enqueteBatimentPayloadWeb.getUsageId());
-            enqueteBatiment.setUsage(usage);
-        }
-
         // ======================
         // Champs simples
         // ======================
@@ -760,13 +715,7 @@ public class EntityFromPayLoadService {
         enqueteBatiment.setRepresentantPrenom(enqueteBatimentPayloadWeb.getRepresentantPrenom());
         enqueteBatiment.setRepresentantTel(enqueteBatimentPayloadWeb.getRepresentantTel());
         enqueteBatiment.setRepresentantNpi(enqueteBatimentPayloadWeb.getRepresentantNpi());
-        enqueteBatiment.setNombrePiscine(enqueteBatimentPayloadWeb.getNombrePiscine());
-        //enqueteBatiment.setStatutEnquete(StatutEnquete.EN_COURS);
-        //if(!enqueteBatimentPayloadWeb.getStatutEnquete().equals(StatutEnquete.DECLARATION)){
-            enqueteBatiment.setStatutEnquete(StatutEnquete.EN_COURS);
-//        }else{
-//            enqueteBatiment.setStatutEnquete(enqueteBatimentPayloadWeb.getStatutEnquete());
-//        }
+        enqueteBatiment.setStatutEnquete(StatutEnquete.EN_COURS);
         return enqueteBatiment;
     }
 
@@ -824,12 +773,7 @@ public class EntityFromPayLoadService {
         // ======================
         enquete.setDateEnquete(LocalDate.now());
         enquete.setLitige(enquetePayLoadWeb.getLitige());
-
-       // if(!enquetePayLoadWeb.getStatutEnquete().equals(StatutEnquete.DECLARATION)){
-            enquete.setStatutEnquete(StatutEnquete.EN_COURS);
-//        }else{
-//            enquete.setStatutEnquete(enquetePayLoadWeb.getStatutEnquete());
-//        }
+        enquete.setStatutEnquete(StatutEnquete.EN_COURS);
         enquete.setObservationParticuliere(enquetePayLoadWeb.getObservation());
         enquete.setAutreAdresse(enquetePayLoadWeb.getAutreAdresse());
         enquete.setAutreNumeroTitreFoncier(enquetePayLoadWeb.getAutreNumeroTitreFoncier());
@@ -856,108 +800,4 @@ public class EntityFromPayLoadService {
 
         return enquete;
     }
-
-
-
-
-    public BaremRfuBati getBaremRfuBatiFromPayLoadWeb(BaremRfuBatiPayloadWeb baremRfuBatiPayloadWeb){
-        BaremRfuBati baremRfuBati = new BaremRfuBati();
-        if (baremRfuBatiPayloadWeb.getId()!=null)
-            baremRfuBati=baremRfuRepository.findById(baremRfuBatiPayloadWeb.getId()).orElse(new BaremRfuBati());
-
-        // ======================
-        // Relations (sans hit DB)
-        // ======================
-
-        if (baremRfuBatiPayloadWeb.getArrondissementId() != null) {
-            Arrondissement arrondissement = new Arrondissement();
-            arrondissement.setId(baremRfuBatiPayloadWeb.getArrondissementId());
-            baremRfuBati.setArrondissement(arrondissement);
-        }
-
-        if (baremRfuBatiPayloadWeb.getQuartierId() != null) {
-            Quartier quartier = new Quartier();
-            quartier.setId(baremRfuBatiPayloadWeb.getQuartierId());
-            baremRfuBati.setQuartier(quartier);
-        }
-
-        if (baremRfuBatiPayloadWeb.getCategorieBatimentId() != null) {
-            CategorieBatiment categorieBatiment = new CategorieBatiment();
-            categorieBatiment.setId(baremRfuBatiPayloadWeb.getCategorieBatimentId());
-            baremRfuBati.setCategorieBatiment(categorieBatiment);
-        }
-
-        baremRfuBati.setTfuMinimum(baremRfuBatiPayloadWeb.getTfuMinimum());
-        baremRfuBati.setValeurLocative(baremRfuBatiPayloadWeb.getValeurLocative());
-        baremRfuBati.setTfuMetreCarre(baremRfuBatiPayloadWeb.getTfuMetreCarre());
-
-
-
-        return baremRfuBati;
-    }
-
-
-    public ImpositionsTfu getImpositionsTfuFromPayLoadWeb(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb){
-        ImpositionsTfu impositionsTfu = new ImpositionsTfu();
-        if (impositionsTfuPaylaodWeb.getId()!=null)
-            impositionsTfu=impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId()).orElse(new ImpositionsTfu());
-
-        // ======================
-        // Relations (sans hit DB)
-        // ======================
-
-        if (impositionsTfuPaylaodWeb.getExerciceId() != null) {
-            Exercice exercice = new Exercice();
-            exercice.setId(impositionsTfuPaylaodWeb.getExerciceId());
-            impositionsTfu.setExercice(exercice);
-        }
-
-        if (impositionsTfuPaylaodWeb.getCommuneId() != null) {
-            Commune commune = new Commune();
-            commune.setId(impositionsTfuPaylaodWeb.getCommuneId());
-            impositionsTfu.setCommune(commune);
-        }
-
-        if (impositionsTfuPaylaodWeb.getStructureId() != null) {
-            Structure structure = new Structure();
-            structure.setId(impositionsTfuPaylaodWeb.getStructureId());
-            impositionsTfu.setStructure(structure);
-        }
-        impositionsTfu.setMotif(impositionsTfuPaylaodWeb.getMotif());
-        impositionsTfu.setDatePieceAdmin(impositionsTfuPaylaodWeb.getDatePieceAdmin());
-        impositionsTfu.setReferencePieceAdmin(impositionsTfuPaylaodWeb.getReferencePieceAdmin());
-
-        return impositionsTfu;
-    }
-
-
-
-    public BaremRfuNonBati getBaremRfuNonBatiFromPayLoadWeb(BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb){
-        BaremRfuNonBati baremRfuNonBati = new BaremRfuNonBati();
-        if (baremRfuNonBatiPayloadWeb.getId()!=null)
-            baremRfuNonBati=baremRfuNonBatiRepository.findById(baremRfuNonBatiPayloadWeb.getId()).orElse(new BaremRfuNonBati());
-
-        // ======================
-        // Relations (sans hit DB)
-        // ======================
-
-        if (baremRfuNonBatiPayloadWeb.getZoneRfuId() != null) {
-            ZoneRfu zoneRfu = new ZoneRfu();
-            zoneRfu.setId(baremRfuNonBatiPayloadWeb.getZoneRfuId());
-            baremRfuNonBati.setZoneRfu(zoneRfu);
-        }
-
-        if (baremRfuNonBatiPayloadWeb.getCommuneId() != null) {
-            Commune commune = new Commune();
-            commune.setId(baremRfuNonBatiPayloadWeb.getCommuneId());
-            baremRfuNonBati.setCommune(commune);
-        }
-
-        baremRfuNonBati.setTaux(baremRfuNonBatiPayloadWeb.getTaux());
-        baremRfuNonBati.setAuMetreCarre(baremRfuNonBatiPayloadWeb.getAuMetreCarre());
-        baremRfuNonBati.setValeurAdministrative(baremRfuNonBatiPayloadWeb.getValeurAdministrative());
-        baremRfuNonBati.setValeurAdministrativeMetreCarre(baremRfuNonBatiPayloadWeb.getValeurAdministrativeMetreCarre());
-
-        return baremRfuNonBati;
-    }
 }

src/main/java/io/gmss/fiscad/service/worker/EnqueteUniteLogementAsyncWorker.java

@@ -125,7 +125,7 @@ public class EnqueteUniteLogementAsyncWorker {
         enqueteUniteLogement.setNbreHabitant(enqueteUniteLogementPayload.getNbreHabitant());
         enqueteUniteLogement.setNbreMenage(enqueteUniteLogementPayload.getNbreMenage());
         enqueteUniteLogement.setEnLocation(enqueteUniteLogementPayload.isEnLocation());
-        enqueteUniteLogement.setMontantMensuelLocation(enqueteUniteLogementPayload.getMontantMensuelLocation());
+        enqueteUniteLogement.setMontantMensuelLoyer(enqueteUniteLogementPayload.getMontantMensuelLoyer());
         enqueteUniteLogement.setNbreMoisLocation(enqueteUniteLogementPayload.getNbreMoisEnLocation());
         enqueteUniteLogement.setMontantLocatifAnnuelDeclare(enqueteUniteLogementPayload.getMontantLocatifAnnuelDeclare());
         enqueteUniteLogement.setSuperficieLouee(enqueteUniteLogementPayload.getSurfaceLouee());

src/main/resources/application.properties

@@ -1,7 +1,6 @@
 spring.profiles.active=${SPRING_PROFILES_ACTIVE}
 #spring.profiles.active=abomey
 #spring.profiles.active=test
-#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