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 d06f984..36e1417 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 @@ -31,8 +31,6 @@ public class CampagneServiceImpl implements CampagneService { throw new BadRequestException("Impossible de créer une nouvelle campgne ayant un id non null."); } - - Campagne campagne= entityFromPayLoadService.getCampagneFromPayLoadWeb(campagnePayloadWeb); campagne= campagneRepository.save(campagne); diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/CampagneRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/CampagneRepository.java index 39ccbd2..91800df 100644 --- a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/CampagneRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/CampagneRepository.java @@ -25,12 +25,13 @@ public interface CampagneRepository extends JpaRepository { c.typeCampagne, e.id, e.annee, - c.structure.id, - c.structure.code, - c.structure.nom + s.id, + s.code, + s.nom ) FROM Campagne c LEFT JOIN c.exercice e + LEFT JOIN c.structure s WHERE c.id = :id """) Optional findPayloadById(@Param("id") Long id); @@ -45,12 +46,13 @@ public interface CampagneRepository extends JpaRepository { c.typeCampagne, e.id, e.annee, - c.structure.id, - c.structure.code, - c.structure.nom + s.id, + s.code, + s.nom ) FROM Campagne c LEFT JOIN c.exercice e + LEFT JOIN c.structure s ORDER BY c.dateDebut DESC """) List findAllPayload(); @@ -65,12 +67,13 @@ public interface CampagneRepository extends JpaRepository { c.typeCampagne, e.id, e.annee, - c.structure.id, - c.structure.code, - c.structure.nom + s.id, + s.code, + s.nom ) FROM Campagne c LEFT JOIN c.exercice e + LEFT JOIN c.structure s """, countQuery = """ SELECT COUNT(c) @@ -88,12 +91,13 @@ public interface CampagneRepository extends JpaRepository { c.typeCampagne, e.id, e.annee, - c.structure.id, - c.structure.code, - c.structure.nom + s.id, + s.code, + s.nom ) FROM Campagne c LEFT JOIN c.exercice e + LEFT JOIN c.structure s WHERE e.id = :exerciceId ORDER BY c.dateDebut DESC """) @@ -110,12 +114,13 @@ public interface CampagneRepository extends JpaRepository { c.typeCampagne, e.id, e.annee, - c.structure.id, - c.structure.code, - c.structure.nom + s.id, + s.code, + s.nom ) FROM Campagne c LEFT JOIN c.exercice e + LEFT JOIN c.structure s WHERE e.id = :exerciceId """, countQuery = """ @@ -138,9 +143,9 @@ public interface CampagneRepository extends JpaRepository { c.typeCampagne, e.id, e.annee, - c.structure.id, - c.structure.code, - c.structure.nom + s.id, + s.code, + s.nom ) FROM Campagne c LEFT JOIN c.exercice e @@ -161,9 +166,9 @@ public interface CampagneRepository extends JpaRepository { c.typeCampagne, e.id, e.annee, - c.structure.id, - c.structure.code, - c.structure.nom + s.id, + s.code, + s.nom ) FROM Campagne c LEFT JOIN c.exercice e diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 80747d9..66fd87c 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