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

Compare commits

base: judaur2005:47bcda41fd0c52eb0d61c8ba0819ed2ac4d61625
Branches Tags
judaur2005:develop judaur2005:main judaur2005:features/fiche_refonte judaur2005:features/crud_entites
..
compare: judaur2005:e325b1254687b67f6d493d91ba19e2bae320adbb
Branches Tags
judaur2005:main judaur2005:develop judaur2005:features/fiche_refonte judaur2005:features/crud_entites

3 Commits
47bcda41fd ... e325b12546

Author SHA1 Message Date
AKAKPO Aurince
e325b12546 Merge pull request 'develop' (#180) from develop into main
All checks were successful
CD - Deploy on main / deploy (push) Successful in 49s
Details 
Reviewed-on: #180
 2026-03-19 18:47:05 +00:00
AKAKPO Aurince
9063162c33 Merge pull request 'fusion maj parcelle,batiment,ulo et leur enquete' (#179) from features/fiche_refonte into develop 
Reviewed-on: #179
 2026-03-19 18:45:31 +00:00
Aurince AKAKPO
4997fd32c1 fusion maj parcelle,batiment,ulo et leur enquete
All checks were successful
CI - Build & Test (develop) / build-and-test (pull_request) Successful in 34s
Details
2026-03-19 19:44:52 +01:00
2 changed files with 5 additions and 3 deletions
Expand all files Collapse all files

6
src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java
View File

@@ -99,9 +99,9 @@ public class Enquete extends BaseEntity implements Serializable {
@ManyToOne @ManyToOne
private Campagne campagne; private Campagne campagne;
@JsonIgnore // @JsonIgnore
@ManyToOne // @ManyToOne
private Equipe equipe; // private Equipe equipe;
// @JsonIgnore // @JsonIgnore
@ManyToOne @ManyToOne

2
src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java
View File

@@ -100,6 +100,7 @@ public class EnqueteServiceImpl implements EnqueteService {
if (!optionalUser.isPresent()) { if (!optionalUser.isPresent()) {
throw new BadRequestException("Echec de l'enregistrement : Enquêteur inexistant"); throw new BadRequestException("Echec de l'enregistrement : Enquêteur inexistant");
} }
Optional<Personne> optionalPersonne = personneRepository.findById(enquetePayLoadWeb.getPersonneId()); Optional<Personne> optionalPersonne = personneRepository.findById(enquetePayLoadWeb.getPersonneId());
if (!optionalPersonne.isPresent()) { if (!optionalPersonne.isPresent()) {
throw new BadRequestException("Echec de l'enregistrement : Propriétaire inexistant"); throw new BadRequestException("Echec de l'enregistrement : Propriétaire inexistant");
@@ -112,6 +113,7 @@ public class EnqueteServiceImpl implements EnqueteService {
} }
} }
Optional<ZoneRfu> optionalZoneRfu = zoneRfuRepository.findById(enquetePayLoadWeb.getZoneRfuId()); Optional<ZoneRfu> optionalZoneRfu = zoneRfuRepository.findById(enquetePayLoadWeb.getZoneRfuId());
if (!optionalZoneRfu.isPresent()) { if (!optionalZoneRfu.isPresent()) {
throw new BadRequestException("Echec de l'enregistrement : zone inexistante"); throw new BadRequestException("Echec de l'enregistrement : zone inexistante");