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

Reviewed-on: #80

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

@@ -27,7 +27,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Arrondissement")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('ROLE_SUPERVISEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('ROLE_SUPERVISEUR')")
 public class ArrondissementController {
 
     private final ArrondissementService arrondissementService;
@@ -175,7 +175,7 @@ public class ArrondissementController {
     public ResponseEntity<?> getArrondissementById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, arrondissementService.getArrondissementById(id).orElse(null), "Arrondissement trouvé avec succès."),
+                    new ApiResponse<>(true, arrondissementService.getArrondissementById(id), "Arrondissement trouvé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -199,31 +199,7 @@ public class ArrondissementController {
     public ResponseEntity<?> getArrondissementByCommune(@PathVariable Long communeId) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, arrondissementService.getArrondissementListByCommuneId(communeId), "Liste des arrondissements par commune 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/commune/{communeId}")
-    public ResponseEntity<?> getArrondissementByCommune(@PathVariable Long communeId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, arrondissementService.getArrondissementListByCommuneId(communeId,pageable), "Liste des arrondissements par commune chargée avec succès."),
+                    new ApiResponse<>(true, arrondissementService.getArrondissementByComune(communeId), "Liste des arrondissements par commune chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

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

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Commune")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
+@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
 public class CommuneController {
 
     private final CommuneService communeService;
@@ -185,31 +185,7 @@ public class CommuneController {
 
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, communeService.getCommunesByDepartementId(departementId), "Liste des communes par département 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-departement-id/{departementId}")
-    public ResponseEntity<?> getCommuneByDepartementIdPaged(@PathVariable Long departementId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, communeService.getCommunesByDepartementId(departementId,pageable), "Liste des communes par département chargée avec succès."),
+                    new ApiResponse<>(true, communeService.getCommunesByDepartement(departementId), "Liste des communes par département chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

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

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Département")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
+@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
 public class DepartementController {
 
     private final DepartementService departementService;

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

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Nationalité")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
+@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
 public class NationaliteController {
 
     private final NationaliteService nationaliteService;

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

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Quartier")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
+@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
 public class QuartierController {
 
     private final QuartierService quartierService;
@@ -158,7 +158,7 @@ public class QuartierController {
     public ResponseEntity<?> getQuartierById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, quartierService.getQuartierById(id).orElse(null), "Quartier trouvé avec succès."),
+                    new ApiResponse<>(true, quartierService.getQuartierById(id), "Quartier trouvé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -182,31 +182,7 @@ public class QuartierController {
 
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, quartierService.getQuartierListByArrondissementId(arrondissementId), "Liste des quartiers par commune 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/arrondissement/{arrondissementId}")
-    public ResponseEntity<?> getQuartierByArrondissementPaged(@PathVariable Long arrondissementId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, quartierService.getQuartierListByArrondissementId(arrondissementId,pageable), "Liste des quartiers par commune chargée avec succès."),
+                    new ApiResponse<>(true, quartierService.getQuartierByArrondissement(arrondissementId), "Liste des quartiers par commune chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java

@@ -41,7 +41,7 @@ public class StructureController {
     }
 
     @PostMapping("/create")
-    public ResponseEntity<?> createStructure(@RequestBody StructurePaylaodWeb structurePaylaodWeb) {
+    public ResponseEntity<?> createStructure(@RequestBody @Valid @Validated StructurePaylaodWeb structurePaylaodWeb) {
         try {
             structurePaylaodWeb = structureService.createStructure(structurePaylaodWeb);
             return new ResponseEntity<>(
@@ -211,7 +211,7 @@ public class StructureController {
     public ResponseEntity<?> getStructureById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, structureService.getStructureById(id), "Structure trouvé avec succès."),
+                    new ApiResponse<>(true, structureService.getStructureByIdToDto(id), "Structure trouvé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/user/AuthController.java

@@ -116,5 +116,18 @@ public class AuthController {
         }
     }
 
-
+    private User getUser(UserRequest userRequest) {
+        User user = new User();
+        user.setNom(userRequest.getNom());
+        user.setPrenom(userRequest.getPrenom());
+        user.setTel(userRequest.getTelephone());
+        user.setEmail(userRequest.getEmail());
+        user.setUsername(userRequest.getEmail());
+        user.setPassword(userRequest.getPassword());
+        user.setActive(false);
+        //Set<Role> roleSet = new HashSet<>();
+        //user.setAvoirFonctions(roleSet);
+        user.setStructure(structureService.getStructureById(userRequest.getStructureId()).get());
+        return user;
+    }
 }

src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java

@@ -30,11 +30,11 @@ import java.util.Set;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-//@SQLDelete(sql =
-//        "UPDATE structure " +
-//                "SET deleted = true " +
-//                "WHERE id = ?")
-//@Where(clause = " deleted = false")
+@SQLDelete(sql =
+        "UPDATE structure " +
+                "SET deleted = true " +
+                "WHERE id = ?")
+@Where(clause = " deleted = false")
 //@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class Structure extends BaseEntity implements Serializable {
 
@@ -49,7 +49,7 @@ public class Structure extends BaseEntity implements Serializable {
     private String tel;
     private String email;
     private String adresse;
-    //@NotNull(message = "Veuillez préciser la commune du centre d'impôts")
+    @NotNull(message = "Veuillez préciser la commune du centre d'impôts")
     @ManyToOne
     private Commune commune;
 
@@ -61,17 +61,4 @@ public class Structure extends BaseEntity implements Serializable {
     )
     private Set<Arrondissement> arrondissements;
 
-    @Override
-    public String toString() {
-        return "Structure{" +
-                "id=" + id +
-                ", code='" + code + '\'' +
-                ", nom='" + nom + '\'' +
-                ", ifu='" + ifu + '\'' +
-                ", rccm='" + rccm + '\'' +
-                ", tel='" + tel + '\'' +
-                ", email='" + email + '\'' +
-                ", adresse='" + adresse + '\'' +
-                '}';
-    }
 }

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

@@ -6,7 +6,6 @@ import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.decoupage.ArrondissementService;
 import io.gmss.fiscad.interfaces.decoupage.CommuneService;
-import io.gmss.fiscad.paylaods.request.crudweb.ArrondissementPaylaodWeb;
 import io.gmss.fiscad.persistence.repositories.decoupage.ArrondissementRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -56,28 +55,27 @@ public class ArrondissementServiceImpl implements ArrondissementService {
     }
 
     @Override
-    public Page<ArrondissementPaylaodWeb> getArrondissementList(Pageable pageable) {
-        return arrondissementRepository.findAllArrondissementToDtoPageable(pageable);
+    public Page<Arrondissement> getArrondissementList(Pageable pageable) {
+        return arrondissementRepository.findAll(pageable);
     }
 
     @Override
-    public List<ArrondissementPaylaodWeb> getArrondissementList() {
-        return arrondissementRepository.findAllArrondissementToDto();
+    public List<Arrondissement> getArrondissementList() {
+        return arrondissementRepository.findAll();
     }
 
     @Override
-    public List<ArrondissementPaylaodWeb> getArrondissementListByCommuneId(Long communeId) {
-        return arrondissementRepository.findAllArrondissementByCommuneToDto(communeId);
+    public Optional<Arrondissement> getArrondissementById(Long id) {
+        return arrondissementRepository.findById(id);
     }
 
     @Override
-    public Page<ArrondissementPaylaodWeb> getArrondissementListByCommuneId(Long communeId, Pageable pageable) {
-        return arrondissementRepository.findAllArrondissementByCommuneToDtoPageable(communeId,pageable);
-    }
-
-    @Override
-    public Optional<ArrondissementPaylaodWeb> getArrondissementById(Long id) {
-        return arrondissementRepository.findArrondissementToDtoById(id);
+    public List<Arrondissement> getArrondissementByComune(Long communeId) {
+        Optional<Commune> communeOptional = communeService.getCommuneById(communeId);
+        if (communeOptional.isEmpty()) {
+            throw new NotFoundException("Impossible de trouver la commune spécifiée.");
+        }
+        return arrondissementRepository.findAllByCommune(communeOptional.get());
     }
 
 

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

@@ -6,8 +6,6 @@ import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.decoupage.CommuneService;
 import io.gmss.fiscad.interfaces.decoupage.DepartementService;
-import io.gmss.fiscad.paylaods.request.crudweb.CommunePaylaodWeb;
-import io.gmss.fiscad.paylaods.request.crudweb.DepartementPaylaodWeb;
 import io.gmss.fiscad.persistence.repositories.decoupage.CommuneRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -57,28 +55,27 @@ public class CommuneServiceImpl implements CommuneService {
     }
 
     @Override
-    public Page<CommunePaylaodWeb> getCommuneList(Pageable pageable) {
-        return communeRepository.findAllCommuneToDtoPageable(pageable);
+    public Page<Commune> getCommuneList(Pageable pageable) {
+        return communeRepository.findAll(pageable);
+    }
+
+    @Override
+    public List<Commune> getCommuneList() {
+        return communeRepository.findAll();
     }
 
 
     @Override
-    public List<CommunePaylaodWeb> getCommuneList() {
-        return communeRepository.findAllCommuneToDto();
+    public List<Commune> getCommunesByDepartement(Long departementId) {
+        Optional<Departement> departementOptional = departementService.getDepartementById(departementId);
+        if (departementOptional.isEmpty()) {
+            throw new NotFoundException("Impossible de trouver le département spécifié.");
+        }
+        return communeRepository.findAllByDepartement(departementOptional.get());
     }
 
     @Override
-    public List<CommunePaylaodWeb> getCommunesByDepartementId(Long departementId) {
-        return communeRepository.findAllCommuneByDepartementToDto(departementId);
-    }
-
-    @Override
-    public Page<CommunePaylaodWeb> getCommunesByDepartementId(Long departementId, Pageable pageable) {
-        return communeRepository.findAllCommuneByDepartementToDtoPageable(departementId,pageable);
-    }
-
-    @Override
-    public Optional<CommunePaylaodWeb> getCommuneById(Long id) {
-        return communeRepository.findCommuneToDtoById(id);
+    public Optional<Commune> getCommuneById(Long id) {
+        return communeRepository.findById(id);
     }
 }

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

@@ -4,7 +4,6 @@ import io.gmss.fiscad.entities.decoupage.Departement;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.decoupage.DepartementService;
-import io.gmss.fiscad.paylaods.request.crudweb.DepartementPaylaodWeb;
 import io.gmss.fiscad.persistence.repositories.decoupage.DepartementRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -52,20 +51,20 @@ public class DepartementServiceImpl implements DepartementService {
     }
 
     @Override
-    public Page<DepartementPaylaodWeb> getDepartementList(Pageable pageable) {
-        return departementRepository.findAllDepartementToDtoPageable(pageable);
+    public Page<Departement> getDepartementList(Pageable pageable) {
+        return departementRepository.findAll(pageable);
     }
 
     @Override
-    public List<DepartementPaylaodWeb> getDepartementList() {
-        return departementRepository.findAllDepartementToDto();
+    public List<Departement> getDepartementList() {
+        return departementRepository.findAll();
     }
 
 
     @Override
-    public Optional<DepartementPaylaodWeb> getDepartementById(Long id) {
+    public Optional<Departement> getDepartementById(Long id) {
         if (departementRepository.existsById(id)) {
-            return departementRepository.findDepartementToDtoById(id);
+            return departementRepository.findById(id);
         } else {
             throw new NotFoundException("Impossible de trouver le département spécifié dans la base de données.");
         }

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

@@ -6,7 +6,6 @@ import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.decoupage.ArrondissementService;
 import io.gmss.fiscad.interfaces.decoupage.QuartierService;
-import io.gmss.fiscad.paylaods.request.crudweb.QuartierPaylaodWeb;
 import io.gmss.fiscad.persistence.repositories.decoupage.QuartierRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -56,28 +55,31 @@ public class QuartierServiceImpl implements QuartierService {
     }
 
     @Override
-    public Page<QuartierPaylaodWeb> getQuartierList(Pageable pageable) {
-        return quartierRepository.findAllQuartierToDtoPageable(pageable);
+    public Page<Quartier> getQuartierList(Pageable pageable) {
+        return quartierRepository.findAll(pageable);
     }
 
     @Override
-    public List<QuartierPaylaodWeb> getQuartierList() {
-        return quartierRepository.findAllQuartierToDto();
+    public List<Quartier> getQuartierList() {
+        return quartierRepository.findAll();
     }
 
     @Override
-    public List<QuartierPaylaodWeb> getQuartierListByArrondissementId(Long arrondissementId) {
-        return quartierRepository.findAllQuartierByArrondissementToDto(arrondissementId);
+    public Optional<Quartier> getQuartierById(Long id) {
+        if (quartierRepository.existsById(id)) {
+            return quartierRepository.findById(id);
+        } else {
+            throw new NotFoundException("Impossible de trouver le quartier spécifié dans la base de données.");
+        }
+
     }
 
     @Override
-    public Page<QuartierPaylaodWeb> getQuartierListByArrondissementId(Long arrondissementId, Pageable pageable) {
-        return quartierRepository.findAllQuartierByArrondissementToDtoPageable(arrondissementId,pageable);
+    public List<Quartier> getQuartierByArrondissement(Long arrondissementId) {
+        Optional<Arrondissement> arrondissementOptional = arrondissementService.getArrondissementById(arrondissementId);
+        if (arrondissementOptional.isEmpty()) {
+            throw new NotFoundException("Impossible de trouver l'arrondissement spécifié.");
+        }
+        return quartierRepository.getAllByArrondissement(arrondissementOptional.get());
     }
-
-    @Override
-    public Optional<QuartierPaylaodWeb> getQuartierById(Long id) {
-        return quartierRepository.findQuartierToDtoById(id);
-    }
-
 }

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

@@ -9,7 +9,6 @@ import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.decoupage.ArrondissementService;
 import io.gmss.fiscad.interfaces.infocad.parametre.BlocService;
 import io.gmss.fiscad.interfaces.infocad.parametre.StructureService;
-import io.gmss.fiscad.paylaods.request.crudweb.StructurePaylaodWeb;
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.BlocRepository;
 import io.gmss.fiscad.service.StringService;
 import org.springframework.data.domain.Page;
@@ -78,7 +77,7 @@ public class BlocServiceImpl implements BlocService {
             }
         }
 
-        Optional<StructurePaylaodWeb> structureOptional = structureService.getStructureById(structure_id);
+        Optional<Structure> structureOptional = structureService.getStructureById(structure_id);
         if (structureOptional.isPresent()) {
             builder.append(structureOptional.get().getCode());
             builder.append(bloc.getArrondissement().getCode());
@@ -134,7 +133,10 @@ public class BlocServiceImpl implements BlocService {
 
     @Override
     public List<Bloc> getBlocsByArrondissement(Long idArrondissement) {
-        return blocRepository.findAllByArrondissement_Id(idArrondissement);
+        Arrondissement arrondissement = arrondissementService.getArrondissementById(idArrondissement).orElseThrow(() -> {
+            throw new NotFoundException("Impossible de trouver l'arrondissement");
+        });
+        return blocRepository.findAllByArrondissement(arrondissement);
     }
 
     @Override

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

@@ -1,6 +1,5 @@
 package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.fiscad.entities.decoupage.Commune;
 import io.gmss.fiscad.entities.decoupage.Section;
 import io.gmss.fiscad.entities.infocad.parametre.Structure;
 import io.gmss.fiscad.exceptions.BadRequestException;
@@ -24,34 +23,64 @@ public class StructureServiceImpl implements StructureService {
     private final StructureRepository structureRepository;
     private final EntityFromPayLoadService entityFromPayLoadService;
 
+//    @Override
+//    public StructurePaylaodWeb createStructure(StructurePaylaodWeb structurePaylaodWeb) throws BadRequestException {
+//        if (structure.getId() != null) {
+//            throw new BadRequestException("Impossible de créer une structure ayant un id non null.");
+//        }
+//        StringBuilder builder = new StringBuilder();
+//        builder.append("C");
+//        builder.append(structureRepository.getLastRecordId() + 1);
+//        structure.setCode(builder.toString());
+//        return structureRepository.save(structure);
+//    }
+//
+//    @Override
+//    public Structure updateStructure(Long id, Structure structure) throws NotFoundException {
+//
+//        System.out.println("structure = " + structure);
+//
+//        if (structure.getId() == null) {
+//            throw new BadRequestException("Impossible de mettre à jour une structure ayant un id null.");
+//        }
+//        if (!structureRepository.existsById(structure.getId())) {
+//            throw new NotFoundException("Impossible de trouver la structure spécifiée dans notre base de données.");
+//        }
+//        try {
+//            structureRepository.save(structure);
+//
+//        }catch (Exception e){
+//            e.printStackTrace();
+//        }
+//
+//        Structure structure1 = structureRepository.getById(structure.getId());
+//
+//        return structure1;
+//    }
+//
     @Override
     public StructurePaylaodWeb createStructure(StructurePaylaodWeb structurePaylaodWeb) throws BadRequestException {
         if (structurePaylaodWeb.getId() != null) {
             throw new BadRequestException("Impossible de créer un nouveau centre ayant un id non null.");
         }
         Structure structure= entityFromPayLoadService.getStructureFromPayLoadWeb(structurePaylaodWeb);
-        structure=structureRepository.save(structure);
+        structureRepository.save(structure);
         return structureRepository.findStructureToDtoById(structure.getId()).orElse(null);
     }
 
     @Override
     public StructurePaylaodWeb updateStructure(Long id, StructurePaylaodWeb structurePaylaodWeb) throws NotFoundException {
         if (structurePaylaodWeb.getId() == null) {
-            throw new BadRequestException("ID obligatoire pour une mise à jour.");
+            throw new BadRequestException("Impossible de mettre à jour un nouveau centre ayant un id null.");
         }
 
-        System.out.println(structurePaylaodWeb.getId());
-        Optional<Structure> optionalStructure = structureRepository.findById(structurePaylaodWeb.getId());
-        if(optionalStructure.isEmpty()){
-            throw new NotFoundException("Structure inexistante.");
+        if (!structureRepository.existsById(structurePaylaodWeb.getId())) {
+            throw new NotFoundException("Impossible de trouver le centre spécifiée.");
         }
-
-        Structure structure = entityFromPayLoadService.getStructureFromPayLoadWeb(structurePaylaodWeb);
-        structureRepository.save(structure);
-
-        return structureRepository
-                .findStructureToDtoById(structure.getId())
-                .orElse(null);
+        Structure structure= entityFromPayLoadService.getStructureFromPayLoadWeb(structurePaylaodWeb);
+        structure = structureRepository.save(structure);
+       // structureRepository.findStructureToDtoById(structure.getId()).orElse(null);
+        return structureRepository.findStructureToDtoById(structure.getId()).orElse(null);
     }
 
     @Override
@@ -85,9 +114,16 @@ public class StructureServiceImpl implements StructureService {
     }
 
     @Override
-    public Optional<StructurePaylaodWeb> getStructureById(Long id) {
+    public Optional<StructurePaylaodWeb> getStructureByIdToDto(Long id) {
         return structureRepository.findStructureToDtoById(id);
     }
 
-
+    @Override
+    public Optional<Structure> getStructureById(Long id) {
+        if (structureRepository.existsById(id)) {
+            return structureRepository.findById(id);
+        } else {
+            throw new NotFoundException("Impossible de trouver la structure spécifiée dans la base de données.");
+        }
+    }
 }

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

@@ -3,7 +3,6 @@ package io.gmss.fiscad.interfaces.decoupage;
 import io.gmss.fiscad.entities.decoupage.Arrondissement;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.paylaods.request.crudweb.ArrondissementPaylaodWeb;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -18,11 +17,11 @@ public interface ArrondissementService {
 
     void deleteArrondissement(Long id) throws NotFoundException;
 
+    Page<Arrondissement> getArrondissementList(Pageable pageable);
 
-    Page<ArrondissementPaylaodWeb> getArrondissementList(Pageable pageable);
-    List<ArrondissementPaylaodWeb> getArrondissementList();
-    List<ArrondissementPaylaodWeb> getArrondissementListByCommuneId(Long structureId);
-    Page<ArrondissementPaylaodWeb> getArrondissementListByCommuneId(Long structureId,Pageable pageable);
+    List<Arrondissement> getArrondissementList();
 
-    Optional<ArrondissementPaylaodWeb> getArrondissementById(Long id);
+    Optional<Arrondissement> getArrondissementById(Long id);
+
+    List<Arrondissement> getArrondissementByComune(Long communeId);
 }

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

@@ -3,7 +3,6 @@ package io.gmss.fiscad.interfaces.decoupage;
 import io.gmss.fiscad.entities.decoupage.Commune;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.paylaods.request.crudweb.CommunePaylaodWeb;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -18,12 +17,11 @@ public interface CommuneService {
 
     void deleteCommune(Long id) throws NotFoundException;
 
-    Page<CommunePaylaodWeb> getCommuneList(Pageable pageable);
+    Page<Commune> getCommuneList(Pageable pageable);
 
-    List<CommunePaylaodWeb> getCommuneList();
+    List<Commune> getCommuneList();
 
-    List<CommunePaylaodWeb> getCommunesByDepartementId(Long departementId);
-    Page<CommunePaylaodWeb> getCommunesByDepartementId(Long departementId,Pageable pageable);
+    List<Commune> getCommunesByDepartement(Long departementId);
 
-    Optional<CommunePaylaodWeb> getCommuneById(Long id) ;
+    Optional<Commune> getCommuneById(Long id);
 }

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

@@ -3,7 +3,6 @@ package io.gmss.fiscad.interfaces.decoupage;
 import io.gmss.fiscad.entities.decoupage.Departement;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.paylaods.request.crudweb.DepartementPaylaodWeb;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -18,9 +17,9 @@ public interface DepartementService {
 
     void deleteDepartement(Long id) throws NotFoundException;
 
-    Page<DepartementPaylaodWeb> getDepartementList(Pageable pageable);
+    Page<Departement> getDepartementList(Pageable pageable);
 
-    List<DepartementPaylaodWeb> getDepartementList();
+    List<Departement> getDepartementList();
 
-    Optional<DepartementPaylaodWeb> getDepartementById(Long id);
+    Optional<Departement> getDepartementById(Long id);
 }

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

@@ -3,7 +3,6 @@ package io.gmss.fiscad.interfaces.decoupage;
 import io.gmss.fiscad.entities.decoupage.Quartier;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.paylaods.request.crudweb.QuartierPaylaodWeb;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -18,11 +17,11 @@ public interface QuartierService {
 
     void deleteQuartier(Long id) throws NotFoundException;
 
+    Page<Quartier> getQuartierList(Pageable pageable);
 
-    Page<QuartierPaylaodWeb> getQuartierList(Pageable pageable);
-    List<QuartierPaylaodWeb> getQuartierList();
-    List<QuartierPaylaodWeb> getQuartierListByArrondissementId(Long arrondissementId);
-    Page<QuartierPaylaodWeb> getQuartierListByArrondissementId(Long arrondissementId,Pageable pageable);
+    List<Quartier> getQuartierList();
 
-    Optional<QuartierPaylaodWeb> getQuartierById(Long id);
+    Optional<Quartier> getQuartierById(Long id);
+
+    List<Quartier> getQuartierByArrondissement(Long arrondissementId);
 }

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

@@ -12,6 +12,16 @@ import java.util.List;
 import java.util.Optional;
 
 public interface StructureService {
+
+//    Structure createStructure(Structure structure) throws BadRequestException;
+//
+//    Structure updateStructure(Long id, Structure structure) throws NotFoundException;
+//
+//    void deleteStructure(Long id) throws NotFoundException;
+//
+//    Page<Structure> getStructureList(Pageable pageable);
+//
+//    List<Structure> getStructureList();
     StructurePaylaodWeb createStructure(StructurePaylaodWeb structurePaylaodWeb) throws BadRequestException;
 
     StructurePaylaodWeb updateStructure(Long id, StructurePaylaodWeb structurePaylaodWeb) throws NotFoundException;
@@ -20,15 +30,13 @@ public interface StructureService {
 
     Page<StructurePaylaodWeb> getStructureList(Pageable pageable);
     List<StructurePaylaodWeb> getStructureList();
+    List<StructurePaylaodWeb> getStructureListByCommuneId(Long structureId);
+    Page<StructurePaylaodWeb> getStructureListByCommuneId(Long structureId,Pageable pageable);
 
-    List<StructurePaylaodWeb> getStructureListByCommuneId(Long communeId);
-
-    Page<StructurePaylaodWeb> getStructureListByCommuneId(Long communeId,Pageable pageable);
-
-    Optional<StructurePaylaodWeb> getStructureById(Long id);
+    Optional<StructurePaylaodWeb> getStructureByIdToDto(Long id);
 
 
     //List<StructureResponse> getStructuresByArrondissement(Long arrondissementID);
 
-
+    Optional<Structure> getStructureById(Long id);
 }

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

@@ -1,27 +0,0 @@
-package io.gmss.fiscad.paylaods.request.crudweb;
-
-import lombok.Data;
-
-@Data
-public class ArrondissementPaylaodWeb {
-    private Long id;
-    private String code;
-    private String nom;
-    private Long communeId;
-    private String communeCode;
-    private String communeNom;
-
-    public ArrondissementPaylaodWeb(Long id,
-                                    String code,
-                                    String nom,
-                                    Long communeId,
-                                    String communeCode,
-                                    String communeNom) {
-        this.id = id;
-        this.code = code;
-        this.nom = nom;
-        this.communeId = communeId;
-        this.communeCode = communeCode;
-        this.communeNom = communeNom;
-    }
-}

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

@@ -1,22 +0,0 @@
-package io.gmss.fiscad.paylaods.request.crudweb;
-
-import lombok.Data;
-
-@Data
-public class CommunePaylaodWeb {
-    private Long id;
-    private String code;
-    private String nom;
-    private Long departementId;
-    private String departementCode;
-    private String departementNom;
-
-    public CommunePaylaodWeb(Long id, String code, String nom, Long departementId,String departementCode, String departementNom) {
-        this.id = id;
-        this.code = code;
-        this.nom = nom;
-        this.departementId = departementId;
-        this.departementCode = departementCode;
-        this.departementNom = departementNom;
-    }
-}

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

@@ -1,18 +0,0 @@
-package io.gmss.fiscad.paylaods.request.crudweb;
-
-import lombok.Data;
-
-import java.time.LocalDate;
-
-@Data
-public class DepartementPaylaodWeb {
-    private Long id;
-    private String code;
-    private String nom;
-
-    public DepartementPaylaodWeb(Long id, String code, String nom) {
-        this.id = id;
-        this.code = code;
-        this.nom = nom;
-    }
-}

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

@@ -1,27 +0,0 @@
-package io.gmss.fiscad.paylaods.request.crudweb;
-
-import lombok.Data;
-
-@Data
-public class QuartierPaylaodWeb {
-    private Long id;
-    private String code;
-    private String nom;
-    private Long arrondissementId;
-    private String arrondissementCode;
-    private String arrondissementNom;
-
-    public QuartierPaylaodWeb(Long id,
-                              String code,
-                              String nom,
-                              Long arrondissementId,
-                              String arrondissementCode,
-                              String arrondissementNom) {
-        this.id = id;
-        this.code = code;
-        this.nom = nom;
-        this.arrondissementId = arrondissementId;
-        this.arrondissementCode = arrondissementCode;
-        this.arrondissementNom = arrondissementNom;
-    }
-}

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

@@ -2,17 +2,12 @@ package io.gmss.fiscad.persistence.repositories.decoupage;
 
 import io.gmss.fiscad.entities.decoupage.Arrondissement;
 import io.gmss.fiscad.entities.decoupage.Commune;
-import io.gmss.fiscad.paylaods.request.crudweb.ArrondissementPaylaodWeb;
 import io.gmss.fiscad.paylaods.response.ArrondissementEnqResponse;
 import io.gmss.fiscad.paylaods.response.synchronisation.ArrondissementSyncResponse;
-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 ArrondissementRepository extends JpaRepository<Arrondissement, Long> {
     List<Arrondissement> findAllByCommune(Commune commune);
@@ -38,94 +33,4 @@ public interface ArrondissementRepository extends JpaRepository<Arrondissement,
             " where sa.structure_id = ?1  )T " +
             " group by T.id,T.code, T.libelle,T.longitude,T.latitude, T.communeId ", nativeQuery = true)
     List<ArrondissementEnqResponse> getArrondissementEnqResponse(Long structure_id);
-
-
-    @Query("""
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.ArrondissementPaylaodWeb(
-                arr.id,
-                arr.code,
-                arr.nom,
-                com.id,
-                com.code,
-                com.nom
-            )
-            FROM Arrondissement arr
-            LEFT JOIN arr.commune com
-        """)
-    List<ArrondissementPaylaodWeb> findAllArrondissementToDto();
-
-
-    @Query("""
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.ArrondissementPaylaodWeb(
-                arr.id,
-                arr.code,
-                arr.nom,
-                com.id,
-                com.code,
-                com.nom
-            )
-            FROM Arrondissement arr
-            LEFT JOIN arr.commune com
-            WHERE arr.id = :arrondissementId
-        """)
-    Optional<ArrondissementPaylaodWeb> findArrondissementToDtoById(@Param("arrondissementId") Long arrondissementId);
-
-    @Query(
-            value = """
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.ArrondissementPaylaodWeb(
-                arr.id,
-                arr.code,
-                arr.nom,
-                com.id,
-                com.code,
-                com.nom
-            )
-            FROM Arrondissement arr
-            LEFT JOIN arr.commune com
-            """,
-            countQuery = """
-            SELECT COUNT(DISTINCT arr.id)
-            FROM Arrondissement arr
-            LEFT JOIN arr.commune com
-            """
-    )
-    Page<ArrondissementPaylaodWeb> findAllArrondissementToDtoPageable(Pageable pageable);
-
-    @Query("""
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.ArrondissementPaylaodWeb(
-                arr.id,
-                arr.code,
-                arr.nom,
-                com.id,
-                com.code,
-                com.nom
-            )
-            FROM Arrondissement arr
-            LEFT JOIN arr.commune com
-            WHERE arr.commune.id = :communeId
-        """)
-    List<ArrondissementPaylaodWeb> findAllArrondissementByCommuneToDto(@Param("communeId") Long communeId);
-
-
-    @Query(value = """
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.ArrondissementPaylaodWeb(
-                arr.id,
-                arr.code,
-                arr.nom,
-                com.id,
-                com.code,
-                com.nom
-            )
-            FROM Arrondissement arr
-            LEFT JOIN arr.commune com
-            WHERE arr.commune.id = :communeId
-        """,
-            countQuery = """
-            SELECT COUNT(DISTINCT arr.id)
-            FROM Arrondissement arr
-            LEFT JOIN arr.commune com
-            WHERE arr.commune.id = :communeId
-            """)
-    Page<ArrondissementPaylaodWeb> findAllArrondissementByCommuneToDtoPageable(@Param("communeId") Long communeId, Pageable pageable);
-
 }

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

@@ -2,17 +2,12 @@ package io.gmss.fiscad.persistence.repositories.decoupage;
 
 import io.gmss.fiscad.entities.decoupage.Commune;
 import io.gmss.fiscad.entities.decoupage.Departement;
-import io.gmss.fiscad.paylaods.request.crudweb.CommunePaylaodWeb;
 import io.gmss.fiscad.paylaods.response.CommuneEnqResponse;
 import io.gmss.fiscad.paylaods.response.synchronisation.CommuneSyncResponse;
-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 CommuneRepository extends JpaRepository<Commune, Long> {
 
@@ -20,7 +15,7 @@ public interface CommuneRepository extends JpaRepository<Commune, Long> {
     List<CommuneSyncResponse> getCommuneResponse();
 
 
-    List<Commune> findAllByDepartement_Id(Long departementId);
+    List<Commune> findAllByDepartement(Departement departement);
 
     @Query(value = " Select  T.id,T.code, T.libelle,T.longitude,T.latitude, sum(case when T.enqueteId is null then 0 else 1 end) as nombreEnquete " +
             " From (select distinct c.id as id,c.code as code, c.nom as libelle, c.longitude,c.latitude, e.id as enqueteId from arrondissement a" +
@@ -42,95 +37,4 @@ public interface CommuneRepository extends JpaRepository<Commune, Long> {
             " group by T.id,T.code, T.libelle,T.longitude,T.latitude",nativeQuery = true)
     List<CommuneEnqResponse> getAdminCommuneEnqResponse();
 
-
-
-    @Query("""
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.CommunePaylaodWeb(
-                com.id,
-                com.code,
-                com.nom,
-                dep.id,
-                dep.code,
-                dep.nom
-            )
-            FROM Commune com
-            LEFT JOIN com.departement dep
-        """)
-    List<CommunePaylaodWeb> findAllCommuneToDto();
-
-
-    @Query("""
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.CommunePaylaodWeb(
-                com.id,
-                com.code,
-                com.nom,
-                dep.id,
-                dep.code,
-                dep.nom
-            )
-            FROM Commune com
-            LEFT JOIN com.departement dep
-            WHERE com.id = :idCommune
-        """)
-    Optional<CommunePaylaodWeb> findCommuneToDtoById(@Param("idCommune") Long idCommune);
-
-    @Query(
-            value = """
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.CommunePaylaodWeb(
-                com.id,
-                com.code,
-                com.nom,
-                dep.id,
-                dep.code,
-                dep.nom
-            )
-            FROM Commune com
-            LEFT JOIN com.departement dep
-            """,
-            countQuery = """
-            SELECT COUNT(DISTINCT com.id)
-            FROM Commune com
-            LEFT JOIN com.departement dep
-            """
-    )
-    Page<CommunePaylaodWeb> findAllCommuneToDtoPageable(Pageable pageable);
-
-    @Query("""
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.CommunePaylaodWeb(
-                com.id,
-                com.code,
-                com.nom,
-                dep.id,
-                dep.code,
-                dep.nom
-            )
-            FROM Commune com
-            LEFT JOIN com.departement dep
-            WHERE com.departement.id = :departementId
-        """)
-    List<CommunePaylaodWeb> findAllCommuneByDepartementToDto(@Param("departementId") Long departementId);
-
-
-    @Query(value = """
-             SELECT new io.gmss.fiscad.paylaods.request.crudweb.CommunePaylaodWeb(
-                com.id,
-                com.code,
-                com.nom,
-                dep.id,
-                dep.code,
-                dep.nom
-            )
-            FROM Commune com
-            LEFT JOIN com.departement dep
-            WHERE com.departement.id = :departementId
-        """,
-            countQuery = """
-            SELECT COUNT(DISTINCT com.id)
-            FROM Commune com
-            LEFT JOIN com.departement dep
-            WHERE com.departement.id = :departementId
-            """)
-    Page<CommunePaylaodWeb> findAllCommuneByDepartementToDtoPageable(@Param("departementId") Long departementId, Pageable pageable);
-
-
 }

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

@@ -1,16 +1,11 @@
 package io.gmss.fiscad.persistence.repositories.decoupage;
 
 import io.gmss.fiscad.entities.decoupage.Departement;
-import io.gmss.fiscad.paylaods.request.crudweb.DepartementPaylaodWeb;
 import io.gmss.fiscad.paylaods.response.synchronisation.DepartementSyncResponse;
-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 DepartementRepository extends JpaRepository<Departement, Long> {
@@ -19,44 +14,4 @@ public interface DepartementRepository extends JpaRepository<Departement, Long>
             " where departement.deleted is false ", nativeQuery = true)
     List<DepartementSyncResponse> getDepartementResponse();
 
-
-    @Query("""
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.DepartementPaylaodWeb(
-                dep.id,
-                dep.code,
-                dep.nom
-            )
-            FROM Departement dep
-        """)
-    List<DepartementPaylaodWeb> findAllDepartementToDto();
-
-
-    @Query("""
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.DepartementPaylaodWeb(
-                dep.id,
-                dep.code,
-                dep.nom
-            )
-            FROM Departement dep
-            WHERE dep.id = :idDepartement
-        """)
-    Optional<DepartementPaylaodWeb> findDepartementToDtoById(@Param("idDepartement") Long idDepartement);
-
-    @Query(
-            value = """
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.DepartementPaylaodWeb(
-                dep.id,
-                dep.code,
-                dep.nom
-            )
-            FROM Departement dep
-            """,
-            countQuery = """
-            SELECT COUNT(DISTINCT dep.id)
-            FROM Departement dep
-            """
-    )
-    Page<DepartementPaylaodWeb> findAllDepartementToDtoPageable(Pageable pageable);
-
-
 }

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

@@ -2,16 +2,11 @@ package io.gmss.fiscad.persistence.repositories.decoupage;
 
 import io.gmss.fiscad.entities.decoupage.Arrondissement;
 import io.gmss.fiscad.entities.decoupage.Quartier;
-import io.gmss.fiscad.paylaods.request.crudweb.QuartierPaylaodWeb;
 import io.gmss.fiscad.paylaods.response.synchronisation.QuartierSyncResponse;
-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 QuartierRepository extends JpaRepository<Quartier, Long> {
     List<Quartier> getAllByArrondissement(Arrondissement arrondissement);
@@ -28,94 +23,5 @@ public interface QuartierRepository extends JpaRepository<Quartier, Long> {
             " where q.deleted is false ", nativeQuery = true)
     List<QuartierSyncResponse> getAdminQuartierResponse();
 
-    @Query("""
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.QuartierPaylaodWeb(
-                qua.id,
-                qua.code,
-                qua.nom,
-                arr.id,
-                arr.code,
-                arr.nom
-            )
-            FROM Quartier qua
-            LEFT JOIN qua.arrondissement arr
-        """)
-    List<QuartierPaylaodWeb> findAllQuartierToDto();
-
-
-    @Query("""
-             SELECT new io.gmss.fiscad.paylaods.request.crudweb.QuartierPaylaodWeb(
-                qua.id,
-                qua.code,
-                qua.nom,
-                arr.id,
-                arr.code,
-                arr.nom
-            )
-            FROM Quartier qua
-            LEFT JOIN qua.arrondissement arr
-            WHERE qua.id = :idQuartier
-        """)
-    Optional<QuartierPaylaodWeb> findQuartierToDtoById(@Param("idQuartier") Long idQuartier);
-
-    @Query(
-            value = """
-             SELECT new io.gmss.fiscad.paylaods.request.crudweb.QuartierPaylaodWeb(
-                qua.id,
-                qua.code,
-                qua.nom,
-                arr.id,
-                arr.code,
-                arr.nom
-            )
-            FROM Quartier qua
-            LEFT JOIN qua.arrondissement arr
-            """,
-            countQuery = """
-            SELECT COUNT(DISTINCT qua.id)
-            FROM Quartier qua
-            LEFT JOIN qua.arrondissement arr
-            """
-    )
-    Page<QuartierPaylaodWeb> findAllQuartierToDtoPageable(Pageable pageable);
-
-    @Query("""
-             SELECT new io.gmss.fiscad.paylaods.request.crudweb.QuartierPaylaodWeb(
-                qua.id,
-                qua.code,
-                qua.nom,
-                arr.id,
-                arr.code,
-                arr.nom
-            )
-            FROM Quartier qua
-            LEFT JOIN qua.arrondissement arr
-            WHERE qua.arrondissement.id = :arrondissementId
-        """)
-    List<QuartierPaylaodWeb> findAllQuartierByArrondissementToDto(@Param("arrondissementId") Long arrondissementId);
-
-
-    @Query(value = """
-            SELECT new io.gmss.fiscad.paylaods.request.crudweb.QuartierPaylaodWeb(
-                qua.id,
-                qua.code,
-                qua.nom,
-                arr.id,
-                arr.code,
-                arr.nom
-            )
-            FROM Quartier qua
-            LEFT JOIN qua.arrondissement arr
-            WHERE qua.arrondissement.id = :arrondissementId
-        """,
-            countQuery = """
-            SELECT COUNT(DISTINCT qua.id)
-            FROM Quartier qua
-            LEFT JOIN qua.arrondissement arr
-            WHERE qua.arrondissement.id = :arrondissementId
-            """)
-    Page<QuartierPaylaodWeb> findAllQuartierByArrondissementToDtoPageable(@Param("arrondissementId") Long arrondissementId, Pageable pageable);
-
-
 }
 

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

@@ -36,7 +36,6 @@ public interface BlocRepository extends JpaRepository<Bloc, Long> {
     List<BlocsParStructureResponse> getBlocsParStructureResponse(Long structure_id);
 
     List<Bloc> findAllByArrondissement(Arrondissement arrondissement);
-    List<Bloc> findAllByArrondissement_Id(Long arrondissementId);
 
     @Query(value = "select structure_id as id from arrondissements_structures " +
             " where arrondissement_id = ?1" +

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

@@ -12,18 +12,14 @@ import io.gmss.fiscad.entities.user.AvoirFonction;
 import io.gmss.fiscad.entities.user.Fonction;
 import io.gmss.fiscad.entities.user.Profile;
 import io.gmss.fiscad.entities.user.User;
-import io.gmss.fiscad.exceptions.BadRequestException;
-import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.paylaods.request.crudweb.*;
 import io.gmss.fiscad.persistence.repositories.decoupage.*;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.PieceRepository;
-import io.gmss.fiscad.persistence.repositories.infocad.metier.UploadRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.*;
 import io.gmss.fiscad.persistence.repositories.rfu.metier.*;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.CaracteristiqueRepository;
-import io.gmss.fiscad.persistence.repositories.user.AvoirFonctionRepository;
 import io.gmss.fiscad.persistence.repositories.user.ProfileRepository;
 import io.gmss.fiscad.persistence.repositories.user.UserRepository;
 import lombok.AllArgsConstructor;
@@ -60,20 +56,9 @@ public class EntityFromPayLoadService {
     private final SectionRepository sectionRepository;
     private final ArrondissementRepository arrondissementRepository;
     private final QuartierRepository quartierRepository;
-    private final CaracteristiqueBatimentRepository caracteristiqueBatimentRepository;
-    private final CaracteristiqueParcelleRepository caracteristiqueParcelleRepository;
-    private final CaracteristiqueUniteLogementRepository caracteristiqueUniteLogementRepository;
-    private final UploadRepository uploadRepository;
-    private final SecteurDecoupageRepository secteurDecoupageRepository;
-    private final AvoirFonctionRepository avoirFonctionRepository;
-    private final EnqueteActiviteRepository enqueteActiviteRepository;
-
 
     public CaracteristiqueParcelle getCaracteristiqueParcelleFromPayLoadWeb(CaracteristiqueParcellePayloadWeb caracteristiqueParcellePayloadWeb){
         CaracteristiqueParcelle caracteristiqueParcelle=new CaracteristiqueParcelle();
-        if(caracteristiqueParcellePayloadWeb.getId()!=null)
-            caracteristiqueParcelle = caracteristiqueParcelleRepository.findById(caracteristiqueParcellePayloadWeb.getId()).orElse(new CaracteristiqueParcelle());
-
         Optional<Enquete> optionalEnquete=Optional.empty();
         Optional<Caracteristique> optionalCaracteristique=Optional.empty();
 
@@ -92,9 +77,6 @@ public class EntityFromPayLoadService {
 
     public CaracteristiqueBatiment getCaracteristiqueBatimentFromPayLoadWeb(CaracteristiqueBatimentPayloadWeb caracteristiqueBatimentPayloadWeb){
         CaracteristiqueBatiment caracteristiqueBatiment=new CaracteristiqueBatiment();
-        if(caracteristiqueBatimentPayloadWeb.getId()!=null)
-            caracteristiqueBatiment = caracteristiqueBatimentRepository.findById(caracteristiqueBatimentPayloadWeb.getId()).orElse(new CaracteristiqueBatiment());
-
         Optional<EnqueteBatiment> optionalEnqueteBatiment=Optional.empty();
         Optional<Caracteristique> optionalCaracteristique=Optional.empty();
 
@@ -119,10 +101,6 @@ public class EntityFromPayLoadService {
         Optional<EnqueteUniteLogement> optionalEnqueteUniteLogement=Optional.empty();
         Optional<Caracteristique> optionalCaracteristique=Optional.empty();
 
-        if(caracteristiqueUniteLogementPayloadWeb.getId()!=null)
-            caracteristiqueUniteLogement = caracteristiqueUniteLogementRepository.findById(caracteristiqueUniteLogementPayloadWeb.getId()).orElse(new CaracteristiqueUniteLogement());
-
-
         if(caracteristiqueUniteLogementPayloadWeb.getEnqueteUniteLogementId()!=null)
             optionalEnqueteUniteLogement=enqueteUniteLogementRepository.findById(caracteristiqueUniteLogementPayloadWeb.getEnqueteUniteLogementId());
 
@@ -145,9 +123,6 @@ public class EntityFromPayLoadService {
         Optional<SourceDroit> optionalSourceDroit=Optional.empty();
         Optional<ModeAcquisition> optionalModeAcquisition=Optional.empty();
         Optional<Personne> optionalPersonne=Optional.empty();
-        if(piecePayLoadWeb.getId()!=null)
-            piece = pieceRepository.findById(piecePayLoadWeb.getId()).orElse(new Piece());
-
 
         if(piecePayLoadWeb.getEnqueteId()!=null)
             optionalEnquete=enqueteRepository.findById(piecePayLoadWeb.getEnqueteId());
@@ -181,10 +156,6 @@ public class EntityFromPayLoadService {
         Optional<Enquete> optionalEnquete=Optional.empty();
         Optional<Personne> optionalPersonne=Optional.empty();
         Optional<Structure> optionalStructure=Optional.empty();
-        if(declarationNcPayloadWeb.getId()!=null)
-            declarationNc = declarationNcRepository.findById(declarationNcPayloadWeb.getId()).orElse(new DeclarationNc());
-
-
         if(declarationNcPayloadWeb.getEnqueteId()!=null)
             optionalEnquete=enqueteRepository.findById(declarationNcPayloadWeb.getEnqueteId());
         if(declarationNcPayloadWeb.getPersonneId()!=null)
@@ -202,13 +173,11 @@ public class EntityFromPayLoadService {
 
     public Upload getUploadFromPayLoadWeb(UploadPayLoadWeb uploadPayLoadWeb){
         Upload upload=new Upload();
-        //Optional<Enquete> optionalEnquete=Optional.empty() ;
+        //Optional<Enquete> optionalEnquete=Optional.empty();
         Optional<DeclarationNc> optionalDeclarationNc=Optional.empty();
         Optional<Personne> optionalPersonne=Optional.empty();
         Optional<EnqueteBatiment> optionalEnqueteBatiment=Optional.empty();
         Optional<EnqueteUniteLogement> optionalEnqueteUniteLogement=Optional.empty();
-        if(uploadPayLoadWeb.getId()!=null)
-            upload = uploadRepository.findById(uploadPayLoadWeb.getId()).orElse(new Upload());
 
 //        if(uploadPayLoadWeb.getEnqueteId()!=null)
 //            optionalEnquete=enqueteRepository.findById(uploadPayLoadWeb.getEnqueteId());
@@ -237,9 +206,6 @@ public class EntityFromPayLoadService {
     public Batiment getBatimentFromPayLoadWeb(BatimentPaylaodWeb batimentPaylaodWeb){
         Batiment batiment=new Batiment();
         Optional<Parcelle> optionalParcelle=Optional.empty();
-        if(batimentPaylaodWeb.getId()!=null)
-            batiment = batimentRepository.findById(batimentPaylaodWeb.getId()).orElse(new Batiment());
-
 
         if(batimentPaylaodWeb.getParcelleId()!=null)
             optionalParcelle=parcelleRepository.findById(batimentPaylaodWeb.getParcelleId());
@@ -257,9 +223,6 @@ public class EntityFromPayLoadService {
     public Section getSectionFromPayLoadWeb(SectionPaylaodWeb sectionPaylaodWeb){
         Section section =new Section();
         Optional<Structure> optionalStructure = Optional.empty();
-        if(sectionPaylaodWeb.getId()!=null)
-            section = sectionRepository.findById(sectionPaylaodWeb.getId()).orElse(new Section());
-
 
         if(sectionPaylaodWeb.getStructureId()!=null)
             optionalStructure=structureRepository.findById(sectionPaylaodWeb.getStructureId());
@@ -273,16 +236,13 @@ public class EntityFromPayLoadService {
 
     public Structure getStructureFromPayLoadWeb(StructurePaylaodWeb structurePaylaodWeb){
         Structure structure =new Structure();
-        if(structurePaylaodWeb.getId()!=null)
-            structure = structureRepository.findById(structurePaylaodWeb.getId()).orElse(new Structure());
+        Optional<Commune> optionalCommune = Optional.empty();
 
-        if (structurePaylaodWeb.getCommuneId() == null) {
-            throw new BadRequestException("La commune est obligatoire.");
-        }
-        Commune commune = communeRepository.findById(structurePaylaodWeb.getCommuneId())
-                .orElseThrow(() -> new NotFoundException("Commune inexistante"));
-        structure.setCommune(commune);
+        if(structurePaylaodWeb.getCommuneId()!=null)
+            optionalCommune=communeRepository.findById(structurePaylaodWeb.getCommuneId());
 
+        structure.setId(structurePaylaodWeb.getId());
+        structure.setCommune(optionalCommune.orElse(null));
         structure.setCode(structurePaylaodWeb.getCode());
         structure.setNom(structurePaylaodWeb.getNom());
         structure.setAdresse(structurePaylaodWeb.getAdresse());
@@ -295,9 +255,6 @@ public class EntityFromPayLoadService {
     public Secteur getSecteurFromPayLoadWeb(SecteurPaylaodWeb secteurPaylaodWeb){
         Secteur secteur =new Secteur();
         Optional<Section> optionalSection = Optional.empty();
-        if(secteurPaylaodWeb.getId()!=null)
-            secteur = secteurRepository.findById(secteurPaylaodWeb.getId()).orElse(new Secteur());
-
 
         if(secteurPaylaodWeb.getSectionId()!=null)
             optionalSection=sectionRepository.findById(secteurPaylaodWeb.getSectionId());
@@ -315,9 +272,6 @@ public class EntityFromPayLoadService {
         Optional<Secteur> optionalSecteur = Optional.empty();
         Optional<Arrondissement> optionalArrondissement = Optional.empty();
         Optional<Quartier> optionalQuartier = Optional.empty();
-        if(secteurDecoupagePaylaodWeb.getId()!=null)
-            secteurDecoupage = secteurDecoupageRepository.findById(secteurDecoupagePaylaodWeb.getId()).orElse(new SecteurDecoupage());
-
 
         if(secteurDecoupagePaylaodWeb.getSecteurId()!=null)
             optionalSecteur=secteurRepository.findById(secteurDecoupagePaylaodWeb.getSecteurId());
@@ -339,10 +293,6 @@ public class EntityFromPayLoadService {
     public UniteLogement getUniteLogementFromPayLoadWeb(UniteLogementPaylaodWeb uniteLogementPaylaodWeb){
         UniteLogement uniteLogement=new UniteLogement();
         Optional<Batiment> optionalBatiment=Optional.empty();
-        if(uniteLogementPaylaodWeb.getId()!=null)
-            uniteLogement = uniteLogementRepository.findById(uniteLogementPaylaodWeb.getId()).orElse(new UniteLogement());
-
-
         if(uniteLogementPaylaodWeb.getBatimentId()!=null)
             optionalBatiment=batimentRepository.findById(uniteLogementPaylaodWeb.getBatimentId());
         uniteLogement.setBatiment(optionalBatiment.orElse(null));
@@ -361,10 +311,6 @@ public class EntityFromPayLoadService {
         Optional<Profile> optionalProfile=Optional.empty();
         Optional<User> optionalUser=Optional.empty();
         Optional<Structure> optionalStructure=Optional.empty();
-        if(fonctionPaylaodWeb.getId()!=null)
-            fonction = fonctionRepository.findById(fonctionPaylaodWeb.getId()).orElse(new Fonction());
-
-
 
         if(fonctionPaylaodWeb.getSecteurId()!=null)
             optionalSecteur=secteurRepository.findById(fonctionPaylaodWeb.getSecteurId());
@@ -391,9 +337,6 @@ public class EntityFromPayLoadService {
         AvoirFonction avoirFonction =new AvoirFonction();
         Optional<Fonction> optionalFonction=Optional.empty();
         Optional<User> optionalUser=Optional.empty();
-        if(avoirFonctionPaylaodWeb.getId()!=null)
-            avoirFonction = avoirFonctionRepository.findById(avoirFonctionPaylaodWeb.getId()).orElse(new AvoirFonction());
-
 
         if(avoirFonctionPaylaodWeb.getFonctionId()!=null)
             optionalFonction=fonctionRepository.findById(avoirFonctionPaylaodWeb.getFonctionId());
@@ -413,14 +356,10 @@ public class EntityFromPayLoadService {
 
     public Profile getProfileFromPayLoadWeb(ProfilePaylaodWeb profilePaylaodWeb){
         Profile profile =new Profile();
-        if(profilePaylaodWeb.getId()!=null)
-            profile = profileRepository.findById(profilePaylaodWeb.getId()).orElse(new Profile());
-
         profile.setDescription(profilePaylaodWeb.getDescription());
         profile.setRoles(profilePaylaodWeb.getRoles());
         profile.setNom(profilePaylaodWeb.getNom());
 
-
         return profile;
     }
 
@@ -431,9 +370,6 @@ public class EntityFromPayLoadService {
         Optional<TypePersonne> optionalTypePersonne=Optional.empty();
         Optional<Profession> optionalProfession=Optional.empty();
         Optional<Commune> optionalCommune=Optional.empty();
-        if(personnePayLoadWeb.getId()!=null)
-            personne = personneRepository.findById(personnePayLoadWeb.getId()).orElse(new Personne());
-
 
         if(personnePayLoadWeb.getSituationMatrimonialeId()!=null)
             optionalSituationMatrimoniale=situationMatrimonialeRepository.findById(personnePayLoadWeb.getSituationMatrimonialeId());
@@ -489,8 +425,6 @@ public class EntityFromPayLoadService {
         Optional<UniteLogement> optionalUniteLogement=Optional.empty();
         Optional<Parcelle> optionalParcelle=Optional.empty();
         Optional<Profession> optionalProfession=Optional.empty();
-        if(enqueteActivitePayLoadWeb.getId()!=null)
-            enqueteActivite = enqueteActiviteRepository.findById(enqueteActivitePayLoadWeb.getId()).orElse(new EnqueteActivite());
 
 
         if(enqueteActivitePayLoadWeb.getBatimentId()!=null)
@@ -536,9 +470,8 @@ public class EntityFromPayLoadService {
     public User getUserFromPayLoadWeb(UserPaylaodWeb userPaylaodWeb){
         User user =new User();
         Optional<Structure> optionalStructure = Optional.empty();
-        if(userPaylaodWeb.getId()!=null)
-            user = userRepository.findById(userPaylaodWeb.getId()).orElse(new User());
 
+        System.out.println(userPaylaodWeb.getStructureId());
 
         if(userPaylaodWeb.getStructureId()!=null)
             optionalStructure=structureRepository.findById(userPaylaodWeb.getStructureId());