judaur2005/fiscad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop #297

Merged
judaur2005 merged 2 commits from develop into main 2026-08-02 21:15:33 +00:00
Conversation 0 Commits 2 Files Changed 3 +33 -30
3 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3119060aa2 - Show all commits

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

@@ -31,8 +31,6 @@ public class CampagneServiceImpl implements CampagneService {
throw new BadRequestException("Impossible de créer une nouvelle campgne ayant un id non null."); throw new BadRequestException("Impossible de créer une nouvelle campgne ayant un id non null.");
} }
Campagne campagne= entityFromPayLoadService.getCampagneFromPayLoadWeb(campagnePayloadWeb); Campagne campagne= entityFromPayLoadService.getCampagneFromPayLoadWeb(campagnePayloadWeb);
campagne= campagneRepository.save(campagne); campagne= campagneRepository.save(campagne);

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

@@ -25,12 +25,13 @@ public interface CampagneRepository extends JpaRepository<Campagne, Long> {
c.typeCampagne, c.typeCampagne,
e.id, e.id,
e.annee, e.annee,
c.structure.id, s.id,
c.structure.code, s.code,
c.structure.nom s.nom
) )
FROM Campagne c FROM Campagne c
LEFT JOIN c.exercice e LEFT JOIN c.exercice e
LEFT JOIN c.structure s
WHERE c.id = :id WHERE c.id = :id
""") """)
Optional<CampagnePayloadWeb> findPayloadById(@Param("id") Long id); Optional<CampagnePayloadWeb> findPayloadById(@Param("id") Long id);
@@ -45,12 +46,13 @@ public interface CampagneRepository extends JpaRepository<Campagne, Long> {
c.typeCampagne, c.typeCampagne,
e.id, e.id,
e.annee, e.annee,
c.structure.id, s.id,
c.structure.code, s.code,
c.structure.nom s.nom
) )
FROM Campagne c FROM Campagne c
LEFT JOIN c.exercice e LEFT JOIN c.exercice e
LEFT JOIN c.structure s
ORDER BY c.dateDebut DESC ORDER BY c.dateDebut DESC
""") """)
List<CampagnePayloadWeb> findAllPayload(); List<CampagnePayloadWeb> findAllPayload();
@@ -65,12 +67,13 @@ public interface CampagneRepository extends JpaRepository<Campagne, Long> {
c.typeCampagne, c.typeCampagne,
e.id, e.id,
e.annee, e.annee,
c.structure.id, s.id,
c.structure.code, s.code,
c.structure.nom s.nom
) )
FROM Campagne c FROM Campagne c
LEFT JOIN c.exercice e LEFT JOIN c.exercice e
LEFT JOIN c.structure s
""", """,
countQuery = """ countQuery = """
SELECT COUNT(c) SELECT COUNT(c)
@@ -88,12 +91,13 @@ public interface CampagneRepository extends JpaRepository<Campagne, Long> {
c.typeCampagne, c.typeCampagne,
e.id, e.id,
e.annee, e.annee,
c.structure.id, s.id,
c.structure.code, s.code,
c.structure.nom s.nom
) )
FROM Campagne c FROM Campagne c
LEFT JOIN c.exercice e LEFT JOIN c.exercice e
LEFT JOIN c.structure s
WHERE e.id = :exerciceId WHERE e.id = :exerciceId
ORDER BY c.dateDebut DESC ORDER BY c.dateDebut DESC
""") """)
@@ -110,12 +114,13 @@ public interface CampagneRepository extends JpaRepository<Campagne, Long> {
c.typeCampagne, c.typeCampagne,
e.id, e.id,
e.annee, e.annee,
c.structure.id, s.id,
c.structure.code, s.code,
c.structure.nom s.nom
) )
FROM Campagne c FROM Campagne c
LEFT JOIN c.exercice e LEFT JOIN c.exercice e
LEFT JOIN c.structure s
WHERE e.id = :exerciceId WHERE e.id = :exerciceId
""", """,
countQuery = """ countQuery = """
@@ -138,9 +143,9 @@ public interface CampagneRepository extends JpaRepository<Campagne, Long> {
c.typeCampagne, c.typeCampagne,
e.id, e.id,
e.annee, e.annee,
c.structure.id, s.id,
c.structure.code, s.code,
c.structure.nom s.nom
) )
FROM Campagne c FROM Campagne c
LEFT JOIN c.exercice e LEFT JOIN c.exercice e
@@ -161,9 +166,9 @@ public interface CampagneRepository extends JpaRepository<Campagne, Long> {
c.typeCampagne, c.typeCampagne,
e.id, e.id,
e.annee, e.annee,
c.structure.id, s.id,
c.structure.code, s.code,
c.structure.nom s.nom
) )
FROM Campagne c FROM Campagne c
LEFT JOIN c.exercice e LEFT JOIN c.exercice e

14
src/main/resources/application-test.properties
View File

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