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

Reviewed-on: #287

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

@@ -6,7 +6,6 @@ import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
 import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.DonneesImpositionTfuService;
-import io.gmss.fiscad.interfaces.rfu.metier.ImpositionsTfuService;
 import io.gmss.fiscad.paylaods.ApiResponse;
 import io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb;
 import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
@@ -409,7 +408,7 @@ public class DonneesImpositionTfuController {
     @PreAuthorize("hasAnyAuthority('CREATE_DONNEESIMPOSITIONTFU', 'UPDATE_DONNEESIMPOSITIONTFU')")
     public ResponseEntity<?> genererDonneesFiscaleBatieUneParcelle(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb,@PathVariable Long parcelleId) {
         try {
-            Optional<ImpositionsTfuPaylaodWeb> optionalImpositionsTfu =impositionsTfuRepository.findByIdToDto(impositionsTfuPaylaodWeb.getId());
+            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
 
             if(optionalImpositionsTfu.isEmpty()){
                 return new ResponseEntity<>(
@@ -425,7 +424,6 @@ public class DonneesImpositionTfuController {
             }
             impositionsTfuPaylaodWeb=donneesImpositionTfuService.genererDonneesFiscalesParcelleBatieUneParcelle(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId(),parcelleId);
 
-            System.out.println("OK apres sorti bati une parcelle");
             return new ResponseEntity<>(
                     new ApiResponse<>(true,impositionsTfuPaylaodWeb, "Données d'imposition des fonciers batis Générées avec succès."),
                     HttpStatus.OK
@@ -509,7 +507,7 @@ public class DonneesImpositionTfuController {
     @PreAuthorize("hasAnyAuthority('CREATE_DONNEESIMPOSITIONTFU', 'UPDATE_DONNEESIMPOSITIONTFU')")
     public ResponseEntity<?> genererDonneesImpositionNonBatiesUneParcelle(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, @PathVariable Long parcelleId) {
         try {
-            Optional<ImpositionsTfuPaylaodWeb> optionalImpositionsTfu = impositionsTfuRepository.findByIdToDto(impositionsTfuPaylaodWeb.getId());
+            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
 
             if(optionalImpositionsTfu.isEmpty()){
                 return new ResponseEntity<>(
@@ -518,13 +516,19 @@ public class DonneesImpositionTfuController {
                 );
             }
 
+//            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.genererDonneesFiscalesParcelleNonBatieUneParcelle(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId(),parcelleId);
 
             return new ResponseEntity<>(

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

@@ -1,17 +1,14 @@
 package io.gmss.fiscad.controllers.rfu.metier;
 
 
-import io.gmss.fiscad.entities.infocad.parametre.Structure;
 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.infocad.parametre.StructureService;
 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.paylaods.request.crudweb.StructurePaylaodWeb;
 import io.gmss.fiscad.security.CurrentUser;
 import io.gmss.fiscad.security.UserPrincipal;
 import io.swagger.v3.oas.annotations.Operation;
@@ -32,8 +29,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
 
-import java.util.Optional;
-
 
 @RestController
 @AllArgsConstructor
@@ -44,8 +39,6 @@ import java.util.Optional;
 public class ImpositionsTfuController {
 
     private final ImpositionsTfuService impositionsTfuService;
-    private final StructureService structureService;
-
     private final EnqueteService enqueteService;
     private static final Logger logger = LoggerFactory.getLogger(ImpositionsTfuController.class);
 
@@ -61,22 +54,11 @@ public class ImpositionsTfuController {
                         HttpStatus.OK
                 );
             }
-
+            User user=currentUser.getUser();
-            if(impositionsTfuPaylaodWeb.getStructureId()==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "Veuillez préciser la strucuture."),
-                        HttpStatus.OK
-                );
-            }
-
-            User user = currentUser.getUser();
-
-            StructurePaylaodWeb st  = structureService.getStructureById(impositionsTfuPaylaodWeb.getStructureId()).orElseGet(null);
-
 
             if(user.getStructure().getId()!=impositionsTfuPaylaodWeb.getStructureId()){
                 return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource. Votre centre : "+ user.getStructure().getNom() +" le centre de liquidation : "+ st.getNom()),
+                        new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."),
                         HttpStatus.OK
                 );
             }

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

@@ -1,236 +0,0 @@
-package io.gmss.fiscad.controllers.rfu.metier;
-
-
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.rfu.metier.ParticiperService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.ParticiperPayloadWeb;
-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.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-
-@RestController
-@RequestMapping(value = "api/participer", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "Participer")
-@CrossOrigin(origins = "*")
-public class ParticiperController {
-
-    private final ParticiperService participerService;
-
-    private static final Logger logger = LoggerFactory.getLogger(ParticiperController.class);
-
-    public ParticiperController(ParticiperService participerService) {
-        this.participerService = participerService;
-    }
-
-    @PostMapping("/create")
-    @PreAuthorize("hasAuthority('CREATE_PARTICIPER')")
-    public ResponseEntity<?> createParticiper(@RequestBody @Valid @Validated ParticiperPayloadWeb participerPaylaodWeb) {
-        try {
-            participerPaylaodWeb = participerService.createParticiper(participerPaylaodWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, participerPaylaodWeb, "Participer 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}")
-    @PreAuthorize("hasAuthority('UPDATE_PARTICIPER')")
-    public ResponseEntity<?> updateParticiper(@PathVariable Long id, @RequestBody ParticiperPayloadWeb participerPaylaodWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, participerService.updateParticiper(id,participerPaylaodWeb), "Participer 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);
-        }
-    }
-
-    @DeleteMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('DELETE_PARTICIPER')")
-    public ResponseEntity<?> deleteParticiper(@PathVariable Long id) {
-        try {
-            participerService.deleteParticiper(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "Participer 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")
-    @PreAuthorize("hasAuthority('READ_PARTICIPER')")
-    public ResponseEntity<?> getAllParticiperList() {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, participerService.getParticiperList(), "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-paged")
-    @PreAuthorize("hasAuthority('READ_PARTICIPER')")
-    public ResponseEntity<?> getAllParticiperPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, participerService.getParticiperList(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/by-equipe-id/{equipeId}")
-    @PreAuthorize("hasAuthority('READ_PARTICIPER')")
-    public ResponseEntity<?> getAllParticiperByParcelleList(@PathVariable Long equipeId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, participerService.getParticiperListByEquipe(equipeId), "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-paged/by-equipe-id/{equipeId}")
-    @PreAuthorize("hasAuthority('READ_PARTICIPER')")
-    public ResponseEntity<?> getAllParticiperByParcellePaged(@PathVariable Long equipeId,  @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, participerService.getParticiperListByEquipePageable(equipeId,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}")
-    @PreAuthorize("hasAuthority('READ_PARTICIPER')")
-    public ResponseEntity<?> getParticiperById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, participerService.getParticiperById(id), "Participer 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/CampagneController.java

@@ -5,7 +5,6 @@ import io.gmss.fiscad.enums.TypeCampagne;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.parametre.CampagneService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.CampagnePayloadWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -38,11 +37,11 @@ public class CampagneController {
 
     @PostMapping("/create")
     @PreAuthorize("hasAuthority('CREATE_CAMPAGNE')")
-    public ResponseEntity<?> createCampagne(@RequestBody @Valid @Validated CampagnePayloadWeb campagnePayloadWeb) {
+    public ResponseEntity<?> createCampagne(@RequestBody @Valid @Validated Campagne campagne) {
         try {
-            campagnePayloadWeb = campagneService.createCampagne(campagnePayloadWeb);
+            campagne = campagneService.createCampagne(campagne);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, campagnePayloadWeb, "Campagne créé avec  succès."),
+                    new ApiResponse<>(true, campagne, "Campagne créé avec  succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -63,10 +62,10 @@ public class CampagneController {
 
     @PutMapping("/update/{id}")
     @PreAuthorize("hasAuthority('UPDATE_CAMPAGNE')")
-    public ResponseEntity<?> updateCampagne(@PathVariable Long id, @RequestBody CampagnePayloadWeb campagnePayloadWeb) {
+    public ResponseEntity<?> updateCampagne(@PathVariable Long id, @RequestBody Campagne campagne) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, campagneService.updateCampagne(id, campagnePayloadWeb), "Campagne mis à jour avec succès."),
+                    new ApiResponse<>(true, campagneService.updateCampagne(id, campagne), "Campagne mis à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -208,111 +207,5 @@ public class CampagneController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-
-    @GetMapping("/by-exercice-id/{exerciceId}")
-    @PreAuthorize("hasAuthority('READ_CAMPAGNE')")
-    public ResponseEntity<?> getCampagneByExercice(@PathVariable Long exerciceId) {
-
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, campagneService.getCampagneByExerciceId(exerciceId), "Liste des campagne par type 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("/page/by-exercice-id/{exerciceId}")
-    @PreAuthorize("hasAuthority('READ_CAMPAGNE')")
-    public ResponseEntity<?> getCampagneByExercice(@PathVariable Long exerciceId,@RequestParam int pageNo, @RequestParam int pageSize) {
-
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, campagneService.getCampagneByExerciceId(exerciceId,pageable), "Liste des campagne par type 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-structure-id/{structureId}")
-    @PreAuthorize("hasAuthority('READ_CAMPAGNE')")
-    public ResponseEntity<?> getCampagneByStructure(@PathVariable Long structureId) {
-
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, campagneService.getCampagneByStructureId(structureId), "Liste des campagne par type 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("/page/by-structure-id/{structureId}")
-    @PreAuthorize("hasAuthority('READ_CAMPAGNE')")
-    public ResponseEntity<?> getCampagneByStructure(@PathVariable Long structureId,@RequestParam int pageNo, @RequestParam int pageSize) {
-
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, campagneService.getCampagneByStructureId(structureId,pageable), "Liste des campagne par type 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);
-        }
-    }
 }
 

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

@@ -4,7 +4,6 @@ import io.gmss.fiscad.entities.rfu.parametre.Equipe;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.parametre.EquipeService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.EquipePayloadWeb;
 import io.gmss.fiscad.paylaods.request.synchronisation.EquipePayload;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -37,12 +36,12 @@ public class EquipeController {
 
 
     @PostMapping("/create")
-   // @PreAuthorize("hasAuthority('CREATE_EQUIPE')")
+    @PreAuthorize("hasAuthority('CREATE_EQUIPE')")
-    public ResponseEntity<?> createEquipe(@RequestBody @Valid @Validated EquipePayloadWeb equipePayloadWeb) {
+    public ResponseEntity<?> createEquipe(@RequestBody @Valid @Validated EquipePayload equipePayload) {
         try {
-             equipePayloadWeb = equipeService.create(equipePayloadWeb);
+            Equipe equipe = equipeService.createEquipe(equipePayload);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, equipePayloadWeb, "Equipe créé avec  succès."),
+                    new ApiResponse<>(true, equipe, "Equipe créé avec  succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -56,18 +55,17 @@ public class EquipeController {
             logger.error(e.getLocalizedMessage());
             return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
         } catch (Exception e) {
-            e.printStackTrace();
             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}")
-   // @PreAuthorize("hasAuthority('UPDATE_EQUIPE')")
+    @PreAuthorize("hasAuthority('UPDATE_EQUIPE')")
-    public ResponseEntity<?> updateEquipe(@PathVariable Long id, @RequestBody EquipePayloadWeb equipePayloadWeb) {
+    public ResponseEntity<?> updateEquipe(@PathVariable Long id, @RequestBody EquipePayload equipePayload) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, equipeService.update(id, equipePayloadWeb), "Equipe mis à jour avec succès."),
+                    new ApiResponse<>(true, equipeService.updateEquipe(id, equipePayload), "Equipe mis à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -90,7 +88,7 @@ public class EquipeController {
     @PreAuthorize("hasAuthority('DELETE_EQUIPE')")
     public ResponseEntity<?> deleteEquiper(@PathVariable Long id) {
         try {
-            equipeService.delete(id);
+            equipeService.deleteEquipe(id);
             return new ResponseEntity<>(
                     new ApiResponse<>(true, "Equipe supprimée avec succès."),
                     HttpStatus.OK
@@ -106,18 +104,17 @@ public class EquipeController {
             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")
-    //@PreAuthorize("hasAuthority('READ_EQUIPE')")
+    @PreAuthorize("hasAuthority('READ_EQUIPE')")
     public ResponseEntity<?> getAllEquipeList() {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, equipeService.findAll(), "Liste des equipes chargée avec succès."),
+                    new ApiResponse<>(true, equipeService.getEquipeList(), "Liste des equipes chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -143,7 +140,7 @@ public class EquipeController {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
 
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, equipeService.findAll(pageable), "Liste des equipes chargée avec succès."),
+                    new ApiResponse<>(true, equipeService.getEquipeList(pageable), "Liste des equipes chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -167,81 +164,7 @@ public class EquipeController {
     public ResponseEntity<?> getEquipeById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, equipeService.findById(id), "Equipe trouvée avec succès."),
+                    new ApiResponse<>(true, equipeService.getEquipeById(id), "Equipe 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-compagne-id/{campagneId}")
-    @PreAuthorize("hasAuthority('READ_EQUIPE')")
-    public ResponseEntity<?> getEquipeByCompagneId(@PathVariable Long campagneId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, equipeService.findByCampagneId(campagneId), "Equipe 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-secteur-id/{secteurId}")
-    @PreAuthorize("hasAuthority('READ_EQUIPE')")
-    public ResponseEntity<?> getEquipeBySecteurId(@PathVariable Long secteurId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, equipeService.findBySecteurId(secteurId), "Equipe 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-quartier-id/{quartierId}")
-    @PreAuthorize("hasAuthority('READ_EQUIPE')")
-    public ResponseEntity<?> getEquipeByQuartierId(@PathVariable Long quartierId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, equipeService.findByQuartierId(quartierId), "Equipe trouvée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

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

@@ -38,8 +38,6 @@ public class ExerciceController {
     @PreAuthorize("hasAuthority('CREATE_EXERCICE')")
     public ResponseEntity<?> createExercice(@RequestBody @Valid @Validated Exercice exercice) {
         try {
-
-
             exercice = exerciceService.createExercice(exercice);
             return new ResponseEntity<>(
                     new ApiResponse<>(true, exercice, "Exercice créé avec  succès."),

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

@@ -27,7 +27,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Formula;
 
 import java.io.Serializable;
 import java.time.LocalDate;
@@ -184,14 +183,6 @@ public class Enquete extends BaseEntity implements Serializable {
     private Integer nbreIndivisiaire;
     private String autreAdresse;
     private Float superficie ;
-    @Formula("""
-        (
-           SELECT COUNT(DISTINCT (bat.id))
-           FROM enquete e
-           join batiment bat on bat.parcelle_id =e.parcelle_id
-           WHERE bat.parcelle_id = parcelle_id
-        )
-    """)
     private Integer nbreBatiment;
     private Integer nbrePiscine;
     private Long montantMensuelleLocation;

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

@@ -94,7 +94,7 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
     private Long nombrePiscine;
     private Long nombreUlog;
     private Long nombreBat;
-    //@Column(nullable = true, columnDefinition = "boolean default true")
+    @Column(nullable = true, columnDefinition = "boolean default true")
     private Boolean homologable ;
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)

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

@@ -8,6 +8,7 @@ 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;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
@@ -15,6 +16,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Formula;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 import java.io.Serializable;
 import java.time.LocalDate;
@@ -93,10 +96,10 @@ public class ImpositionsTfu extends BaseEntity implements Serializable {
     @Column(columnDefinition = "TEXT")
     private String motif;
 
-  //  @JsonIgnore
+    @JsonIgnore
-  //  @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-  //  @JoinColumn(name = "impositions_tfu_id")
+    @JoinColumn(name = "impositions_tfu_id")
- //   private List<DonneesImpositionTfu> donneesImpositionTfus;
+    private List<DonneesImpositionTfu> donneesImpositionTfus;
 
 
 }

src/main/java/io/gmss/fiscad/entities/rfu/parametre/Campagne.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.infocad.metier.Enquete;
-import io.gmss.fiscad.entities.infocad.parametre.Structure;
 import io.gmss.fiscad.enums.TypeCampagne;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
@@ -40,12 +39,12 @@ public class Campagne extends BaseEntity implements Serializable {
     private LocalDate dateFin;
     @Enumerated(EnumType.STRING)
     private TypeCampagne typeCampagne;
-    @ManyToOne
+//    @JsonIgnore
-    private Exercice exercice ;
+//    @OneToMany(mappedBy = "campagne")
-
+//    private List<Equipe> equipes;
-    @ManyToOne
+//    @JsonIgnore
-    private Structure structure ;
+//    @OneToMany(mappedBy = "campagne")
-
+//    private List<Enquete> enquetes;
 
 }
 

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

@@ -1,13 +1,10 @@
 package io.gmss.fiscad.entities.rfu.parametre;
 
-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.decoupage.Secteur;
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
 import io.gmss.fiscad.entities.infocad.parametre.Bloc;
-import io.gmss.fiscad.entities.rfu.metier.Participer;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -16,7 +13,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
@@ -36,10 +32,6 @@ public class Equipe extends BaseEntity implements Serializable {
     private Bloc bloc;
     @ManyToOne
     private Secteur secteur;
-
-    @ManyToOne
-    private Quartier quartier;
-
     @ManyToOne
     private Campagne campagne;
 
@@ -47,14 +39,6 @@ public class Equipe extends BaseEntity implements Serializable {
     @JoinColumn(name = "equipe_id")
     private List<Participer> participers;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateDebut;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateFin;
-
 //    @JsonIgnore
 //    @OneToMany(mappedBy = "equipe")
 //    private List<Enquete> enquetes;

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

@@ -21,11 +21,6 @@ import java.time.LocalDate;
 @NoArgsConstructor
 @AllArgsConstructor
 @Where(clause = " deleted = false")
-@Table(
-        uniqueConstraints = {
-                @UniqueConstraint(name = "uk_exercice_annee", columnNames = "annee")
-        }
-)
 public class Exercice extends BaseEntity implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

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

@@ -1,11 +1,10 @@
-package io.gmss.fiscad.entities.rfu.metier;
+package io.gmss.fiscad.entities.rfu.parametre;
 
 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.rfu.parametre.Equipe;
 import io.gmss.fiscad.entities.user.User;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
@@ -22,15 +21,7 @@ import java.time.LocalDate;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-//@Where(clause = " deleted = false")
+@Where(clause = " deleted = false")
-@Table(
-        uniqueConstraints = {
-                @UniqueConstraint(
-                        name = "uk_participer_equipe_user",
-                        columnNames = {"equipe_id", "user_id"}
-                )
-        }
-)
 public class Participer extends BaseEntity implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/io/gmss/fiscad/entities/user/User.java

@@ -1,9 +1,15 @@
 package io.gmss.fiscad.entities.user;
 
+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.Secteur;
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
 import io.gmss.fiscad.entities.infocad.parametre.Structure;
-import io.gmss.fiscad.entities.rfu.metier.Participer;
+import io.gmss.fiscad.entities.rfu.parametre.Participer;
+import io.gmss.fiscad.enums.UserRole;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -13,6 +19,7 @@ import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.HashSet;
 import java.util.List;

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

@@ -267,6 +267,7 @@ public class PersonneServiceImpl implements PersonneService {
             }
 
             if(request.getNpi()!=null && !request.getNpi().equals("")){
+
                 List<PersonnePayLoadWeb> personnePayLoadWebs = personneRepository.findAllPersonneByNpiToDto(request.getNpi());
                 if(!personnePayLoadWebs.isEmpty())
                     return personnePayLoadWebs;
@@ -276,14 +277,13 @@ public class PersonneServiceImpl implements PersonneService {
 
             result = recherchePersonneLocal(request);
 
-            if (result != null && ! result.isEmpty()) {
+            if (result != null && !result.isEmpty()) {
                 return result;
             }
             // Conversion date en String format yyyy-MM-dd
             String dateNaissance = Optional.ofNullable(request.getDateNaissance())
                     .map(d -> d.format(DateTimeFormatter.ISO_LOCAL_DATE))
                     .orElse(null);
-
             // Construction du body IFU
             IfuEnLigneRechercheBody ifuRequest = new IfuEnLigneRechercheBody();
             ifuRequest.setNom(request.getNom());

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

@@ -2,16 +2,16 @@ package io.gmss.fiscad.implementations.rfu.metier;
 
 import io.gmss.fiscad.entities.decoupage.Arrondissement;
 import io.gmss.fiscad.entities.infocad.metier.Parcelle;
-import io.gmss.fiscad.entities.infocad.parametre.Structure;
 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.infocad.parametre.StructureService;
 import io.gmss.fiscad.interfaces.rfu.metier.DonneesImpositionTfuService;
-import io.gmss.fiscad.paylaods.request.crudweb.*;
+import io.gmss.fiscad.paylaods.request.crudweb.ArrondissementPaylaodWeb;
+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;
@@ -45,7 +45,6 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
     private final ArrondissementRepository arrondissementRepository;
     private final BaremRfuRepository baremRfuRepository;
     private final EntityFromPayLoadService entityFromPayLoadService;
-    private final StructureService structureService;
 
 
 
@@ -117,38 +116,23 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
     @Override
     @Transactional
     public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleNonBatieUneParcelle(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId,Long parcelleId) {
-
         boolean existsBareme = baremRfuNonBatiRepository.existsBaremForParcelleNonBati(parcelleId);
-
+        Optional<Parcelle> optionalParcelle= parcelleRepository.findById(parcelleId);
-        Optional<ParcellePayLoadWeb> optionalParcelle= parcelleRepository.findParcelleToDtoById(parcelleId);
-
         String nomQuartier="";
         String nomArrondissement="";
         String nomCommune="";
         if(optionalParcelle.isPresent()){
-            nomQuartier= optionalParcelle.get().getQuartierNom();
+            nomQuartier= optionalParcelle.get().getQuartier().getNom();
-
+            nomArrondissement= optionalParcelle.get().getQuartier().getArrondissement().getNom();
+            nomCommune= optionalParcelle.get().getQuartier().getArrondissement().getCommune().getNom();
         }
         if(!existsBareme){
-            throw new BadRequestException("Impossible de continuer la liquidation  : Il n'existe pas de barème configuré pour la zone de cette parcelle : "+nomQuartier);
+            throw new BadRequestException("Impossible de continuer la liquidation  : Il n'existe pas de barème configuré pour la zone de cette parcelle : "+nomCommune+" : "+nomArrondissement+" : "+nomQuartier);
         }
-
+        Integer nb= donneesImpositionTfuRepository.genererDonneesTfuNonBatie(impositionsTfuPaylaodWeb.getId(),userId,parcelleId);
-        List<Structure> structures = structureService.getListStructureUserId(userId);
-
-        boolean existe = structures.stream()
-                .anyMatch(s -> s.getId().equals(impositionsTfuPaylaodWeb.getStructureId()));
-
-        if (!existe) {
-            throw new BadRequestException("Impossible de continuer la liquidation  : La parcelle ne se trouve pas dans votre territoire ");
-        }
-
-
-        Integer nb= donneesImpositionTfuRepository.genererDonneesTfuNonBatie(impositionsTfuPaylaodWeb.getId(), userId, parcelleId);
-
-        System.out.println(nb);
-
         ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
         impositionsTfu.setStatusAvis(StatusAvis.TFU_FNB_GENERE);
+        //impositionsTfu.setNombreAvisFnb(nb);
         impositionsTfuRepository.save(impositionsTfu);
         return impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
     }
@@ -189,21 +173,23 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
     public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleBatieUneParcelle(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId, Long parcelleId) {
 
         Optional<ImpositionsTfuPaylaodWeb>  imp=impositionsTfuRepository.findByIdToDto(impositionsTfuPaylaodWeb.getId());
-        if(imp.isPresent()){
+       if(imp.isPresent()){
            boolean dejaLiquide = donneesImpositionTfuRepository.existsByImpositionAnneeAndParcelle(Long.valueOf(imp.get().getExerciceAnnee()),parcelleId);
             if(dejaLiquide){
                 return imp.orElse(null);
             }
        }
 
-        boolean existsBareme = baremRfuRepository.existsBaremForParcelle(parcelleId);
 
-        Optional<ParcellePayLoadWeb> optionalParcelle= parcelleRepository.findParcelleToDtoById(parcelleId);
+        boolean existsBareme = baremRfuRepository.existsBaremForParcelle(parcelleId);
+        Optional<Parcelle> optionalParcelle= parcelleRepository.findById(parcelleId);
         String nomQuartier="";
         String nomArrondissement="";
         String nomCommune="";
         if(optionalParcelle.isPresent()){
-            nomQuartier= optionalParcelle.get().getQuartierNom();
+            nomQuartier= optionalParcelle.get().getQuartier().getNom();
+            nomArrondissement= optionalParcelle.get().getQuartier().getArrondissement().getNom();
+            nomCommune= optionalParcelle.get().getQuartier().getArrondissement().getCommune().getNom();
         }
         if(!existsBareme){
             throw new BadRequestException("Impossible de continuer la liquidation  : Il n'existe pas de barème configuré pour la zone de cette parcelle : "+nomCommune+" : "+nomArrondissement+" : "+nomQuartier);
@@ -223,10 +209,15 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
 
         Integer nbMajAcompteRirf= donneesImpositionTfuRepository.majDonneesAcompteRirfUneParcelle(impositionsTfuPaylaodWeb.getId(),parcelleId);
 
+
         ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
 
         impositionsTfu.setStatusAvis(StatusAvis.GENERE);
 
+        //impositionsTfu.setNombreAvis(impositionsTfu.getNombreAvis()+1);
+        //impositionsTfu.setNombreAvisBatiment(impositionsTfu.getNombreAvisFnb()+1);
+        //impositionsTfu.setNombreAvisUniteLog(impositionsTfu.getNombreAvisUniteLog()+1);
+
         impositionsTfuRepository.save(impositionsTfu);
 
         return impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);

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

@@ -1,136 +0,0 @@
-package io.gmss.fiscad.implementations.rfu.metier;
-
-import io.gmss.fiscad.entities.infocad.metier.Parcelle;
-import io.gmss.fiscad.entities.rfu.metier.Participer;
-import io.gmss.fiscad.exceptions.ApplicationException;
-import io.gmss.fiscad.exceptions.BadRequestException;
-import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.interfaces.rfu.metier.ParticiperService;
-import io.gmss.fiscad.paylaods.request.crudweb.ParticiperPayloadWeb;
-import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository;
-import io.gmss.fiscad.persistence.repositories.rfu.metier.ParticiperRepository;
-import io.gmss.fiscad.persistence.repositories.rfu.parametre.EquipeRepository;
-import io.gmss.fiscad.persistence.repositories.user.UserRepository;
-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 ParticiperServiceImpl implements ParticiperService {
-
-    private final ParticiperRepository participerRepository;
-    private final EquipeRepository equipeRepository;
-    private final UserRepository userRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
-
-
-    @Override
-    public ParticiperPayloadWeb createParticiper(ParticiperPayloadWeb participerPaylaodWeb) throws BadRequestException {
-        if (participerPaylaodWeb.getId() != null) {
-            throw new BadRequestException("Impossible de créer un nouveau participer ayant un id non null.");
-        }
-        if (participerPaylaodWeb.getEquipeId() == null) {
-            throw new BadRequestException("Impossible de créer un nouveau participer: L'équipe doit être précisée.");
-        }else {
-            if(!equipeRepository.existsById(participerPaylaodWeb.getEquipeId()))
-                throw new BadRequestException("Impossible de créer la participation: L'équipe doit être précisée.");
-        }
-
-
-
-        if (participerPaylaodWeb.getUserId() == null) {
-            throw new BadRequestException("Impossible de créer la participation : Le participant doit être précisé.");
-        }else {
-            if(!userRepository.existsById(participerPaylaodWeb.getUserId()))
-                throw new BadRequestException("Impossible de créer un nouveau participer: Le participant doit être précisé.");
-        }
-
-        if (participerRepository.existsByEquipeIdAndUserId(
-                participerPaylaodWeb.getEquipeId(),
-                participerPaylaodWeb.getUserId())) {
-            throw new ApplicationException("Cet utilisateur participe déjà à cette équipe.");
-        }
-
-
-        Participer participer= entityFromPayLoadService.getParticiperFromPayLoadWeb(participerPaylaodWeb);
-        participer=  participerRepository.save(participer);
-
-        return participerRepository.findPayloadById(participer.getId()).orElse(null);
-    }
-
-    @Override
-    public ParticiperPayloadWeb updateParticiper(Long id,ParticiperPayloadWeb participerPaylaodWeb) throws NotFoundException {
-        if (participerPaylaodWeb.getId() == null) {
-            throw new BadRequestException("Participation non spécifiée");
-        }
-        if (!participerRepository.existsById(participerPaylaodWeb.getId())) {
-            throw new NotFoundException("Impossible de trouver la participation.");
-        }
-
-        if (participerPaylaodWeb.getEquipeId() == null) {
-            throw new BadRequestException("Impossible de créer un nouveau participer: L'équipe doit être précisée.");
-        }else {
-            if(!equipeRepository.existsById(participerPaylaodWeb.getEquipeId()))
-                throw new BadRequestException("Impossible de créer un nouveau participer: L'équipe doit être précisée.");
-        }
-
-        if (participerPaylaodWeb.getUserId() == null) {
-            throw new BadRequestException("Impossible de créer un nouveau participer: Le participant doit être précisé.");
-        }else {
-            if(!userRepository.existsById(participerPaylaodWeb.getUserId()))
-                throw new BadRequestException("Impossible de créer un nouveau participer: Le participant doit être précisé.");
-        }
-        Participer participer= entityFromPayLoadService.getParticiperFromPayLoadWeb(participerPaylaodWeb);
-        participer=  participerRepository.save(participer);
-
-        return participerRepository.findPayloadById(participer.getId()).orElse(null);
-    }
-
-    @Override
-    public void deleteParticiper(Long id) throws NotFoundException {
-        Optional<Participer> participerOptional = participerRepository.findById(id);
-        if (participerOptional.isPresent()) {
-            participerRepository.deleteById(participerOptional.get().getId());
-        } else {
-            throw new NotFoundException("Impossible de trouver le participer spécifié dans notre base de données.");
-        }
-
-    }
-
-    @Override
-    public Page<ParticiperPayloadWeb> getParticiperList(Pageable pageable) {
-        return participerRepository.findAllPayload(pageable);
-    }
-
-    @Override
-    public List<ParticiperPayloadWeb> getParticiperList() {
-        return participerRepository.findAllPayload();
-    }
-
-    @Override
-    public Page<ParticiperPayloadWeb> getParticiperListByEquipePageable(Long equipeId, Pageable pageable) {
-        return participerRepository.findAllPayloadByEquipeId(equipeId,pageable);
-    }
-
-    @Override
-    public List<ParticiperPayloadWeb> getParticiperListByEquipe(Long equipeId) {
-        return participerRepository.findAllPayloadByEquipeId(equipeId);
-    }
-
-
-    @Override
-    public Optional<ParticiperPayloadWeb> getParticiperById(Long id) {
-        if (participerRepository.existsById(id)) {
-            return participerRepository.findPayloadById(id);
-        } else {
-            throw new NotFoundException("Impossible de trouver la participation spécifiée dans la base de données.");
-        }
-    }
-
-}

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

@@ -1,16 +1,11 @@
 package io.gmss.fiscad.implementations.rfu.parametre;
 
-import io.gmss.fiscad.entities.infocad.metier.Parcelle;
-import io.gmss.fiscad.entities.rfu.metier.Batiment;
 import io.gmss.fiscad.entities.rfu.parametre.Campagne;
 import io.gmss.fiscad.enums.TypeCampagne;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.rfu.parametre.CampagneService;
-import io.gmss.fiscad.paylaods.request.crudweb.CampagnePayloadWeb;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.CampagneRepository;
-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;
@@ -19,36 +14,29 @@ import java.util.List;
 import java.util.Optional;
 
 @Service
-@AllArgsConstructor
 public class CampagneServiceImpl implements CampagneService {
     private final CampagneRepository campagneRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
 
+    public CampagneServiceImpl(CampagneRepository campagneRepository) {
+        this.campagneRepository = campagneRepository;
+    }
 
     @Override
-    public CampagnePayloadWeb createCampagne(CampagnePayloadWeb campagnePayloadWeb) throws BadRequestException {
+    public Campagne createCampagne(Campagne campagne) throws BadRequestException {
-        if (campagnePayloadWeb.getId() != null) {
+        if (campagne.getId() != null) {
             throw new BadRequestException("Impossible de créer une nouvelle campgne ayant un id non null.");
         }
-
+        return campagneRepository.save(campagne);
-        Campagne campagne= entityFromPayLoadService.getCampagneFromPayLoadWeb(campagnePayloadWeb);
-        campagne=  campagneRepository.save(campagne);
-
-        return campagneRepository.findPayloadById(campagne.getId()).orElse(null);
-
     }
     @Override
-    public CampagnePayloadWeb updateCampagne(Long id, CampagnePayloadWeb campagnePayloadWeb) throws NotFoundException {
+    public Campagne updateCampagne(Long id, Campagne campagne) throws NotFoundException {
-        if (campagnePayloadWeb.getId() == null) {
+        if (campagne.getId() == null) {
             throw new BadRequestException("Impossible de mettre à jour une nouvelle campagne ayant un id null.");
         }
-        if (!campagneRepository.existsById(campagnePayloadWeb.getId())) {
+        if (!campagneRepository.existsById(campagne.getId())) {
             throw new NotFoundException("Impossible de trouver la campagne spécifiée dans notre base de données.");
         }
-        Campagne campagne= entityFromPayLoadService.getCampagneFromPayLoadWeb(campagnePayloadWeb);
+        return campagneRepository.save(campagne);
-        campagne=  campagneRepository.save(campagne);
-
-        return campagneRepository.findPayloadById(campagne.getId()).orElse(null);
     }
 
     @Override
@@ -61,13 +49,13 @@ public class CampagneServiceImpl implements CampagneService {
         }
     }
     @Override
-    public Page<CampagnePayloadWeb> getCampagneList(Pageable pageable) {
+    public Page<Campagne> getCampagneList(Pageable pageable) {
-        return campagneRepository.findAllPayload(pageable);
+        return campagneRepository.findAll(pageable);
     }
 
     @Override
-    public List<CampagnePayloadWeb> getCampagneList() {
+    public List<Campagne> getCampagneList() {
-        return campagneRepository.findAllPayload();
+        return campagneRepository.findAll();
     }
 
     @Override
@@ -76,28 +64,8 @@ public class CampagneServiceImpl implements CampagneService {
     }
 
     @Override
-    public Optional<CampagnePayloadWeb> getCampagneById(Long id) {
+    public Optional<Campagne> getCampagneById(Long id) {
-        return campagneRepository.findPayloadById(id);
+        return campagneRepository.findById(id);
-    }
-
-    @Override
-    public List<CampagnePayloadWeb> getCampagneByExerciceId(Long exerciceId) {
-        return campagneRepository.findAllPayloadByExerciceId(exerciceId);
-    }
-
-    @Override
-    public Page<CampagnePayloadWeb> getCampagneByExerciceId(Long exerciceId, Pageable pageable) {
-        return campagneRepository.findAllPayloadByExerciceId(exerciceId,pageable);
-    }
-
-    @Override
-    public List<CampagnePayloadWeb> getCampagneByStructureId(Long structureId) {
-        return campagneRepository.findAllPayloadByStructureId(structureId);
-    }
-
-    @Override
-    public Page<CampagnePayloadWeb> getCampagneByStructureId(Long structureId, Pageable pageable) {
-        return campagneRepository.findAllPayloadByStructureId(structureId,pageable);
     }
 }
 

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

@@ -1,131 +1,121 @@
 package io.gmss.fiscad.implementations.rfu.parametre;
 
+import io.gmss.fiscad.entities.decoupage.Secteur;
+import io.gmss.fiscad.entities.infocad.parametre.Bloc;
+import io.gmss.fiscad.entities.rfu.parametre.Campagne;
 import io.gmss.fiscad.entities.rfu.parametre.Equipe;
+import io.gmss.fiscad.entities.rfu.parametre.Participer;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.rfu.parametre.EquipeService;
-import io.gmss.fiscad.paylaods.request.crudweb.EquipePayloadWeb;
+import io.gmss.fiscad.paylaods.request.synchronisation.EquipePayload;
+import io.gmss.fiscad.paylaods.request.synchronisation.ParticiperPayload;
+import io.gmss.fiscad.persistence.repositories.decoupage.SecteurRepository;
+import io.gmss.fiscad.persistence.repositories.infocad.parametre.BlocRepository;
+import io.gmss.fiscad.persistence.repositories.rfu.parametre.CampagneRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.EquipeRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
+import io.gmss.fiscad.persistence.repositories.user.UserRepository;
-import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-@AllArgsConstructor
 @Service
 public class EquipeServiceImpl implements EquipeService {
-  private final EntityFromPayLoadService entityFromPayLoadService;
+    private final EquipeRepository equipeRepository;
-  private final EquipeRepository equipeRepository;
+    private final UserRepository userRepository;
+    private final BlocRepository blocRepository;
+    private final SecteurRepository secteurRepository;
+    private final CampagneRepository campagneRepository;
+
+    public EquipeServiceImpl(EquipeRepository equipeRepository, UserRepository userRepository, BlocRepository blocRepository, SecteurRepository secteurRepository, CampagneRepository campagneRepository) {
+        this.equipeRepository = equipeRepository;
+        this.userRepository = userRepository;
+        this.blocRepository = blocRepository;
+        this.secteurRepository = secteurRepository;
+        this.campagneRepository = campagneRepository;
+    }
+
+
     @Override
-    public EquipePayloadWeb create(EquipePayloadWeb equipePayloadWeb) {
+    public Equipe createEquipe(EquipePayload equipePayload) throws BadRequestException {
-        if (equipePayloadWeb.getId() != null) {
+        if (equipePayload.getId() != null) {
-            throw new BadRequestException("Impossible de créer une nouvelle caracteristique ayant un id non null.");
+            throw new BadRequestException("Impossible de créer une nouvelle equipe ayant un id non null.");
         }
-        Equipe equipe = entityFromPayLoadService.getEquipeFromPayLoadWeb(equipePayloadWeb);
+        Equipe equipe = getEquipeFromPayload(equipePayload);
-        equipe = equipeRepository.save(equipe);
+        return equipeRepository.save(equipe);
-        return equipeRepository.findPayloadById(equipe.getId()).orElse(null);
+    }
+
+    private Equipe getEquipeFromPayload(EquipePayload equipePayload) {
+        Equipe equipe = new Equipe();
+        Optional<Bloc> optionalBloc = blocRepository.findById(equipePayload.getBlocId());
+        equipe.setBloc(optionalBloc.orElse(null));
+        equipe.setId(equipePayload.getId());
+        equipe.setCode(equipePayload.getCode());
+        equipe.setNom(equipePayload.getNom());
+        Optional<Secteur> optionalSecteur = secteurRepository.findById(equipePayload.getSecteurId());
+        equipe.setSecteur(optionalSecteur.orElse(null));
+        Optional<Campagne> optionalCampagne = campagneRepository.findById(equipePayload.getCampagneId());
+        equipe.setCampagne(optionalCampagne.orElse(null));
+
+        List<Participer> participerList = new ArrayList<>();
+
+        for (ParticiperPayload pp : equipePayload.getParticiperPayloads()) {
+            Participer part = new Participer();
+            part.setId(pp.getId());
+            if (pp.getEquipeId() != null && equipeRepository.existsById(equipe.getId())) {
+                part.setEquipe(equipeRepository.findById(equipe.getId()).orElse(null));
+            }
+            if (pp.getUserId() != null && userRepository.existsById(pp.getUserId())) {
+                part.setUser(userRepository.findById(pp.getUserId()).orElse(null));
+            }
+            part.setDateDebut(pp.getDateDebut());
+            part.setDateFin(pp.getDateFin());
+            participerList.add(part);
+        }
+        equipe.setParticipers(participerList);
+
+        return equipe;
     }
 
     @Override
-    public EquipePayloadWeb update(Long id, EquipePayloadWeb equipePayloadWeb) {
+    public Equipe updateEquipe(Long id, EquipePayload equipePayload) throws NotFoundException {
-        if (equipePayloadWeb.getId() == null) {
+        if (equipePayload.getId() == null) {
-            throw new BadRequestException("Impossible de faire la mise à jour: Equipe non fournie");
+            throw new BadRequestException("Impossible de mettre à jour une nouvelle equipe ayant un id null.");
         }
-        Optional<Equipe> optionalEquipe=Optional.empty();
+        if (!equipeRepository.existsById(equipePayload.getId())) {
-        if(!equipeRepository.existsById(equipePayloadWeb.getId())){
+            throw new NotFoundException("Impossible de trouver la equipe spécifiée dans notre base de données.");
-            throw new BadRequestException("Impossible de faire la mise à jour: Equipe non fournie");
         }
-
+        Equipe equipe = getEquipeFromPayload(equipePayload);
-        Equipe equipe = entityFromPayLoadService.getEquipeFromPayLoadWeb(equipePayloadWeb);
+        return equipeRepository.save(equipe);
-        equipe = equipeRepository.save(equipe);
-        return equipeRepository.findPayloadById(equipe.getId()).orElse(null);
     }
 
     @Override
-    public void delete(Long id) {
+    public void deleteEquipe(Long id) throws NotFoundException {
-        Optional<Equipe> optionalEquipe = equipeRepository.findById(id);
+        Optional<Equipe> equipeOptional = equipeRepository.findById(id);
-        if (optionalEquipe.isPresent()) {
+        if (equipeOptional.isPresent()) {
-            equipeRepository.deleteById(optionalEquipe.get().getId());
+            equipeRepository.deleteById(equipeOptional.get().getId());
         } else {
-            throw new NotFoundException("Impossible de trouver l'équipe spécifiée.");
+            throw new NotFoundException("Impossible de trouver la equipe spécifiée dans notre base de données.");
         }
     }
 
     @Override
-    public EquipePayloadWeb findById(Long id) {
+    public Page<Equipe> getEquipeList(Pageable pageable) {
-        if (equipeRepository.existsById(id)) {
+        return equipeRepository.findAll(pageable);
-            return equipeRepository.findPayloadById(id).orElse(null);
-        } else {
-            throw new NotFoundException("Impossible de trouver la caractéristique spécifiée dans la base de données.");
-        }
     }
 
     @Override
-    public List<EquipePayloadWeb> findAll() {
+    public List<Equipe> getEquipeList() {
-        return equipeRepository.findAllPayload();
+        return equipeRepository.findAll();
     }
 
-    @Override
-    public Page<EquipePayloadWeb> findAll(Pageable pageable) {
-        return equipeRepository.findAllPayload(pageable);
-    }
 
     @Override
-    public List<EquipePayloadWeb> findByCampagneId(Long campagneId) {
+    public Optional<Equipe> getEquipeById(Long id) {
-        return equipeRepository.findAllPayloadByCampagneId(campagneId);
+        return equipeRepository.findById(id);
-    }
-
-    @Override
-    public Page<EquipePayloadWeb> findByCampagneId(Long campagneId, Pageable pageable) {
-        return equipeRepository.findAllPayloadByCampagneId(campagneId,pageable);
-    }
-
-    @Override
-    public List<EquipePayloadWeb> findBySecteurId(Long secteurId) {
-        return equipeRepository.findAllPayloadBySecteurId(secteurId);
-    }
-
-    @Override
-    public Page<EquipePayloadWeb> findBySecteurId(Long secteurId, Pageable pageable) {
-        return null;
-    }
-
-    @Override
-    public List<EquipePayloadWeb> findByQuartierId(Long quartierId) {
-        return equipeRepository.findAllPayloadByQuartierId(quartierId);
-    }
-
-    @Override
-    public Page<EquipePayloadWeb> findByQuartierId(Long quartierId, Pageable pageable) {
-        return null;
-    }
-
-    @Override
-    public List<EquipePayloadWeb> findByBlocId(Long blocId) {
-        return null;
-    }
-
-    @Override
-    public Page<EquipePayloadWeb> findByBlocId(Long blocId, Pageable pageable) {
-        return null;
-    }
-
-    @Override
-    public boolean existsById(Long id) {
-        return false;
-    }
-
-    @Override
-    public boolean existsByCode(String code) {
-        return false;
-    }
-
-    @Override
-    public Optional<Equipe> findEntityById(Long id) {
-        return Optional.empty();
     }
 }

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

@@ -1,7 +1,6 @@
 package io.gmss.fiscad.implementations.rfu.parametre;
 
 import io.gmss.fiscad.entities.rfu.parametre.Exercice;
-import io.gmss.fiscad.exceptions.ApplicationException;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.rfu.parametre.ExerciceService;
@@ -23,14 +22,8 @@ public class ExerciceServiceImpl implements ExerciceService {
 
     @Override
     public Exercice createExercice(Exercice exercice) throws BadRequestException {
-        if (exercice.getId() == null) {
+        if (exercice.getId() != null) {
-            if (exerciceRepository.existsByAnnee(exercice.getAnnee())) {
+            throw new BadRequestException("Impossible de créer une nouvelle campgne ayant un id non null.");
-                throw new ApplicationException("Un exercice existe déjà pour l'année " + exercice.getAnnee() + ".");
-            }
-        } else {
-            if (exerciceRepository.existsByAnneeAndIdNot(exercice.getAnnee(), exercice.getId())) {
-                throw new ApplicationException("Un exercice existe déjà pour l'année " + exercice.getAnnee() + ".");
-            }
         }
         return exerciceRepository.save(exercice);
     }

src/main/java/io/gmss/fiscad/implementations/user/UserServiceImpl.java

@@ -137,10 +137,9 @@ public class UserServiceImpl implements UserService {
     public UserPaylaodWeb updateUser(Long id, UserPaylaodWeb userPaylaodWeb) {
 
         if ((userRepository.findByUsername(userPaylaodWeb.getLogin()).isEmpty())
-                && (userRepository.findByEmail(userPaylaodWeb.getEmail()).isEmpty())) {
+                || (userRepository.findByEmail(userPaylaodWeb.getEmail()).isEmpty())) {
             throw new BadRequestException("Cet utilisateur n'existe pas.");
         }
-
         if (userPaylaodWeb.getId() == null) {
             throw new BadRequestException("Cet utilisateur n'existe déjà.");
         }

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

@@ -1,30 +0,0 @@
-package io.gmss.fiscad.interfaces.rfu.metier;
-
-import io.gmss.fiscad.exceptions.BadRequestException;
-import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.paylaods.request.crudweb.ParticiperPayloadWeb;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-import java.util.List;
-import java.util.Optional;
-
-public interface ParticiperService {
-
-    ParticiperPayloadWeb createParticiper(ParticiperPayloadWeb participerPayloadWeb) throws BadRequestException;
-
-    ParticiperPayloadWeb updateParticiper(Long id,ParticiperPayloadWeb participerPayloadWeb) throws NotFoundException;
-
-    void deleteParticiper(Long id) throws NotFoundException;
-
-    Page<ParticiperPayloadWeb> getParticiperList(Pageable pageable);
-
-    List<ParticiperPayloadWeb> getParticiperList();
-
-    Page<ParticiperPayloadWeb> getParticiperListByEquipePageable(Long equipeId, Pageable pageable);
-
-    List<ParticiperPayloadWeb> getParticiperListByEquipe(Long equipeId);
-
-    Optional<ParticiperPayloadWeb> getParticiperById(Long id);
-
-}

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

@@ -4,7 +4,6 @@ import io.gmss.fiscad.entities.rfu.parametre.Campagne;
 import io.gmss.fiscad.enums.TypeCampagne;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.paylaods.request.crudweb.CampagnePayloadWeb;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -13,23 +12,18 @@ import java.util.Optional;
 
 public interface CampagneService {
 
-    CampagnePayloadWeb createCampagne(CampagnePayloadWeb campagnePayloadWeb) throws BadRequestException;
+    Campagne createCampagne(Campagne campagne) throws BadRequestException;
 
-    CampagnePayloadWeb updateCampagne(Long id, CampagnePayloadWeb campagnePayloadWeb) throws NotFoundException;
+    Campagne updateCampagne(Long id, Campagne campagne) throws NotFoundException;
 
     void deleteCampagne(Long id) throws NotFoundException;
 
-    Page<CampagnePayloadWeb> getCampagneList(Pageable pageable);
+    Page<Campagne> getCampagneList(Pageable pageable);
 
-    List<CampagnePayloadWeb> getCampagneList();
+    List<Campagne> getCampagneList();
 
     List<Campagne> getCampagnesByType(TypeCampagne typeCampagne);
 
-    Optional<CampagnePayloadWeb> getCampagneById(Long id);
+    Optional<Campagne> getCampagneById(Long id);
-    List<CampagnePayloadWeb> getCampagneByExerciceId(Long exerciceId);
-    Page<CampagnePayloadWeb> getCampagneByExerciceId(Long exerciceId,Pageable pageable);
-    List<CampagnePayloadWeb> getCampagneByStructureId(Long structureId);
-    Page<CampagnePayloadWeb> getCampagneByStructureId(Long structureId, Pageable pageable);
-
 }
 

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

@@ -3,7 +3,6 @@ package io.gmss.fiscad.interfaces.rfu.parametre;
 import io.gmss.fiscad.entities.rfu.parametre.Equipe;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.paylaods.request.crudweb.EquipePayloadWeb;
 import io.gmss.fiscad.paylaods.request.synchronisation.EquipePayload;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -13,42 +12,16 @@ import java.util.Optional;
 
 public interface EquipeService {
 
-    // CRUD
+    Equipe createEquipe(EquipePayload equipePayload) throws BadRequestException;
-    EquipePayloadWeb create(EquipePayloadWeb payload);
 
-    EquipePayloadWeb update(Long id, EquipePayloadWeb payload);
+    Equipe updateEquipe(Long id, EquipePayload equipePayload) throws NotFoundException;
 
-    void delete(Long id);
+    void deleteEquipe(Long id) throws NotFoundException;
 
-    // Recherche
+    Page<Equipe> getEquipeList(Pageable pageable);
-    EquipePayloadWeb findById(Long id);
 
-    List<EquipePayloadWeb> findAll();
+    List<Equipe> getEquipeList();
 
-    Page<EquipePayloadWeb> findAll(Pageable pageable);
+    Optional<Equipe> getEquipeById(Long id);
-
-    // Filtres
-    List<EquipePayloadWeb> findByCampagneId(Long campagneId);
-
-    Page<EquipePayloadWeb> findByCampagneId(Long campagneId, Pageable pageable);
-
-    List<EquipePayloadWeb> findBySecteurId(Long secteurId);
-
-    Page<EquipePayloadWeb> findBySecteurId(Long secteurId, Pageable pageable);
-
-    List<EquipePayloadWeb> findByQuartierId(Long quartierId);
-
-    Page<EquipePayloadWeb> findByQuartierId(Long quartierId, Pageable pageable);
-
-    List<EquipePayloadWeb> findByBlocId(Long blocId);
-
-    Page<EquipePayloadWeb> findByBlocId(Long blocId, Pageable pageable);
-
-    // Vérifications
-    boolean existsById(Long id);
-
-    boolean existsByCode(String code);
-
-    Optional<Equipe> findEntityById(Long id);
 }
 

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

@@ -1,49 +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.rfu.parametre.Exercice;
-import io.gmss.fiscad.enums.TypeCampagne;
-import jakarta.persistence.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDate;
-
-@NoArgsConstructor
-@Data
-public class CampagnePayloadWeb {
-
-    private Long id;
-    private String refAdministrative;
-    private String nom;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateDebut;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateFin;
-    @Enumerated(EnumType.STRING)
-    private TypeCampagne typeCampagne;
-    private Long exerciceId ;
-    private Integer exerciceAnnee ;
-
-    private Long structureId ;
-    private String structureCode ;
-    private String structureNom ;
-
-    public CampagnePayloadWeb(Long id, String refAdministrative, String nom, LocalDate dateDebut, LocalDate dateFin, TypeCampagne typeCampagne, Long exerciceId, Integer exerciceAnnee, Long structureId, String structureCode, String structureNom) {
-        this.id = id;
-        this.refAdministrative = refAdministrative;
-        this.nom = nom;
-        this.dateDebut = dateDebut;
-        this.dateFin = dateFin;
-        this.typeCampagne = typeCampagne;
-        this.exerciceId = exerciceId;
-        this.exerciceAnnee = exerciceAnnee;
-        this.structureId = structureId;
-        this.structureCode = structureCode;
-        this.structureNom = structureNom;
-    }
-}

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

@@ -36,7 +36,6 @@ public class EnquetePayLoadWeb {
     private Long zoneRfuId;
     private String zoneRfuNom;
     private Long personneId;
-    private String personneIfu;
     private String personneNom;
     private String personnePrenom;
     private String personneRaisonSociale;

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

@@ -1,58 +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 lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDate;
-
-@NoArgsConstructor
-@Data
-public class EquipePayloadWeb {
-    private Long id;
-    private String code;
-    private String nom;
-
-    private Long blocId;
-    private String blocCode;
-
-    private Long secteurId;
-    private String secteurCode;
-    private String secteurNom;
-
-    private Long campagneId;
-    private String campagneNom;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateDebut;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateFin;
-
-    private Long quartierId;
-    private String quartierCode;
-    private String quartierNom;
-
-
-    public EquipePayloadWeb(Long id, String code, String nom, Long blocId, String blocCode, Long secteurId, String secteurCode, String secteurNom, Long campagneId, String campagneNom, LocalDate dateDebut, LocalDate dateFin, Long quartierId, String quartierCode, String quartierNom) {
-        this.id = id;
-        this.code = code;
-        this.nom = nom;
-        this.blocId = blocId;
-        this.blocCode = blocCode;
-        this.secteurId = secteurId;
-        this.secteurCode = secteurCode;
-        this.secteurNom = secteurNom;
-        this.campagneId = campagneId;
-        this.campagneNom = campagneNom;
-        this.dateDebut = dateDebut;
-        this.dateFin = dateFin;
-        this.quartierId = quartierId;
-        this.quartierCode = quartierCode;
-        this.quartierNom = quartierNom;
-    }
-}

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

@@ -1,50 +0,0 @@
-package io.gmss.fiscad.paylaods.request.crudweb;
-
-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.rfu.parametre.Equipe;
-import io.gmss.fiscad.entities.user.User;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDate;
-
-@NoArgsConstructor
-@Data
-public class ParticiperPayloadWeb {
-    private Long id;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateDebut;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateFin;
-
-    private Long equipeId;
-    private String equipeCode;
-    private String equipeNom;
-
-    private Long userId;
-    private String userNom;
-    private String userPrenom;
-
-    public ParticiperPayloadWeb(Long id, LocalDate dateDebut, LocalDate dateFin, Long equipeId, String equipeCode, String equipeNom, Long userId, String userNom, String userPrenom) {
-        this.id = id;
-        this.dateDebut = dateDebut;
-        this.dateFin = dateFin;
-        this.equipeId = equipeId;
-        this.equipeCode = equipeCode;
-        this.equipeNom = equipeNom;
-        this.userId = userId;
-        this.userNom = userNom;
-        this.userPrenom = userPrenom;
-    }
-}

src/main/java/io/gmss/fiscad/persistence/customrepository/ParcelleRepositoryCustomImpl.java

@@ -73,12 +73,12 @@ public class ParcelleRepositoryCustomImpl implements ParcelleRepositoryCustom {
                         r.numero as rueNumero,
                         r.nom as rueNom,
 
-                        pers.id as proprietaireId,
+                        pers.id as personneId,
-                        pers.ifu as proprietaireIfu,
+                        pers.ifu as ifu,
-                        pers.npi as proprietaireNpi,
+                        pers.npi as npi,
-                        pers.nom as proprietaireNom,
+                        pers.nom as nom,
-                        pers.prenom as proprietairePrenom,
+                        pers.prenom as prenom,
-                        pers.raison_sociale as proprietaireRaisonSociale,
+                        pers.raison_sociale as raisonSociale,
 
                         de.id as enqueteCouranteId
 

src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql

@@ -121,10 +121,6 @@ FROM impositions_tfu imp
         order by exo.annee,dimp.parcelle_id,dimp.nature_impot, dimp.montant_taxe-coalesce(dimp.acompte,0)-coalesce(dimp.retenu_irf,0) desc ;
 
 
-select * from  e_avis_view
-
-select *
-from impositions_tfu;
 
 
 ---------------------------------------------------

src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/integrer_avis_dans_table_eavis.sql

@@ -63,15 +63,6 @@ $$;
 
 call integrer_eavis();
 
-call integrer_eavis_detail();
+select * from eavis
 
-select *
+delete from eavis;
-from e_avis_view ;
-
-select * from eavis;
-
-
-select * from eavis_detail;
-
-select  *
-from donnees_imposition_tfu;

src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/integrer_situation_fiscale_parcelle.sql

@@ -147,11 +147,3 @@ select * from arrondissement
 
 select left(code,4) as code_commune_fiscad, code as code_quartier_fiscad,nom as nom_quartier_fiscad
 from quartier;
-
-
-create function get_dblink_connection_sigibe() returns text
-    language sql
-as
-$$
-SELECT 'host=193.181.208.4 port=5433 dbname=sigibe_test user=sigibe_test_user password=sigibe_test_pwd';
-$$;

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

@@ -667,7 +667,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
         LEFT join d.structure s 
         LEFT join d.zoneRfu z
         WHERE itfu.id = :impositionTfuId
-        and d.homologable is null
+        and (d.homologable is true or d.homologable is null)
         order by d.nomProp,d.nomProp asc
         """)
     Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdHomologablePageable(
@@ -682,7 +682,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
     UPDATE DonneesImpositionTfu d
     SET d.homologable = true
     WHERE d.impositionsTfu.id = :impositionsTfuId
-      AND d.homologable IS NULL
+      AND (d.homologable IS NULL OR d.homologable = true)
     """)
     int homologuerDonneesImposition(
             @Param("impositionsTfuId") Long impositionsTfuId

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

@@ -1,175 +0,0 @@
-package io.gmss.fiscad.persistence.repositories.rfu.metier;
-
-import io.gmss.fiscad.entities.rfu.metier.Participer;
-import io.gmss.fiscad.paylaods.request.crudweb.ParticiperPayloadWeb;
-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 ParticiperRepository extends JpaRepository<Participer, Long> {
-    boolean existsByEquipeIdAndUserId(Long equipeId, Long userId);
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.ParticiperPayloadWeb(
-        p.id,
-        p.dateDebut,
-        p.dateFin,
-        e.id,
-        e.code,
-        e.nom,
-        u.id,
-        u.nom,
-        u.prenom
-    ) 
-    FROM Participer p
-    LEFT JOIN p.equipe e
-    LEFT JOIN p.user u
-    WHERE p.id = :id
-    """)
-    Optional<ParticiperPayloadWeb> findPayloadById(@Param("id") Long id);
-
-
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.ParticiperPayloadWeb(
-        p.id,
-        p.dateDebut,
-        p.dateFin,
-        e.id,
-        e.code,
-        e.nom,
-        u.id,
-        u.nom,
-        u.prenom
-    )
-    FROM Participer p
-    LEFT JOIN p.equipe e
-    LEFT JOIN p.user u
-    ORDER BY e.nom, u.nom, u.prenom
-    """)
-    List<ParticiperPayloadWeb> findAllPayload();
-
-
-    @Query(value = """
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.ParticiperPayloadWeb(
-        p.id,
-        p.dateDebut,
-        p.dateFin,
-        e.id,
-        e.code,
-        e.nom,
-        u.id,
-        u.nom,
-        u.prenom
-    )
-    FROM Participer p
-    LEFT JOIN p.equipe e
-    LEFT JOIN p.user u
-    """,
-            countQuery = """
-    SELECT COUNT(p)
-    FROM Participer p
-    """)
-    Page<ParticiperPayloadWeb> findAllPayload(Pageable pageable);
-
-
-
-    @Query(value = """
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.ParticiperPayloadWeb(
-        p.id,
-        p.dateDebut,
-        p.dateFin,
-        e.id,
-        e.code,
-        e.nom,
-        u.id,
-        u.nom,
-        u.prenom
-    )
-    FROM Participer p
-    LEFT JOIN p.equipe e
-    LEFT JOIN p.user u
-    WHERE e.id = :equipeId
-    """,
-            countQuery = """
-    SELECT COUNT(p)
-    FROM Participer p
-    WHERE p.equipe.id = :equipeId
-    """)
-    Page<ParticiperPayloadWeb> findAllPayloadByEquipeId(
-            @Param("equipeId") Long equipeId,
-            Pageable pageable);
-
-
-
-    @Query(value = """
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.ParticiperPayloadWeb(
-        p.id,
-        p.dateDebut,
-        p.dateFin,
-        e.id,
-        e.code,
-        e.nom,
-        u.id,
-        u.nom,
-        u.prenom
-    )
-    FROM Participer p
-    LEFT JOIN p.equipe e
-    LEFT JOIN p.user u
-    WHERE u.id = :userId
-    """,
-            countQuery = """
-    SELECT COUNT(p)
-    FROM Participer p
-    WHERE p.user.id = :userId
-    """)
-    Page<ParticiperPayloadWeb> findAllPayloadByUserId(
-            @Param("userId") Long userId,
-            Pageable pageable);
-
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.ParticiperPayloadWeb(
-        p.id,
-        p.dateDebut,
-        p.dateFin,
-        e.id,
-        e.code,
-        e.nom,
-        u.id,
-        u.nom,
-        u.prenom
-    )
-    FROM Participer p
-    LEFT JOIN p.equipe e
-    LEFT JOIN p.user u
-    WHERE e.id = :equipeId
-    ORDER BY u.nom, u.prenom
-    """)
-    List<ParticiperPayloadWeb> findAllPayloadByEquipeId(@Param("equipeId") Long equipeId);
-
-
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.ParticiperPayloadWeb(
-        p.id,
-        p.dateDebut,
-        p.dateFin,
-        e.id,
-        e.code,
-        e.nom,
-        u.id,
-        u.nom,
-        u.prenom
-    )
-    FROM Participer p
-    LEFT JOIN p.equipe e
-    LEFT JOIN p.user u
-    WHERE u.id = :userId
-    ORDER BY e.nom
-    """)
-    List<ParticiperPayloadWeb> findAllPayloadByUserId(@Param("userId") Long userId);
-}
-

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

@@ -2,186 +2,11 @@ package io.gmss.fiscad.persistence.repositories.rfu.parametre;
 
 import io.gmss.fiscad.entities.rfu.parametre.Campagne;
 import io.gmss.fiscad.enums.TypeCampagne;
-import io.gmss.fiscad.paylaods.request.crudweb.CampagnePayloadWeb;
-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 CampagneRepository extends JpaRepository<Campagne, Long> {
     List<Campagne> findAllByTypeCampagne(TypeCampagne typeCampagne);
-
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.CampagnePayloadWeb(
-        c.id,
-        c.refAdministrative,
-        c.nom,
-        c.dateDebut,
-        c.dateFin,
-        c.typeCampagne,
-        e.id,
-        e.annee,
-        s.id,
-        s.code,
-        s.nom
-    )
-    FROM Campagne c
-    LEFT JOIN c.exercice e
-    LEFT JOIN c.structure s
-    WHERE c.id = :id
-    """)
-    Optional<CampagnePayloadWeb> findPayloadById(@Param("id") Long id);
-
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.CampagnePayloadWeb(
-        c.id,
-        c.refAdministrative,
-        c.nom,
-        c.dateDebut,
-        c.dateFin,
-        c.typeCampagne,
-        e.id,
-        e.annee,
-        s.id,
-        s.code,
-        s.nom
-    )
-    FROM Campagne c
-    LEFT JOIN c.exercice e
-    LEFT JOIN c.structure s
-    ORDER BY c.dateDebut DESC
-    """)
-    List<CampagnePayloadWeb> findAllPayload();
-
-    @Query(value = """
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.CampagnePayloadWeb(
-        c.id,
-        c.refAdministrative,
-        c.nom,
-        c.dateDebut,
-        c.dateFin,
-        c.typeCampagne,
-        e.id,
-        e.annee,
-        s.id,
-        s.code,
-        s.nom
-    )
-    FROM Campagne c
-    LEFT JOIN c.exercice e
-    LEFT JOIN c.structure s
-    """,
-            countQuery = """
-    SELECT COUNT(c)
-    FROM Campagne c
-    """)
-    Page<CampagnePayloadWeb> findAllPayload(Pageable pageable);
-
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.CampagnePayloadWeb(
-        c.id,
-        c.refAdministrative,
-        c.nom,
-        c.dateDebut,
-        c.dateFin,
-        c.typeCampagne,
-        e.id,
-        e.annee,
-        s.id,
-        s.code,
-        s.nom
-    )
-    FROM Campagne c
-    LEFT JOIN c.exercice e
-    LEFT JOIN c.structure s
-    WHERE e.id = :exerciceId
-    ORDER BY c.dateDebut DESC
-    """)
-    List<CampagnePayloadWeb> findAllPayloadByExerciceId(@Param("exerciceId") Long exerciceId);
-
-
-    @Query(value = """
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.CampagnePayloadWeb(
-        c.id,
-        c.refAdministrative,
-        c.nom,
-        c.dateDebut,
-        c.dateFin,
-        c.typeCampagne,
-        e.id,
-        e.annee,
-        s.id,
-        s.code,
-        s.nom
-    )
-    FROM Campagne c
-    LEFT JOIN c.exercice e
-    LEFT JOIN c.structure s
-    WHERE e.id = :exerciceId
-    """,
-            countQuery = """
-    SELECT COUNT(c)
-    FROM Campagne c
-    WHERE c.exercice.id = :exerciceId
-    """)
-    Page<CampagnePayloadWeb> findAllPayloadByExerciceId(
-            @Param("exerciceId") Long exerciceId,
-            Pageable pageable);
-
-
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.CampagnePayloadWeb(
-        c.id,
-        c.refAdministrative,
-        c.nom,
-        c.dateDebut,
-        c.dateFin,
-        c.typeCampagne,
-        e.id,
-        e.annee,
-        s.id,
-        s.code,
-        s.nom
-    )
-    FROM Campagne c
-    LEFT JOIN c.exercice e
-    LEFT JOIN c.structure s
-    WHERE s.id = :structureId
-    ORDER BY c.dateDebut DESC
-    """)
-    List<CampagnePayloadWeb> findAllPayloadByStructureId(@Param("structureId") Long structureId);
-
-
-    @Query(value = """
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.CampagnePayloadWeb(
-        c.id,
-        c.refAdministrative,
-        c.nom,
-        c.dateDebut,
-        c.dateFin,
-        c.typeCampagne,
-        e.id,
-        e.annee,
-        s.id,
-        s.code,
-        s.nom
-    )
-    FROM Campagne c
-    LEFT JOIN c.exercice e
-    LEFT JOIN c.structure s
-    WHERE s.id = :structureId
-    """,
-            countQuery = """
-    SELECT COUNT(c)
-    FROM Campagne c
-    WHERE c.structure.id = :structureId
-    """)
-    Page<CampagnePayloadWeb> findAllPayloadByStructureId(
-            @Param("exerciceId") Long structureId,
-            Pageable pageable);
 }
 

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

@@ -1,292 +1,9 @@
 package io.gmss.fiscad.persistence.repositories.rfu.parametre;
 
 import io.gmss.fiscad.entities.rfu.parametre.Equipe;
-import io.gmss.fiscad.paylaods.request.crudweb.EquipePayloadWeb;
-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 EquipeRepository extends JpaRepository<Equipe, Long> {
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.EquipePayloadWeb(
-        e.id,
-        e.code,
-        e.nom,
-        b.id,
-        b.cote,
-        s.id,
-        s.code,
-        s.nom,
-        c.id,
-        c.nom,
-        e.dateDebut,
-        e.dateFin,
-        q.id,
-        q.code,
-        q.nom
-    )
-    FROM Equipe e
-    LEFT JOIN e.bloc b
-    LEFT JOIN e.secteur s
-    LEFT JOIN e.campagne c
-    LEFT JOIN e.quartier q
-    WHERE e.id = :id
-    """)
-    Optional<EquipePayloadWeb> findPayloadById(@Param("id") Long id);
 
-
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.EquipePayloadWeb(
-        e.id,
-        e.code,
-        e.nom,
-        b.id,
-        b.cote,
-        s.id,
-        s.code,
-        s.nom,
-        c.id,
-        c.nom,
-        e.dateDebut,
-        e.dateFin,
-        q.id,
-        q.code,
-        q.nom
-    )
-    FROM Equipe e
-    LEFT JOIN e.bloc b
-    LEFT JOIN e.secteur s
-    LEFT JOIN e.campagne c
-    LEFT JOIN e.quartier q
-    ORDER BY e.nom
-    """)
-    List<EquipePayloadWeb> findAllPayload();
-
-
-    @Query(value = """
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.EquipePayloadWeb(
-        e.id,
-        e.code,
-        e.nom,
-        b.id,
-        b.cote,
-        s.id,
-        s.code,
-        s.nom,
-        c.id,
-        c.nom,
-        e.dateDebut,
-        e.dateFin,
-        q.id,
-        q.code,
-        q.nom
-    )
-    FROM Equipe e
-    LEFT JOIN e.bloc b
-    LEFT JOIN e.secteur s
-    LEFT JOIN e.campagne c
-    LEFT JOIN e.quartier q
-    """,
-            countQuery = """
-    SELECT COUNT(e)
-    FROM Equipe e
-    """)
-    Page<EquipePayloadWeb> findAllPayload(Pageable pageable);
-
-
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.EquipePayloadWeb(
-        e.id,
-        e.code,
-        e.nom,
-        b.id,
-        b.cote,
-        s.id,
-        s.code,
-        s.nom,
-        c.id,
-        c.nom,
-        e.dateDebut,
-        e.dateFin,
-        q.id,
-        q.code,
-        q.nom
-    )
-    FROM Equipe e
-    LEFT JOIN e.bloc b
-    LEFT JOIN e.secteur s
-    LEFT JOIN e.campagne c
-    LEFT JOIN e.quartier q
-    WHERE c.id = :campagneId
-    ORDER BY e.nom
-    """)
-    List<EquipePayloadWeb> findAllPayloadByCampagneId(@Param("campagneId") Long campagneId);
-
-
-    @Query(value ="""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.EquipePayloadWeb(
-        e.id,
-        e.code,
-        e.nom,
-        b.id,
-        b.cote,
-        s.id,
-        s.code,
-        s.nom,
-        c.id,
-        c.nom,
-        e.dateDebut,
-        e.dateFin,
-        q.id,
-        q.code,
-        q.nom
-    )
-    FROM Equipe e
-    LEFT JOIN e.bloc b
-    LEFT JOIN e.secteur s
-    LEFT JOIN e.campagne c
-    LEFT JOIN e.quartier q
-    WHERE c.id = :campagneId
-    ORDER BY e.nom
-    """,
-            countQuery = """
-    SELECT COUNT(e)
-    FROM Equipe e
-    where e.campagne.id= :campagneId
-    """)
-    Page<EquipePayloadWeb> findAllPayloadByCampagneId(@Param("campagneId") Long campagneId,Pageable pageable);
-
-
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.EquipePayloadWeb(
-        e.id,
-        e.code,
-        e.nom,
-        b.id,
-        b.cote,
-        s.id,
-        s.code,
-        s.nom,
-        c.id,
-        c.nom,
-        e.dateDebut,
-        e.dateFin,
-        q.id,
-        q.code,
-        q.nom
-    )
-    FROM Equipe e
-    LEFT JOIN e.bloc b
-    LEFT JOIN e.secteur s
-    LEFT JOIN e.campagne c
-    LEFT JOIN e.quartier q
-    WHERE s.id = :secteurId
-    ORDER BY e.nom
-    """)
-    List<EquipePayloadWeb> findAllPayloadBySecteurId(@Param("secteurId") Long secteurId);
-
-
-    @Query("""
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.EquipePayloadWeb(
-        e.id,
-        e.code,
-        e.nom,
-        b.id,
-        b.cote,
-        s.id,
-        s.code,
-        s.nom,
-        c.id,
-        c.nom,
-        e.dateDebut,
-        e.dateFin,
-        q.id,
-        q.code,
-        q.nom
-    )
-    FROM Equipe e
-    LEFT JOIN e.bloc b
-    LEFT JOIN e.secteur s
-    LEFT JOIN e.campagne c
-    LEFT JOIN e.quartier q
-    WHERE e.quartier.id = :quartierId
-    ORDER BY e.nom
-    """)
-    List<EquipePayloadWeb> findAllPayloadByQuartierId(@Param("quartierId") Long quartierId);
-
-
-    @Query(value = """
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.EquipePayloadWeb(
-        e.id,
-        e.code,
-        e.nom,
-        b.id,
-        b.cote,
-        s.id,
-        s.code,
-        s.nom,
-        c.id,
-        c.nom,
-        e.dateDebut,
-        e.dateFin,
-        q.id,
-        q.code,
-        q.nom
-    )
-    FROM Equipe e
-    LEFT JOIN e.bloc b
-    LEFT JOIN e.secteur s
-    LEFT JOIN e.campagne c
-    LEFT JOIN e.quartier q
-    WHERE e.quartier.id = :quartierId
-    """,
-            countQuery = """
-    SELECT COUNT(e)
-    FROM Equipe e
-    WHERE e.quartier.id = :quartierId
-    """)
-    Page<EquipePayloadWeb> findAllPayloadByQuartierId(
-            @Param("quartierId") Long quartierId,
-            Pageable pageable);
-
-
-    @Query(value = """
-    SELECT new io.gmss.fiscad.paylaods.request.crudweb.EquipePayloadWeb(
-        e.id,
-        e.code,
-        e.nom,
-        b.id,
-        b.cote,
-        s.id,
-        s.code,
-        s.nom,
-        c.id,
-        c.nom,
-        e.dateDebut,
-        e.dateFin,
-        q.id,
-        q.code,
-        q.nom
-    )
-    FROM Equipe e
-    LEFT JOIN e.bloc b
-    LEFT JOIN e.secteur s
-    LEFT JOIN e.campagne c
-    LEFT JOIN e.quartier q
-    WHERE e.secteur.id = :secteurId
-    """,
-            countQuery = """
-    SELECT COUNT(e)
-    FROM Equipe e
-    WHERE e.secteur.id = :secteurId
-    """)
-    Page<EquipePayloadWeb> findAllPayloadBySecteurId(
-            @Param("secteurId") Long secteurId,
-            Pageable pageable);
 }
 

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

@@ -10,8 +10,5 @@ import java.util.Optional;
 
 public interface ExerciceRepository extends JpaRepository<Exercice, Long> {
  Optional<Exercice> findFirstByAnnee(int annee);
- boolean existsByAnnee(Integer annee);
-
- boolean existsByAnneeAndIdNot(Integer annee, Long id);
 }
 

src/main/java/io/gmss/fiscad/persistence/repositories/user/AvoirFonctionRepository.java

@@ -88,26 +88,25 @@ public interface AvoirFonctionRepository extends JpaRepository<AvoirFonction, Lo
     Page<AvoirFonctionPaylaodWeb> findAllAvoirFonctionToDtoPageable(Pageable pageable);
 
     @Query("""
-        SELECT new io.gmss.fiscad.paylaods.request.crudweb.AvoirFonctionPaylaodWeb(
+            SELECT new io.gmss.fiscad.paylaods.request.crudweb.AvoirFonctionPaylaodWeb(
-            af.id,
+                af.id,
-            af.dateDebut,
+                af.dateDebut,
-            af.dateFin,
+                af.dateFin,
-            f.id,
+                f.id,
-            f.code,
+                f.code,
-            f.nom,
+                f.nom,
-            u.id,
+                u.id,
-            u.username,
+                u.username,
-            u.nom,
+                u.nom,
-            u.prenom,
+                u.prenom,
-            u.email,
+                u.email,
-            af.titre
+                af.titre
-        )
+            )
-        FROM AvoirFonction af
+            FROM AvoirFonction af
-        LEFT JOIN af.user u
+            LEFT JOIN af.user u
-        LEFT JOIN af.fonction f
+            LEFT JOIN af.fonction f
-        WHERE u.id = :userId
+            WHERE u.id = :userId
-          AND (af.dateFin IS NULL OR af.dateFin >= CURRENT_DATE)
+        """)
-    """)
     List<AvoirFonctionPaylaodWeb> findAllAvoirFonctionByUserToDto(@Param("userId") Long userId);
 
 

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

@@ -38,9 +38,6 @@ public class EntityFromPayLoadService {
     private final TypePieceRepository typePieceRepository;
     private final PieceRepository pieceRepository;
     private final CaracteristiqueRepository caracteristiqueRepository;
-    private final EquipeRepository equipeRepository;
-    private final BlocRepository blocRepository;
-    private final CampagneRepository campagneRepository;
     private final ModeAcquisitionRepository modeAcquisitionRepository;
     private final PersonneRepository personneRepository;
     private final SourceDroitRepository sourceDroitRepository;
@@ -81,7 +78,6 @@ public class EntityFromPayLoadService {
     private final CommuneCentreAssignationRepository communeCentreAssignationRepository ;
     private final ModuleRepository moduleRepository ;
     private final FonctionnaliteRepository fonctionnaliteRepository ;
-    private final ParticiperRepository participerRepository ;
     private final ProfileModuleFonctionnaliteRepository profileModuleFonctionnaliteRepository ;
     private final TypeCaracteristiqueRepository typeCaracteristiqueRepository ;
 
@@ -143,46 +139,6 @@ public class EntityFromPayLoadService {
     }
 
 
-    public Equipe getEquipeFromPayLoadWeb(EquipePayloadWeb equipePayloadWeb){
-        Equipe equipe=new Equipe();
-        if(equipePayloadWeb.getId()!=null)
-            equipe = equipeRepository.findById(equipePayloadWeb.getId()).orElse(new Equipe());
-
-        Optional<Campagne> optionalCampagne=Optional.empty();
-        Optional<Secteur> optionalSecteur=Optional.empty();
-        Optional<Quartier> optionalQuartier=Optional.empty();
-        Optional<Bloc> optionalBloc=Optional.empty();
-
-        if(equipePayloadWeb.getBlocId()!=null)
-            optionalBloc=blocRepository.findById(equipePayloadWeb.getBlocId());
-
-
-        if(equipePayloadWeb.getCampagneId()!=null)
-            optionalCampagne=campagneRepository.findById(equipePayloadWeb.getCampagneId());
-        if(equipePayloadWeb.getSecteurId()!=null)
-            optionalSecteur=secteurRepository.findById(equipePayloadWeb.getSecteurId());
-        if(equipePayloadWeb.getQuartierId()!=null)
-            optionalQuartier=quartierRepository.findById(equipePayloadWeb.getQuartierId());
-
-        if(optionalBloc.isPresent())
-            equipe.setBloc(optionalBloc.get());
-
-        if(optionalCampagne.isPresent())
-            equipe.setCampagne(optionalCampagne.get());
-        if(optionalSecteur.isPresent())
-            equipe.setSecteur(optionalSecteur.get());
-        if(optionalQuartier.isPresent())
-            equipe.setQuartier(optionalQuartier.get());
-
-        equipe.setId(equipePayloadWeb.getId());
-        equipe.setNom(equipePayloadWeb.getNom());
-        equipe.setCode(equipePayloadWeb.getCode());
-        equipe.setDateDebut(equipePayloadWeb.getDateDebut());
-        equipe.setDateFin(equipePayloadWeb.getDateFin());
-        return equipe;
-    }
-
-
     public ModeAcquisition getModeAcquisitionFromPayLoadWeb(ModeAcquisitionPayloadWeb modeAcquisitionPayloadWeb){
         ModeAcquisition modeAcquisition=new ModeAcquisition();
         if(modeAcquisitionPayloadWeb.getId()!=null)
@@ -1206,56 +1162,4 @@ public class EntityFromPayLoadService {
 
         return profileModuleFonctionnalite ;
     }
-
-    public Participer getParticiperFromPayLoadWeb(ParticiperPayloadWeb participerPayloadWeb) {
-        Participer participer =new Participer();
-        if(participerPayloadWeb.getId()!=null)
-            participer = participerRepository.findById(participerPayloadWeb.getId()).orElse(new Participer());
-
-        if (participerPayloadWeb.getEquipeId() != null) {
-            Equipe equipe = new Equipe();
-            equipe.setId(participerPayloadWeb.getEquipeId());
-            participer.setEquipe(equipe);
-        }
-
-
-        if (participerPayloadWeb.getUserId() != null) {
-            User user = new User();
-            user.setId(participerPayloadWeb.getUserId());
-            participer.setUser(user);
-        }
-
-        participer.setId(participerPayloadWeb.getId());
-        participer.setDateDebut(participerPayloadWeb.getDateDebut());
-        participer.setDateFin(participerPayloadWeb.getDateFin());
-        return participer ;
-
-    }
-
-    public Campagne getCampagneFromPayLoadWeb(CampagnePayloadWeb campagnePayloadWeb) {
-        Campagne campagne =new Campagne();
-        if(campagnePayloadWeb.getId()!=null)
-            campagne = campagneRepository.findById(campagnePayloadWeb.getId()).orElse(new Campagne());
-
-        if (campagnePayloadWeb.getExerciceId() != null) {
-            Exercice exercice = new Exercice();
-            exercice.setId(campagnePayloadWeb.getExerciceId());
-            campagne.setExercice(exercice);
-        }
-
-        if (campagnePayloadWeb.getStructureId() != null) {
-            Structure structure = new Structure();
-            structure.setId(campagnePayloadWeb.getStructureId());
-            campagne.setStructure(structure);
-        }
-
-        campagne.setId(campagnePayloadWeb.getId());
-        campagne.setDateDebut(campagnePayloadWeb.getDateDebut());
-        campagne.setDateFin(campagnePayloadWeb.getDateFin());
-        campagne.setTypeCampagne(campagnePayloadWeb.getTypeCampagne());
-        campagne.setRefAdministrative(campagnePayloadWeb.getRefAdministrative());
-        campagne.setNom(campagnePayloadWeb.getNom());
-
-        return campagne ;
-    }
 }

src/main/resources/application-test.properties

@@ -2,16 +2,16 @@ server.port=8282
 io.gmss.fiscad.profile=test
 
 # LOCAL ENV TEST
-#spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi
+spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi
-#spring.datasource.username=infocad_user
+spring.datasource.username=infocad_user
-#spring.datasource.password=W5fwD({9*q53
-
-
-spring.datasource.url=jdbc:postgresql://193.181.208.4:5432/fiscad_db
-spring.datasource.username=fiscad_user
 spring.datasource.password=W5fwD({9*q53
 
 
+#spring.datasource.url=jdbc:postgresql://193.181.208.4:5432/fiscad_db
+#spring.datasource.username=fiscad_user
+#spring.datasource.password=W5fwD({9*q53
+
+
 app.default-user.username=fiscad_admin
 app.default-user.password=1234567890