diff --git a/src/main/java/io/gmss/fiscad/component/DataLoadConfig.java b/src/main/java/io/gmss/fiscad/component/DataLoadConfig.java index 6b20ce0..5bda203 100755 --- a/src/main/java/io/gmss/fiscad/component/DataLoadConfig.java +++ b/src/main/java/io/gmss/fiscad/component/DataLoadConfig.java @@ -1,11 +1,10 @@ package io.gmss.fiscad.component; -import io.gmss.fiscad.entities.user.Profile; import io.gmss.fiscad.entities.user.Role; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.UserRole; -import io.gmss.fiscad.repositories.user.RoleRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.user.RoleRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/io/gmss/fiscad/configuration/AuditConfig.java b/src/main/java/io/gmss/fiscad/configuration/AuditConfig.java index 8fd24eb..7bdcc64 100755 --- a/src/main/java/io/gmss/fiscad/configuration/AuditConfig.java +++ b/src/main/java/io/gmss/fiscad/configuration/AuditConfig.java @@ -1,7 +1,7 @@ package io.gmss.fiscad.configuration; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.domain.AuditorAware; diff --git a/src/main/java/io/gmss/fiscad/configuration/AuditorAwareImpl.java b/src/main/java/io/gmss/fiscad/configuration/AuditorAwareImpl.java index 1ffdf81..8875ff7 100755 --- a/src/main/java/io/gmss/fiscad/configuration/AuditorAwareImpl.java +++ b/src/main/java/io/gmss/fiscad/configuration/AuditorAwareImpl.java @@ -1,6 +1,6 @@ package io.gmss.fiscad.configuration; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import io.gmss.fiscad.security.UserPrincipal; import org.springframework.data.domain.AuditorAware; import org.springframework.security.authentication.AnonymousAuthenticationToken; diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java index 408588a..addddd8 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java @@ -4,7 +4,9 @@ import io.gmss.fiscad.entities.decoupage.Secteur; import io.gmss.fiscad.exceptions.*; import io.gmss.fiscad.interfaces.decoupage.SecteurService; import io.gmss.fiscad.paylaods.ApiResponse; +import io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb; import io.gmss.fiscad.paylaods.request.synchronisation.SecteurPayload; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import org.slf4j.Logger; @@ -24,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException; @RequestMapping(value = "api/secteur", produces = MediaType.APPLICATION_JSON_VALUE) //@SecurityRequirement(name = "bearer") @Tag(name = "Secteur") -@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')") +//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')") public class SecteurController { private final SecteurService secteurService; @@ -34,14 +36,16 @@ public class SecteurController { this.secteurService = secteurService; } - + @Operation( + summary = "Créer un secteur", + description = "Permet de Créer un secteur" + ) @PostMapping("/create") - public ResponseEntity createSecteur(@RequestBody @Valid @Validated SecteurPayload secteurPayload) { + public ResponseEntity createSecteur(@RequestBody @Valid @Validated SecteurPaylaodWeb secteurPaylaodWeb) { try { - // Secteur secteur=getSecteurFromPayload(secteurPayload); - Secteur secteur = secteurService.createSecteur(secteurPayload); + secteurPaylaodWeb = secteurService.createSecteur(secteurPaylaodWeb); return new ResponseEntity<>( - new ApiResponse<>(true, secteur, "Secteur créé avec succès."), + new ApiResponse<>(true, secteurPaylaodWeb, "Secteur créé avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { @@ -60,12 +64,15 @@ public class SecteurController { } } - + @Operation( + summary = "mettre à jour un secteur", + description = "Permet de modifier un secteur" + ) @PutMapping("/update/{id}") - public ResponseEntity updateSecteur(@PathVariable Long id, @RequestBody SecteurPayload secteurPayload) { + public ResponseEntity updateSecteur(@PathVariable Long id, @RequestBody SecteurPaylaodWeb secteurPayloadWeb) { try { return new ResponseEntity<>( - new ApiResponse<>(true, secteurService.updateSecteur(id, secteurPayload), "Secteur mis à jour avec succès."), + new ApiResponse<>(true, secteurService.updateSecteur(id, secteurPayloadWeb), "Secteur mis à jour avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { @@ -83,7 +90,10 @@ public class SecteurController { return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK); } } - + @Operation( + summary = "supprimer un secteur", + description = "Permet de supprimer un secteur" + ) @DeleteMapping("/delete/{id}") public ResponseEntity deleteSecteurr(@PathVariable Long id) { try { @@ -107,7 +117,10 @@ public class SecteurController { return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK); } } - + @Operation( + summary = "recuperer tous les secteurs", + description = "Permet de récuperer l'ensemble des secteurs" + ) @GetMapping("/all") public ResponseEntity getAllSecteurList() { try { @@ -131,6 +144,10 @@ public class SecteurController { } } + @Operation( + summary = "recuperer tous les secteurs avec pagination", + description = "Permet de récuperer l'ensemble des secteurs avec pagination" + ) @GetMapping("/all-paged") public ResponseEntity getAllSecteurPaged(@RequestParam int pageNo, @RequestParam int pageSize) { try { @@ -155,6 +172,10 @@ public class SecteurController { } } + @Operation( + summary = "recuperer un secteurs par son ID ", + description = "Permet de récuperer le secteur ayant l'ID fournie en path" + ) @GetMapping("/id/{id}") public ResponseEntity getSecteurById(@PathVariable Long id) { try { @@ -178,12 +199,15 @@ public class SecteurController { } } - + @Operation( + summary = "recuperer tous les secteurs d'une structure", + description = "Permet de récuperer l'ensemble des secteurs de la structure dont l'ID est fourni en path" + ) @GetMapping("/by-structure-id/{structureId}") public ResponseEntity getSecteurByStructureId(@PathVariable Long structureId) { try { return new ResponseEntity<>( - new ApiResponse<>(true, secteurService.getSecteurListUneStruture(structureId), "Secteur trouvée avec succès."), + new ApiResponse<>(true, secteurService.getSecteurListByStructureId(structureId), "Secteur trouvée avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { @@ -203,4 +227,92 @@ public class SecteurController { } + @Operation( + summary = "recuperer tous les secteurs d'une structure", + description = "Permet de récuperer l'ensemble des secteurs de la structure dont l'ID est fourni en path avec pagination" + ) + @GetMapping("/page/by-structure-id/{structureId}") + public ResponseEntity getSecteurByStructureIdPage(@PathVariable Long structureId, @RequestParam int pageNo, @RequestParam int pageSize) { + try { + Pageable pageable = PageRequest.of(pageNo, pageSize); + return new ResponseEntity<>( + new ApiResponse<>(true, secteurService.getSecteurListByStructureId(structureId,pageable), "Secteur trouvée avec succès."), + HttpStatus.OK + ); + } catch (HttpClientErrorException.MethodNotAllowed e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK); + } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException | + FileStorageException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK); + } catch (NullPointerException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK); + } catch (Exception e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK); + } + } + + + + @Operation( + summary = "recuperer tous les secteurs d'une section", + description = "Permet de récuperer l'ensemble des secteurs de la section dont l'ID est fourni en path" + ) + @GetMapping("/by-section-id/{sectionId}") + public ResponseEntity getSecteurBySectionId(@PathVariable Long sectionId) { + try { + return new ResponseEntity<>( + new ApiResponse<>(true, secteurService.getSecteurListBySectionId(sectionId), "Secteur trouvée avec succès."), + HttpStatus.OK + ); + } catch (HttpClientErrorException.MethodNotAllowed e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK); + } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException | + FileStorageException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK); + } catch (NullPointerException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK); + } catch (Exception e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK); + } + } + + + @Operation( + summary = "recuperer tous les secteurs d'une section avec pagination", + description = "Permet de récuperer l'ensemble des secteurs de la section dont l'ID est fourni en path avec pagination" + ) + @GetMapping("/page/by-section-id/{sectionId}") + public ResponseEntity getSecteurBySectionIdPage(@PathVariable Long sectionId, @RequestParam int pageNo, @RequestParam int pageSize) { + try { + Pageable pageable = PageRequest.of(pageNo, pageSize); + return new ResponseEntity<>( + new ApiResponse<>(true, secteurService.getSecteurListBySectionId(sectionId,pageable), "Secteur trouvée avec succès."), + HttpStatus.OK + ); + } catch (HttpClientErrorException.MethodNotAllowed e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK); + } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException | + FileStorageException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK); + } catch (NullPointerException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK); + } catch (Exception e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK); + } + } + + + } \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurDecoupageController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurDecoupageController.java index 43c83f7..4274cf8 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurDecoupageController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurDecoupageController.java @@ -180,7 +180,7 @@ public class SecteurDecoupageController { public ResponseEntity getArborescenceByUserId(@PathVariable Long userId) { try { return new ResponseEntity<>( - new ApiResponse<>(true, secteurService.getStatParcelleDecoupageByUserId(userId), "SecteurDecoupage trouvée avec succès."), + new ApiResponse<>(true, secteurDecoupageService.getStatParcelleDecoupageByUserId(userId), "SecteurDecoupage trouvée avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/SectionController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/SectionController.java new file mode 100644 index 0000000..557620b --- /dev/null +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/SectionController.java @@ -0,0 +1,255 @@ +package io.gmss.fiscad.controllers.decoupage; + +import io.gmss.fiscad.exceptions.*; +import io.gmss.fiscad.interfaces.decoupage.SectionService; +import io.gmss.fiscad.paylaods.ApiResponse; +import io.gmss.fiscad.paylaods.request.crudweb.SectionPaylaodWeb; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.client.HttpClientErrorException; + + +@RestController +@RequestMapping(value = "api/section", produces = MediaType.APPLICATION_JSON_VALUE) +//@SecurityRequirement(name = "bearer") +@Tag(name = "Section") +//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')") +public class SectionController { + + private final SectionService sectionService; + private static final Logger logger = LoggerFactory.getLogger(SectionController.class); + + public SectionController(SectionService sectionService) { + this.sectionService = sectionService; + } + + @Operation( + summary = "Créer un section", + description = "Permet de Créer un section" + ) + @PostMapping("/create") + public ResponseEntity createSection(@RequestBody @Valid @Validated SectionPaylaodWeb sectionPaylaodWeb) { + try { + sectionPaylaodWeb = sectionService.createSection(sectionPaylaodWeb); + return new ResponseEntity<>( + new ApiResponse<>(true, sectionPaylaodWeb, "Section 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); + } + } + + @Operation( + summary = "mettre à jour un section", + description = "Permet de modifier un section" + ) + @PutMapping("/update/{id}") + public ResponseEntity updateSection(@PathVariable Long id, @RequestBody SectionPaylaodWeb sectionPayloadWeb) { + try { + return new ResponseEntity<>( + new ApiResponse<>(true, sectionService.updateSection(id, sectionPayloadWeb), "Section mis à jour avec succès."), + HttpStatus.OK + ); + } catch (HttpClientErrorException.MethodNotAllowed e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK); + } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException | + FileStorageException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK); + } catch (NullPointerException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK); + } catch (Exception e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK); + } + } + @Operation( + summary = "supprimer un section", + description = "Permet de supprimer un section" + ) + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteSection(@PathVariable Long id) { + try { + sectionService.deleteSection(id); + return new ResponseEntity<>( + new ApiResponse<>(true, "Section 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); + } + } + @Operation( + summary = "recuperer tous les sections", + description = "Permet de récuperer l'ensemble des sections" + ) + @GetMapping("/all") + public ResponseEntity getAllSectionList() { + try { + return new ResponseEntity<>( + new ApiResponse<>(true, sectionService.getSectionList(), "Liste des sections 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); + } + } + + @Operation( + summary = "recuperer tous les sections avec pagination", + description = "Permet de récuperer l'ensemble des sections avec pagination" + ) + @GetMapping("/all-paged") + public ResponseEntity getAllSectionPaged(@RequestParam int pageNo, @RequestParam int pageSize) { + try { + Pageable pageable = PageRequest.of(pageNo, pageSize); + return new ResponseEntity<>( + new ApiResponse<>(true, sectionService.getSectionList(pageable), "Liste des sections 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); + } + } + + @Operation( + summary = "recuperer un sections par son ID ", + description = "Permet de récuperer le section ayant l'ID fournie en path" + ) + @GetMapping("/id/{id}") + public ResponseEntity getSectionById(@PathVariable Long id) { + try { + return new ResponseEntity<>( + new ApiResponse<>(true, sectionService.getSectionById(id).orElse(null), "Section trouvée avec succès."), + HttpStatus.OK + ); + } catch (HttpClientErrorException.MethodNotAllowed e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK); + } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException | + FileStorageException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK); + } catch (NullPointerException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK); + } catch (Exception e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK); + } + } + + @Operation( + summary = "recuperer tous les sections d'une structure", + description = "Permet de récuperer l'ensemble des sections de la structure dont l'ID est fourni en path" + ) + @GetMapping("/by-structure-id/{structureId}") + public ResponseEntity getSectionByStructureId(@PathVariable Long structureId) { + try { + return new ResponseEntity<>( + new ApiResponse<>(true, sectionService.getSectionListByStructureId(structureId), "Section trouvée avec succès."), + HttpStatus.OK + ); + } catch (HttpClientErrorException.MethodNotAllowed e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK); + } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException | + FileStorageException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK); + } catch (NullPointerException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK); + } catch (Exception e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK); + } + } + + + @Operation( + summary = "recuperer tous les sections d'une structure", + description = "Permet de récuperer l'ensemble des sections de la structure dont l'ID est fourni en path avec pagination" + ) + @GetMapping("/page/by-structure-id/{structureId}") + public ResponseEntity getSectionByStructureIdPage(@PathVariable Long structureId, @RequestParam int pageNo, @RequestParam int pageSize) { + try { + Pageable pageable = PageRequest.of(pageNo, pageSize); + return new ResponseEntity<>( + new ApiResponse<>(true, sectionService.getSectionListByStructureId(structureId,pageable), "Section 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); + } + } + +} \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java index e680366..20ea21d 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java @@ -10,6 +10,7 @@ import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb; import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad; import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -207,6 +208,35 @@ public class EnqueteController { } } + @Operation( + summary = "Récupérer les enquetes d'une parcelle", + description = "Permet de récuperer les enquêtes déjà réalisées sur une parcelles" + ) + @GetMapping("/all/by-parcelle-id/{parcelleId}") + public ResponseEntity getAllByEnqueteDecoupageAdmin(@PathVariable Long parcelleId) { + try { + return new ResponseEntity<>( + new ApiResponse<>(true, enqueteService.getEnqueteListByParcelle(parcelleId), "Liste des enquetes 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/dgi/decoupage-admin-for-enquete") public ResponseEntity getAllByEnqueteDecoupageAdminForDgi() { diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleController.java index aa1220a..ef1e0c2 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleController.java @@ -218,5 +218,31 @@ public class ParcelleController { + @GetMapping("/user-id/{userId}") + public ResponseEntity getParcellesByUserId(@PathVariable Long userId,@RequestParam int pageNo, @RequestParam int pageSize) { + try { + Pageable pageable = PageRequest.of(pageNo, pageSize); + return new ResponseEntity<>( + new ApiResponse<>(true, parcelleService.getParcelleDataTableListByUserId(userId,pageable), "enquete trouvé avec succès."), + HttpStatus.OK + ); + } catch (HttpClientErrorException.MethodNotAllowed e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK); + } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException | + FileStorageException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK); + } catch (NullPointerException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK); + } catch (Exception e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK); + } + } + + + } diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java index 76e7d57..24c0267 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.metier.Upload; import io.gmss.fiscad.paylaods.ApiResponse; import io.gmss.fiscad.paylaods.JobModels; import io.gmss.fiscad.proprietes.ZipStorageProperties; -import io.gmss.fiscad.repositories.infocad.metier.UploadRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.UploadRepository; import io.gmss.fiscad.service.FileStorageService; import io.gmss.fiscad.service.StringManager; import io.gmss.fiscad.service.ZipAsyncService; diff --git a/src/main/java/io/gmss/fiscad/controllers/report/ReportingController.java b/src/main/java/io/gmss/fiscad/controllers/report/ReportingController.java index 1bcfc3d..3ddea36 100644 --- a/src/main/java/io/gmss/fiscad/controllers/report/ReportingController.java +++ b/src/main/java/io/gmss/fiscad/controllers/report/ReportingController.java @@ -7,8 +7,8 @@ package io.gmss.fiscad.controllers.report; import io.gmss.fiscad.enums.FormatRapport; import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad; -import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; -import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.BlocRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.StructureRepository; import io.gmss.fiscad.service.ReportService; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/DonneesImpositionTfuController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/DonneesImpositionTfuController.java index 45c88ca..cc7163d 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/DonneesImpositionTfuController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/DonneesImpositionTfuController.java @@ -7,7 +7,7 @@ import io.gmss.fiscad.enums.StatusAvis; import io.gmss.fiscad.exceptions.*; import io.gmss.fiscad.interfaces.rfu.metier.DonneesImpositionTfuService; import io.gmss.fiscad.paylaods.ApiResponse; -import io.gmss.fiscad.repositories.rfu.metier.ImpositionsTfuRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.ImpositionsTfuRepository; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/io/gmss/fiscad/controllers/user/FonctionController.java b/src/main/java/io/gmss/fiscad/controllers/user/FonctionController.java index aacb919..8d40817 100644 --- a/src/main/java/io/gmss/fiscad/controllers/user/FonctionController.java +++ b/src/main/java/io/gmss/fiscad/controllers/user/FonctionController.java @@ -111,7 +111,7 @@ public class FonctionController { public ResponseEntity getAllFonctionList() { try { return new ResponseEntity<>( - new ApiResponse<>(true, fonctionService.getFonctionList(), "Liste des caractéristiques chargée avec succès."), + new ApiResponse<>(true, fonctionService.getFonctionListToDto(), "Liste des caractéristiques chargée avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { @@ -135,7 +135,7 @@ public class FonctionController { try { Pageable pageable = PageRequest.of(pageNo, pageSize); return new ResponseEntity<>( - new ApiResponse<>(true, fonctionService.getFonctionList(pageable), "Liste des caractéristiques chargée avec succès."), + new ApiResponse<>(true, fonctionService.getFonctionListToDtoPageable(pageable), "Liste des caractéristiques chargée avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { diff --git a/src/main/java/io/gmss/fiscad/entities/decoupage/Secteur.java b/src/main/java/io/gmss/fiscad/entities/decoupage/Secteur.java index 574035f..f7ce97c 100644 --- a/src/main/java/io/gmss/fiscad/entities/decoupage/Secteur.java +++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Secteur.java @@ -28,15 +28,15 @@ public class Secteur extends BaseEntity implements Serializable { private String code; private String nom; - @ManyToOne - private Structure structure; + // @ManyToOne + // private Structure structure; //@JsonBackReference @ManyToOne private Section section ; - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @JoinColumn(name = "secteur_id") - @JsonManagedReference - private List secteurDecoupages; + //@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) + // @JoinColumn(name = "secteur_id") + // @JsonManagedReference + // private List secteurDecoupages; } diff --git a/src/main/java/io/gmss/fiscad/entities/decoupage/SecteurDecoupage.java b/src/main/java/io/gmss/fiscad/entities/decoupage/SecteurDecoupage.java index 380c1ae..5f5946c 100644 --- a/src/main/java/io/gmss/fiscad/entities/decoupage/SecteurDecoupage.java +++ b/src/main/java/io/gmss/fiscad/entities/decoupage/SecteurDecoupage.java @@ -25,7 +25,6 @@ import java.util.List; @AllArgsConstructor @Where(clause = " deleted = false") public class SecteurDecoupage extends BaseEntity implements Serializable { - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @@ -36,7 +35,7 @@ public class SecteurDecoupage extends BaseEntity implements Serializable { @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateFin; - @JsonBackReference + //@JsonBackReference @ManyToOne private Secteur secteur; diff --git a/src/main/java/io/gmss/fiscad/entities/decoupage/Section.java b/src/main/java/io/gmss/fiscad/entities/decoupage/Section.java index d75bde3..243d647 100644 --- a/src/main/java/io/gmss/fiscad/entities/decoupage/Section.java +++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Section.java @@ -26,11 +26,12 @@ public class Section extends BaseEntity implements Serializable { private Long id; private String code; private String nom; + @ManyToOne private Structure structure; - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @JoinColumn(name = "section_id") + //@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) + //@JoinColumn(name = "section_id") //@JsonManagedReference - private List fonctionList; + //private List secteurs; } diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java index 7b321db..120c90a 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java @@ -157,18 +157,18 @@ public class Enquete extends BaseEntity implements Serializable { private String numeroTitreFoncier; /// Nouveau champs ajoutés pour RFU Abomey - private String numEnterParcelle; + private String numEntreeParcelle; private String numRue; private String nomRue; private String emplacement; - private float altitude; - private float precision; - private int nbreCoProprietaire; - private int nbreIndivisiaire; + private Float altitude; + private Float precision; + private Integer nbreCoProprietaire; + private Integer nbreIndivisiaire; private String autreAdresse; - private float superficie ; - private int nbreBatiment; - private int nbrePiscine; + private Float superficie ; + private Integer nbreBatiment; + private Integer nbrePiscine; private Long montantMensuelleLocation; private Long montantAnnuelleLocation; private Long valeurParcelleEstime; diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java index ed7fda6..4c01be4 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java @@ -2,9 +2,11 @@ package io.gmss.fiscad.entities.infocad.parametre; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonManagedReference; import io.gmss.fiscad.entities.BaseEntity; import io.gmss.fiscad.entities.decoupage.Arrondissement; import io.gmss.fiscad.entities.decoupage.Commune; +import io.gmss.fiscad.entities.user.Fonction; import io.gmss.fiscad.entities.user.User; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; @@ -58,11 +60,5 @@ public class Structure extends BaseEntity implements Serializable { inverseJoinColumns = @JoinColumn(name = "arrondissement_id") ) private Set arrondissements; -// @JsonIgnore -// @OneToMany(mappedBy = "structure") -// private List agents; -// @JsonIgnore -// @OneToMany(mappedBy = "structure") -// private List blocs; } diff --git a/src/main/java/io/gmss/fiscad/entities/user/Fonction.java b/src/main/java/io/gmss/fiscad/entities/user/Fonction.java index d33bf47..5f70158 100644 --- a/src/main/java/io/gmss/fiscad/entities/user/Fonction.java +++ b/src/main/java/io/gmss/fiscad/entities/user/Fonction.java @@ -6,6 +6,7 @@ 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.Departement; import io.gmss.fiscad.entities.decoupage.Secteur; import io.gmss.fiscad.entities.decoupage.Section; import io.gmss.fiscad.entities.infocad.parametre.Structure; @@ -42,14 +43,17 @@ public class Fonction extends BaseEntity implements Serializable { @ManyToOne private Secteur secteur; - @JsonBackReference + //@JsonBackReference @ManyToOne private Section section; - //@JsonBackReference @ManyToOne + @JoinColumn(name = "structure_id") private Structure structure; + @ManyToOne + private Departement departement; + //@JsonIgnore @ManyToOne //(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "profile_id", nullable = false) diff --git a/src/main/java/io/gmss/fiscad/implementations/decoupage/ArrondissementServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/ArrondissementServiceImpl.java index f9739e7..7e63d3c 100644 --- a/src/main/java/io/gmss/fiscad/implementations/decoupage/ArrondissementServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/ArrondissementServiceImpl.java @@ -6,7 +6,7 @@ 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.repositories.decoupage.ArrondissementRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.ArrondissementRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/decoupage/CommuneServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/CommuneServiceImpl.java index ac75298..7f225ad 100644 --- a/src/main/java/io/gmss/fiscad/implementations/decoupage/CommuneServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/CommuneServiceImpl.java @@ -6,7 +6,7 @@ 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.repositories.decoupage.CommuneRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.CommuneRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/decoupage/DepartementServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/DepartementServiceImpl.java index 605c48e..fd7de14 100644 --- a/src/main/java/io/gmss/fiscad/implementations/decoupage/DepartementServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/DepartementServiceImpl.java @@ -4,7 +4,7 @@ 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.repositories.decoupage.DepartementRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.DepartementRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/decoupage/NationaliteServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/NationaliteServiceImpl.java index 94ec2d2..b81b22c 100644 --- a/src/main/java/io/gmss/fiscad/implementations/decoupage/NationaliteServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/NationaliteServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.decoupage.Nationalite; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.decoupage.NationaliteService; -import io.gmss.fiscad.repositories.decoupage.NationaliteRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.NationaliteRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/decoupage/QuartierServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/QuartierServiceImpl.java index 1ad326c..de656e6 100644 --- a/src/main/java/io/gmss/fiscad/implementations/decoupage/QuartierServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/QuartierServiceImpl.java @@ -6,7 +6,7 @@ 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.repositories.decoupage.QuartierRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.QuartierRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurDecoupageServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurDecoupageServiceImpl.java index ad102de..8a642b9 100644 --- a/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurDecoupageServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurDecoupageServiceImpl.java @@ -1,24 +1,30 @@ package io.gmss.fiscad.implementations.decoupage; +import io.gmss.fiscad.entities.decoupage.Secteur; import io.gmss.fiscad.entities.decoupage.SecteurDecoupage; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.decoupage.SecteurDecoupageService; -import io.gmss.fiscad.repositories.decoupage.SecteurDecoupageRepository; +import io.gmss.fiscad.interfaces.decoupage.SecteurService; +import io.gmss.fiscad.paylaods.response.restoration.ParcelleStatsProjectionUnSecteur; +import io.gmss.fiscad.persistence.repositories.decoupage.SecteurDecoupageRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository; +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 SecteurDecoupageServiceImpl implements SecteurDecoupageService { private final SecteurDecoupageRepository secteurDecoupageRepository; + private final SecteurService secteurService; + private final ParcelleRepository parcelleRepository; + - public SecteurDecoupageServiceImpl(SecteurDecoupageRepository secteurDecoupageRepository) { - this.secteurDecoupageRepository = secteurDecoupageRepository; - } @Override public SecteurDecoupage createSecteurDecoupage(SecteurDecoupage secteurDecoupage) throws BadRequestException { @@ -64,4 +70,21 @@ public class SecteurDecoupageServiceImpl implements SecteurDecoupageService { public Optional getSecteurDecoupageById(Long id) { return secteurDecoupageRepository.findById(id); } + + @Override + public List getStatParcelleDecoupageUnSecteur(Long secteurId) { + return parcelleRepository.findStatsBySecteurs(List.of(secteurId)); + } + + @Override + public List getStatParcelleDecoupageByUserId(Long userId) { + List parcelleStatsProjectionUnSecteurs = new ArrayList<>(); + List secteurs= secteurService.getListSecteurUserId(userId); + List secteurIds = secteurs.stream() + .map(Secteur::getId) + .toList(); + parcelleStatsProjectionUnSecteurs = parcelleRepository.findStatsBySecteurs(secteurIds); + + return parcelleStatsProjectionUnSecteurs ; + } } \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java index 660f165..01cfb8f 100644 --- a/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java @@ -8,16 +8,17 @@ import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.decoupage.SecteurService; +import io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb; import io.gmss.fiscad.paylaods.request.synchronisation.SecteurDecoupagePayload; import io.gmss.fiscad.paylaods.request.synchronisation.SecteurPayload; -import io.gmss.fiscad.paylaods.response.restoration.ParcelleStatsProjectionUnSecteur; -import io.gmss.fiscad.repositories.decoupage.ArrondissementRepository; -import io.gmss.fiscad.repositories.decoupage.QuartierRepository; -import io.gmss.fiscad.repositories.decoupage.SecteurRepository; -import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository; -import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository; -import io.gmss.fiscad.repositories.user.AvoirFonctionRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.ArrondissementRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.QuartierRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.SecteurRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.StructureRepository; +import io.gmss.fiscad.persistence.repositories.user.AvoirFonctionRepository; +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; @@ -27,7 +28,6 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import java.util.concurrent.atomic.AtomicReference; @AllArgsConstructor @Service @@ -39,73 +39,68 @@ public class SecteurServiceImpl implements SecteurService { private final QuartierRepository quartierRepository; private final StructureRepository structureRepository; private final AvoirFonctionRepository avoirFonctionRepository; + private final EntityFromPayLoadService entityFromPayLoadService; @Override - public Secteur createSecteur(SecteurPayload secteurPayload) throws BadRequestException { - if (secteurPayload.getId() != null) { + public SecteurPaylaodWeb createSecteur(SecteurPaylaodWeb secteurPaylaodWeb) throws BadRequestException { + if (secteurPaylaodWeb.getId() != null) { throw new BadRequestException("Impossible de créer un nouveau secteur ayant un id non null."); } + Secteur secteur = entityFromPayLoadService.getSecteurFromPayLoadWeb(secteurPaylaodWeb); - if (secteurPayload.getChefSecteurId() != null && userRepository.existsById(secteurPayload.getChefSecteurId())) { - Secteur secteur = getSecteurFromPayload(secteurPayload); - return secteurRepository.save(secteur); - } else { - throw new BadRequestException("Impossible de créer un nouveau secteur sans le chef le Chef Secteur."); - } + secteur = secteurRepository.save(secteur); + return secteurRepository.findSecteurToDtoById(secteur.getId()).orElse(null); } - private Secteur getSecteurFromPayload(SecteurPayload secteurPayload) { - Secteur secteur = new Secteur(); - Optional optionalUser = userRepository.findById(secteurPayload.getChefSecteurId()); - //secteur.setChefSecteur(optionalUser.orElse(null)); - Optional optionalStructure = structureRepository.findById(secteurPayload.getStructureId()); - secteur.setStructure(optionalStructure.orElse(null)); - List secteurDecoupageList = new ArrayList<>(); - - for (SecteurDecoupagePayload sdp : secteurPayload.getSecteurDecoupages()) { - SecteurDecoupage sd = new SecteurDecoupage(); - if (sdp.getSecteurId() != null && secteurRepository.existsById(sdp.getSecteurId())) { - sd.setSecteur(secteurRepository.findById(sdp.getSecteurId()).orElse(null)); - } - - if (sdp.getArrondissementId() != null && arrondissementRepository.existsById(sdp.getArrondissementId())) { - sd.setArrondissement(arrondissementRepository.findById(sdp.getArrondissementId()).orElse(null)); - } - - if (sdp.getQuartierId() != null && quartierRepository.existsById(sdp.getQuartierId())) { - sd.setQuartier(quartierRepository.findById(sdp.getQuartierId()).orElse(null)); - } - sd.setDateDebut(sdp.getDateDebut()); - sd.setDateFin(sdp.getDateFin()); - sd.setId(sdp.getId()); - secteurDecoupageList.add(sd); - } - secteur.setSecteurDecoupages(secteurDecoupageList); - //TODO - secteur.setId(secteurPayload.getId()); - secteur.setCode(secteurPayload.getCode()); - secteur.setNom(secteurPayload.getNom()); - return secteur; - } +// private Secteur getSecteurFromPayload(SecteurPayload secteurPayload) { +// Secteur secteur = new Secteur(); +//// Optional optionalUser = userRepository.findById(secteurPayload.getChefSecteurId()); +// //secteur.setChefSecteur(optionalUser.orElse(null)); +//// Optional optionalStructure = structureRepository.findById(secteurPayload.getStructureId()); +//// secteur.setStructure(optionalStructure.orElse(null)); +//// List secteurDecoupageList = new ArrayList<>(); +// +//// for (SecteurDecoupagePayload sdp : secteurPayload.getSecteurDecoupages()) { +//// SecteurDecoupage sd = new SecteurDecoupage(); +//// if (sdp.getSecteurId() != null && secteurRepository.existsById(sdp.getSecteurId())) { +//// sd.setSecteur(secteurRepository.findById(sdp.getSecteurId()).orElse(null)); +//// } +//// +//// if (sdp.getArrondissementId() != null && arrondissementRepository.existsById(sdp.getArrondissementId())) { +//// sd.setArrondissement(arrondissementRepository.findById(sdp.getArrondissementId()).orElse(null)); +//// } +//// +//// if (sdp.getQuartierId() != null && quartierRepository.existsById(sdp.getQuartierId())) { +//// sd.setQuartier(quartierRepository.findById(sdp.getQuartierId()).orElse(null)); +//// } +//// sd.setDateDebut(sdp.getDateDebut()); +//// sd.setDateFin(sdp.getDateFin()); +//// sd.setId(sdp.getId()); +//// secteurDecoupageList.add(sd); +//// } +// //secteur.setSecteurDecoupages(secteurDecoupageList); +// //TODO +// secteur.setId(secteurPayload.getId()); +// secteur.setCode(secteurPayload.getCode()); +// secteur.setNom(secteurPayload.getNom()); +// return secteur; +// } @Override - public Secteur updateSecteur(Long id, SecteurPayload secteurPayload) throws NotFoundException { - if (secteurPayload.getId() == null) { + public SecteurPaylaodWeb updateSecteur(Long id, SecteurPaylaodWeb secteurPaylaodWeb) throws NotFoundException { + if (secteurPaylaodWeb.getId() == null) { throw new BadRequestException("Impossible de mettre à jour un nouveau secteur ayant un id null."); } - if (!secteurRepository.existsById(secteurPayload.getId())) { + if (!secteurRepository.existsById(secteurPaylaodWeb.getId())) { throw new NotFoundException("Impossible de trouver le secteur spécifié."); } - if (secteurPayload.getChefSecteurId() != null && userRepository.existsById(secteurPayload.getChefSecteurId())) { - Secteur secteur = getSecteurFromPayload(secteurPayload); - return secteurRepository.save(secteur); - } else { - throw new BadRequestException("Impossible de créer un nouveau secteur sans le chef le Chef Secteur."); - } + Secteur secteur = entityFromPayLoadService.getSecteurFromPayLoadWeb(secteurPaylaodWeb); + secteur = secteurRepository.save(secteur); + return secteurRepository.findSecteurToDtoById(secteur.getId()).orElse(null); } @Override @@ -119,59 +114,58 @@ public class SecteurServiceImpl implements SecteurService { } @Override - public Page getSecteurList(Pageable pageable) { - return secteurRepository.findAll(pageable); + public Page getSecteurList(Pageable pageable) { + return secteurRepository.findAllSecteurToDtoPageable(pageable); } @Override - public List getSecteurList() { - return secteurRepository.findAll(); + public List getSecteurList() { + return secteurRepository.findAllSecteurToDto(); } @Override - public List getSecteurListUneStruture(Long structureId) { - return secteurRepository.findAllByStructure_Id(structureId); + public Page getSecteurListBySectionId(Long sectionId, Pageable pageable) { + return secteurRepository.findAllSecteurBySectionIdToDtoPageable(sectionId,pageable); + } + + @Override + public List getSecteurListBySectionId(Long sectionId) { + return secteurRepository.findAllSecteurBySectionIdToDto(sectionId); + } + + @Override + public List getSecteurListByStructureId(Long structureId) { + return secteurRepository.findAllSecteurByStructureIdToDto(structureId); + } + + @Override + public Page getSecteurListByStructureId(Long structureId, Pageable pageable) { + return secteurRepository.findAllSecteurByStructureIdToDtoPageable(structureId,pageable); } @Override - public Optional getSecteurById(Long id) { - return secteurRepository.findById(id); + public Optional getSecteurById(Long id) { + return secteurRepository.findSecteurToDtoById(id); } - @Override - public List getStatParcelleDecoupageUnSecteur(Long secteurId) { - return parcelleRepository.findStatsBySecteurs(List.of(secteurId)); - } @Override - public List getStatParcelleDecoupageByUserId(Long userId) { + public List getListSecteurUserId(Long userId) { List avoirFonctions= avoirFonctionRepository.findAvoirFonctionByUser_Id(userId); - AtomicReference> parcelleStatsProjectionUnSecteurs = new AtomicReference<>(new ArrayList<>()); - + List secteurs = new ArrayList<>(); avoirFonctions.stream() .filter(af -> af.getDateFin() == null || af.getDateFin().isAfter(LocalDate.now())) .forEach(avoirFonction -> { if(avoirFonction.getFonction().getSecteur()!=null){ - parcelleStatsProjectionUnSecteurs.set(parcelleRepository.findStatsBySecteurs(List.of(avoirFonction.getFonction().getSecteur().getId()))); + secteurs.addAll(List.of(avoirFonction.getFonction().getSecteur())); }else - if (avoirFonction.getFonction().getSection()!=null){ - List secteurs= secteurRepository.findDistinctBySection_Id(avoirFonction.getFonction().getSection().getId()); - List secteurIds = secteurs.stream() - .map(Secteur::getId) - .toList(); - parcelleStatsProjectionUnSecteurs.set(parcelleRepository.findStatsBySecteurs(secteurIds)); - }else if(avoirFonction.getFonction().getStructure()!=null){ - List secteurs= secteurRepository.findDistinctBySection_Structure_Id(avoirFonction.getFonction().getStructure().getId()); - List secteurIds = secteurs.stream() - .map(Secteur::getId) - .toList(); - parcelleStatsProjectionUnSecteurs.set(parcelleRepository.findStatsBySecteurs(secteurIds)); - } - + if (avoirFonction.getFonction().getSection()!=null){ + secteurs.addAll(secteurRepository.findDistinctBySection_Id(avoirFonction.getFonction().getSection().getId())); + }else if(avoirFonction.getFonction().getStructure()!=null){ + secteurs.addAll(secteurRepository.findDistinctBySection_Structure_Id(avoirFonction.getFonction().getStructure().getId())); + } }); - - - return parcelleStatsProjectionUnSecteurs.get(); + return secteurs; } } \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/implementations/decoupage/SectionServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/SectionServiceImpl.java new file mode 100644 index 0000000..8e53a30 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/SectionServiceImpl.java @@ -0,0 +1,89 @@ +package io.gmss.fiscad.implementations.decoupage; + +import io.gmss.fiscad.entities.decoupage.Secteur; +import io.gmss.fiscad.entities.decoupage.Section; +import io.gmss.fiscad.entities.rfu.metier.Batiment; +import io.gmss.fiscad.exceptions.BadRequestException; +import io.gmss.fiscad.exceptions.NotFoundException; +import io.gmss.fiscad.interfaces.decoupage.SectionService; +import io.gmss.fiscad.paylaods.request.crudweb.SectionPaylaodWeb; +import io.gmss.fiscad.persistence.repositories.decoupage.SectionRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.StructureRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.BatimentRepository; +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 SectionServiceImpl implements SectionService { + private final StructureRepository structureRepository; + private final SectionRepository sectionRepository; + private final EntityFromPayLoadService entityFromPayLoadService; + @Override + public SectionPaylaodWeb createSection(SectionPaylaodWeb sectionPaylaodWeb) throws BadRequestException { + if (sectionPaylaodWeb.getId() != null) { + throw new BadRequestException("Impossible de créer une nouvelle section ayant un id non null."); + } + Section section= entityFromPayLoadService.getSectionFromPayLoadWeb(sectionPaylaodWeb); + return sectionRepository.findSectionToDtoById(section.getId()).orElse(null); + } + + @Override + public SectionPaylaodWeb updateSection(Long id, SectionPaylaodWeb sectionPaylaodWeb) throws NotFoundException { + if (sectionPaylaodWeb.getId() == null) { + throw new BadRequestException("Impossible de mettre à jour un nouveau section ayant un id null."); + } + + if (!sectionRepository.existsById(sectionPaylaodWeb.getId())) { + throw new NotFoundException("Impossible de trouver le section spécifié."); + } + Section section= entityFromPayLoadService.getSectionFromPayLoadWeb(sectionPaylaodWeb); + sectionRepository.findSectionToDtoById(section.getId()).orElse(null); + return sectionRepository.findSectionToDtoById(section.getId()).orElse(null); + } + + @Override + public void deleteSection(Long id) throws NotFoundException { + Optional
optionalSection = sectionRepository.findById(id); + if (optionalSection.isPresent()) { + sectionRepository.deleteById(optionalSection.get().getId()); + } else { + throw new NotFoundException("Impossible de trouver la section spécifié."); + } + } + + @Override + public Page getSectionList(Pageable pageable) { + + return sectionRepository.findAllSectionToDtoPageable(pageable); + } + + @Override + public List getSectionList() { + return sectionRepository.findAllSectionToDto(); + } + + + + @Override + public List getSectionListByStructureId(Long structureId) { + return sectionRepository.findAllSectionByStructureToDto(structureId); + } + + @Override + public Page getSectionListByStructureId(Long structureId, Pageable pageable) { + return sectionRepository.findAllSectionByStructureToDtoPageable(structureId,pageable); + } + + @Override + public Optional getSectionById(Long id) { + return sectionRepository.findSectionToDtoById(id); + } + + +} diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ActeurConcerneServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ActeurConcerneServiceImpl.java index 140680b..f72fa8e 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ActeurConcerneServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ActeurConcerneServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.metier.ActeurConcerneService; -import io.gmss.fiscad.repositories.infocad.metier.ActeurConcerneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.ActeurConcerneRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/CommentaireServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/CommentaireServiceImpl.java index b078240..833b7c1 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/CommentaireServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/CommentaireServiceImpl.java @@ -7,7 +7,7 @@ import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.metier.CommentaireService; import io.gmss.fiscad.paylaods.request.SyncCommentaireRequest; import io.gmss.fiscad.paylaods.response.CommentaireResponse; -import io.gmss.fiscad.repositories.infocad.metier.CommentaireRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.CommentaireRepository; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java index aedeef7..cfe883d 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java @@ -1,7 +1,6 @@ package io.gmss.fiscad.implementations.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.*; -import io.gmss.fiscad.entities.infocad.parametre.Bloc; import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle; import io.gmss.fiscad.entities.rfu.metier.DeclarationNc; @@ -18,7 +17,6 @@ import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService; import io.gmss.fiscad.interfaces.infocad.metier.PieceService; import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueParcelleService; import io.gmss.fiscad.interfaces.rfu.metier.DeclarationNcService; -import io.gmss.fiscad.interfaces.rfu.parametre.CaracteristiqueService; import io.gmss.fiscad.interfaces.user.UserService; //import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad ; //import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb ; @@ -27,20 +25,20 @@ import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad; import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb; import io.gmss.fiscad.paylaods.response.* ; import io.gmss.fiscad.paylaods.response.FicheResponse.* ; -import io.gmss.fiscad.repositories.decoupage.ArrondissementRepository; -import io.gmss.fiscad.repositories.decoupage.CommuneRepository; -import io.gmss.fiscad.repositories.decoupage.SecteurRepository; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; -import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository; -import io.gmss.fiscad.repositories.rfu.metier.CaracteristiqueParcelleRepository; -import io.gmss.fiscad.repositories.rfu.metier.EnqueteBatimentRepository; -import io.gmss.fiscad.repositories.rfu.metier.EnqueteUniteLogementRepository; -import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository; -import io.gmss.fiscad.repositories.rfu.parametre.EquipeRepository; -import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.paylaods.response.synchronisation.EnqueteNonSyncResponse; +import io.gmss.fiscad.persistence.repositories.decoupage.ArrondissementRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.CommuneRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.SecteurRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.*; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.BlocRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.StructureRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.CaracteristiqueParcelleRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteBatimentRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteUniteLogementRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.EquipeRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.ZoneRfuRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import io.gmss.fiscad.service.EntityFromPayLoadService; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; @@ -153,7 +151,7 @@ public class EnqueteServiceImpl implements EnqueteService { enquete.setNbrePiscine(enquetePayLoadWeb.getNbrePiscine()); enquete.setNbreIndivisiaire(enquetePayLoadWeb.getNbreIndivisiaire()); enquete.setNbreCoProprietaire(enquetePayLoadWeb.getNbreCoProprietaire()); - enquete.setNumEnterParcelle(enquetePayLoadWeb.getNumEnterParcelle()); + enquete.setNumEntreeParcelle(enquetePayLoadWeb.getNumEntreeParcelle()); enquete.setNomRue(enquetePayLoadWeb.getNomRue()); enquete.setNumRue(enquetePayLoadWeb.getNumRue()); enquete.setSuperficie(enquetePayLoadWeb.getSuperficie()); @@ -267,7 +265,7 @@ public class EnqueteServiceImpl implements EnqueteService { enquete.setNbrePiscine(enquetePayLoadWeb.getNbrePiscine()); enquete.setNbreIndivisiaire(enquetePayLoadWeb.getNbreIndivisiaire()); enquete.setNbreCoProprietaire(enquetePayLoadWeb.getNbreCoProprietaire()); - enquete.setNumEnterParcelle(enquetePayLoadWeb.getNumEnterParcelle()); + enquete.setNumEntreeParcelle(enquetePayLoadWeb.getNumEntreeParcelle()); enquete.setNomRue(enquetePayLoadWeb.getNomRue()); enquete.setNumRue(enquetePayLoadWeb.getNumRue()); enquete.setSuperficie(enquetePayLoadWeb.getSuperficie()); @@ -401,6 +399,11 @@ public class EnqueteServiceImpl implements EnqueteService { return enqueteRepository.findAll(); } + @Override + public List getEnqueteListByParcelle(Long parcelleId) { + return enqueteRepository.findAllByParcelle_Id(parcelleId); + } + @Override public Optional getEnqueteById(Long id) { if (enqueteRepository.existsById(id)) { diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java index 4f1858d..700a126 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java @@ -3,19 +3,15 @@ package io.gmss.fiscad.implementations.infocad.metier; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import io.gmss.fiscad.entities.infocad.metier.Enquete; -import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.metier.ParcelleGeom; import io.gmss.fiscad.entities.infocad.metier.Upload; -import io.gmss.fiscad.enums.StatutParcelle; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.metier.ParcelleGeomService; -import io.gmss.fiscad.interfaces.synchronisation.SynchronisationService; -import io.gmss.fiscad.paylaods.request.synchronisation.UploadPayLoad; import io.gmss.fiscad.paylaods.response.EnqueteCheckResponse; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.metier.ParcelleGeomRepository; -import io.gmss.fiscad.repositories.infocad.metier.UploadRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleGeomRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.UploadRepository; import io.gmss.fiscad.service.FileStorageService; import lombok.RequiredArgsConstructor; import org.locationtech.jts.geom.Coordinate; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java index ef94b51..3457216 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java @@ -1,26 +1,28 @@ package io.gmss.fiscad.implementations.infocad.metier; import io.gmss.fiscad.entities.decoupage.Quartier; +import io.gmss.fiscad.entities.decoupage.Secteur; +import io.gmss.fiscad.entities.infocad.metier.EnqueteFiltreResponse; import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.metier.Rue; import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine; -import io.gmss.fiscad.entities.infocad.parametre.SituationGeographique; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; +import io.gmss.fiscad.interfaces.decoupage.SecteurService; import io.gmss.fiscad.interfaces.infocad.metier.ParcelleService; +import io.gmss.fiscad.paylaods.request.FiltreParcellePayLoad; import io.gmss.fiscad.paylaods.request.crudweb.ParcellePayLoadWeb; -import io.gmss.fiscad.repositories.decoupage.QuartierRepository; -import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository; -import io.gmss.fiscad.repositories.infocad.metier.RueRepository; -import io.gmss.fiscad.repositories.infocad.parametre.NatureDomaineRepository; -import io.gmss.fiscad.repositories.infocad.parametre.SituationGeographiqueRepository; +import io.gmss.fiscad.paylaods.response.dataTableResponse.ParcelleDataTableResponse; +import io.gmss.fiscad.persistence.repositories.decoupage.QuartierRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.RueRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.NatureDomaineRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.SituationGeographiqueRepository; +import io.gmss.fiscad.persistence.specification.ParcelleSpecification; import io.gmss.fiscad.service.GeometryService; +import jakarta.persistence.Query; import lombok.AllArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Sort; +import org.springframework.data.domain.*; import org.springframework.stereotype.Service; import java.util.List; @@ -34,6 +36,7 @@ public class ParcelleServiceImpl implements ParcelleService { private final ParcelleRepository parcelleRepository; private final RueRepository rueRepository; private final GeometryService geometryService; + private final SecteurService secteurService; // @Value("${infocad.geom.srid}") // private String defaultSrid32631; @@ -123,6 +126,37 @@ public class ParcelleServiceImpl implements ParcelleService { } } + @Override + public Page getParcelleDataTableListByUserId(Long userId, Pageable pageable) { + + List secteurs = secteurService.getListSecteurUserId(userId); + List secteurIds = secteurs.stream() + .map(Secteur::getId) + .toList(); + Page parcelleDataTableResponses=parcelleRepository.getParcelleDataTableResponse(secteurIds,pageable); + + return parcelleDataTableResponses ; + } + + @Override + public Page getParcelleDataTableListByMultiFiltre(Long userId, FiltreParcellePayLoad filtreParcellePayLoad, Pageable pageable) { + List secteurs = secteurService.getListSecteurUserId(userId); + List secteurIds = secteurs.stream() + .map(Secteur::getId) + .toList(); +// +// return parcelleRepository.findAll( +// ParcelleSpecification.filtre(filtreParcellePayLoad, secteurIds), +// pageable +// ); + + + + Page parcelleDataTableResponses=parcelleRepository.getParcelleDataTableResponse(secteurIds,pageable); + + return parcelleDataTableResponses ; + } + private Parcelle getParcelleFromPayload(Parcelle parcelle, ParcellePayLoadWeb parcellePayLoadWeb) { if(parcellePayLoadWeb.getRueId()!=null) { Optional optionalRue = rueRepository.findById(parcellePayLoadWeb.getRueId()); diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java index ede8f93..bbcb784 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java @@ -1,9 +1,6 @@ package io.gmss.fiscad.implementations.infocad.metier; -import io.gmss.fiscad.entities.decoupage.Commune; -import io.gmss.fiscad.entities.decoupage.Nationalite; -import io.gmss.fiscad.entities.decoupage.Quartier; import io.gmss.fiscad.entities.infocad.parametre.*; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; @@ -11,15 +8,15 @@ import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.metier.PersonneService; import io.gmss.fiscad.paylaods.dto.*; import io.gmss.fiscad.paylaods.request.crudweb.PersonnePayLoadWeb; -import io.gmss.fiscad.repositories.decoupage.CommuneRepository; -import io.gmss.fiscad.repositories.decoupage.NationaliteRepository; -import io.gmss.fiscad.repositories.infocad.metier.MembreGroupeRepository; -import io.gmss.fiscad.repositories.infocad.metier.PieceRepository; -import io.gmss.fiscad.repositories.infocad.metier.UploadRepository; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; -import io.gmss.fiscad.repositories.infocad.parametre.ProfessionRepository; -import io.gmss.fiscad.repositories.infocad.parametre.SituationMatrimonialeRepository; -import io.gmss.fiscad.repositories.infocad.parametre.TypePersonneRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.CommuneRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.NationaliteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.MembreGroupeRepository; +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.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.ProfessionRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.SituationMatrimonialeRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypePersonneRepository; import io.gmss.fiscad.service.EntityFromPayLoadService; import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/TpeServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/TpeServiceImpl.java index 8989b15..076acc3 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/TpeServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/TpeServiceImpl.java @@ -4,8 +4,8 @@ import io.gmss.fiscad.entities.infocad.metier.Tpe; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.metier.TpeService; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.metier.TpeRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.TpeRepository; import io.gmss.fiscad.service.StringService; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/BlocServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/BlocServiceImpl.java index 49b43e5..35ce685 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/BlocServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/BlocServiceImpl.java @@ -9,7 +9,7 @@ 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.repositories.infocad.parametre.BlocRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.BlocRepository; import io.gmss.fiscad.service.StringService; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ModeAcquisitionServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ModeAcquisitionServiceImpl.java index f460e06..98130e2 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ModeAcquisitionServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ModeAcquisitionServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.ModeAcquisition; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.ModeAcquisitionService; -import io.gmss.fiscad.repositories.infocad.parametre.ModeAcquisitionRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.ModeAcquisitionRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/NatureDomaineServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/NatureDomaineServiceImpl.java index 0015feb..89a4600 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/NatureDomaineServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/NatureDomaineServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.NatureDomaineService; -import io.gmss.fiscad.repositories.infocad.parametre.NatureDomaineRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.NatureDomaineRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/PositionRepresentationServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/PositionRepresentationServiceImpl.java index 8d833da..40a2316 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/PositionRepresentationServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/PositionRepresentationServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.PositionRepresentationService; -import io.gmss.fiscad.repositories.infocad.parametre.PositionRepresentationRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PositionRepresentationRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ProfessionServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ProfessionServiceImpl.java index b875eee..3eb804e 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ProfessionServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ProfessionServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.Profession; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.ProfessionService; -import io.gmss.fiscad.repositories.infocad.parametre.ProfessionRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.ProfessionRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationGeographiqueServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationGeographiqueServiceImpl.java index 4cc4644..95a24f2 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationGeographiqueServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationGeographiqueServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.SituationGeographique; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.SituationGeographiqueService; -import io.gmss.fiscad.repositories.infocad.parametre.SituationGeographiqueRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.SituationGeographiqueRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationMatrimonialeServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationMatrimonialeServiceImpl.java index 42d2706..7476825 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationMatrimonialeServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationMatrimonialeServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.SituationMatrimoniale; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.SituationMatrimonialeService; -import io.gmss.fiscad.repositories.infocad.parametre.SituationMatrimonialeRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.SituationMatrimonialeRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SourceDroitServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SourceDroitServiceImpl.java index 5bedddc..657398b 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SourceDroitServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SourceDroitServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.SourceDroit; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.SourceDroitService; -import io.gmss.fiscad.repositories.infocad.parametre.SourceDroitRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.SourceDroitRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/StructureServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/StructureServiceImpl.java index dd7ab95..11c3772 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/StructureServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/StructureServiceImpl.java @@ -5,7 +5,7 @@ import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.StructureService; import io.gmss.fiscad.paylaods.response.StructureResponse; -import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.StructureRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeContestationServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeContestationServiceImpl.java index 88647ca..68fa091 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeContestationServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeContestationServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.TypeContestation; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.TypeContestationService; -import io.gmss.fiscad.repositories.infocad.parametre.TypeContestationRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypeContestationRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeDomaineServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeDomaineServiceImpl.java index 07aba34..cbcf398 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeDomaineServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeDomaineServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.TypeDomaine; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.TypeDomaineService; -import io.gmss.fiscad.repositories.infocad.parametre.TypeDomaineRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypeDomaineRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePersonneServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePersonneServiceImpl.java index 9f53e59..01a642e 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePersonneServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePersonneServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.TypePersonne; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.TypePersonneService; -import io.gmss.fiscad.repositories.infocad.parametre.TypePersonneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypePersonneRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePieceServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePieceServiceImpl.java index 2f9af62..33659eb 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePieceServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePieceServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.TypePiece; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.TypePieceService; -import io.gmss.fiscad.repositories.infocad.parametre.TypePieceRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypePieceRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRepresentationServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRepresentationServiceImpl.java index ffb1898..2367961 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRepresentationServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRepresentationServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.TypeRepresentationService; -import io.gmss.fiscad.repositories.infocad.parametre.TypeRepresentationRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypeRepresentationRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRueServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRueServiceImpl.java index 44b4c17..8e01646 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRueServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRueServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.TypeRue; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.parametre.TypeRueService; -import io.gmss.fiscad.repositories.infocad.parametre.TypeRueRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypeRueRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java index deb9de4..36b8ae4 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java @@ -5,7 +5,7 @@ import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.metier.BatimentService; import io.gmss.fiscad.paylaods.request.crudweb.BatimentPaylaodWeb; -import io.gmss.fiscad.repositories.rfu.metier.BatimentRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.BatimentRepository; import io.gmss.fiscad.service.EntityFromPayLoadService; import lombok.AllArgsConstructor; import org.springframework.data.domain.Page; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueBatimentServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueBatimentServiceImpl.java index 9f3ef15..a1486d5 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueBatimentServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueBatimentServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueBatimentService; -import io.gmss.fiscad.repositories.rfu.metier.CaracteristiqueBatimentRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.CaracteristiqueBatimentRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueParcelleServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueParcelleServiceImpl.java index 33ca951..a9dfca7 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueParcelleServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueParcelleServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueParcelleService; -import io.gmss.fiscad.repositories.rfu.metier.CaracteristiqueParcelleRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.CaracteristiqueParcelleRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueUniteLogementServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueUniteLogementServiceImpl.java index f52fe0b..23c45d0 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueUniteLogementServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueUniteLogementServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueUniteLogement; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueUniteLogementService; -import io.gmss.fiscad.repositories.rfu.metier.CaracteristiqueUniteLogementRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.CaracteristiqueUniteLogementRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DeclarationNcServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DeclarationNcServiceImpl.java index 5a2624a..47535a0 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DeclarationNcServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DeclarationNcServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.metier.DeclarationNc; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.metier.DeclarationNcService; -import io.gmss.fiscad.repositories.rfu.metier.DeclarationNcRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.DeclarationNcRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java index 061bace..ebd2822 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java @@ -1,23 +1,20 @@ package io.gmss.fiscad.implementations.rfu.metier; import io.gmss.fiscad.entities.decoupage.Arrondissement; -import io.gmss.fiscad.entities.infocad.metier.Enquete; -import io.gmss.fiscad.entities.infocad.metier.Parcelle; 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.entities.rfu.parametre.Exercice; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.metier.DonneesImpositionTfuService; import io.gmss.fiscad.paylaods.response.DonneesImpositionTfuResponse; -import io.gmss.fiscad.repositories.decoupage.ArrondissementRepository; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository; -import io.gmss.fiscad.repositories.rfu.metier.DonneesImpositionTfuRepository; -import io.gmss.fiscad.repositories.rfu.metier.ImpositionsTfuRepository; -import io.gmss.fiscad.repositories.rfu.parametre.BaremRfuNonBatiRepository; -import io.gmss.fiscad.repositories.rfu.parametre.ExerciceRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.ArrondissementRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.DonneesImpositionTfuRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.ImpositionsTfuRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuNonBatiRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.ExerciceRepository; import jakarta.transaction.Transactional; import lombok.AllArgsConstructor; import org.springframework.dao.DataIntegrityViolationException; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteActiviteServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteActiviteServiceImpl.java index 964292b..8da7d5d 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteActiviteServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteActiviteServiceImpl.java @@ -5,7 +5,7 @@ import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.metier.EnqueteActiviteService; import io.gmss.fiscad.paylaods.request.crudweb.EnqueteActivitePayLoadWeb; -import io.gmss.fiscad.repositories.rfu.metier.EnqueteActiviteRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteActiviteRepository; import io.gmss.fiscad.service.EntityFromPayLoadService; import lombok.AllArgsConstructor; import org.springframework.data.domain.Page; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java index e0a78c0..7a8ce34 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java @@ -5,7 +5,6 @@ import io.gmss.fiscad.entities.infocad.metier.Upload; import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.rfu.metier.Batiment; import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment; -import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; @@ -13,17 +12,16 @@ import io.gmss.fiscad.interfaces.rfu.metier.BatimentService; import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueBatimentService; import io.gmss.fiscad.interfaces.rfu.metier.EnqueteBatimentService; import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.metier.UploadRepository; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; -import io.gmss.fiscad.repositories.rfu.metier.EnqueteBatimentRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.UploadRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteBatimentRepository; 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 javax.swing.text.html.Option; import java.util.List; import java.util.Optional; @AllArgsConstructor diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java index dc64650..0d30470 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java @@ -10,10 +10,10 @@ import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueUniteLogementService; import io.gmss.fiscad.interfaces.rfu.metier.EnqueteUniteLogementService; import io.gmss.fiscad.interfaces.rfu.metier.UniteLogementService; import io.gmss.fiscad.paylaods.request.crudweb.EnqueteUniteLogementPayloadWeb; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.metier.UploadRepository; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; -import io.gmss.fiscad.repositories.rfu.metier.EnqueteUniteLogementRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.UploadRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteUniteLogementRepository; import io.gmss.fiscad.service.EntityFromPayLoadService; import lombok.AllArgsConstructor; import org.springframework.data.domain.Page; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/FonctionServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/FonctionServiceImpl.java index 4abe135..cb23a35 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/FonctionServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/FonctionServiceImpl.java @@ -5,7 +5,7 @@ import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.metier.FonctionService; import io.gmss.fiscad.paylaods.request.crudweb.FonctionPaylaodWeb; -import io.gmss.fiscad.repositories.rfu.metier.FonctionRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.FonctionRepository; import io.gmss.fiscad.service.EntityFromPayLoadService; import lombok.AllArgsConstructor; import org.springframework.data.domain.Page; @@ -19,7 +19,7 @@ import java.util.Optional; @Service public class FonctionServiceImpl implements FonctionService { - private final FonctionRepository gererSecteurRepository; + private final FonctionRepository fonctionRepository; private final EntityFromPayLoadService entityFromPayLoadService; @@ -30,7 +30,7 @@ public class FonctionServiceImpl implements FonctionService { } Fonction fonction = entityFromPayLoadService.getFonctionFromPayLoadWeb(fonctionPaylaodWeb); - return gererSecteurRepository.save(fonction); + return fonctionRepository.save(fonction); } @Override @@ -38,39 +38,49 @@ public class FonctionServiceImpl implements FonctionService { if (fonctionPaylaodWeb.getId() == null) { throw new BadRequestException("Impossible de mettre à jour un nouveau fonction ayant un id null."); } - if (!gererSecteurRepository.existsById(fonctionPaylaodWeb.getId())) { + if (!fonctionRepository.existsById(fonctionPaylaodWeb.getId())) { throw new NotFoundException("Impossible de trouver le fonction spécifié dans notre base de données."); } Fonction fonction = entityFromPayLoadService.getFonctionFromPayLoadWeb(fonctionPaylaodWeb); - return gererSecteurRepository.save(fonction); + return fonctionRepository.save(fonction); } @Override public void deleteFonction(Long id) throws NotFoundException { - Optional gererSecteurOptional = gererSecteurRepository.findById(id); - if (gererSecteurOptional.isPresent()) { - gererSecteurRepository.deleteById(gererSecteurOptional.get().getId()); + Optional fonctionOptional = fonctionRepository.findById(id); + if (fonctionOptional.isPresent()) { + fonctionRepository.deleteById(fonctionOptional.get().getId()); } else { - throw new NotFoundException("Impossible de trouver le gererSecteur spécifié dans notre base de données."); + throw new NotFoundException("Impossible de trouver le fonction spécifié dans notre base de données."); } } @Override public Page getFonctionList(Pageable pageable) { - return gererSecteurRepository.findAll(pageable); + return fonctionRepository.findAll(pageable); } @Override public List getFonctionList() { - return gererSecteurRepository.findAll(); + return fonctionRepository.findAll(); + } + + @Override + public List getFonctionListToDto() { + return fonctionRepository.findAllFonctionToDto() ; + } + + @Override + public Page getFonctionListToDtoPageable(Pageable pageable) { + return fonctionRepository.findAllFonctionToDtoPageable(pageable); } @Override public Optional getFonctionById(Long id) { - if (gererSecteurRepository.existsById(id)) { - return gererSecteurRepository.findById(id); + if (fonctionRepository.existsById(id)) { + return fonctionRepository.findById(id); } else { throw new NotFoundException("Impossible de trouver la caractéristique spécifiée dans la base de données."); } diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/ImpositionsTfuServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/ImpositionsTfuServiceImpl.java index 1204d29..e1cb9d6 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/ImpositionsTfuServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/ImpositionsTfuServiceImpl.java @@ -5,7 +5,7 @@ import io.gmss.fiscad.enums.StatusAvis; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.metier.ImpositionsTfuService; -import io.gmss.fiscad.repositories.rfu.metier.ImpositionsTfuRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.ImpositionsTfuRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/UniteLogementServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/UniteLogementServiceImpl.java index c55c19e..5147431 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/UniteLogementServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/UniteLogementServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.metier.UniteLogement; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.metier.UniteLogementService; -import io.gmss.fiscad.repositories.rfu.metier.UniteLogementRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.UniteLogementRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/BaremRfuNonBatiServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/BaremRfuNonBatiServiceImpl.java index 4039f4a..af5ab6d 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/BaremRfuNonBatiServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/BaremRfuNonBatiServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.parametre.BaremRfuNonBatiService; -import io.gmss.fiscad.repositories.rfu.parametre.BaremRfuNonBatiRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuNonBatiRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/BaremRfuServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/BaremRfuServiceImpl.java index 765e041..680bbda 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/BaremRfuServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/BaremRfuServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.parametre.BaremRfuBati; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.parametre.BaremRfuService; -import io.gmss.fiscad.repositories.rfu.parametre.BaremRfuRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CampagneServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CampagneServiceImpl.java index e97d212..a0f2195 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CampagneServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CampagneServiceImpl.java @@ -5,7 +5,7 @@ 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.repositories.rfu.parametre.CampagneRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.CampagneRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CaracteristiqueServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CaracteristiqueServiceImpl.java index c6c4f49..8b4e958 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CaracteristiqueServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CaracteristiqueServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.parametre.Caracteristique; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.parametre.CaracteristiqueService; -import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.CaracteristiqueRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CategorieBatimentServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CategorieBatimentServiceImpl.java index 8af18c9..c6ca8c2 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CategorieBatimentServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CategorieBatimentServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.parametre.CategorieBatimentService; -import io.gmss.fiscad.repositories.rfu.parametre.CategorieBatimentRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.CategorieBatimentRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/EquipeServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/EquipeServiceImpl.java index 599b37a..968435b 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/EquipeServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/EquipeServiceImpl.java @@ -10,11 +10,11 @@ import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.parametre.EquipeService; import io.gmss.fiscad.paylaods.request.synchronisation.EquipePayload; import io.gmss.fiscad.paylaods.request.synchronisation.ParticiperPayload; -import io.gmss.fiscad.repositories.decoupage.SecteurRepository; -import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; -import io.gmss.fiscad.repositories.rfu.parametre.CampagneRepository; -import io.gmss.fiscad.repositories.rfu.parametre.EquipeRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +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.persistence.repositories.user.UserRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/ExerciceServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/ExerciceServiceImpl.java index 8e217ed..f199b22 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/ExerciceServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/ExerciceServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.parametre.Exercice; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.parametre.ExerciceService; -import io.gmss.fiscad.repositories.rfu.parametre.ExerciceRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.ExerciceRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/TypeCaracteristiqueServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/TypeCaracteristiqueServiceImpl.java index 5a8d66b..79d0919 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/TypeCaracteristiqueServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/TypeCaracteristiqueServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.parametre.TypeCaracteristique; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.parametre.TypeCaracteristiqueService; -import io.gmss.fiscad.repositories.rfu.parametre.TypeCaracteristiqueRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.TypeCaracteristiqueRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/ZoneRfuServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/ZoneRfuServiceImpl.java index ef9ee0d..c6b5a08 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/ZoneRfuServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/ZoneRfuServiceImpl.java @@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.rfu.parametre.ZoneRfuService; -import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.ZoneRfuRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/statistiques/StatistiquesServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/statistiques/StatistiquesServiceImpl.java index 45f558d..2874475 100644 --- a/src/main/java/io/gmss/fiscad/implementations/statistiques/StatistiquesServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/statistiques/StatistiquesServiceImpl.java @@ -3,12 +3,12 @@ package io.gmss.fiscad.implementations.statistiques; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.interfaces.statistique.StatistiquesService; import io.gmss.fiscad.interfaces.user.UserService; -import io.gmss.fiscad.paylaods.response.*; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; -import io.gmss.fiscad.repositories.rfu.metier.BatimentRepository; -import io.gmss.fiscad.repositories.rfu.metier.UniteLogementRepository; +import io.gmss.fiscad.paylaods.response.statistique.*; +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.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.BatimentRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.UniteLogementRepository; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/synchronisation/RestaurationServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/synchronisation/RestaurationServiceImpl.java index e8c04f0..651c525 100644 --- a/src/main/java/io/gmss/fiscad/implementations/synchronisation/RestaurationServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/synchronisation/RestaurationServiceImpl.java @@ -6,9 +6,9 @@ import io.gmss.fiscad.interfaces.synchronisation.RestaurationService; import io.gmss.fiscad.interfaces.user.UserService; import io.gmss.fiscad.paylaods.request.synchronisation.UploadPayLoad; import io.gmss.fiscad.paylaods.response.restoration.*; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; -import io.gmss.fiscad.repositories.rfu.metier.*; +import io.gmss.fiscad.persistence.repositories.infocad.metier.*; +import io.gmss.fiscad.persistence.repositories.rfu.metier.*; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; import io.gmss.fiscad.service.FileStorageService; import lombok.RequiredArgsConstructor; import org.springframework.core.io.Resource; diff --git a/src/main/java/io/gmss/fiscad/implementations/synchronisation/SynchronisationServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/synchronisation/SynchronisationServiceImpl.java index 1856342..c48e478 100644 --- a/src/main/java/io/gmss/fiscad/implementations/synchronisation/SynchronisationServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/synchronisation/SynchronisationServiceImpl.java @@ -12,15 +12,15 @@ import io.gmss.fiscad.enums.TypeObjet; import io.gmss.fiscad.interfaces.synchronisation.SynchronisationService; import io.gmss.fiscad.interfaces.user.UserService; import io.gmss.fiscad.paylaods.request.EnqueteAllDataPayload; -import io.gmss.fiscad.paylaods.response.*; import io.gmss.fiscad.paylaods.request.synchronisation.*; -import io.gmss.fiscad.repositories.decoupage.*; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.parametre.*; -import io.gmss.fiscad.repositories.metadata.*; -import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository; -import io.gmss.fiscad.repositories.rfu.parametre.TypeCaracteristiqueRepository; -import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; +import io.gmss.fiscad.paylaods.response.synchronisation.*; +import io.gmss.fiscad.persistence.repositories.decoupage.*; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.*; +import io.gmss.fiscad.persistence.repositories.metadata.*; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.CaracteristiqueRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.TypeCaracteristiqueRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.ZoneRfuRepository; import io.gmss.fiscad.service.FileStorageService; import io.gmss.fiscad.service.worker.*; import jakarta.transaction.Transactional; @@ -31,7 +31,6 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import io.gmss.fiscad.paylaods.request.synchronisation.*; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/io/gmss/fiscad/implementations/user/AvoirFonctionServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/user/AvoirFonctionServiceImpl.java index d0adead..64167e8 100644 --- a/src/main/java/io/gmss/fiscad/implementations/user/AvoirFonctionServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/user/AvoirFonctionServiceImpl.java @@ -1,13 +1,11 @@ package io.gmss.fiscad.implementations.user; -import io.gmss.fiscad.entities.user.AvoirFonction; import io.gmss.fiscad.entities.user.AvoirFonction; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.user.AvoirFonctionService; import io.gmss.fiscad.paylaods.request.crudweb.AvoirFonctionPaylaodWeb; -import io.gmss.fiscad.repositories.user.AvoirFonctionRepository; -import io.gmss.fiscad.repositories.user.AvoirFonctionRepository; +import io.gmss.fiscad.persistence.repositories.user.AvoirFonctionRepository; import io.gmss.fiscad.service.EntityFromPayLoadService; import lombok.AllArgsConstructor; import org.springframework.data.domain.Page; diff --git a/src/main/java/io/gmss/fiscad/implementations/user/DemandeReinitialisationMPServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/user/DemandeReinitialisationMPServiceImpl.java index 59e5853..559c355 100644 --- a/src/main/java/io/gmss/fiscad/implementations/user/DemandeReinitialisationMPServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/user/DemandeReinitialisationMPServiceImpl.java @@ -8,7 +8,7 @@ import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.user.DemandeReinitialisationMPService; import io.gmss.fiscad.interfaces.user.UserService; -import io.gmss.fiscad.repositories.user.DemandeReinitialisationMPRepository; +import io.gmss.fiscad.persistence.repositories.user.DemandeReinitialisationMPRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/user/ProfileServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/user/ProfileServiceImpl.java index d83375d..b53c75f 100644 --- a/src/main/java/io/gmss/fiscad/implementations/user/ProfileServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/user/ProfileServiceImpl.java @@ -6,7 +6,7 @@ import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.user.ProfileService; import io.gmss.fiscad.paylaods.request.crudweb.ProfilePaylaodWeb; -import io.gmss.fiscad.repositories.user.ProfileRepository; +import io.gmss.fiscad.persistence.repositories.user.ProfileRepository; import io.gmss.fiscad.service.EntityFromPayLoadService; import lombok.AllArgsConstructor; import org.springframework.data.domain.Page; diff --git a/src/main/java/io/gmss/fiscad/implementations/user/RoleServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/user/RoleServiceImpl.java index 0b57df5..4fff219 100644 --- a/src/main/java/io/gmss/fiscad/implementations/user/RoleServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/user/RoleServiceImpl.java @@ -5,7 +5,7 @@ import io.gmss.fiscad.enums.UserRole; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.user.RoleService; -import io.gmss.fiscad.repositories.user.RoleRepository; +import io.gmss.fiscad.persistence.repositories.user.RoleRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/implementations/user/UserServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/user/UserServiceImpl.java index 0151347..e14177a 100644 --- a/src/main/java/io/gmss/fiscad/implementations/user/UserServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/user/UserServiceImpl.java @@ -1,7 +1,6 @@ package io.gmss.fiscad.implementations.user; import io.gmss.fiscad.entities.infocad.parametre.Structure; -import io.gmss.fiscad.entities.user.Role; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.UserRole; import io.gmss.fiscad.exceptions.BadRequestException; @@ -13,7 +12,7 @@ import io.gmss.fiscad.paylaods.JwtAuthenticationResponse; import io.gmss.fiscad.paylaods.Login; import io.gmss.fiscad.paylaods.UserListByStructureResponse; import io.gmss.fiscad.paylaods.UserResponse; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import io.gmss.fiscad.security.TokenAuthentificationProvider; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurDecoupageService.java b/src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurDecoupageService.java index 1ae6caf..e31a8d1 100644 --- a/src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurDecoupageService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurDecoupageService.java @@ -3,6 +3,7 @@ package io.gmss.fiscad.interfaces.decoupage; import io.gmss.fiscad.entities.decoupage.SecteurDecoupage; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; +import io.gmss.fiscad.paylaods.response.restoration.ParcelleStatsProjectionUnSecteur; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -22,4 +23,7 @@ public interface SecteurDecoupageService { List getSecteurDecoupageList(); Optional getSecteurDecoupageById(Long id); + + List getStatParcelleDecoupageUnSecteur(Long secteurId) ; + List getStatParcelleDecoupageByUserId(Long userId) ; } \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurService.java b/src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurService.java index f9d2059..9932f8e 100644 --- a/src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurService.java @@ -3,6 +3,7 @@ package io.gmss.fiscad.interfaces.decoupage; import io.gmss.fiscad.entities.decoupage.Secteur; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; +import io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb; import io.gmss.fiscad.paylaods.request.synchronisation.SecteurPayload; import io.gmss.fiscad.paylaods.response.restoration.ParcelleStatsProjectionUnSecteur; import org.springframework.data.domain.Page; @@ -13,20 +14,22 @@ import java.util.Optional; public interface SecteurService { - Secteur createSecteur(SecteurPayload secteur) throws BadRequestException; + SecteurPaylaodWeb createSecteur(SecteurPaylaodWeb secteur) throws BadRequestException; - Secteur updateSecteur(Long id, SecteurPayload secteur) throws NotFoundException; + SecteurPaylaodWeb updateSecteur(Long id, SecteurPaylaodWeb secteur) throws NotFoundException; void deleteSecteur(Long id) throws NotFoundException; - Page getSecteurList(Pageable pageable); + Page getSecteurList(Pageable pageable); - List getSecteurList(); + List getSecteurList(); - List getSecteurListUneStruture(Long structureId); + Page getSecteurListBySectionId(Long sectionId,Pageable pageable); + List getSecteurListBySectionId(Long sectionId); + List getSecteurListByStructureId(Long structureId); + Page getSecteurListByStructureId(Long structureId,Pageable pageable); - Optional getSecteurById(Long id); + Optional getSecteurById(Long id); - List getStatParcelleDecoupageUnSecteur(Long serveurId) ; - List getStatParcelleDecoupageByUserId(Long userId) ; + List getListSecteurUserId(Long userId) ; } \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/interfaces/decoupage/SectionService.java b/src/main/java/io/gmss/fiscad/interfaces/decoupage/SectionService.java new file mode 100644 index 0000000..9f8d799 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/interfaces/decoupage/SectionService.java @@ -0,0 +1,30 @@ +package io.gmss.fiscad.interfaces.decoupage; + +import io.gmss.fiscad.entities.decoupage.Section; +import io.gmss.fiscad.exceptions.BadRequestException; +import io.gmss.fiscad.exceptions.NotFoundException; +import io.gmss.fiscad.paylaods.request.crudweb.SectionPaylaodWeb; +import io.gmss.fiscad.paylaods.request.crudweb.SectionPaylaodWeb; +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; + +public interface SectionService { + + SectionPaylaodWeb createSection(SectionPaylaodWeb sectionPaylaodWeb) throws BadRequestException; + + SectionPaylaodWeb updateSection(Long id, SectionPaylaodWeb sectionPaylaodWeb) throws NotFoundException; + + void deleteSection(Long id) throws NotFoundException; + + Page getSectionList(Pageable pageable); + List getSectionList(); + List getSectionListByStructureId(Long structureId); + Page getSectionListByStructureId(Long structureId,Pageable pageable); + + Optional getSectionById(Long id); + +} \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java index c8bf13a..4cba95d 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java @@ -7,9 +7,9 @@ import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad; import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad; import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb; -import io.gmss.fiscad.paylaods.response.EnqueteNonSyncResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.EnqueteNonSyncResponse; import io.gmss.fiscad.paylaods.response.EnqueteResponse; -import io.gmss.fiscad.paylaods.response.FicheEnqueteResponse; +import io.gmss.fiscad.paylaods.response.FicheResponse.FicheEnqueteResponse; import io.gmss.fiscad.paylaods.response.UserDecoupageEnqResponses; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -29,6 +29,8 @@ public interface EnqueteService { List getEnqueteList(); + List getEnqueteListByParcelle(Long parcelleId); + List getEnqueteCommuneArrondBloc(); List getEnqueteCommuneArrondBlocFiltre(FiltreEnquetePayLoad filtreEnquetePayLoad); diff --git a/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleService.java index 2bb7e49..d2c413b 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleService.java @@ -3,7 +3,9 @@ package io.gmss.fiscad.interfaces.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; +import io.gmss.fiscad.paylaods.request.FiltreParcellePayLoad; import io.gmss.fiscad.paylaods.request.crudweb.ParcellePayLoadWeb; +import io.gmss.fiscad.paylaods.response.dataTableResponse.ParcelleDataTableResponse; import io.gmss.fiscad.paylaods.response.restoration.ParcelleStatsProjectionUnSecteur; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -26,5 +28,6 @@ public interface ParcelleService { Optional getParcelleById(Long id); - -} + Page getParcelleDataTableListByUserId(Long userId, Pageable pageable); + Page getParcelleDataTableListByMultiFiltre(Long userId, FiltreParcellePayLoad filtreParcellePayLoad, Pageable pageable); + } diff --git a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/FonctionService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/FonctionService.java index 4750c1d..fd93018 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/FonctionService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/FonctionService.java @@ -22,5 +22,9 @@ public interface FonctionService { List getFonctionList(); + List getFonctionListToDto(); + + Page getFonctionListToDtoPageable(Pageable pageable); + Optional getFonctionById(Long id); } diff --git a/src/main/java/io/gmss/fiscad/interfaces/statistique/StatistiquesService.java b/src/main/java/io/gmss/fiscad/interfaces/statistique/StatistiquesService.java index 90481dd..d1d5dbb 100644 --- a/src/main/java/io/gmss/fiscad/interfaces/statistique/StatistiquesService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/statistique/StatistiquesService.java @@ -1,7 +1,6 @@ package io.gmss.fiscad.interfaces.statistique; -import io.gmss.fiscad.enums.NiveauDecoupage; -import io.gmss.fiscad.paylaods.response.*; +import io.gmss.fiscad.paylaods.response.statistique.*; import java.util.List; diff --git a/src/main/java/io/gmss/fiscad/interfaces/synchronisation/SynchronisationService.java b/src/main/java/io/gmss/fiscad/interfaces/synchronisation/SynchronisationService.java index ed7dffb..806d5c9 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/synchronisation/SynchronisationService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/synchronisation/SynchronisationService.java @@ -1,15 +1,12 @@ package io.gmss.fiscad.interfaces.synchronisation; -import io.gmss.fiscad.entities.infocad.metier.Upload; -import io.gmss.fiscad.entities.metadata.MobileDataUpload; import io.gmss.fiscad.paylaods.request.EnqueteAllDataPayload; import io.gmss.fiscad.paylaods.request.synchronisation.*; -import io.gmss.fiscad.paylaods.request.synchronisation.*; -import io.gmss.fiscad.paylaods.response.ReferencesSyncResponses; -import io.gmss.fiscad.paylaods.response.SyncEnqueteAllDataResponse; -import io.gmss.fiscad.paylaods.response.SyncResponse; -import io.gmss.fiscad.paylaods.response.UserDecoupageSyncResponses; +import io.gmss.fiscad.paylaods.response.synchronisation.ReferencesSyncResponses; +import io.gmss.fiscad.paylaods.response.synchronisation.SyncEnqueteAllDataResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.SyncResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.UserDecoupageSyncResponses; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/FiltreParcellePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/FiltreParcellePayLoad.java new file mode 100644 index 0000000..c6d7d26 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/FiltreParcellePayLoad.java @@ -0,0 +1,18 @@ +package io.gmss.fiscad.paylaods.request; + +import lombok.Data; + +@Data +public class FiltreParcellePayLoad { + private Long structureId; + private Long parcelleId; + private Long communeId; + private Long arrondissementId; + private Long quartierId; + private Long natureDomaneId; + private Long typeDomaineId; + private Boolean batie; + private Long secteurId; + private Long sectionId; +} + diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/AvoirFonctionPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/AvoirFonctionPaylaodWeb.java index 6a9892e..5ed4812 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/AvoirFonctionPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/AvoirFonctionPaylaodWeb.java @@ -19,8 +19,10 @@ public class AvoirFonctionPaylaodWeb { @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateFin; - private Long FonctionId; + private Long fonctionId; + private String fonctionNom; private Long userId ; + private Long userNom ; @Enumerated(EnumType.STRING) private Titre titre; } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnquetePayLoadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnquetePayLoadWeb.java index d250e13..be7258c 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnquetePayLoadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnquetePayLoadWeb.java @@ -24,7 +24,7 @@ public class EnquetePayLoadWeb { private String observation; private String numeroTitreFoncier; private LocalDate dateTitreFoncier; - private String numEnterParcelle; + private String numEntreeParcelle; private String numRue; private String nomRue; private float precision; diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/FonctionPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/FonctionPaylaodWeb.java index cccfd03..90fd116 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/FonctionPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/FonctionPaylaodWeb.java @@ -3,23 +3,73 @@ 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.enums.UserProfile; +import jakarta.annotation.Nullable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NonNull; import java.time.LocalDate; @Data public class FonctionPaylaodWeb { private Long id; - @JsonFormat(pattern = "dd-MM-yyyy") - @JsonDeserialize(using = LocalDateDeserializer.class) - private LocalDate dateDebut; - @JsonFormat(pattern = "dd-MM-yyyy") - @JsonDeserialize(using = LocalDateDeserializer.class) - private LocalDate dateFin; private String code ; private String nom ; private Long secteurId; + private String secteurCode; + private String secteurNom; private Long sectionId; - private Long StructureId ; - private Long ProfileId ; + private String sectionCode; + private String sectionNom; + private Long structureId ; + private String structureCode ; + private String structureNom ; + private Long profileId ; + @Enumerated(EnumType.STRING) + private UserProfile profileNom; + private Long departementId ; + private String departementCode; + private String departementNom; + + + public FonctionPaylaodWeb( + Long id, + String code, + String nom, + Long secteurId, + String secteurCode, + String secteurNom, + Long sectionId, + String sectionCode, + String sectionNom, + Long structureId, + String structureCode, + String structureNom, + Long profileId, + UserProfile profileNom, + Long departementId, + String departementCode, + String departementNom + ) { + this.id = id; + this.code = code; + this.nom = nom; + this.secteurId = secteurId; + this.secteurCode = secteurCode; + this.secteurNom = secteurNom; + this.sectionId = sectionId; + this.sectionNom = sectionNom; + this.sectionCode = sectionCode; + this.structureId = structureId; + this.structureCode = structureCode; + this.structureNom = structureNom; + this.profileId = profileId; + this.profileNom = profileNom; + this.departementId = departementId; + this.departementCode = departementCode; + this.departementNom = departementNom; + } } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ParcellePayLoadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ParcellePayLoadWeb.java index 4007e7a..6bf3ac7 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ParcellePayLoadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ParcellePayLoadWeb.java @@ -18,9 +18,10 @@ public class ParcellePayLoadWeb { private Long situationGeographiqueId; private Long natureDomaineId; private Long quartierId; - private float superficie; + private Float superficie; private String observation; private Long typeDomaineId; private String situationGeographique; private Long rueId; + private String numEntreeParcelle; } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SecteurPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SecteurPaylaodWeb.java new file mode 100644 index 0000000..d24c51b --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SecteurPaylaodWeb.java @@ -0,0 +1,31 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import io.gmss.fiscad.enums.UserProfile; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import lombok.Data; + +@Data +public class SecteurPaylaodWeb { + private Long id; + private String code ; + private String nom ; + private Long sectionId; + private String sectionCode; + private String sectionNom; + public SecteurPaylaodWeb( + Long id, + String code, + String nom, + Long sectionId, + String sectionCode, + String sectionNom + ){ + this.id = id; + this.code = code; + this.nom = nom; + this.sectionId = sectionId ; + this.sectionCode = sectionCode ; + this.sectionNom = sectionNom ; + } +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SectionPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SectionPaylaodWeb.java new file mode 100644 index 0000000..780e1a9 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SectionPaylaodWeb.java @@ -0,0 +1,31 @@ +package io.gmss.fiscad.paylaods.request.crudweb; + +import io.gmss.fiscad.enums.UserProfile; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import lombok.Data; + +@Data +public class SectionPaylaodWeb { + private Long id; + private String code ; + private String nom ; + private Long structureId ; + private String structureCode ; + private String structureNom ; + public SectionPaylaodWeb( + Long id, + String code, + String nom, + Long structureId, + String structureCode, + String structureNom + ) { + this.id = id; + this.code = code; + this.nom = nom; + this.structureId = structureId; + this.structureCode = structureCode; + this.structureNom = structureNom; + } +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/SecteurPayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/SecteurPayload.java index b865647..597341b 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/SecteurPayload.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/SecteurPayload.java @@ -16,5 +16,5 @@ public class SecteurPayload implements Serializable { private String nom; private Long chefSecteurId; private Long structureId; - private List secteurDecoupages; + //private List secteurDecoupages; } \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/EnquetePayLoadResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/EnquetePayLoadResponse.java deleted file mode 100644 index cf435f2..0000000 --- a/src/main/java/io/gmss/fiscad/paylaods/response/EnquetePayLoadResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.gmss.fiscad.paylaods.response; - -import io.gmss.fiscad.entities.infocad.metier.Enquete; - -public class EnquetePayLoadResponse { - private Enquete enquete; - -} - diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheEnqueteResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnqueteResponse.java similarity index 78% rename from src/main/java/io/gmss/fiscad/paylaods/response/FicheEnqueteResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnqueteResponse.java index 064d72e..64d948d 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/FicheEnqueteResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnqueteResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.FicheResponse; import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne; import io.gmss.fiscad.paylaods.response.FicheResponse.FicheActeurConcerneResponse; @@ -13,9 +13,6 @@ import java.util.List; @Getter @Setter public class FicheEnqueteResponse { - //private Enquete enquete ; - //private List acteurConcernes; - private FicheEnquetesResponse enquete; private List acteurConcernes; } diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/UserDecoupageEnqResponses.java b/src/main/java/io/gmss/fiscad/paylaods/response/UserDecoupageEnqResponses.java index c1c37e5..44edf45 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/UserDecoupageEnqResponses.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/UserDecoupageEnqResponses.java @@ -6,7 +6,6 @@ import java.util.List; @Data public class UserDecoupageEnqResponses { - //public List departementEnqResponses; public List communes; public List arrondissements; public List blocs; diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/dataTableResponse/ParcelleDataTableResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/dataTableResponse/ParcelleDataTableResponse.java new file mode 100644 index 0000000..c356e3f --- /dev/null +++ b/src/main/java/io/gmss/fiscad/paylaods/response/dataTableResponse/ParcelleDataTableResponse.java @@ -0,0 +1,43 @@ +package io.gmss.fiscad.paylaods.response.dataTableResponse; + +public interface ParcelleDataTableResponse { + Long getId(); + String getQ(); + String getI(); + String getP(); + String getNup(); + String getNupProvisoire(); + String getNumTitreFoncier(); + String getLongitude(); + String getLatitude(); + String getAltitude(); + String getEmplacement(); + Long getNatureDomaineId(); + String getNomNatureDomaine(); + Long getQuartierId(); + String getNomQuartier(); + Float getSuperficie(); + String getObservation(); + Long getTypeDomaineId(); + String getNomTypeDomaine(); + String getSituationGeographique(); + Long getRueId(); + String getNomRue(); + String getNumeroRue(); + String getNumEntreeParcelle(); + String getBatieOuiNon(); + + Long getDepartementId(); + String getDepartementCode(); + String getDepartementNom(); + Long getNbParcellesDepartement(); + Long getCommuneId(); + String getCommuneCode(); + String getCommuneNom(); + Long getArrondissementId(); + String getArrondissementCode(); + String getArrondissementNom(); + + String getQuartierCode(); + String getQuartierNom(); +} diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteAdminDecoupageResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatEnqueteAdminDecoupageResponse.java similarity index 79% rename from src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteAdminDecoupageResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatEnqueteAdminDecoupageResponse.java index 2d26dca..4f1fff6 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteAdminDecoupageResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatEnqueteAdminDecoupageResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.statistique; public interface StatEnqueteAdminDecoupageResponse { public String getArrondissement(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteAdminStructureResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatEnqueteAdminStructureResponse.java similarity index 79% rename from src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteAdminStructureResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatEnqueteAdminStructureResponse.java index 960e42b..06ebdf8 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteAdminStructureResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatEnqueteAdminStructureResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.statistique; public interface StatEnqueteAdminStructureResponse { public String getStructure(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteParBlocResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatEnqueteParBlocResponse.java similarity index 75% rename from src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteParBlocResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatEnqueteParBlocResponse.java index 85c29be..9f222e3 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteParBlocResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatEnqueteParBlocResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.statistique; public interface StatEnqueteParBlocResponse { public String getBloc(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteParStatutResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatEnqueteParStatutResponse.java similarity index 68% rename from src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteParStatutResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatEnqueteParStatutResponse.java index b2f244a..aa46134 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteParStatutResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatEnqueteParStatutResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.statistique; public interface StatEnqueteParStatutResponse { public String getStatutEnquete(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/StatNombrePersonneParCategorie.java b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatNombrePersonneParCategorie.java similarity index 66% rename from src/main/java/io/gmss/fiscad/paylaods/response/StatNombrePersonneParCategorie.java rename to src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatNombrePersonneParCategorie.java index 6cd8e67..97e212d 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/StatNombrePersonneParCategorie.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatNombrePersonneParCategorie.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.statistique; public interface StatNombrePersonneParCategorie { String getTypePersonne(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/StatNombreTotalObjet.java b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatNombreTotalObjet.java similarity index 80% rename from src/main/java/io/gmss/fiscad/paylaods/response/StatNombreTotalObjet.java rename to src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatNombreTotalObjet.java index b2e2010..84e495d 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/StatNombreTotalObjet.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatNombreTotalObjet.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.statistique; import lombok.Data; diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/StatistiqueTypeNombreResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatistiqueTypeNombreResponse.java similarity index 67% rename from src/main/java/io/gmss/fiscad/paylaods/response/StatistiqueTypeNombreResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatistiqueTypeNombreResponse.java index 25a39b3..fa75926 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/StatistiqueTypeNombreResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/statistique/StatistiqueTypeNombreResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.statistique; public interface StatistiqueTypeNombreResponse { public String getType(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/ArrondissementSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ArrondissementSyncResponse.java similarity index 80% rename from src/main/java/io/gmss/fiscad/paylaods/response/ArrondissementSyncResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ArrondissementSyncResponse.java index 8145aca..d61d07f 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/ArrondissementSyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ArrondissementSyncResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; public interface ArrondissementSyncResponse { public Long getId(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/BlocSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/BlocSyncResponse.java similarity index 74% rename from src/main/java/io/gmss/fiscad/paylaods/response/BlocSyncResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/BlocSyncResponse.java index e6a84a0..28886aa 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/BlocSyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/BlocSyncResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; public interface BlocSyncResponse { Long getId(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/CommuneSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/CommuneSyncResponse.java similarity index 79% rename from src/main/java/io/gmss/fiscad/paylaods/response/CommuneSyncResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/CommuneSyncResponse.java index e7d4df6..d5fa3cc 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/CommuneSyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/CommuneSyncResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; public interface CommuneSyncResponse { public Long getId(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/DepartementSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/DepartementSyncResponse.java similarity index 68% rename from src/main/java/io/gmss/fiscad/paylaods/response/DepartementSyncResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/DepartementSyncResponse.java index 244f617..05f11f0 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/DepartementSyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/DepartementSyncResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; public interface DepartementSyncResponse { public Long getId(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/EnqueteNonSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/EnqueteNonSyncResponse.java similarity index 82% rename from src/main/java/io/gmss/fiscad/paylaods/response/EnqueteNonSyncResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/EnqueteNonSyncResponse.java index 5c74bef..2ef56e7 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/EnqueteNonSyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/EnqueteNonSyncResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; import io.gmss.fiscad.enums.StatutEnquete; diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/ModesAcquisitionSourceSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ModesAcquisitionSourceSyncResponse.java similarity index 71% rename from src/main/java/io/gmss/fiscad/paylaods/response/ModesAcquisitionSourceSyncResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ModesAcquisitionSourceSyncResponse.java index 7b70231..e25344a 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/ModesAcquisitionSourceSyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ModesAcquisitionSourceSyncResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; public interface ModesAcquisitionSourceSyncResponse { public Long getId(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/ModesAcquisitionTypePersonneSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ModesAcquisitionTypePersonneSyncResponse.java similarity index 73% rename from src/main/java/io/gmss/fiscad/paylaods/response/ModesAcquisitionTypePersonneSyncResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ModesAcquisitionTypePersonneSyncResponse.java index e3811d4..19f2286 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/ModesAcquisitionTypePersonneSyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ModesAcquisitionTypePersonneSyncResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; public interface ModesAcquisitionTypePersonneSyncResponse { public Long getId(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/NatureDomaineSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/NatureDomaineSyncResponse.java similarity index 71% rename from src/main/java/io/gmss/fiscad/paylaods/response/NatureDomaineSyncResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/NatureDomaineSyncResponse.java index 9b839ab..6c6f861 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/NatureDomaineSyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/NatureDomaineSyncResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; public interface NatureDomaineSyncResponse { public Long getId(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/QuartierSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/QuartierSyncResponse.java similarity index 74% rename from src/main/java/io/gmss/fiscad/paylaods/response/QuartierSyncResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/QuartierSyncResponse.java index f1e7c31..b1dee0b 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/QuartierSyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/QuartierSyncResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; public interface QuartierSyncResponse { public Long getId(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/ReferencesSyncResponses.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ReferencesSyncResponses.java similarity index 96% rename from src/main/java/io/gmss/fiscad/paylaods/response/ReferencesSyncResponses.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ReferencesSyncResponses.java index 5460e28..6a666da 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/ReferencesSyncResponses.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ReferencesSyncResponses.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; import io.gmss.fiscad.entities.decoupage.Nationalite; import io.gmss.fiscad.entities.infocad.parametre.*; diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/SourceDroitsSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/SourceDroitsSyncResponse.java similarity index 83% rename from src/main/java/io/gmss/fiscad/paylaods/response/SourceDroitsSyncResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/SourceDroitsSyncResponse.java index d6d76ac..0b8315b 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/SourceDroitsSyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/SourceDroitsSyncResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; public interface SourceDroitsSyncResponse { public Long getId(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/SyncEnqueteAllDataResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/SyncEnqueteAllDataResponse.java similarity index 87% rename from src/main/java/io/gmss/fiscad/paylaods/response/SyncEnqueteAllDataResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/SyncEnqueteAllDataResponse.java index afa9732..01b17cb 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/SyncEnqueteAllDataResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/SyncEnqueteAllDataResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; import lombok.Data; diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/SyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/SyncResponse.java similarity index 93% rename from src/main/java/io/gmss/fiscad/paylaods/response/SyncResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/SyncResponse.java index be508f5..281b3ee 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/SyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/SyncResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; import lombok.Data; diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/TypePersonneNatureDomaineSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/TypePersonneNatureDomaineSyncResponse.java similarity index 80% rename from src/main/java/io/gmss/fiscad/paylaods/response/TypePersonneNatureDomaineSyncResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/TypePersonneNatureDomaineSyncResponse.java index c054439..86443ec 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/TypePersonneNatureDomaineSyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/TypePersonneNatureDomaineSyncResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; public interface TypePersonneNatureDomaineSyncResponse { public Long getId(); diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/UserDecoupageSyncResponses.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/UserDecoupageSyncResponses.java similarity index 87% rename from src/main/java/io/gmss/fiscad/paylaods/response/UserDecoupageSyncResponses.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/UserDecoupageSyncResponses.java index f74db0a..b17d4ee 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/UserDecoupageSyncResponses.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/UserDecoupageSyncResponses.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; import lombok.Data; diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/ZoneRfuSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ZoneRfuSyncResponse.java similarity index 64% rename from src/main/java/io/gmss/fiscad/paylaods/response/ZoneRfuSyncResponse.java rename to src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ZoneRfuSyncResponse.java index 6198009..d0c699a 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/ZoneRfuSyncResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/synchronisation/ZoneRfuSyncResponse.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.paylaods.response; +package io.gmss.fiscad.paylaods.response.synchronisation; public interface ZoneRfuSyncResponse { Long getId(); diff --git a/src/main/java/io/gmss/fiscad/repositories/decoupage/ArrondissementRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/ArrondissementRepository.java similarity index 94% rename from src/main/java/io/gmss/fiscad/repositories/decoupage/ArrondissementRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/ArrondissementRepository.java index 9a5011a..4d3de75 100755 --- a/src/main/java/io/gmss/fiscad/repositories/decoupage/ArrondissementRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/ArrondissementRepository.java @@ -1,9 +1,9 @@ -package io.gmss.fiscad.repositories.decoupage; +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.response.ArrondissementEnqResponse; -import io.gmss.fiscad.paylaods.response.ArrondissementSyncResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.ArrondissementSyncResponse; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/io/gmss/fiscad/repositories/decoupage/CommuneRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/CommuneRepository.java similarity index 93% rename from src/main/java/io/gmss/fiscad/repositories/decoupage/CommuneRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/CommuneRepository.java index 001f9d8..415a4be 100755 --- a/src/main/java/io/gmss/fiscad/repositories/decoupage/CommuneRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/CommuneRepository.java @@ -1,9 +1,9 @@ -package io.gmss.fiscad.repositories.decoupage; +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.response.CommuneEnqResponse; -import io.gmss.fiscad.paylaods.response.CommuneSyncResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.CommuneSyncResponse; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/io/gmss/fiscad/repositories/decoupage/DepartementRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/DepartementRepository.java similarity index 77% rename from src/main/java/io/gmss/fiscad/repositories/decoupage/DepartementRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/DepartementRepository.java index 93e2aea..ecf5c7e 100755 --- a/src/main/java/io/gmss/fiscad/repositories/decoupage/DepartementRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/DepartementRepository.java @@ -1,7 +1,7 @@ -package io.gmss.fiscad.repositories.decoupage; +package io.gmss.fiscad.persistence.repositories.decoupage; import io.gmss.fiscad.entities.decoupage.Departement; -import io.gmss.fiscad.paylaods.response.DepartementSyncResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.DepartementSyncResponse; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/io/gmss/fiscad/repositories/decoupage/NationaliteRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/NationaliteRepository.java similarity index 87% rename from src/main/java/io/gmss/fiscad/repositories/decoupage/NationaliteRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/NationaliteRepository.java index 9f3426d..3d2c150 100755 --- a/src/main/java/io/gmss/fiscad/repositories/decoupage/NationaliteRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/NationaliteRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.decoupage; +package io.gmss.fiscad.persistence.repositories.decoupage; import io.gmss.fiscad.entities.decoupage.Nationalite; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/io/gmss/fiscad/repositories/decoupage/QuartierRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/QuartierRepository.java similarity index 89% rename from src/main/java/io/gmss/fiscad/repositories/decoupage/QuartierRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/QuartierRepository.java index 38b3bfb..a4b526b 100755 --- a/src/main/java/io/gmss/fiscad/repositories/decoupage/QuartierRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/QuartierRepository.java @@ -1,8 +1,8 @@ -package io.gmss.fiscad.repositories.decoupage; +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.response.QuartierSyncResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.QuartierSyncResponse; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/io/gmss/fiscad/repositories/decoupage/SecteurDecoupageRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/SecteurDecoupageRepository.java similarity index 78% rename from src/main/java/io/gmss/fiscad/repositories/decoupage/SecteurDecoupageRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/SecteurDecoupageRepository.java index 12b928a..ac193e2 100644 --- a/src/main/java/io/gmss/fiscad/repositories/decoupage/SecteurDecoupageRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/SecteurDecoupageRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.decoupage; +package io.gmss.fiscad.persistence.repositories.decoupage; import io.gmss.fiscad.entities.decoupage.SecteurDecoupage; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/SecteurRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/SecteurRepository.java new file mode 100644 index 0000000..021fa87 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/SecteurRepository.java @@ -0,0 +1,190 @@ +package io.gmss.fiscad.persistence.repositories.decoupage; + +import io.gmss.fiscad.entities.decoupage.Secteur; +import io.gmss.fiscad.paylaods.request.crudweb.FonctionPaylaodWeb; +import io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb; +import io.gmss.fiscad.paylaods.request.crudweb.SectionPaylaodWeb; +import io.gmss.fiscad.paylaods.response.SecteurEnqResponse; +import io.gmss.fiscad.paylaods.response.StructureEnqResponse; +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 SecteurRepository extends JpaRepository { + // List findAllByStructure_Id(Long structureId); + + @Query(value = """ + select + st.id, + st.code, + st.nom, + s.id as structureId, + count(distinct e.id) as nombreEnquete + from structure s + inner join commune c on c.id=s.commune_id + inner join bloc b on b.structure_id=s.id + inner join secteur st on st.id=b.secteur_id + left join enquete e on e.bloc_id=b.id + group by st.id,st.code,st.nom,s.id; + """, nativeQuery = true) + List getAdminSecteurEnqResponse(); + + + @Query(value = """ + select + st.id, + st.code, + st.nom, + s.id as structureId, + count(distinct e.id) as nombreEnquete + from structure s + inner join commune c on c.id=s.commune_id + inner join bloc b on b.structure_id=s.id + inner join secteur st on st.id=b.secteur_id + left join enquete e on e.bloc_id=b.id + where s.id=?1 and st.id=?2 + group by st.id,st.code,st.nom,s.id; + """, nativeQuery = true) + List getSecteurEnqResponse(Long structure_id , Long secteurId); + + List findDistinctBySection_Id(Long sectionId); + List findDistinctBySection_Structure_Id(Long structureId); + + + @Query(""" + SELECT new io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb( + sec.id, + sec.code, + sec.nom, + secti.id, + secti.code, + secti.nom + ) + FROM Secteur sec + LEFT JOIN sec.section secti + """) + List findAllSecteurToDto(); + + @Query( + value = """ + SELECT new io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb( + sec.id, + sec.code, + sec.nom, + secti.id, + secti.code, + secti.nom + ) + FROM Secteur sec + LEFT JOIN sec.section secti + """, + countQuery = """ + SELECT COUNT(DISTINCT sec.id) + FROM Secteur sec + LEFT JOIN sec.section secti + """ + ) + Page findAllSecteurToDtoPageable(Pageable pageable); + + + @Query(""" + SELECT new io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb( + sec.id, + sec.code, + sec.nom, + secti.id, + secti.code, + secti.nom + ) + FROM Secteur sec + LEFT JOIN sec.section secti + WHERE secti.id = :idSection + """) + List findAllSecteurBySectionIdToDto(@Param("idSection") Long idSection); + + @Query(value =""" + SELECT new io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb( + sec.id, + sec.code, + sec.nom, + secti.id, + secti.code, + secti.nom + ) + FROM Secteur sec + LEFT JOIN sec.section secti + WHERE secti.id = :idSection + """, + countQuery = """ + SELECT COUNT(DISTINCT sec.id) + FROM Secteur sec + LEFT JOIN sec.section secti + WHERE secti.id = :idSection + """ + ) + Page findAllSecteurBySectionIdToDtoPageable(@Param("idSection") Long idSection,Pageable pageable); + + + @Query(""" + SELECT new io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb( + sec.id, + sec.code, + sec.nom, + secti.id, + secti.code, + secti.nom + ) + FROM Secteur sec + LEFT JOIN sec.section secti + LEFT JOIN sec.section.structure st + WHERE st.id = :idStructure + """) + List findAllSecteurByStructureIdToDto(@Param("idStructure") Long idStructure); + + @Query(value =""" + SELECT new io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb( + sec.id, + sec.code, + sec.nom, + secti.id, + secti.code, + secti.nom + ) + FROM Secteur sec + LEFT JOIN sec.section secti + LEFT JOIN sec.section.structure st + WHERE st.id = :idStructure + """, + countQuery = """ + SELECT COUNT(DISTINCT sec.id) + FROM Secteur sec + LEFT JOIN sec.section secti + LEFT JOIN sec.section.structure st + WHERE st.id = :idStructure + """ + ) + Page findAllSecteurByStructureIdToDtoPageable(@Param("idStructure") Long idStructure,Pageable pageable); + + @Query(""" + SELECT new io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb( + sec.id, + sec.code, + sec.nom, + secti.id, + secti.code, + secti.nom + ) + FROM Secteur sec + LEFT JOIN sec.section secti + WHERE sec.id = :idSecteur + """) + Optional findSecteurToDtoById(@Param("idSecteur") Long idSecteur); + + + +} \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/SectionRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/SectionRepository.java new file mode 100644 index 0000000..72c2c57 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/decoupage/SectionRepository.java @@ -0,0 +1,106 @@ +package io.gmss.fiscad.persistence.repositories.decoupage; + +import io.gmss.fiscad.entities.decoupage.Secteur; +import io.gmss.fiscad.entities.decoupage.Section; +import io.gmss.fiscad.paylaods.request.crudweb.FonctionPaylaodWeb; +import io.gmss.fiscad.paylaods.request.crudweb.SectionPaylaodWeb; +import io.gmss.fiscad.paylaods.response.SecteurEnqResponse; +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 SectionRepository extends JpaRepository { + @Query(""" + SELECT new io.gmss.fiscad.paylaods.request.crudweb.SectionPaylaodWeb( + sec.id, + sec.code, + sec.nom, + st.id, + st.code, + st.nom + ) + FROM Section sec + LEFT JOIN sec.structure st + """) + List findAllSectionToDto(); + + + @Query(""" + SELECT new io.gmss.fiscad.paylaods.request.crudweb.SectionPaylaodWeb( + sec.id, + sec.code, + sec.nom, + st.id, + st.code, + st.nom + ) + FROM Section sec + LEFT JOIN sec.structure st + WHERE sec.id = :idSection + """) + Optional findSectionToDtoById(@Param("idSection") Long idSection); + + @Query( + value = """ + SELECT new io.gmss.fiscad.paylaods.request.crudweb.SectionPaylaodWeb( + sec.id, + sec.code, + sec.nom, + st.id, + st.code, + st.nom + ) + FROM Section sec + LEFT JOIN sec.structure st + """, + countQuery = """ + SELECT COUNT(DISTINCT sec.id) + FROM Section sec + LEFT JOIN sec.structure st + """ + ) + Page findAllSectionToDtoPageable(Pageable pageable); + + @Query(""" + SELECT new io.gmss.fiscad.paylaods.request.crudweb.SectionPaylaodWeb( + sec.id, + sec.code, + sec.nom, + st.id, + st.code, + st.nom + ) + FROM Section sec + LEFT JOIN sec.structure st + WHERE st.id = :structureId + """) + List findAllSectionByStructureToDto(@Param("structureId") Long structureId); + + + @Query(value = """ + SELECT new io.gmss.fiscad.paylaods.request.crudweb.SectionPaylaodWeb( + sec.id, + sec.code, + sec.nom, + st.id, + st.code, + st.nom + ) + FROM Section sec + LEFT JOIN sec.structure st + WHERE st.id = :structureId + """, + countQuery = """ + SELECT COUNT(DISTINCT sec.id) + FROM Section sec + LEFT JOIN sec.structure st + WHERE st.id = :structureId + """) + Page findAllSectionByStructureToDtoPageable(@Param("structureId") Long structureId, Pageable pageable); + +} \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ActeurConcerneRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ActeurConcerneRepository.java similarity index 97% rename from src/main/java/io/gmss/fiscad/repositories/infocad/metier/ActeurConcerneRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ActeurConcerneRepository.java index bf79851..61b2f86 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ActeurConcerneRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ActeurConcerneRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.metier; +package io.gmss.fiscad.persistence.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne; import io.gmss.fiscad.paylaods.response.restoration.ActeurConcernePayLoadRestor; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/CommentaireRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/CommentaireRepository.java similarity index 92% rename from src/main/java/io/gmss/fiscad/repositories/infocad/metier/CommentaireRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/CommentaireRepository.java index e6fb3a9..5da0e2b 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/CommentaireRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/CommentaireRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.metier; +package io.gmss.fiscad.persistence.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.Commentaire; import io.gmss.fiscad.enums.Origine; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/EnqueteRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/EnqueteRepository.java similarity index 95% rename from src/main/java/io/gmss/fiscad/repositories/infocad/metier/EnqueteRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/EnqueteRepository.java index 6dd3154..eb8d4f7 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/EnqueteRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/EnqueteRepository.java @@ -1,14 +1,17 @@ -package io.gmss.fiscad.repositories.infocad.metier; +package io.gmss.fiscad.persistence.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.Enquete; -import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.paylaods.response.*; import io.gmss.fiscad.paylaods.response.report.EnqueteParBlocResponse; import io.gmss.fiscad.paylaods.response.restoration.EnquetePayLoad; +import io.gmss.fiscad.paylaods.response.statistique.StatEnqueteAdminDecoupageResponse; +import io.gmss.fiscad.paylaods.response.statistique.StatEnqueteAdminStructureResponse; +import io.gmss.fiscad.paylaods.response.statistique.StatEnqueteParBlocResponse; +import io.gmss.fiscad.paylaods.response.statistique.StatEnqueteParStatutResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.EnqueteNonSyncResponse; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import javax.swing.text.html.Option; import java.util.List; import java.util.Optional; @@ -222,5 +225,6 @@ public interface EnqueteRepository extends JpaRepository { Optional findFirstByParcelle_IdOrderByDateEnqueteDescIdDesc(Long parcelleId); + List findAllByParcelle_Id(Long parcelleId); } diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/MembreGroupeRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/MembreGroupeRepository.java similarity index 96% rename from src/main/java/io/gmss/fiscad/repositories/infocad/metier/MembreGroupeRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/MembreGroupeRepository.java index 07f6a3b..24dd09a 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/MembreGroupeRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/MembreGroupeRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.metier; +package io.gmss.fiscad.persistence.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.MembreGroupe; import io.gmss.fiscad.paylaods.response.restoration.MembreGroupePayLoadRestor; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleGeomRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ParcelleGeomRepository.java similarity index 97% rename from src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleGeomRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ParcelleGeomRepository.java index 8021a86..d4e494b 100644 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleGeomRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ParcelleGeomRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.metier; +package io.gmss.fiscad.persistence.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.ParcelleGeom; import jakarta.transaction.Transactional; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ParcelleRepository.java similarity index 58% rename from src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ParcelleRepository.java index 8c30e6a..1e0e47d 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ParcelleRepository.java @@ -1,17 +1,21 @@ -package io.gmss.fiscad.repositories.infocad.metier; +package io.gmss.fiscad.persistence.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.Parcelle; -import io.gmss.fiscad.paylaods.response.StatistiqueTypeNombreResponse; +import io.gmss.fiscad.paylaods.response.dataTableResponse.ParcelleDataTableResponse; +import io.gmss.fiscad.paylaods.response.statistique.StatistiqueTypeNombreResponse; import io.gmss.fiscad.paylaods.response.restoration.ParcellePayLoadRestor; import io.gmss.fiscad.paylaods.response.restoration.ParcelleStatsProjectionUnSecteur; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import java.util.List; import java.util.Optional; -public interface ParcelleRepository extends JpaRepository { +public interface ParcelleRepository extends JpaRepository, JpaSpecificationExecutor { Optional findFirstByExternalKeyAndTerminal_Id(Long externalKey, Long TerminalId); Optional findByMobileDataId(Long id); @Query(value = "Select " + @@ -95,4 +99,70 @@ public interface ParcelleRepository extends JpaRepository { ); + @Query( + value = """ + SELECT DISTINCT + parc.id, + parc.q, + parc.i, + parc.p, + parc.nup, + parc.nup_provisoire, + parc.num_titre_foncier, + parc.longitude, + parc.latitude, + parc.altitude, + parc.nature_domaine_id, + nd.libelle as nom_nature_domaine, + parc.superficie, + parc.observation, + parc.type_domaine_id, + td.libelle as nom_type_domaine, + parc.situation_geographique, + parc.rue_id, + r.nom as nom_rue, + parc.num_entree_parcelle, + parc.numero_rue, + 'OUI' as batieOuiNon, + d.id AS departement_id, + d.code AS departement_code, + d.nom AS departement_nom, + c.id AS commune_id, + c.code AS commune_code, + c.nom AS commune_nom, + a.id AS arrondissement_id, + a.code AS arrondissement_code, + a.nom AS arrondissement_nom, + q.id AS quartier_id, + q.code AS quartier_code, + q.nom AS quartier_nom + FROM secteur_decoupage sd + JOIN quartier q ON q.id = sd.quartier_id + JOIN arrondissement a ON a.id = q.arrondissement_id + JOIN commune c ON c.id = a.commune_id + JOIN departement d ON d.id = c.departement_id + JOIN parcelle parc ON parc.quartier_id = q.id + LEFT JOIN nature_domaine nd ON nd.id = parc.nature_domaine_id + LEFT JOIN type_domaine td ON td.id = parc.type_domaine_id + LEFT JOIN rue r ON r.id = parc.rue_id + WHERE sd.secteur_id IN (:secteurIds) + """, + countQuery = """ + SELECT COUNT(DISTINCT parc.id) + FROM secteur_decoupage sd + JOIN quartier q ON q.id = sd.quartier_id + JOIN arrondissement a ON a.id = q.arrondissement_id + JOIN commune c ON c.id = a.commune_id + JOIN departement d ON d.id = c.departement_id + JOIN parcelle parc ON parc.quartier_id = q.id + WHERE sd.secteur_id IN (:secteurIds) + """, + nativeQuery = true + ) + Page getParcelleDataTableResponse( + @Param("secteurIds") List secteurIds, + Pageable pageable + ); + + } diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/PieceRepository.java similarity index 97% rename from src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/PieceRepository.java index 34cd5ae..e2edebf 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/PieceRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.metier; +package io.gmss.fiscad.persistence.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.Piece; import io.gmss.fiscad.paylaods.response.restoration.PiecePayLoadRestor; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/RueRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/RueRepository.java similarity index 88% rename from src/main/java/io/gmss/fiscad/repositories/infocad/metier/RueRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/RueRepository.java index 7668bcb..810da5c 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/RueRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/RueRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.metier; +package io.gmss.fiscad.persistence.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.Rue; import io.gmss.fiscad.entities.infocad.metier.Tpe; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/TpeRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/TpeRepository.java similarity index 96% rename from src/main/java/io/gmss/fiscad/repositories/infocad/metier/TpeRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/TpeRepository.java index 916b4c5..d1a43b0 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/TpeRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/TpeRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.metier; +package io.gmss.fiscad.persistence.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.Enquete; import io.gmss.fiscad.entities.infocad.metier.Tpe; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/UploadRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/UploadRepository.java similarity index 97% rename from src/main/java/io/gmss/fiscad/repositories/infocad/metier/UploadRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/UploadRepository.java index ff3b566..1007964 100644 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/UploadRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/UploadRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.metier; +package io.gmss.fiscad.persistence.repositories.infocad.metier; import io.gmss.fiscad.entities.infocad.metier.Upload; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/BlocRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/BlocRepository.java similarity index 97% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/BlocRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/BlocRepository.java index a2448cb..27ca961 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/BlocRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/BlocRepository.java @@ -1,9 +1,9 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.decoupage.Arrondissement; import io.gmss.fiscad.entities.infocad.parametre.Bloc; import io.gmss.fiscad.paylaods.response.BlocEnqResponse; -import io.gmss.fiscad.paylaods.response.BlocSyncResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.BlocSyncResponse; import io.gmss.fiscad.paylaods.response.report.BlocsParStructureResponse; import io.gmss.fiscad.paylaods.response.report.ZoneInterventionParStructureResponse; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/ModeAcquisitionRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/ModeAcquisitionRepository.java similarity index 80% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/ModeAcquisitionRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/ModeAcquisitionRepository.java index ac979a0..d2580c0 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/ModeAcquisitionRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/ModeAcquisitionRepository.java @@ -1,7 +1,7 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.ModeAcquisition; -import io.gmss.fiscad.paylaods.response.ModesAcquisitionTypePersonneSyncResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.ModesAcquisitionTypePersonneSyncResponse; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/NatureDomaineRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/NatureDomaineRepository.java similarity index 79% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/NatureDomaineRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/NatureDomaineRepository.java index b2e2321..b16d850 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/NatureDomaineRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/NatureDomaineRepository.java @@ -1,8 +1,8 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine; -import io.gmss.fiscad.paylaods.response.NatureDomaineSyncResponse; -import io.gmss.fiscad.paylaods.response.TypePersonneNatureDomaineSyncResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.NatureDomaineSyncResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.TypePersonneNatureDomaineSyncResponse; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/PersonneRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/PersonneRepository.java similarity index 93% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/PersonneRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/PersonneRepository.java index dbe053a..ea70fff 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/PersonneRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/PersonneRepository.java @@ -1,11 +1,10 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.Personne; -import io.gmss.fiscad.paylaods.response.StatistiqueTypeNombreResponse; +import io.gmss.fiscad.paylaods.response.statistique.StatistiqueTypeNombreResponse; import io.gmss.fiscad.paylaods.response.restoration.PersonnePayLoad; 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; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/PositionRepresentationRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/PositionRepresentationRepository.java similarity index 78% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/PositionRepresentationRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/PositionRepresentationRepository.java index 2425d5b..79f67a7 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/PositionRepresentationRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/PositionRepresentationRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/ProfessionRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/ProfessionRepository.java similarity index 75% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/ProfessionRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/ProfessionRepository.java index 8b6a021..b4a8939 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/ProfessionRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/ProfessionRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.Profession; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SituationGeographiqueRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/SituationGeographiqueRepository.java similarity index 78% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SituationGeographiqueRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/SituationGeographiqueRepository.java index 1bacb42..6026474 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SituationGeographiqueRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/SituationGeographiqueRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.SituationGeographique; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SituationMatrimonialeRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/SituationMatrimonialeRepository.java similarity index 78% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SituationMatrimonialeRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/SituationMatrimonialeRepository.java index dbe4f41..0ccebc5 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SituationMatrimonialeRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/SituationMatrimonialeRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.SituationMatrimoniale; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SourceDroitExerceRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/SourceDroitExerceRepository.java similarity index 77% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SourceDroitExerceRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/SourceDroitExerceRepository.java index 6c3bec7..cc1462b 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SourceDroitExerceRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/SourceDroitExerceRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.SourceDroitExerce; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SourceDroitRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/SourceDroitRepository.java similarity index 80% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SourceDroitRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/SourceDroitRepository.java index 0c25a6f..ea7cc9b 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SourceDroitRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/SourceDroitRepository.java @@ -1,8 +1,8 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.SourceDroit; -import io.gmss.fiscad.paylaods.response.ModesAcquisitionSourceSyncResponse; -import io.gmss.fiscad.paylaods.response.SourceDroitsSyncResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.ModesAcquisitionSourceSyncResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.SourceDroitsSyncResponse; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/StructureRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/StructureRepository.java similarity index 96% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/StructureRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/StructureRepository.java index cc9c587..640f069 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/StructureRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/StructureRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.Structure; import io.gmss.fiscad.paylaods.response.ArrondissementEnqResponse; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeContestationRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypeContestationRepository.java similarity index 77% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeContestationRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypeContestationRepository.java index baf84f8..d75096e 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeContestationRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypeContestationRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.TypeContestation; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeDomaineRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypeDomaineRepository.java similarity index 75% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeDomaineRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypeDomaineRepository.java index b7e0136..350e69c 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeDomaineRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypeDomaineRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.TypeDomaine; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypePersonneRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypePersonneRepository.java similarity index 83% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypePersonneRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypePersonneRepository.java index 50323a1..239d0fc 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypePersonneRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypePersonneRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.TypePersonne; import io.gmss.fiscad.enums.Categorie; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypePieceRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypePieceRepository.java similarity index 75% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypePieceRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypePieceRepository.java index 0ad0acd..600a8dd 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypePieceRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypePieceRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.TypePiece; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeRepresentationRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypeRepresentationRepository.java similarity index 77% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeRepresentationRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypeRepresentationRepository.java index 9cfc5f3..0d33929 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeRepresentationRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypeRepresentationRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeRueRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypeRueRepository.java similarity index 79% rename from src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeRueRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypeRueRepository.java index 5ddfe9a..c7c16da 100755 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeRueRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/infocad/parametre/TypeRueRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.infocad.parametre; +package io.gmss.fiscad.persistence.repositories.infocad.parametre; import io.gmss.fiscad.entities.infocad.parametre.TypePiece; import io.gmss.fiscad.entities.infocad.parametre.TypeRue; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataActeurConcerneRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataActeurConcerneRepository.java similarity index 92% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataActeurConcerneRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataActeurConcerneRepository.java index 461c410..eae9c7f 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataActeurConcerneRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataActeurConcerneRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataActeurConcerne; import io.gmss.fiscad.entities.metadata.MobileDataPersonne; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataBatimentRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataBatimentRepository.java similarity index 92% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataBatimentRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataBatimentRepository.java index e57dc69..a4b6d68 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataBatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataBatimentRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataActeurConcerne; import io.gmss.fiscad.entities.metadata.MobileDataBatiment; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueBatimentRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataCaracteristiqueBatimentRepository.java similarity index 93% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueBatimentRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataCaracteristiqueBatimentRepository.java index 4115525..594117f 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueBatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataCaracteristiqueBatimentRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataBatiment; import io.gmss.fiscad.entities.metadata.MobileDataCaracteristiqueBatiment; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueParcelleRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataCaracteristiqueParcelleRepository.java similarity index 93% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueParcelleRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataCaracteristiqueParcelleRepository.java index cbce076..6e825c6 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueParcelleRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataCaracteristiqueParcelleRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataCaracteristiqueBatiment; import io.gmss.fiscad.entities.metadata.MobileDataCaracteristiqueParcelle; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueUniteLogementRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataCaracteristiqueUniteLogementRepository.java similarity index 93% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueUniteLogementRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataCaracteristiqueUniteLogementRepository.java index 44ce5f9..3c6b369 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataCaracteristiqueUniteLogementRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataCaracteristiqueUniteLogementRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataCaracteristiqueParcelle; import io.gmss.fiscad.entities.metadata.MobileDataCaracteristiqueUniteLogement; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataDeclarationNcRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataDeclarationNcRepository.java similarity index 92% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataDeclarationNcRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataDeclarationNcRepository.java index ace2c3e..51afe0f 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataDeclarationNcRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataDeclarationNcRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataDeclarationNc; import io.gmss.fiscad.entities.rfu.metier.DeclarationNc; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataEnqueteActiviteRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataEnqueteActiviteRepository.java similarity index 89% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataEnqueteActiviteRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataEnqueteActiviteRepository.java index 9d582c9..981bfc7 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataEnqueteActiviteRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataEnqueteActiviteRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataEnqueteActivite; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataEnqueteBatimentRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataEnqueteBatimentRepository.java similarity index 93% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataEnqueteBatimentRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataEnqueteBatimentRepository.java index 32b6925..f71dc35 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataEnqueteBatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataEnqueteBatimentRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataActeurConcerne; import io.gmss.fiscad.entities.metadata.MobileDataCaracteristiqueUniteLogement; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataEnqueteRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataEnqueteRepository.java similarity index 92% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataEnqueteRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataEnqueteRepository.java index 45fd3fb..1d399b5 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataEnqueteRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataEnqueteRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataEnquete; import io.gmss.fiscad.entities.metadata.MobileDataEnqueteBatiment; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataEnqueteUniteLogementRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataEnqueteUniteLogementRepository.java similarity index 93% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataEnqueteUniteLogementRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataEnqueteUniteLogementRepository.java index 256a541..3be6307 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataEnqueteUniteLogementRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataEnqueteUniteLogementRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataActeurConcerne; import io.gmss.fiscad.entities.metadata.MobileDataEnquete; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataMembreGroupeRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataMembreGroupeRepository.java similarity index 92% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataMembreGroupeRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataMembreGroupeRepository.java index a6cb61d..e2bb3b7 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataMembreGroupeRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataMembreGroupeRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataActeurConcerne; import io.gmss.fiscad.entities.metadata.MobileDataEnqueteUniteLogement; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataParcelleRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataParcelleRepository.java similarity index 93% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataParcelleRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataParcelleRepository.java index 653afe7..1dcd47d 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataParcelleRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataParcelleRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataMembreGroupe; import io.gmss.fiscad.entities.metadata.MobileDataParcelle; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataParcelleTestRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataParcelleTestRepository.java similarity index 85% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataParcelleTestRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataParcelleTestRepository.java index 8455023..b572762 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataParcelleTestRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataParcelleTestRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataParcelle; import io.gmss.fiscad.entities.metadata.MobileDataParcelleTest; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataPersonneRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataPersonneRepository.java similarity index 93% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataPersonneRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataPersonneRepository.java index 8d1ed6d..aa47237 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataPersonneRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataPersonneRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataActeurConcerne; import io.gmss.fiscad.entities.metadata.MobileDataParcelle; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataPieceRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataPieceRepository.java similarity index 92% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataPieceRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataPieceRepository.java index b83a74d..2cd6604 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataPieceRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataPieceRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataActeurConcerne; import io.gmss.fiscad.entities.metadata.MobileDataParcelle; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataUniteLogementRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataUniteLogementRepository.java similarity index 92% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataUniteLogementRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataUniteLogementRepository.java index fbc9c2f..e918dbe 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataUniteLogementRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataUniteLogementRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataActeurConcerne; import io.gmss.fiscad.entities.metadata.MobileDataPiece; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataUploadRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataUploadRepository.java similarity index 91% rename from src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataUploadRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataUploadRepository.java index c27e3a6..47912c3 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/MobileDataUploadRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/MobileDataUploadRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.MobileDataUniteLogement; import io.gmss.fiscad.entities.metadata.MobileDataUpload; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/PieceMetaDataRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/PieceMetaDataRepository.java similarity index 81% rename from src/main/java/io/gmss/fiscad/repositories/metadata/PieceMetaDataRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/PieceMetaDataRepository.java index 057241d..b976b70 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/PieceMetaDataRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/PieceMetaDataRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.metadata.PieceMetaData; import io.gmss.fiscad.entities.metadata.UploadMetaData; diff --git a/src/main/java/io/gmss/fiscad/repositories/metadata/UploadMetaDataRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/UploadMetaDataRepository.java similarity index 82% rename from src/main/java/io/gmss/fiscad/repositories/metadata/UploadMetaDataRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/metadata/UploadMetaDataRepository.java index 42258bd..47965dd 100755 --- a/src/main/java/io/gmss/fiscad/repositories/metadata/UploadMetaDataRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/metadata/UploadMetaDataRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.metadata; +package io.gmss.fiscad.persistence.repositories.metadata; import io.gmss.fiscad.entities.infocad.parametre.TypePiece; import io.gmss.fiscad.entities.metadata.UploadMetaData; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/BatimentRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/BatimentRepository.java similarity index 95% rename from src/main/java/io/gmss/fiscad/repositories/rfu/metier/BatimentRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/BatimentRepository.java index 0dc68aa..a32bf1e 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/BatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/BatimentRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.metier; +package io.gmss.fiscad.persistence.repositories.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.Batiment; import io.gmss.fiscad.paylaods.response.restoration.BatimentPayloadRestor; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueBatimentRepository.java similarity index 96% rename from src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueBatimentRepository.java index 9fbce11..d4da008 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueBatimentRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.metier; +package io.gmss.fiscad.persistence.repositories.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueParcelleRepository.java similarity index 96% rename from src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueParcelleRepository.java index 7169dc6..8f0eaba 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueParcelleRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.metier; +package io.gmss.fiscad.persistence.repositories.rfu.metier; import io.gmss.fiscad.entities.infocad.metier.Enquete; import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java similarity index 96% rename from src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java index 187a246..4509957 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.metier; +package io.gmss.fiscad.persistence.repositories.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueUniteLogement; import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/DeclarationNcRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DeclarationNcRepository.java similarity index 89% rename from src/main/java/io/gmss/fiscad/repositories/rfu/metier/DeclarationNcRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DeclarationNcRepository.java index 4bb5d30..f1b3dee 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/DeclarationNcRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DeclarationNcRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.metier; +package io.gmss.fiscad.persistence.repositories.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.DeclarationNc; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/DonneesImpositionTfuRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java similarity index 99% rename from src/main/java/io/gmss/fiscad/repositories/rfu/metier/DonneesImpositionTfuRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java index e9da4af..32b2d0b 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/DonneesImpositionTfuRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.metier; +package io.gmss.fiscad.persistence.repositories.rfu.metier; import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.rfu.metier.DonneesImpositionTfu; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteActiviteRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteActiviteRepository.java similarity index 90% rename from src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteActiviteRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteActiviteRepository.java index 617eba6..566b863 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteActiviteRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteActiviteRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.metier; +package io.gmss.fiscad.persistence.repositories.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.EnqueteActivite; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteBatimentRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java similarity index 97% rename from src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteBatimentRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java index 50020af..f9bbddd 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteBatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.metier; +package io.gmss.fiscad.persistence.repositories.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; import io.gmss.fiscad.paylaods.response.restoration.EnqueteBatimentPayLoadRestor; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteUniteLogementRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteUniteLogementRepository.java similarity index 97% rename from src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteUniteLogementRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteUniteLogementRepository.java index 9b7f0d4..78009de 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteUniteLogementRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteUniteLogementRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.metier; +package io.gmss.fiscad.persistence.repositories.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; import io.gmss.fiscad.paylaods.response.restoration.EnqueteUniteLogementPayLoadRestor; diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/FonctionRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/FonctionRepository.java new file mode 100755 index 0000000..844b2b0 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/FonctionRepository.java @@ -0,0 +1,84 @@ +package io.gmss.fiscad.persistence.repositories.rfu.metier; + +import io.gmss.fiscad.entities.user.Fonction; +import io.gmss.fiscad.paylaods.request.crudweb.FonctionPaylaodWeb; +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 java.util.List; + + +public interface FonctionRepository extends JpaRepository { + @Query(""" + SELECT new io.gmss.fiscad.paylaods.request.crudweb.FonctionPaylaodWeb( + f.id, + f.code, + f.nom, + sec.id, + sec.code, + sec.nom, + se.id, + se.nom, + se.code, + st.id, + st.code, + st.nom, + p.id, + p.nom, + d.id, + d.code, + d.nom + ) + FROM Fonction f + LEFT JOIN f.secteur sec + LEFT JOIN f.section se + LEFT JOIN f.structure st + LEFT JOIN f.profile p + LEFT JOIN f.departement d + """) + List findAllFonctionToDto(); + + @Query( + value = """ + SELECT DISTINCT new io.gmss.fiscad.paylaods.request.crudweb.FonctionPaylaodWeb( + f.id, + f.code, + f.nom, + sec.id, + sec.code, + sec.nom, + se.id, + se.code, + se.nom, + st.id, + st.code, + st.nom, + p.id, + p.nom, + d.id, + d.code, + d.nom + ) + FROM Fonction f + LEFT JOIN f.secteur sec + LEFT JOIN f.section se + LEFT JOIN f.structure st + LEFT JOIN f.profile p + LEFT JOIN f.departement d + """, + countQuery = """ + SELECT COUNT(DISTINCT f.id) + FROM Fonction f + LEFT JOIN f.secteur sec + LEFT JOIN f.section se + LEFT JOIN f.structure st + LEFT JOIN f.profile p + LEFT JOIN f.departement d + """ + ) + Page findAllFonctionToDtoPageable(Pageable pageable); + + +} diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/ImpositionsTfuRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/ImpositionsTfuRepository.java similarity index 93% rename from src/main/java/io/gmss/fiscad/repositories/rfu/metier/ImpositionsTfuRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/ImpositionsTfuRepository.java index 6ca0211..e7e48eb 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/ImpositionsTfuRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/ImpositionsTfuRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.metier; +package io.gmss.fiscad.persistence.repositories.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/UniteLogementRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/UniteLogementRepository.java similarity index 95% rename from src/main/java/io/gmss/fiscad/repositories/rfu/metier/UniteLogementRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/UniteLogementRepository.java index 5f8231b..8fb7e0a 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/UniteLogementRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/UniteLogementRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.metier; +package io.gmss.fiscad.persistence.repositories.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.UniteLogement; import io.gmss.fiscad.paylaods.response.restoration.UniteLogementPayLoadRestor; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/BaremRfuNonBatiRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/BaremRfuNonBatiRepository.java similarity index 86% rename from src/main/java/io/gmss/fiscad/repositories/rfu/parametre/BaremRfuNonBatiRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/BaremRfuNonBatiRepository.java index 3b31853..55cb011 100644 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/BaremRfuNonBatiRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/BaremRfuNonBatiRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.parametre; +package io.gmss.fiscad.persistence.repositories.rfu.parametre; import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati; import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/BaremRfuRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/BaremRfuRepository.java similarity index 82% rename from src/main/java/io/gmss/fiscad/repositories/rfu/parametre/BaremRfuRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/BaremRfuRepository.java index 79fa768..4870e03 100644 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/BaremRfuRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/BaremRfuRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.parametre; +package io.gmss.fiscad.persistence.repositories.rfu.parametre; import io.gmss.fiscad.entities.rfu.parametre.BaremRfuBati; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CampagneRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/CampagneRepository.java similarity index 84% rename from src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CampagneRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/CampagneRepository.java index 8a34220..f8f58a1 100644 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CampagneRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/CampagneRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.parametre; +package io.gmss.fiscad.persistence.repositories.rfu.parametre; import io.gmss.fiscad.entities.rfu.parametre.Campagne; import io.gmss.fiscad.enums.TypeCampagne; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CaracteristiqueRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/CaracteristiqueRepository.java similarity index 86% rename from src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CaracteristiqueRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/CaracteristiqueRepository.java index 41985c1..43ab026 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CaracteristiqueRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/CaracteristiqueRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.parametre; +package io.gmss.fiscad.persistence.repositories.rfu.parametre; import io.gmss.fiscad.entities.rfu.parametre.Caracteristique; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CategorieBatimentRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/CategorieBatimentRepository.java similarity index 84% rename from src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CategorieBatimentRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/CategorieBatimentRepository.java index d7c20a1..6deba7e 100644 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CategorieBatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/CategorieBatimentRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.parametre; +package io.gmss.fiscad.persistence.repositories.rfu.parametre; import io.gmss.fiscad.entities.rfu.parametre.Campagne; import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/EquipeRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/EquipeRepository.java similarity index 75% rename from src/main/java/io/gmss/fiscad/repositories/rfu/parametre/EquipeRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/EquipeRepository.java index 22d658b..826ec29 100644 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/EquipeRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/EquipeRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.parametre; +package io.gmss.fiscad.persistence.repositories.rfu.parametre; import io.gmss.fiscad.entities.rfu.parametre.Equipe; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/ExerciceRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/ExerciceRepository.java similarity index 86% rename from src/main/java/io/gmss/fiscad/repositories/rfu/parametre/ExerciceRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/ExerciceRepository.java index b489577..ba581f0 100644 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/ExerciceRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/ExerciceRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.parametre; +package io.gmss.fiscad.persistence.repositories.rfu.parametre; import io.gmss.fiscad.entities.rfu.parametre.Campagne; import io.gmss.fiscad.entities.rfu.parametre.Exercice; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/TypeCaracteristiqueRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/TypeCaracteristiqueRepository.java similarity index 83% rename from src/main/java/io/gmss/fiscad/repositories/rfu/parametre/TypeCaracteristiqueRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/TypeCaracteristiqueRepository.java index 0ac6aaa..72a5e16 100755 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/TypeCaracteristiqueRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/TypeCaracteristiqueRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.rfu.parametre; +package io.gmss.fiscad.persistence.repositories.rfu.parametre; import io.gmss.fiscad.entities.rfu.parametre.TypeCaracteristique; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/ZoneRfuRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/ZoneRfuRepository.java similarity index 65% rename from src/main/java/io/gmss/fiscad/repositories/rfu/parametre/ZoneRfuRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/ZoneRfuRepository.java index a9ca8a4..8c73559 100644 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/ZoneRfuRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/ZoneRfuRepository.java @@ -1,14 +1,11 @@ -package io.gmss.fiscad.repositories.rfu.parametre; +package io.gmss.fiscad.persistence.repositories.rfu.parametre; -import io.gmss.fiscad.entities.rfu.parametre.Exercice; import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; -import io.gmss.fiscad.paylaods.response.BlocSyncResponse; -import io.gmss.fiscad.paylaods.response.ZoneRfuSyncResponse; +import io.gmss.fiscad.paylaods.response.synchronisation.ZoneRfuSyncResponse; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import java.util.List; -import java.util.Optional; public interface ZoneRfuRepository extends JpaRepository { @Query(value = "select z.id, z.code, z.nom " + diff --git a/src/main/java/io/gmss/fiscad/repositories/user/AvoirFonctionRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/user/AvoirFonctionRepository.java similarity index 88% rename from src/main/java/io/gmss/fiscad/repositories/user/AvoirFonctionRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/user/AvoirFonctionRepository.java index 055a457..0d311bb 100755 --- a/src/main/java/io/gmss/fiscad/repositories/user/AvoirFonctionRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/user/AvoirFonctionRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.user; +package io.gmss.fiscad.persistence.repositories.user; import io.gmss.fiscad.entities.user.AvoirFonction; import io.gmss.fiscad.entities.user.AvoirFonction; diff --git a/src/main/java/io/gmss/fiscad/repositories/user/DemandeReinitialisationMPRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/user/DemandeReinitialisationMPRepository.java similarity index 89% rename from src/main/java/io/gmss/fiscad/repositories/user/DemandeReinitialisationMPRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/user/DemandeReinitialisationMPRepository.java index 9f68276..d48189d 100755 --- a/src/main/java/io/gmss/fiscad/repositories/user/DemandeReinitialisationMPRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/user/DemandeReinitialisationMPRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.user; +package io.gmss.fiscad.persistence.repositories.user; import io.gmss.fiscad.entities.infocad.parametre.Structure; import io.gmss.fiscad.entities.user.DemandeReinitialisationMP; diff --git a/src/main/java/io/gmss/fiscad/repositories/user/ProfileRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/user/ProfileRepository.java similarity index 89% rename from src/main/java/io/gmss/fiscad/repositories/user/ProfileRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/user/ProfileRepository.java index abdbf6c..0487411 100755 --- a/src/main/java/io/gmss/fiscad/repositories/user/ProfileRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/user/ProfileRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.user; +package io.gmss.fiscad.persistence.repositories.user; import io.gmss.fiscad.entities.user.Profile; import io.gmss.fiscad.enums.UserProfile; diff --git a/src/main/java/io/gmss/fiscad/repositories/user/RoleRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/user/RoleRepository.java similarity index 88% rename from src/main/java/io/gmss/fiscad/repositories/user/RoleRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/user/RoleRepository.java index 9aeefde..f649648 100755 --- a/src/main/java/io/gmss/fiscad/repositories/user/RoleRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/user/RoleRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.user; +package io.gmss.fiscad.persistence.repositories.user; import io.gmss.fiscad.entities.user.Role; import io.gmss.fiscad.enums.UserRole; diff --git a/src/main/java/io/gmss/fiscad/repositories/user/UserRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/user/UserRepository.java similarity index 93% rename from src/main/java/io/gmss/fiscad/repositories/user/UserRepository.java rename to src/main/java/io/gmss/fiscad/persistence/repositories/user/UserRepository.java index 80326cc..1f1b982 100755 --- a/src/main/java/io/gmss/fiscad/repositories/user/UserRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/user/UserRepository.java @@ -1,4 +1,4 @@ -package io.gmss.fiscad.repositories.user; +package io.gmss.fiscad.persistence.repositories.user; import io.gmss.fiscad.entities.infocad.parametre.Structure; import io.gmss.fiscad.entities.user.Role; diff --git a/src/main/java/io/gmss/fiscad/persistence/specification/ParcelleSpecification.java b/src/main/java/io/gmss/fiscad/persistence/specification/ParcelleSpecification.java new file mode 100644 index 0000000..ce00955 --- /dev/null +++ b/src/main/java/io/gmss/fiscad/persistence/specification/ParcelleSpecification.java @@ -0,0 +1,112 @@ +package io.gmss.fiscad.persistence.specification; + +import io.gmss.fiscad.entities.decoupage.*; +import io.gmss.fiscad.entities.infocad.metier.Parcelle; +import io.gmss.fiscad.entities.infocad.metier.Rue; +import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine; +import io.gmss.fiscad.entities.infocad.parametre.TypeDomaine; +import io.gmss.fiscad.entities.rfu.metier.Batiment; +import io.gmss.fiscad.paylaods.request.FiltreParcellePayLoad; +import jakarta.persistence.criteria.*; +import org.springframework.data.jpa.domain.Specification; + +import java.util.ArrayList; +import java.util.List; + +public class ParcelleSpecification { + + private ParcelleSpecification() {} + + public static Specification filtre( + FiltreParcellePayLoad f, + List secteurIds + ) { + + return (root, query, cb) -> { + + query.distinct(true); + + // ========================= + // CHAÎNE STABLE + // ========================= + + Join quartier = + root.join("quartier", JoinType.INNER); + + Join arrondissement = + quartier.join("arrondissement", JoinType.INNER); + + Join commune = + arrondissement.join("commune", JoinType.INNER); + + // ========================= + // SECTEUR DECOUPAGE (2 CHEMINS) + // ========================= + + Join sdParQuartier = + quartier.join("secteurDecoupages", JoinType.LEFT); + + Join sdParArrondissement = + arrondissement.join("secteurDecoupages", JoinType.LEFT); + + List predicates = new ArrayList<>(); + + // ========================= + // WHERE sd.secteur_id IN (:secteurIds) + // ========================= + + if (secteurIds != null && !secteurIds.isEmpty()) { + + Predicate viaQuartier = + sdParQuartier.get("secteur") + .get("id") + .in(secteurIds); + + Predicate viaArrondissement = + sdParArrondissement.get("secteur") + .get("id") + .in(secteurIds); + + predicates.add(cb.or(viaQuartier, viaArrondissement)); + } + + // ========================= + // AUTRES FILTRES + // ========================= + + if (f.getParcelleId() != null) { + predicates.add(cb.equal(root.get("id"), f.getParcelleId())); + } + + if (f.getQuartierId() != null) { + predicates.add(cb.equal(quartier.get("id"), f.getQuartierId())); + } + + if (f.getArrondissementId() != null) { + predicates.add(cb.equal(arrondissement.get("id"), f.getArrondissementId())); + } + + // ----- batie (EXISTS Batiment) ----- + if (f.getBatie() != null) { + + Subquery sq = query.subquery(Long.class); + Root bat = sq.from(Batiment.class); + + sq.select(cb.literal(1L)) + .where(cb.equal( + bat.get("parcelle").get("id"), + root.get("id") + )); + + predicates.add( + f.getBatie() + ? cb.exists(sq) + : cb.not(cb.exists(sq)) + ); + } + + return cb.and(predicates.toArray(new Predicate[0])); + }; + } + +} diff --git a/src/main/java/io/gmss/fiscad/repositories/decoupage/SecteurRepository.java b/src/main/java/io/gmss/fiscad/repositories/decoupage/SecteurRepository.java deleted file mode 100644 index 4c98f8e..0000000 --- a/src/main/java/io/gmss/fiscad/repositories/decoupage/SecteurRepository.java +++ /dev/null @@ -1,51 +0,0 @@ -package io.gmss.fiscad.repositories.decoupage; - -import io.gmss.fiscad.entities.decoupage.Secteur; -import io.gmss.fiscad.paylaods.response.SecteurEnqResponse; -import io.gmss.fiscad.paylaods.response.StructureEnqResponse; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; - -import java.util.List; - -public interface SecteurRepository extends JpaRepository { - List findAllByStructure_Id(Long structureId); - - @Query(value = """ - select - st.id, - st.code, - st.nom, - s.id as structureId, - count(distinct e.id) as nombreEnquete - from structure s - inner join commune c on c.id=s.commune_id - inner join bloc b on b.structure_id=s.id - inner join secteur st on st.id=b.secteur_id - left join enquete e on e.bloc_id=b.id - group by st.id,st.code,st.nom,s.id; - """, nativeQuery = true) - List getAdminSecteurEnqResponse(); - - - @Query(value = """ - select - st.id, - st.code, - st.nom, - s.id as structureId, - count(distinct e.id) as nombreEnquete - from structure s - inner join commune c on c.id=s.commune_id - inner join bloc b on b.structure_id=s.id - inner join secteur st on st.id=b.secteur_id - left join enquete e on e.bloc_id=b.id - where s.id=?1 and st.id=?2 - group by st.id,st.code,st.nom,s.id; - """, nativeQuery = true) - List getSecteurEnqResponse(Long structure_id , Long secteurId); - - List findDistinctBySection_Id(Long sectionId); - List findDistinctBySection_Structure_Id(Long structureId); - -} \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/repositories/decoupage/SectionRepository.java b/src/main/java/io/gmss/fiscad/repositories/decoupage/SectionRepository.java deleted file mode 100644 index bc37c87..0000000 --- a/src/main/java/io/gmss/fiscad/repositories/decoupage/SectionRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.gmss.fiscad.repositories.decoupage; - -import io.gmss.fiscad.entities.decoupage.Secteur; -import io.gmss.fiscad.entities.decoupage.Section; -import io.gmss.fiscad.paylaods.response.SecteurEnqResponse; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; - -import java.util.List; - -public interface SectionRepository extends JpaRepository { - List findAllByStructure_Id(Long structureId); -} \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/FonctionRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/FonctionRepository.java deleted file mode 100755 index b5f2458..0000000 --- a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/FonctionRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.gmss.fiscad.repositories.rfu.metier; - -import io.gmss.fiscad.entities.user.Fonction; -import org.springframework.data.jpa.repository.JpaRepository; - - -public interface FonctionRepository extends JpaRepository { - -} diff --git a/src/main/java/io/gmss/fiscad/security/CustomUserDetailsService.java b/src/main/java/io/gmss/fiscad/security/CustomUserDetailsService.java index 65f180d..bf78fd1 100755 --- a/src/main/java/io/gmss/fiscad/security/CustomUserDetailsService.java +++ b/src/main/java/io/gmss/fiscad/security/CustomUserDetailsService.java @@ -1,7 +1,7 @@ package io.gmss.fiscad.security; import io.gmss.fiscad.entities.user.User; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/io/gmss/fiscad/security/TokenAuthentificationProvider.java b/src/main/java/io/gmss/fiscad/security/TokenAuthentificationProvider.java index dbdff78..f30b029 100755 --- a/src/main/java/io/gmss/fiscad/security/TokenAuthentificationProvider.java +++ b/src/main/java/io/gmss/fiscad/security/TokenAuthentificationProvider.java @@ -3,7 +3,7 @@ package io.gmss.fiscad.security; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.paylaods.JwtAuthenticationResponse; import io.gmss.fiscad.paylaods.UserResponse; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import io.jsonwebtoken.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java index a9d922b..f840997 100644 --- a/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java +++ b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java @@ -16,18 +16,18 @@ 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.paylaods.request.crudweb.*; -import io.gmss.fiscad.repositories.decoupage.CommuneRepository; -import io.gmss.fiscad.repositories.decoupage.NationaliteRepository; -import io.gmss.fiscad.repositories.decoupage.SecteurRepository; -import io.gmss.fiscad.repositories.decoupage.SectionRepository; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository; -import io.gmss.fiscad.repositories.infocad.metier.PieceRepository; -import io.gmss.fiscad.repositories.infocad.parametre.*; -import io.gmss.fiscad.repositories.rfu.metier.*; -import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository; -import io.gmss.fiscad.repositories.user.ProfileRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.CommuneRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.NationaliteRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.SecteurRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.SectionRepository; +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.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.ProfileRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -48,7 +48,7 @@ public class EntityFromPayLoadService { private final EnqueteUniteLogementRepository enqueteUniteLogementRepository; private final DeclarationNcRepository declarationNcRepository; private final ParcelleRepository parcelleRepository; - private final BatimentRepository batimentRepository; + private final BatimentRepository batimentRepository; private final UniteLogementRepository uniteLogementRepository; private final SituationMatrimonialeRepository situationMatrimonialeRepository; private final NationaliteRepository nationaliteRepository; @@ -223,6 +223,35 @@ public class EntityFromPayLoadService { return batiment ; } + + public Section getSectionFromPayLoadWeb(SectionPaylaodWeb sectionPaylaodWeb){ + Section section =new Section(); + Optional optionalStructure = Optional.empty(); + + if(sectionPaylaodWeb.getStructureId()!=null) + optionalStructure=structureRepository.findById(sectionPaylaodWeb.getStructureId()); + + section.setId(sectionPaylaodWeb.getId()); + section.setStructure(optionalStructure.orElse(null)); + section.setCode(sectionPaylaodWeb.getCode()); + section.setNom(sectionPaylaodWeb.getNom()); + return section ; + } + + public Secteur getSecteurFromPayLoadWeb(SecteurPaylaodWeb secteurPaylaodWeb){ + Secteur secteur =new Secteur(); + Optional
optionalSection = Optional.empty(); + + if(secteurPaylaodWeb.getSectionId()!=null) + optionalSection=sectionRepository.findById(secteurPaylaodWeb.getSectionId()); + + secteur.setId(secteurPaylaodWeb.getId()); + secteur.setSection(optionalSection.orElse(null)); + secteur.setCode(secteurPaylaodWeb.getCode()); + secteur.setNom(secteurPaylaodWeb.getNom()); + return secteur ; + } + public UniteLogement getUniteLogementFromPayLoadWeb(UniteLogementPaylaodWeb uniteLogementPaylaodWeb){ UniteLogement uniteLogement=new UniteLogement(); Optional optionalBatiment=Optional.empty(); diff --git a/src/main/java/io/gmss/fiscad/service/ReportService.java b/src/main/java/io/gmss/fiscad/service/ReportService.java index 83fcb7f..dc5d1fb 100644 --- a/src/main/java/io/gmss/fiscad/service/ReportService.java +++ b/src/main/java/io/gmss/fiscad/service/ReportService.java @@ -11,11 +11,11 @@ import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService; import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad; import io.gmss.fiscad.paylaods.response.report.BlocsParStructureResponse; import io.gmss.fiscad.paylaods.response.report.EnqueteParBlocResponse; -import io.gmss.fiscad.repositories.decoupage.ArrondissementRepository; -import io.gmss.fiscad.repositories.decoupage.CommuneRepository; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; -import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.ArrondissementRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.CommuneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.BlocRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.StructureRepository; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletResponse; import net.sf.jasperreports.engine.*; diff --git a/src/main/java/io/gmss/fiscad/service/worker/ActeurConcerneAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/ActeurConcerneAsyncWorker.java index 3a840b2..e4c8cba 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/ActeurConcerneAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/ActeurConcerneAsyncWorker.java @@ -10,18 +10,16 @@ import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation; import io.gmss.fiscad.entities.metadata.MobileDataActeurConcerne; import io.gmss.fiscad.enums.TypeObjet; import io.gmss.fiscad.paylaods.request.synchronisation.ActeurConcernePayLoad; -import io.gmss.fiscad.repositories.infocad.metier.ActeurConcerneRepository; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.metier.TpeRepository; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; -import io.gmss.fiscad.repositories.infocad.parametre.PositionRepresentationRepository; -import io.gmss.fiscad.repositories.infocad.parametre.TypeContestationRepository; -import io.gmss.fiscad.repositories.infocad.parametre.TypeRepresentationRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataActeurConcerneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.ActeurConcerneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.TpeRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PositionRepresentationRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypeContestationRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypeRepresentationRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataActeurConcerneRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/io/gmss/fiscad/service/worker/BatimentAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/BatimentAsyncWorker.java index ac14971..6d915e1 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/BatimentAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/BatimentAsyncWorker.java @@ -3,25 +3,17 @@ package io.gmss.fiscad.service.worker; import io.gmss.fiscad.entities.infocad.metier.Enquete; import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.metier.Tpe; -import io.gmss.fiscad.entities.infocad.parametre.Bloc; import io.gmss.fiscad.entities.metadata.MobileDataBatiment; -import io.gmss.fiscad.entities.metadata.MobileDataEnquete; import io.gmss.fiscad.entities.rfu.metier.Batiment; -import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; -import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; import io.gmss.fiscad.paylaods.request.synchronisation.BatimentPaylaod; -import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataBatimentRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataEnqueteRepository; -import io.gmss.fiscad.repositories.rfu.metier.*; -import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +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.TpeRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.BatimentRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataBatimentRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueBatimentAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueBatimentAsyncWorker.java index 04dbc39..e90b947 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueBatimentAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueBatimentAsyncWorker.java @@ -1,30 +1,21 @@ package io.gmss.fiscad.service.worker; import io.gmss.fiscad.entities.infocad.metier.Enquete; -import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.metier.Tpe; -import io.gmss.fiscad.entities.infocad.parametre.Bloc; import io.gmss.fiscad.entities.metadata.MobileDataCaracteristiqueBatiment; -import io.gmss.fiscad.entities.metadata.MobileDataEnquete; import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; import io.gmss.fiscad.entities.rfu.parametre.Caracteristique; -import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; -import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueBatimentPayload; -import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataCaracteristiqueBatimentRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataEnqueteRepository; -import io.gmss.fiscad.repositories.rfu.metier.*; -import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository; -import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.TpeRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.CaracteristiqueBatimentRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteBatimentRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataCaracteristiqueBatimentRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.CaracteristiqueRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueParcelleAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueParcelleAsyncWorker.java index a004a07..d4a030e 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueParcelleAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueParcelleAsyncWorker.java @@ -1,29 +1,19 @@ package io.gmss.fiscad.service.worker; import io.gmss.fiscad.entities.infocad.metier.Enquete; -import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.metier.Tpe; -import io.gmss.fiscad.entities.infocad.parametre.Bloc; import io.gmss.fiscad.entities.metadata.MobileDataCaracteristiqueParcelle; -import io.gmss.fiscad.entities.metadata.MobileDataEnquete; import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle; import io.gmss.fiscad.entities.rfu.parametre.Caracteristique; -import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; -import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueParcellePayload; -import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataCaracteristiqueParcelleRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataEnqueteRepository; -import io.gmss.fiscad.repositories.rfu.metier.*; -import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository; -import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.TpeRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.CaracteristiqueParcelleRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataCaracteristiqueParcelleRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.CaracteristiqueRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueUniteLogementAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueUniteLogementAsyncWorker.java index d9271c1..0242fa6 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueUniteLogementAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/CaracteristiqueUniteLogementAsyncWorker.java @@ -2,28 +2,21 @@ package io.gmss.fiscad.service.worker; import io.gmss.fiscad.entities.infocad.metier.Enquete; import io.gmss.fiscad.entities.infocad.metier.Tpe; -import io.gmss.fiscad.entities.metadata.MobileDataCaracteristiqueBatiment; import io.gmss.fiscad.entities.metadata.MobileDataCaracteristiqueUniteLogement; -import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment; import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueUniteLogement; -import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; import io.gmss.fiscad.entities.rfu.parametre.Caracteristique; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueBatimentPayload; import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueUniteLogementPayload; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.metier.TpeRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataCaracteristiqueBatimentRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataCaracteristiqueUniteLogementRepository; -import io.gmss.fiscad.repositories.rfu.metier.CaracteristiqueBatimentRepository; -import io.gmss.fiscad.repositories.rfu.metier.CaracteristiqueUniteLogementRepository; -import io.gmss.fiscad.repositories.rfu.metier.EnqueteBatimentRepository; -import io.gmss.fiscad.repositories.rfu.metier.EnqueteUniteLogementRepository; -import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.TpeRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataCaracteristiqueBatimentRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataCaracteristiqueUniteLogementRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.CaracteristiqueUniteLogementRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteUniteLogementRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.CaracteristiqueRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/io/gmss/fiscad/service/worker/DeclarationNcAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/DeclarationNcAsyncWorker.java index a016c37..5140717 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/DeclarationNcAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/DeclarationNcAsyncWorker.java @@ -5,19 +5,17 @@ import io.gmss.fiscad.entities.infocad.metier.Tpe; import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.infocad.parametre.Structure; import io.gmss.fiscad.entities.metadata.MobileDataDeclarationNc; -import io.gmss.fiscad.entities.rfu.metier.Batiment; import io.gmss.fiscad.entities.rfu.metier.DeclarationNc; -import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; import io.gmss.fiscad.paylaods.request.synchronisation.DeclarationNcPayload; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.metier.TpeRepository; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; -import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataDeclarationNcRepository; -import io.gmss.fiscad.repositories.rfu.metier.BatimentRepository; -import io.gmss.fiscad.repositories.rfu.metier.DeclarationNcRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.TpeRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.StructureRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataDeclarationNcRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.BatimentRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.DeclarationNcRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/service/worker/EnqueteActiviteAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/EnqueteActiviteAsyncWorker.java index dc76154..c0435d2 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/EnqueteActiviteAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/EnqueteActiviteAsyncWorker.java @@ -5,26 +5,24 @@ import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.metier.Tpe; import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.infocad.parametre.Profession; -import io.gmss.fiscad.entities.infocad.parametre.Profession; import io.gmss.fiscad.entities.infocad.parametre.Structure; import io.gmss.fiscad.entities.metadata.MobileDataEnqueteActivite; import io.gmss.fiscad.entities.rfu.metier.Batiment; import io.gmss.fiscad.entities.rfu.metier.EnqueteActivite; import io.gmss.fiscad.entities.rfu.metier.UniteLogement; -import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; import io.gmss.fiscad.paylaods.request.synchronisation.EnqueteActivitePayload; -import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository; -import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository; -import io.gmss.fiscad.repositories.infocad.metier.TpeRepository; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; -import io.gmss.fiscad.repositories.infocad.parametre.ProfessionRepository; -import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataEnqueteActiviteRepository; -import io.gmss.fiscad.repositories.rfu.metier.BatimentRepository; -import io.gmss.fiscad.repositories.rfu.metier.EnqueteActiviteRepository; -import io.gmss.fiscad.repositories.rfu.metier.UniteLogementRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +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.TpeRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.ProfessionRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.StructureRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataEnqueteActiviteRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.BatimentRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteActiviteRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.UniteLogementRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/io/gmss/fiscad/service/worker/EnqueteAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/EnqueteAsyncWorker.java index ace359c..4d92845 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/EnqueteAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/EnqueteAsyncWorker.java @@ -8,14 +8,13 @@ import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; -import io.gmss.fiscad.paylaods.request.synchronisation.UploadPayLoad; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataEnqueteRepository; -import io.gmss.fiscad.repositories.rfu.metier.*; -import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.*; +import io.gmss.fiscad.persistence.repositories.rfu.metier.*; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.BlocRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataEnqueteRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.ZoneRfuRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -181,7 +180,7 @@ public class EnqueteAsyncWorker { enquete.setCodeEquipe(enquetePayLoad.getCodeEquipe()); enquete.setNumeroTitreFoncier(enquetePayLoad.getNumeroTitreFoncier()); - enquete.setNumEnterParcelle(enquetePayLoad.getNumEnterParcelle()); + enquete.setNumEntreeParcelle(enquetePayLoad.getNumEnterParcelle()); enquete.setNumRue(enquetePayLoad.getNumRue()); enquete.setNomRue(enquetePayLoad.getNomRue()); enquete.setEmplacement(enquetePayLoad.getEmplacement()); diff --git a/src/main/java/io/gmss/fiscad/service/worker/EnqueteBatimentAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/EnqueteBatimentAsyncWorker.java index 5122dd5..6678ab8 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/EnqueteBatimentAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/EnqueteBatimentAsyncWorker.java @@ -1,30 +1,23 @@ package io.gmss.fiscad.service.worker; import io.gmss.fiscad.entities.infocad.metier.Enquete; -import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.metier.Tpe; -import io.gmss.fiscad.entities.infocad.parametre.Bloc; import io.gmss.fiscad.entities.infocad.parametre.Personne; -import io.gmss.fiscad.entities.metadata.MobileDataEnquete; import io.gmss.fiscad.entities.metadata.MobileDataEnqueteBatiment; import io.gmss.fiscad.entities.rfu.metier.Batiment; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; -import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; import io.gmss.fiscad.paylaods.request.synchronisation.EnqueteBatimentPayload; -import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataEnqueteBatimentRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataEnqueteRepository; -import io.gmss.fiscad.repositories.rfu.metier.*; -import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.TpeRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.BatimentRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteBatimentRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataEnqueteBatimentRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/io/gmss/fiscad/service/worker/EnqueteUniteLogementAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/EnqueteUniteLogementAsyncWorker.java index 9428e09..b4cd5b6 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/EnqueteUniteLogementAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/EnqueteUniteLogementAsyncWorker.java @@ -1,30 +1,23 @@ package io.gmss.fiscad.service.worker; import io.gmss.fiscad.entities.infocad.metier.Enquete; -import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.metier.Tpe; -import io.gmss.fiscad.entities.infocad.parametre.Bloc; import io.gmss.fiscad.entities.infocad.parametre.Personne; -import io.gmss.fiscad.entities.metadata.MobileDataEnquete; import io.gmss.fiscad.entities.metadata.MobileDataEnqueteUniteLogement; import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; import io.gmss.fiscad.entities.rfu.metier.UniteLogement; -import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; import io.gmss.fiscad.paylaods.request.synchronisation.EnqueteUniteLogementPayload; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataEnqueteRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataEnqueteUniteLogementRepository; -import io.gmss.fiscad.repositories.rfu.metier.*; -import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.TpeRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteUniteLogementRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.UniteLogementRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataEnqueteUniteLogementRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/io/gmss/fiscad/service/worker/MembreGroupeAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/MembreGroupeAsyncWorker.java index 3d13a75..4a02b04 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/MembreGroupeAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/MembreGroupeAsyncWorker.java @@ -1,26 +1,21 @@ package io.gmss.fiscad.service.worker; -import io.gmss.fiscad.entities.decoupage.Commune; -import io.gmss.fiscad.entities.decoupage.Nationalite; import io.gmss.fiscad.entities.infocad.metier.Enquete; import io.gmss.fiscad.entities.infocad.metier.MembreGroupe; import io.gmss.fiscad.entities.infocad.metier.Tpe; import io.gmss.fiscad.entities.infocad.parametre.*; import io.gmss.fiscad.entities.metadata.MobileDataMembreGroupe; -import io.gmss.fiscad.entities.metadata.MobileDataPersonne; -import io.gmss.fiscad.enums.Categorie; import io.gmss.fiscad.enums.TypeObjet; import io.gmss.fiscad.paylaods.request.synchronisation.MembreGroupePayLoad; -import io.gmss.fiscad.paylaods.request.synchronisation.PersonnePayLoad; -import io.gmss.fiscad.repositories.decoupage.CommuneRepository; -import io.gmss.fiscad.repositories.decoupage.NationaliteRepository; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.*; -import io.gmss.fiscad.repositories.metadata.MobileDataMembreGroupeRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataPersonneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.MembreGroupeRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.TpeRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PositionRepresentationRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypeRepresentationRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataMembreGroupeRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/io/gmss/fiscad/service/worker/ParcelleAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/ParcelleAsyncWorker.java index ca85304..109b5d3 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/ParcelleAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/ParcelleAsyncWorker.java @@ -1,30 +1,19 @@ package io.gmss.fiscad.service.worker; import io.gmss.fiscad.entities.decoupage.Quartier; -import io.gmss.fiscad.entities.infocad.metier.Enquete; import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.metier.Tpe; -import io.gmss.fiscad.entities.infocad.parametre.Bloc; import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine; -import io.gmss.fiscad.entities.metadata.MobileDataEnquete; import io.gmss.fiscad.entities.metadata.MobileDataParcelle; -import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; -import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; import io.gmss.fiscad.paylaods.request.synchronisation.ParcellePayLoad; -import io.gmss.fiscad.repositories.decoupage.QuartierRepository; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; -import io.gmss.fiscad.repositories.infocad.parametre.NatureDomaineRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataEnqueteRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataParcelleRepository; -import io.gmss.fiscad.repositories.rfu.metier.*; -import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.QuartierRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.TpeRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.NatureDomaineRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataParcelleRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/io/gmss/fiscad/service/worker/PersonneAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/PersonneAsyncWorker.java index 27f8782..bacf4f9 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/PersonneAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/PersonneAsyncWorker.java @@ -2,25 +2,25 @@ package io.gmss.fiscad.service.worker; import io.gmss.fiscad.entities.decoupage.Commune; import io.gmss.fiscad.entities.decoupage.Nationalite; -import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne; -import io.gmss.fiscad.entities.infocad.metier.Enquete; import io.gmss.fiscad.entities.infocad.metier.Tpe; import io.gmss.fiscad.entities.infocad.parametre.*; -import io.gmss.fiscad.entities.metadata.MobileDataActeurConcerne; import io.gmss.fiscad.entities.metadata.MobileDataPersonne; import io.gmss.fiscad.enums.Categorie; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.synchronisation.ActeurConcernePayLoad; import io.gmss.fiscad.paylaods.request.synchronisation.PersonnePayLoad; -import io.gmss.fiscad.repositories.decoupage.CommuneRepository; -import io.gmss.fiscad.repositories.decoupage.NationaliteRepository; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.*; -import io.gmss.fiscad.repositories.metadata.MobileDataActeurConcerneRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataPersonneRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.CommuneRepository; +import io.gmss.fiscad.persistence.repositories.decoupage.NationaliteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.MembreGroupeRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.PieceRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.TpeRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.UploadRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.ProfessionRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.SituationMatrimonialeRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypePersonneRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataPersonneRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/io/gmss/fiscad/service/worker/PieceAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/PieceAsyncWorker.java index 79f7b3d..efc5fe9 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/PieceAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/PieceAsyncWorker.java @@ -1,27 +1,23 @@ package io.gmss.fiscad.service.worker; -import io.gmss.fiscad.entities.decoupage.Commune; -import io.gmss.fiscad.entities.decoupage.Nationalite; -import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne; import io.gmss.fiscad.entities.infocad.metier.Enquete; import io.gmss.fiscad.entities.infocad.metier.Piece; import io.gmss.fiscad.entities.infocad.metier.Tpe; import io.gmss.fiscad.entities.infocad.parametre.*; -import io.gmss.fiscad.entities.metadata.MobileDataPersonne; import io.gmss.fiscad.entities.metadata.MobileDataPiece; -import io.gmss.fiscad.enums.Categorie; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.synchronisation.PersonnePayLoad; import io.gmss.fiscad.paylaods.request.synchronisation.PiecePayLoad; -import io.gmss.fiscad.repositories.decoupage.CommuneRepository; -import io.gmss.fiscad.repositories.decoupage.NationaliteRepository; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.*; -import io.gmss.fiscad.repositories.metadata.MobileDataPersonneRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataPieceRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.ActeurConcerneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.PieceRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.TpeRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.ModeAcquisitionRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.SourceDroitRepository; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypePieceRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataPieceRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/io/gmss/fiscad/service/worker/UniteLogementAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/UniteLogementAsyncWorker.java index 62005cb..ccb9402 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/UniteLogementAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/UniteLogementAsyncWorker.java @@ -1,28 +1,21 @@ package io.gmss.fiscad.service.worker; import io.gmss.fiscad.entities.infocad.metier.Enquete; -import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.metier.Tpe; -import io.gmss.fiscad.entities.infocad.parametre.Bloc; -import io.gmss.fiscad.entities.metadata.MobileDataEnquete; import io.gmss.fiscad.entities.metadata.MobileDataUniteLogement; import io.gmss.fiscad.entities.rfu.metier.Batiment; import io.gmss.fiscad.entities.rfu.metier.UniteLogement; -import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu; -import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad; import io.gmss.fiscad.paylaods.request.synchronisation.UniteLogementPaylaod; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataEnqueteRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataUniteLogementRepository; -import io.gmss.fiscad.repositories.rfu.metier.*; -import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository; -import io.gmss.fiscad.repositories.user.UserRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.*; +import io.gmss.fiscad.persistence.repositories.rfu.metier.*; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.BlocRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataEnqueteRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataUniteLogementRepository; +import io.gmss.fiscad.persistence.repositories.rfu.parametre.ZoneRfuRepository; +import io.gmss.fiscad.persistence.repositories.user.UserRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/io/gmss/fiscad/service/worker/UploadAsyncWorker.java b/src/main/java/io/gmss/fiscad/service/worker/UploadAsyncWorker.java index 30deddd..9f6aaca 100644 --- a/src/main/java/io/gmss/fiscad/service/worker/UploadAsyncWorker.java +++ b/src/main/java/io/gmss/fiscad/service/worker/UploadAsyncWorker.java @@ -1,29 +1,19 @@ package io.gmss.fiscad.service.worker; import io.gmss.fiscad.entities.infocad.metier.*; -import io.gmss.fiscad.entities.infocad.parametre.ModeAcquisition; import io.gmss.fiscad.entities.infocad.parametre.Personne; -import io.gmss.fiscad.entities.infocad.parametre.SourceDroit; -import io.gmss.fiscad.entities.infocad.parametre.TypePiece; -import io.gmss.fiscad.entities.metadata.MobileDataPiece; import io.gmss.fiscad.entities.metadata.MobileDataUpload; import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; import io.gmss.fiscad.enums.TypeObjet; -import io.gmss.fiscad.paylaods.request.synchronisation.PiecePayLoad; import io.gmss.fiscad.paylaods.request.synchronisation.UploadPayLoad; -import io.gmss.fiscad.repositories.infocad.metier.*; -import io.gmss.fiscad.repositories.infocad.parametre.ModeAcquisitionRepository; -import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository; -import io.gmss.fiscad.repositories.infocad.parametre.SourceDroitRepository; -import io.gmss.fiscad.repositories.infocad.parametre.TypePieceRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataPieceRepository; -import io.gmss.fiscad.repositories.metadata.MobileDataUploadRepository; -import io.gmss.fiscad.repositories.rfu.metier.EnqueteBatimentRepository; -import io.gmss.fiscad.repositories.rfu.metier.EnqueteUniteLogementRepository; +import io.gmss.fiscad.persistence.repositories.infocad.metier.*; +import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository; +import io.gmss.fiscad.persistence.repositories.metadata.MobileDataUploadRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteBatimentRepository; +import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteUniteLogementRepository; import io.gmss.fiscad.service.LogService; import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/resources/application-dgi.properties b/src/main/resources/application-dgi.properties index dd19eff..9bf51db 100755 --- a/src/main/resources/application-dgi.properties +++ b/src/main/resources/application-dgi.properties @@ -1,15 +1,9 @@ server.port=8282 io.gmss.fiscad.profile=${IO_GMSS_FISCAD_PROFILE} -#io.gmss.fiscad.profile=dgi -# TEST ENV -#spring.datasource.url=jdbc:postgresql://vmi792116.contaboserver.net:5599/dgi_db -#spring.datasource.username=infocad_user -#spring.datasource.password=W5fwD({9*q53 -# LOCAL ENV -#spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi -#spring.datasource.username=infocad_user -#spring.datasource.password=W5fwD({9*q53 +app.default-user.username=${DEFAULT_USER_NAME} +app.default-user.password=${DEFAULT_USER_PASSWORD} + # PROD ENVIRONNEMENT spring.datasource.url=${SPRING_DATASOURCE_URL} diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties new file mode 100755 index 0000000..005fca2 --- /dev/null +++ b/src/main/resources/application-test.properties @@ -0,0 +1,10 @@ +server.port=8282 +io.gmss.fiscad.profile=test + +# LOCAL ENV TEST +spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi +spring.datasource.username=infocad_user +spring.datasource.password=W5fwD({9*q53 + +app.default-user.username=fiscad_admin +app.default-user.password=1234567890 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 9ccf284..fe1b6af 100755 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ -spring.profiles.active=${SPRING_PROFILES_ACTIVE} +#spring.profiles.active=${SPRING_PROFILES_ACTIVE} #spring.profiles.active=abomey -#spring.profiles.active=dgi +spring.profiles.active=test spring.jpa.properties.hibernate.id.new_generator_mappings=false spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true spring.jpa.open-in-view=false @@ -42,14 +42,6 @@ file.upload_dir=./uploads file.jasper-reports=./jasperReport logging.file.name=/app/logs/fiscad.log -#app.abs.env.defaultpassword = 1234567890 -#app.abs.env.defaultuser = fiscad_admin - -#app.default-user.username=fiscad_admin -#app.default-user.password=1234567890 - -app.default-user.username=${DEFAULT_USER_NAME} -app.default-user.password=${DEFAULT_USER_PASSWORD} app.upload.root=${file.upload_dir} app.upload.zips.received=${app.upload.root}/zips/received