From 415186bd3320276f0974c7d64ed3d92171207afc Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Thu, 30 Jul 2026 14:18:38 +0100 Subject: [PATCH 1/2] reajustement workflow --- .../parametre/StructureController.java | 25 ++++++ .../DonneesImpositionTfuController.java | 28 ++++++- .../rfu/metier/ImpositionsTfuController.java | 26 +++++++ .../parametre/StructureServiceImpl.java | 29 ++++++- .../CommuneCentreAssignationServiceImpl.java | 14 ++-- .../DonneesImpositionTfuServiceImpl.java | 6 ++ .../rfu/metier/ImpositionsTfuServiceImpl.java | 5 ++ .../infocad/parametre/StructureService.java | 1 + .../metier/DonneesImpositionTfuService.java | 1 + .../rfu/metier/ImpositionsTfuService.java | 2 + .../DonneesImpositionTfuRepository.java | 77 +++++++++++++++++++ .../rfu/metier/ImpositionsTfuRepository.java | 32 ++++++++ .../service/EntityFromPayLoadService.java | 12 --- .../resources/application-test.properties | 14 ++-- src/main/resources/application.properties | 4 +- 15 files changed, 246 insertions(+), 30 deletions(-) diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java index c664cc3..fab125a 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java @@ -237,4 +237,29 @@ public class StructureController { return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK); } } + + @GetMapping("/by-avoir-fonction/{avoirFonctionId}") + @PreAuthorize("hasAuthority('READ_STRUCTURE')") + public ResponseEntity getAllStructureListByAvoirFonction(@PathVariable Long avoirFonctionId) { + try { + return new ResponseEntity<>( + new ApiResponse<>(true, structureService.getListStructureAvoirFonctionId(avoirFonctionId), "Liste des structures 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); + } + } + } 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 114324d..485ce71 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 @@ -151,7 +151,7 @@ public class DonneesImpositionTfuController { @GetMapping("/donnees-non-homologable/{idImpositionTfu}") @PreAuthorize("hasAuthority('HOMOLOGUE_AVIS') or hasAuthority('READ_DONNEESIMPOSITIONTFU')") - public ResponseEntity getHomologableDonneesImpositionTfu(@PathVariable Long idImpositionTfu,@RequestParam int pageNo, @RequestParam int pageSize) { + public ResponseEntity getNonHomologableDonneesImpositionTfu(@PathVariable Long idImpositionTfu,@RequestParam int pageNo, @RequestParam int pageSize) { try { Pageable pageable = PageRequest.of(pageNo, pageSize); return new ResponseEntity<>( @@ -174,6 +174,32 @@ public class DonneesImpositionTfuController { } } + + @GetMapping("/donnees-homologable/{idImpositionTfu}") + @PreAuthorize("hasAuthority('HOMOLOGUE_AVIS') or hasAuthority('READ_DONNEESIMPOSITIONTFU')") + public ResponseEntity getHomologableDonneesImpositionTfu(@PathVariable Long idImpositionTfu,@RequestParam int pageNo, @RequestParam int pageSize) { + try { + Pageable pageable = PageRequest.of(pageNo, pageSize); + return new ResponseEntity<>( + new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesHomologable(idImpositionTfu,pageable), "Donnees Imposition Tfu récupérées avec succès."), + HttpStatus.OK + ); + } catch (HttpClientErrorException.MethodNotAllowed e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK); + } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException | + FileStorageException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK); + } catch (NullPointerException e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK); + } catch (Exception e) { + logger.error(e.getLocalizedMessage()); + return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK); + } + } + @DeleteMapping("/delete/{id}") @PreAuthorize("hasAuthority('DELETE_DONNEESIMPOSITIONTFU')") public ResponseEntity deleteDonneesImpositionTfu(@PathVariable Long id) { diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java index 8589574..8ba4e1c 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java @@ -331,4 +331,30 @@ public class ImpositionsTfuController { return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK); } } + + @GetMapping("/all-generer/by-structure-id/{structureId}") + @PreAuthorize("hasAuthority('READ_IMPOSITIONSTFU')") + public ResponseEntity getImpositionsTfuGenererByStructureId(@PathVariable Long structureId) { + try { + return new ResponseEntity<>( + new ApiResponse<>(true, impositionsTfuService.getImpositionsTfuByStructureIdByStatut(structureId, StatusAvis.GENERE), "liste imposition TFU 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); + } + } + + } 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 4fe68f7..f1c54ed 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 @@ -102,7 +102,7 @@ public class StructureServiceImpl implements StructureService { avoirFonctions.stream() .filter(af -> af.getDateFin() == null || af.getDateFin().isAfter(LocalDate.now())) .forEach(avoirFonction -> { - if(avoirFonction.getFonction().getStructure()!=null){ + if(avoirFonction.getFonction().getStructure()!=null && avoirFonction.getFonction().getDepartement()==null){ structures.addAll(List.of(avoirFonction.getFonction().getStructure())); }else if (avoirFonction.getFonction().getDepartement()!=null){ structures.addAll(structureRepository.findDistinctByCommune_Departement_Id(avoirFonction.getFonction().getDepartement().getId())); @@ -111,6 +111,33 @@ public class StructureServiceImpl implements StructureService { return structures; } + @Override + public List getListStructureAvoirFonctionId(Long avoirFonctionId) { + Optional optionalAvoirFonction= avoirFonctionRepository.findById(avoirFonctionId); + + List avoirFonctions= new ArrayList<>() ; + if(optionalAvoirFonction.isPresent()){ + avoirFonctions.add(optionalAvoirFonction.get()); + } + + List structures = new ArrayList<>(); + avoirFonctions.stream() + .filter(af -> af.getDateFin() == null || af.getDateFin().isAfter(LocalDate.now())) + .forEach(avoirFonction -> { + if(avoirFonction.getFonction().getStructure()!=null && avoirFonction.getFonction().getDepartement()==null){ + structures.addAll(List.of(avoirFonction.getFonction().getStructure())); + }else if (avoirFonction.getFonction().getDepartement()!=null){ + structures.addAll(structureRepository.findDistinctByCommune_Departement_Id(avoirFonction.getFonction().getDepartement().getId())); + } + }); + List structurePaylaodWebs=new ArrayList<>(); + structures.forEach(structure -> { + structurePaylaodWebs.add(structureRepository.findStructureToDtoById(structure.getId()).orElse(null)); + }); + + return structurePaylaodWebs; + } + // public List getStructureIdListForUser(Long userId) { diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CommuneCentreAssignationServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CommuneCentreAssignationServiceImpl.java index b36354d..bb147cd 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CommuneCentreAssignationServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CommuneCentreAssignationServiceImpl.java @@ -38,30 +38,30 @@ public class CommuneCentreAssignationServiceImpl implements CommuneCentreAssigna public CommuneCentreAssignationPaylaodWeb createCommuneCentreAssignation(User user, CommuneCentreAssignationPaylaodWeb communeCentreAssignationPaylaodWeb) throws BadRequestException { if (user.getStructure() == null) { - throw new BadRequestException("Impossible de créer l'assignation: Votre centre doit être précisé."); + throw new BadRequestException("Impossible de finaliser l'assignation: Votre centre doit être précisé."); } if (user.getStructure().getCommune() == null) { - throw new BadRequestException("Impossible de créer un nouveau communeCentreAssignation: votre commune doit être précisée."); + throw new BadRequestException("Impossible de finaliser l'assignation : votre commune doit être précisée."); } if (communeCentreAssignationPaylaodWeb.getPersonneId() == null) { - throw new BadRequestException("Impossible de créer un nouveau communeCentreAssignation: Le contribuable doit être précisée."); + throw new BadRequestException("Impossible de finaliser l'assignation : Le contribuable doit être précisée."); }else { if(!personneRepository.existsById(communeCentreAssignationPaylaodWeb.getPersonneId())) - throw new BadRequestException("Impossible de créer un nouveau communeCentreAssignation: Le contribuable doit être précisée."); + throw new BadRequestException("Impossible de finaliser l'assignation : Le contribuable doit être précisée."); } if (communeCentreAssignationPaylaodWeb.getParcelleContactId() == null) { - throw new BadRequestException("Impossible de créer une nouvelle assignation de centre : La parcelle de contact doit être précisée."); + throw new BadRequestException("Impossible de finaliser l'assignation : La parcelle de contact doit être précisée."); }else { if(!parcelleRepository.existsById(communeCentreAssignationPaylaodWeb.getParcelleContactId())) - throw new BadRequestException("Impossible de créer une nouvelle assignation de centre: La parcelle précisée n'existe pas."); + throw new BadRequestException("Impossible de finaliser l'assignation : La parcelle précisée n'existe pas."); } Optional communeCentreAssignationPaylaodWebOptional=communeCentreAssignationRepository.findbyCommuneAndPersonne(user.getStructure().getCommune().getId(),communeCentreAssignationPaylaodWeb.getPersonneId()); if(communeCentreAssignationPaylaodWeb.getId()==null && communeCentreAssignationPaylaodWebOptional.isPresent()){ - throw new NotAcceptableException("Impossible de créer une nouvelle assignation de centre: Le contribuable est déjà assigné au centre : "+communeCentreAssignationPaylaodWebOptional.get().getStructureNom()); + throw new NotAcceptableException("Impossible de finaliser l'assignation : Le contribuable est déjà assigné au centre : "+communeCentreAssignationPaylaodWebOptional.get().getStructureNom()); } 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 932f87c..62df991 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 @@ -342,4 +342,10 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ public Page getDonneesFiscalesNonHomologable(Long impositionTfuId,Pageable pageable) { return donneesImpositionTfuRepository.findAllByImpositionTfuIdNonHomologablePageable(impositionTfuId,pageable); } + + + @Override + public Page getDonneesFiscalesHomologable(Long impositionTfuId,Pageable pageable) { + return donneesImpositionTfuRepository.findAllByImpositionTfuIdHomologablePageable(impositionTfuId,pageable); + } } 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 15b699c..bca7862 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 @@ -211,4 +211,9 @@ public class ImpositionsTfuServiceImpl implements ImpositionsTfuService { System.out.println(structureIds.get(0)); return impositionsTfuRepository.findByStructureIdsToDto(structureIds); } + + @Override + public List getImpositionsTfuByStructureIdByStatut(Long structureId, StatusAvis statusAvis) { + return impositionsTfuRepository.findByStructureIdByStatutToDto(structureId,statusAvis); + } } diff --git a/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/StructureService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/StructureService.java index b76034c..47fef32 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/StructureService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/StructureService.java @@ -36,5 +36,6 @@ public interface StructureService { public List getListStructureUserId(Long userId) ; + public List getListStructureAvoirFonctionId(Long avoirFonctionId) ; } diff --git a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/DonneesImpositionTfuService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/DonneesImpositionTfuService.java index 1a413f5..ab54e8f 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/DonneesImpositionTfuService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/DonneesImpositionTfuService.java @@ -55,6 +55,7 @@ public interface DonneesImpositionTfuService { Integer setDonneesFiscalesNonHomologable(List donneesImpositionPaylaodWebs); Integer setDonneesFiscalesHomologable(List donneesImpositionPaylaodWebs); Page getDonneesFiscalesNonHomologable(Long impositionTfuId,Pageable pageable); + Page getDonneesFiscalesHomologable(Long impositionTfuId,Pageable pageable); public Integer homologuer(Long impositionTfuId); } diff --git a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/ImpositionsTfuService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/ImpositionsTfuService.java index d7ff8d1..d1427be 100755 --- a/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/ImpositionsTfuService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/ImpositionsTfuService.java @@ -1,6 +1,7 @@ package io.gmss.fiscad.interfaces.rfu.metier; import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu; +import io.gmss.fiscad.enums.StatusAvis; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb; @@ -28,4 +29,5 @@ public interface ImpositionsTfuService { Optional getImpositionsTfuById(Long id); List getImpositionsTfuByUserIdIds(Long userId); + List getImpositionsTfuByStructureIdByStatut(Long structureId, StatusAvis statusAvis); } diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java index 51a79c2..c1078e6 100755 --- a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java @@ -592,6 +592,83 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb( ); + @Query(""" +SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb( + d.id, + d.annee, + d.codeDepartement, + d.nomDepartement, + d.codeCommune, + d.nomCommune, + d.codeArrondissement, + d.nomArrondissement, + d.codeQuartierVillage, + d.nomQuartierVillage, + d.q, + d.ilot, + d.parcelle, + d.nup, + d.titreFoncier, + d.numBatiment, + d.numUniteLogement, + d.ifu, + d.npi, + d.telProp, + d.emailProp, + d.nomProp, + d.prenomProp, + d.raisonSociale, + d.adresseProp, + d.telSc, + d.emailSc, + d.nomSc, + d.prenomSc, + d.adresseSc, + d.longitude, + d.latitude, + d.superficieParc, + d.superficieAuSolBat, + d.superficieAuSolUlog, + d.batie, + d.exonere, + d.batimentExonere, + d.uniteLogementExonere, + d.valeurLocativeAdm, + d.montantLoyerAnnuel, + d.tfuMetreCarre, + d.tfuMinimum, + d.standingBat, + d.categorieBat, + d.nombrePiscine, + d.nombreUlog, + d.nombreBat, + d.dateEnquete, + s.id, + z.id, + d.valeurAdminParcelleNb, + d.natureImpot, + s.code, + z.nom, + d.valeurBatiment, + d.valeurParcelle, + d.valeurLocativeAdmMetreCarre, + d.valeurAdminParcelleNbMetreCarre, + d.montantTaxe + ) + FROM DonneesImpositionTfu d + JOIN d.impositionsTfu itfu + LEFT join d.structure s + LEFT join d.zoneRfu z + WHERE itfu.id = :impositionTfuId + and (d.homologable is true or d.homologable is null) + order by d.nomProp,d.nomProp asc + """) + Page findAllByImpositionTfuIdHomologablePageable( + Long impositionTfuId, + Pageable pageable + ); + + @Modifying @Transactional @Query(""" diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/ImpositionsTfuRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/ImpositionsTfuRepository.java index 292c544..bd837b1 100755 --- a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/ImpositionsTfuRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/ImpositionsTfuRepository.java @@ -194,4 +194,36 @@ public interface ImpositionsTfuRepository extends JpaRepository findByDepartementIdToDto(@Param("departementId") Long departementId); + + + @Query(""" + SELECT new io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb( + i.id, + i.dateGeneration, + i.dateCloture, + i.referencePieceAdmin, + i.datePieceAdmin, + i.statusAvis, + i.nombreAvis, + i.motif, + e.id, + e.annee, + c.id, + c.code, + c.nom, + s.id, + s.nom, + i.nombreAvisFnb, + i.nombreAvisBatiment, + i.nombreAvisUniteLog + ) + FROM ImpositionsTfu i + LEFT JOIN i.exercice e + LEFT JOIN i.commune c + LEFT JOIN i.structure s + WHERE s.id = :structureId + AND i.statusAvis = :statutAvis + """) + List findByStructureIdByStatutToDto(@Param("structureId") Long structureId, @Param("statutAvis") StatusAvis statutAvis); + } diff --git a/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java index 06c90b9..d041927 100644 --- a/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java +++ b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java @@ -1094,18 +1094,6 @@ public class EntityFromPayLoadService { communeCentreAssignation.setAdresseContact(communeCentreAssignationPaylaodWeb.getAdresseContact()); -// if (communeCentreAssignationPaylaodWeb.getCommuneId() != null) { -// Commune commune = new Commune(); -// commune.setId(communeCentreAssignationPaylaodWeb.getCommuneId()); -// communeCentreAssignation.setCommune(commune); -// } - -// if (communeCentreAssignationPaylaodWeb.getStructureId() != null) { -// Structure structure = new Structure(); -// structure.setId(communeCentreAssignationPaylaodWeb.getStructureId()); -// communeCentreAssignation.setStructure(structure); -// } - if (communeCentreAssignationPaylaodWeb.getParcelleContactId() != null) { Parcelle parcelle = new Parcelle(); parcelle.setId(communeCentreAssignationPaylaodWeb.getParcelleContactId()); diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 794620f..80747d9 100755 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -2,16 +2,16 @@ server.port=8282 io.gmss.fiscad.profile=test # LOCAL ENV TEST -#spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi -#spring.datasource.username=infocad_user -@spring.datasource.password=W5fwD({9*q53 - - -spring.datasource.url=jdbc:postgresql://193.181.208.4:5432/fiscad_db -spring.datasource.username=fiscad_user +spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi +spring.datasource.username=infocad_user spring.datasource.password=W5fwD({9*q53 +#spring.datasource.url=jdbc:postgresql://193.181.208.4:5432/fiscad_db +#spring.datasource.username=fiscad_user +#spring.datasource.password=W5fwD({9*q53 + + 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 1a74ba6..b02753a 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=test +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 From d78a6aa6693fafd120159359dbd8f378e90afc28 Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Thu, 30 Jul 2026 14:23:36 +0100 Subject: [PATCH 2/2] reajustement workflow --- src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b02753a..1a74ba6 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=test +#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