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

Merge pull request 'develop' (#180) from develop into main
All checks were successful
CD - Deploy on main / deploy (push) Successful in 49s
Details

Browse Source 
Reviewed-on: #180
This commit was merged in pull request #180.
This commit is contained in:
AKAKPO Aurince
2026-03-19 18:47:05 +00:00
parent 47bcda41fd 9063162c33
commit e325b12546
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File 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");