diff --git a/src/main/java/io/gmss/fiscad/entities/decoupage/Arrondissement.java b/src/main/java/io/gmss/fiscad/entities/decoupage/Arrondissement.java index 12e4f33..9827346 100644 --- a/src/main/java/io/gmss/fiscad/entities/decoupage/Arrondissement.java +++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Arrondissement.java @@ -20,7 +20,6 @@ import java.util.List; @AllArgsConstructor @Where(clause = " deleted = false") public class Arrondissement extends BaseEntity implements Serializable { - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @@ -30,10 +29,10 @@ public class Arrondissement extends BaseEntity implements Serializable { private String latitude; @ManyToOne private Commune commune; - @JsonIgnore - @OneToMany(mappedBy = "arrondissement") - private List quartiers; - @JsonIgnore - @OneToMany(mappedBy = "arrondissement") - private List blocs; +// @JsonIgnore +// @OneToMany(mappedBy = "arrondissement") +// private List quartiers; +// @JsonIgnore +// @OneToMany(mappedBy = "arrondissement") +// private List blocs; } diff --git a/src/main/java/io/gmss/fiscad/entities/decoupage/Commune.java b/src/main/java/io/gmss/fiscad/entities/decoupage/Commune.java index 4b98397..06eb596 100644 --- a/src/main/java/io/gmss/fiscad/entities/decoupage/Commune.java +++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Commune.java @@ -30,11 +30,11 @@ public class Commune extends BaseEntity implements Serializable { private String latitude; @ManyToOne private Departement departement; - @JsonIgnore - @OneToMany(mappedBy = "commune") - private List arrondissements; - @JsonIgnore - @OneToMany(mappedBy = "commune") - private List personnes; +// @JsonIgnore +// @OneToMany(mappedBy = "commune") +// private List arrondissements; +// @JsonIgnore +// @OneToMany(mappedBy = "commune") +// private List personnes; } diff --git a/src/main/java/io/gmss/fiscad/entities/decoupage/Departement.java b/src/main/java/io/gmss/fiscad/entities/decoupage/Departement.java index 07d3e64..6c4a02b 100644 --- a/src/main/java/io/gmss/fiscad/entities/decoupage/Departement.java +++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Departement.java @@ -25,7 +25,7 @@ public class Departement extends BaseEntity implements Serializable { private Long id; private String code; private String nom; - @JsonIgnore - @OneToMany(mappedBy = "departement") - private List communes; +// @JsonIgnore +// @OneToMany(mappedBy = "departement") +// private List communes; } diff --git a/src/main/java/io/gmss/fiscad/entities/decoupage/Nationalite.java b/src/main/java/io/gmss/fiscad/entities/decoupage/Nationalite.java index 39c0e5c..bd00397 100644 --- a/src/main/java/io/gmss/fiscad/entities/decoupage/Nationalite.java +++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Nationalite.java @@ -33,7 +33,7 @@ public class Nationalite extends BaseEntity implements Serializable { private String code; private String indicatif; private String nationality; - @JsonIgnore - @OneToMany(mappedBy = "nationalite") - private List personnes; +// @JsonIgnore +// @OneToMany(mappedBy = "nationalite") +// private List personnes; } diff --git a/src/main/java/io/gmss/fiscad/entities/decoupage/Quartier.java b/src/main/java/io/gmss/fiscad/entities/decoupage/Quartier.java index 528b825..1bab512 100644 --- a/src/main/java/io/gmss/fiscad/entities/decoupage/Quartier.java +++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Quartier.java @@ -19,17 +19,16 @@ import java.io.Serializable; @AllArgsConstructor @Where(clause = " deleted = false") public class Quartier extends BaseEntity implements Serializable { - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String code; private String nom; - @JsonIgnore + // @JsonIgnore @ManyToOne private Arrondissement arrondissement; - @JsonIgnore - @OneToOne(mappedBy = "quartier") - private Bloc bloc; +// @JsonIgnore +// @OneToOne(mappedBy = "quartier") +// private Bloc bloc; } diff --git a/src/main/java/io/gmss/fiscad/entities/decoupage/Secteur.java b/src/main/java/io/gmss/fiscad/entities/decoupage/Secteur.java index b6c3ff9..b5b368e 100644 --- a/src/main/java/io/gmss/fiscad/entities/decoupage/Secteur.java +++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Secteur.java @@ -20,7 +20,6 @@ import java.util.List; @AllArgsConstructor @Where(clause = " deleted = false") public class Secteur extends BaseEntity implements Serializable { - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @@ -30,7 +29,10 @@ public class Secteur extends BaseEntity implements Serializable { private User chefSecteur; @ManyToOne private Structure structure; - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @JoinColumn(name = "secteur_id") - private List secteurDecoupages; +// @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) +// @JoinColumn(name = "secteur_id") +// private List secteurDecoupages; + + ///Creer un payload pour la creation de secteur découpage + /// ressource pour envoyer les découpage d'un secteur } diff --git a/src/main/java/io/gmss/fiscad/entities/decoupage/SecteurDecoupage.java b/src/main/java/io/gmss/fiscad/entities/decoupage/SecteurDecoupage.java index 3c7946a..0acdcf8 100644 --- a/src/main/java/io/gmss/fiscad/entities/decoupage/SecteurDecoupage.java +++ b/src/main/java/io/gmss/fiscad/entities/decoupage/SecteurDecoupage.java @@ -35,17 +35,15 @@ public class SecteurDecoupage extends BaseEntity implements Serializable { @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateFin; - @JsonIgnore @ManyToOne private Secteur secteur; - @ManyToOne private Arrondissement arrondissement; @ManyToOne private Quartier quartier; - @JsonIgnore - @OneToMany(mappedBy = "secteurDecoupage") - private List blocs; +// @JsonIgnore +// @OneToMany(mappedBy = "secteurDecoupage") +// private List blocs; } \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/ActeurConcerne.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/ActeurConcerne.java index 4208adb..43bd994 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/ActeurConcerne.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/ActeurConcerne.java @@ -31,7 +31,6 @@ import java.util.List; "WHERE id = ?") @Where(clause = " deleted = false") public class ActeurConcerne extends BaseEntity implements Serializable { - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @@ -52,8 +51,10 @@ public class ActeurConcerne extends BaseEntity implements Serializable { private Enquete enquete; @Enumerated(EnumType.STRING) private RoleActeur roleActeur; - @OneToMany(mappedBy = "acteurConcerne") - private List pieces; + +// @OneToMany(mappedBy = "acteurConcerne") +// private List pieces; + @JsonIgnore @ManyToOne private Tpe terminal; diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java index e05f291..31cddff 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java @@ -60,7 +60,7 @@ public class Enquete extends BaseEntity implements Serializable { private Parcelle parcelle; @JsonIgnore @ManyToOne - private Bloc bloc; //représente un secteur d'enquetes + private Bloc bloc; @ManyToOne private Campagne campagne; @ManyToOne diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/MembreGroupe.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/MembreGroupe.java index 2763fd1..ee6e520 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/MembreGroupe.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/MembreGroupe.java @@ -35,9 +35,9 @@ public class MembreGroupe extends BaseEntity implements Serializable { private TypeRepresentation typeRepresentation; @ManyToOne private PositionRepresentation positionRepresentation; - @JsonIgnore - @OneToMany(mappedBy = "membreGroupe") - private Set uploads; +// @JsonIgnore +// @OneToMany(mappedBy = "membreGroupe") +// private Set uploads; @JsonIgnore @ManyToOne private Tpe terminal; diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java index c7d02c9..0750cab 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java @@ -42,9 +42,9 @@ public class Parcelle extends BaseEntity implements Serializable { private String longitude; private String latitude; private String situationGeographique; - @JsonIgnore - @OneToMany(mappedBy = "parcelle") - private List enquetes; +// @JsonIgnore +// @OneToMany(mappedBy = "parcelle") +// private List enquetes; // @ManyToOne // private SituationGeographique situationGeographique; @ManyToOne @@ -69,9 +69,9 @@ public class Parcelle extends BaseEntity implements Serializable { private Long idDerniereEnquete; - @JsonIgnore - @OneToMany(mappedBy = "parcelle") - private List batiments; +// @JsonIgnore +// @OneToMany(mappedBy = "parcelle") +// private List batiments; // @ColumnDefault("0") // private int geomSrid; @@ -85,6 +85,4 @@ public class Parcelle extends BaseEntity implements Serializable { // @JsonDeserialize(contentUsing = GeometryDeserializer.class) // @Column(name = "geom_32631",columnDefinition = "geometry(MultiPolygon,32631)") // private Point geometry32631; - - } diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java index 599cfe2..4d88137 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java @@ -54,6 +54,7 @@ public class Piece extends BaseEntity implements Serializable { private SourceDroit sourceDroit; @ManyToOne private ModeAcquisition modeAcquisition; + @OneToMany(mappedBy = "piece") private List uploads; diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java index c54c5b1..b434416 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java @@ -31,9 +31,11 @@ public class Upload extends BaseEntity implements Serializable { @JsonIgnore @ManyToOne private Piece piece; + @JsonIgnore @ManyToOne private MembreGroupe membreGroupe; + @JsonIgnore @ManyToOne private Tpe terminal; @@ -48,6 +50,7 @@ public class Upload extends BaseEntity implements Serializable { @ManyToOne private EnqueteBatiment enqueteBatiment; + @ManyToOne private EnqueteUniteLogement enqueteUniteLogement; diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/ModeAcquisition.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/ModeAcquisition.java index f5c891f..04062b4 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/ModeAcquisition.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/ModeAcquisition.java @@ -33,7 +33,6 @@ public class ModeAcquisition extends BaseEntity implements Serializable { private String libelle; @JsonIgnore @OneToMany(mappedBy = "modeAcquisition") - //private List sourceDroitExerces; private List pieces; @ManyToMany @JoinTable(name = "modeAcquisition_typePersonne", diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/NatureDomaine.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/NatureDomaine.java index 532587b..d9b9289 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/NatureDomaine.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/NatureDomaine.java @@ -34,9 +34,10 @@ public class NatureDomaine extends BaseEntity implements Serializable { //@JsonIgnore @ManyToOne private TypeDomaine typeDomaine; - @JsonIgnore - @OneToMany(mappedBy = "natureDomaine") - private List parcelles; +// @JsonIgnore +// @OneToMany(mappedBy = "natureDomaine") +// private List parcelles; + @ManyToMany @JoinTable(name = "natureDomaine_typePersonne", joinColumns = @JoinColumn(name = "nature_domaine_id"), diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java index 4cb53c5..43872a2 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java @@ -47,9 +47,9 @@ public class Personne extends BaseEntity implements Serializable { private String adresse; @Enumerated(EnumType.STRING) private Categorie categorie; - @JsonIgnore - @OneToMany(mappedBy = "personne") - private List acteurConcernes; +// @JsonIgnore +// @OneToMany(mappedBy = "personne") +// private List acteurConcernes; @ManyToOne private SituationMatrimoniale situationMatrimoniale; @ManyToOne @@ -60,9 +60,8 @@ public class Personne extends BaseEntity implements Serializable { private Profession profession; @ManyToOne private Commune commune; - @OneToMany(mappedBy = "personne") - private List pieces; - +// @OneToMany(mappedBy = "personne") +// private List pieces; @JsonIgnore @ManyToOne private Tpe terminal; diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/PositionRepresentation.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/PositionRepresentation.java index 60f91ca..2b0919f 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/PositionRepresentation.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/PositionRepresentation.java @@ -31,10 +31,10 @@ public class PositionRepresentation extends BaseEntity implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String libelle; - @JsonIgnore - @OneToMany(mappedBy = "positionRepresentation") - private List acteurConcernes; - @JsonIgnore - @OneToMany(mappedBy = "positionRepresentation") - private List membreGroupes; +// @JsonIgnore +// @OneToMany(mappedBy = "positionRepresentation") +// private List acteurConcernes; +// @JsonIgnore +// @OneToMany(mappedBy = "positionRepresentation") +// private List membreGroupes; } diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Profession.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Profession.java index 529f68b..dcc3e6e 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Profession.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Profession.java @@ -30,7 +30,7 @@ public class Profession extends BaseEntity implements Serializable { private Long id; private String code; private String libelle; - @JsonIgnore - @OneToMany(mappedBy = "profession") - private List personnes; +// @JsonIgnore +// @OneToMany(mappedBy = "profession") +// private List personnes; } diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/SituationMatrimoniale.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/SituationMatrimoniale.java index 0ecb624..8816d41 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/SituationMatrimoniale.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/SituationMatrimoniale.java @@ -29,7 +29,7 @@ public class SituationMatrimoniale extends BaseEntity implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String libelle; - @JsonIgnore - @OneToMany(mappedBy = "situationMatrimoniale") - private List personnes; +// @JsonIgnore +// @OneToMany(mappedBy = "situationMatrimoniale") +// private List personnes; } diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java index d7c6c98..3a7ce8b 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java @@ -53,11 +53,11 @@ public class Structure extends BaseEntity implements Serializable { inverseJoinColumns = @JoinColumn(name = "arrondissement_id") ) private Set arrondissements; - @JsonIgnore - @OneToMany(mappedBy = "structure") - private List agents; - @JsonIgnore - @OneToMany(mappedBy = "structure") - private List blocs; +// @JsonIgnore +// @OneToMany(mappedBy = "structure") +// private List agents; +// @JsonIgnore +// @OneToMany(mappedBy = "structure") +// private List blocs; } diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeContestation.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeContestation.java index 9b560a4..e4397b5 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeContestation.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeContestation.java @@ -26,14 +26,13 @@ import java.util.List; "WHERE id = ?") @Where(clause = " deleted = false") public class TypeContestation extends BaseEntity implements Serializable { - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String libelle; @ColumnDefault("true") private boolean droitPropriete; - @JsonIgnore - @OneToMany(mappedBy = "typeContestation") - private List acteurConcernes; +// @JsonIgnore +// @OneToMany(mappedBy = "typeContestation") +// private List acteurConcernes; } diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypePersonne.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypePersonne.java index 5401e1c..55a89b7 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypePersonne.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypePersonne.java @@ -34,7 +34,7 @@ public class TypePersonne extends BaseEntity implements Serializable { private Categorie categorie; @Column(nullable = false, columnDefinition = "BOOLEAN DEFAULT false") private boolean groupeOuvert; - @JsonIgnore - @OneToMany(mappedBy = "typePersonne") - private List personnes; +// @JsonIgnore +// @OneToMany(mappedBy = "typePersonne") +// private List personnes; } diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRepresentation.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRepresentation.java index 26da214..e7aee93 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRepresentation.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRepresentation.java @@ -33,11 +33,11 @@ public class TypeRepresentation extends BaseEntity implements Serializable { private String libelle; @Column(columnDefinition = "boolean default false") private boolean estUnique; - @JsonIgnore - @OneToMany(mappedBy = "typeRepresentation") - private List acteurConcernes; - @JsonIgnore - @OneToMany(mappedBy = "typeRepresentation") - private List membreGroupes; +// @JsonIgnore +// @OneToMany(mappedBy = "typeRepresentation") +// private List acteurConcernes; +// @JsonIgnore +// @OneToMany(mappedBy = "typeRepresentation") +// private List membreGroupes; } diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java index ffa9a53..814e9c5 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java @@ -34,15 +34,16 @@ public class Batiment extends BaseEntity implements Serializable { @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateConstruction; - @JsonIgnore - @OneToMany(mappedBy = "batiment") - private List enqueteBatiments; +// @JsonIgnore +// @OneToMany(mappedBy = "batiment") +// private List enqueteBatiments; private Long idDerniereEnquete; + @JsonIgnore @ManyToOne private Parcelle parcelle; - @JsonIgnore - @OneToMany(mappedBy = "batiment") - private List uniteLogements; +// @JsonIgnore +// @OneToMany(mappedBy = "batiment") +// private List uniteLogements; @JsonIgnore @ManyToOne diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueParcelle.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueParcelle.java index b932ba6..36df3a0 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueParcelle.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueParcelle.java @@ -30,6 +30,7 @@ public class CaracteristiqueParcelle extends BaseEntity implements Serializable @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @JsonIgnore @ManyToOne private Enquete enquete; @ManyToOne diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java index aa3ed1f..dacf385 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java @@ -63,11 +63,12 @@ public class EnqueteBatiment extends BaseEntity implements Serializable { private Personne personne; @ManyToOne private Batiment batiment; + @JsonIgnore @ManyToOne private Enquete enquete; - @JsonIgnore - @OneToMany(mappedBy = "enqueteBatiment") - List caracteristiqueBatiments; +// @JsonIgnore +// @OneToMany(mappedBy = "enqueteBatiment") +// List caracteristiqueBatiments; @JsonIgnore @ManyToOne private Tpe terminal; diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java index 514d833..6aef6bc 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java @@ -57,15 +57,16 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable { @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateFinExcemption; + @JsonIgnore @ManyToOne private Enquete enquete; @ManyToOne private UniteLogement uniteLogement; @OneToOne private Personne personne; - @JsonIgnore - @OneToMany(mappedBy = "enqueteUniteLogement") - private List caracteristiqueUniteLogements; +// @JsonIgnore +// @OneToMany(mappedBy = "enqueteUniteLogement") +// private List caracteristiqueUniteLogements; @JsonIgnore @ManyToOne private Tpe terminal; diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Campagne.java b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Campagne.java index 97946d1..be82fd2 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Campagne.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Campagne.java @@ -39,12 +39,12 @@ public class Campagne extends BaseEntity implements Serializable { private LocalDate dateFin; @Enumerated(EnumType.STRING) private TypeCampagne typeCampagne; - @JsonIgnore - @OneToMany(mappedBy = "campagne") - private List equipes; - @JsonIgnore - @OneToMany(mappedBy = "campagne") - private List enquetes; +// @JsonIgnore +// @OneToMany(mappedBy = "campagne") +// private List equipes; +// @JsonIgnore +// @OneToMany(mappedBy = "campagne") +// private List enquetes; } diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Caracteristique.java b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Caracteristique.java index fc81c6f..8d94222 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Caracteristique.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Caracteristique.java @@ -30,15 +30,16 @@ public class Caracteristique extends BaseEntity implements Serializable { private String code; private String libelle; private boolean actif; + @Enumerated(EnumType.STRING) private TypeImmeuble typeImmeuble; @ManyToOne private TypeCaracteristique typeCaracteristique; - @JsonIgnore - @OneToMany(mappedBy = "caracteristique") - private List caracteristiqueBatiments; - @JsonIgnore - @OneToMany(mappedBy = "caracteristique") - private List caracteristiqueUniteLogements; +// @JsonIgnore +// @OneToMany(mappedBy = "caracteristique") +// private List caracteristiqueBatiments; +// @JsonIgnore +// @OneToMany(mappedBy = "caracteristique") +// private List caracteristiqueUniteLogements; @JsonIgnore @ManyToOne private Tpe terminal; diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Equipe.java b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Equipe.java index 7c72c0e..7a67ce7 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Equipe.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Equipe.java @@ -38,7 +38,7 @@ public class Equipe extends BaseEntity implements Serializable { @JoinColumn(name = "equipe_id") private List participers; - @JsonIgnore - @OneToMany(mappedBy = "equipe") - private List enquetes; +// @JsonIgnore +// @OneToMany(mappedBy = "equipe") +// private List enquetes; } diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Participer.java b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Participer.java index 5bc3c98..20ccad3 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Participer.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Participer.java @@ -35,6 +35,7 @@ public class Participer extends BaseEntity implements Serializable { @JsonIgnore @ManyToOne private Equipe equipe; + @JsonIgnore @ManyToOne private User user; } diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/TypeCaracteristique.java b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/TypeCaracteristique.java index 0bcd2ee..0c7ecb8 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/TypeCaracteristique.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/TypeCaracteristique.java @@ -29,9 +29,10 @@ public class TypeCaracteristique extends BaseEntity implements Serializable { private boolean actif; private boolean bati; private boolean nonBati; + @Enumerated(EnumType.STRING) private TypeImmeuble typeImmeuble; - @JsonIgnore - @OneToMany(mappedBy = "typeCaracteristique") - private List caracteristiques; +// @JsonIgnore +// @OneToMany(mappedBy = "typeCaracteristique") +// private List caracteristiques; } diff --git a/src/main/java/io/gmss/fiscad/entities/user/User.java b/src/main/java/io/gmss/fiscad/entities/user/User.java index ae9a52c..697ef43 100755 --- a/src/main/java/io/gmss/fiscad/entities/user/User.java +++ b/src/main/java/io/gmss/fiscad/entities/user/User.java @@ -54,15 +54,15 @@ public class User extends BaseEntity implements Serializable { private Set roles; @ManyToOne private Structure structure; - @JsonIgnore - @OneToMany(mappedBy = "user") - private List enquetes; +// @JsonIgnore +// @OneToMany(mappedBy = "user") +// private List enquetes; @JsonIgnore @OneToMany(mappedBy = "user") private List participers; - @JsonIgnore - @OneToMany(mappedBy = "chefSecteur") - private List secteurs; +// @JsonIgnore +// @OneToMany(mappedBy = "chefSecteur") +// private List secteurs; @Transient private Long idCampagneCourant; @@ -84,10 +84,12 @@ public class User extends BaseEntity implements Serializable { public Long getIdCampagneCourant() { - for (Participer p : participers) { - if (p.getDateFin() == null) { - if(p.getEquipe().getCampagne()!=null) { - return p.getEquipe().getCampagne().getId(); + if(participers!=null) { + for (Participer p : participers) { + if (p.getDateFin() == null) { + if (p.getEquipe().getCampagne() != null) { + return p.getEquipe().getCampagne().getId(); + } } } } @@ -95,6 +97,7 @@ public class User extends BaseEntity implements Serializable { } public Long getIdSecteurCourant() { + if(participers!=null){ for (Participer p : participers) { if (p.getDateFin() == null) { if(p.getEquipe().getSecteur()!=null) { @@ -102,7 +105,8 @@ public class User extends BaseEntity implements Serializable { } } } - return null; + } + return null ; } diff --git a/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java index addc289..1152865 100644 --- a/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java @@ -79,7 +79,8 @@ public class SecteurServiceImpl implements SecteurService { sd.setId(sdp.getId()); secteurDecoupageList.add(sd); } - secteur.setSecteurDecoupages(secteurDecoupageList); + //secteur.setSecteurDecoupages(secteurDecoupageList); + //TODO secteur.setId(secteurPayload.getId()); secteur.setCode(secteurPayload.getCode()); secteur.setNom(secteurPayload.getNom()); diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java index c2adf7e..da580bb 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java @@ -385,39 +385,17 @@ public class EnqueteServiceImpl implements EnqueteService { if (optionalEnquete.isPresent()) { ficheEnquetesResponse = modelMapper.map(optionalEnquete.get(), FicheEnquetesResponse.class); } - - List ficheActeurConcerneResponses = new ArrayList<>(); - if (!acteurConcernes.isEmpty()) { - acteurConcernes.stream().forEach(acteurConcerne -> ficheActeurConcerneResponses.add(modelMapper.map(acteurConcerne, FicheActeurConcerneResponse.class))); - } - List caracteristiqueParcelles = caracteristiqueParcelleRepository.findAllByEnquete_Id(enqueteId); - List caracteristiqueParcelleResponses = new ArrayList<>(); - if (!caracteristiqueParcelles.isEmpty()) { - caracteristiqueParcelles.stream().forEach(caracteristiqueParcelle -> caracteristiqueParcelleResponses.add(modelMapper.map(caracteristiqueParcelle, FicheCaracteristiqueParcelleResponse.class))); - } - - List enqueteBatimentResponses = new ArrayList<>(); - List enqueteBatiments = enqueteBatimentRepository.findAllByEnquete_Id(enqueteId); - if (!enqueteBatiments.isEmpty()) { - enqueteBatiments.stream().forEach(enqueteBatiment -> enqueteBatimentResponses.add(modelMapper.map(enqueteBatiment, FicheEnqueteBatimentResponse.class))); - } - - List enqueteUniteLogementResponses = new ArrayList<>(); List enqueteUniteLogements = enqueteUniteLogementRepository.findAllByEnquete_Id(enqueteId); - if (!enqueteUniteLogements.isEmpty()) { - enqueteUniteLogements.stream().forEach(enqueteUniteLogement -> enqueteUniteLogementResponses.add(modelMapper.map(enqueteUniteLogement, FicheEnqueteUniteLogementResponse.class))); - } - - ficheEnquetesResponse.setCaracteristiquesParcelles(caracteristiqueParcelleResponses); - ficheEnquetesResponse.setEnquetesBatiments(enqueteBatimentResponses); - ficheEnquetesResponse.setEnquetesUniteLogements(enqueteUniteLogementResponses); + ficheEnquetesResponse.setCaracteristiquesParcelles(caracteristiqueParcelles); + ficheEnquetesResponse.setEnquetesBatiments(enqueteBatiments); + ficheEnquetesResponse.setEnquetesUniteLogements(enqueteUniteLogements); ficheEnqueteResponse.setEnquete(ficheEnquetesResponse); - ficheEnqueteResponse.setActeurConcernes(ficheActeurConcerneResponses); + ficheEnqueteResponse.setActeurConcernes(acteurConcernes); return ficheEnqueteResponse; } diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheEnqueteResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheEnqueteResponse.java index 9c3ff83..064d72e 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/FicheEnqueteResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheEnqueteResponse.java @@ -1,5 +1,6 @@ package io.gmss.fiscad.paylaods.response; +import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne; import io.gmss.fiscad.paylaods.response.FicheResponse.FicheActeurConcerneResponse; import io.gmss.fiscad.paylaods.response.FicheResponse.FicheEnquetesResponse; import lombok.Data; @@ -16,6 +17,6 @@ public class FicheEnqueteResponse { //private List acteurConcernes; private FicheEnquetesResponse enquete; - private List acteurConcernes; + private List acteurConcernes; } diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnquetesResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnquetesResponse.java index 7e0bd98..3fb6973 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnquetesResponse.java +++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnquetesResponse.java @@ -8,6 +8,9 @@ import io.gmss.fiscad.entities.decoupage.Arrondissement; import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.parametre.Bloc; import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine; +import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle; +import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment; +import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement; import io.gmss.fiscad.entities.rfu.parametre.Campagne; import io.gmss.fiscad.entities.rfu.parametre.Equipe; import io.gmss.fiscad.entities.user.User; @@ -49,7 +52,7 @@ public class FicheEnquetesResponse { @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateLitigeResolu; - @JsonFormat + @JsonIgnore private Bloc bloc; @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) @@ -115,16 +118,9 @@ public class FicheEnquetesResponse { @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateFinExcemption; -// public Long getTerminalId(){ -// if(this.terminal!=null){ -// return this.terminal.getId(); -// }else return null; -// } - - - private List caracteristiquesParcelles; - private List enquetesBatiments; - private List enquetesUniteLogements; + private List caracteristiquesParcelles; + private List enquetesBatiments; + private List enquetesUniteLogements; public String getNomPrenomEnqueteur() { if (this.user != null) {