Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

develop to main #111

Merged
merged 1 commit into from
Dec 12, 2024
Merged

develop to main #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/src/main/java/fr/abes/item/core/entities/item/DemandeExemp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ public class DemandeExemp extends Demande{
@Column(name = "LISTE_ZONES", length = 2000)
private String listeZones;

@OneToMany(mappedBy = "demandeExemp", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<JournalDemandeExemp> journalDemandes;

@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "DEM_INDEX_RECHERCHE")
private IndexRecherche indexRecherche;

@OneToMany(mappedBy = "demandeExemp", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<LigneFichierExemp> ligneFichierExemps;

@OneToMany(mappedBy = "demandeExemp", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<JournalDemandeExemp> journalDemandes;

public DemandeExemp(Integer numDemande) {
super(numDemande);
}
Expand Down
12 changes: 8 additions & 4 deletions core/src/main/java/fr/abes/item/core/entities/item/DemandeRecouv.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package fr.abes.item.core.entities.item;

import fr.abes.item.core.constant.TYPE_DEMANDE;
import jakarta.persistence.Entity;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import jakarta.persistence.*;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.Set;

@Entity
@Table(name = "DEMANDE_RECOUV")
Expand All @@ -21,6 +19,12 @@ public class DemandeRecouv extends Demande {
@JoinColumn(name = "DEM_INDEX_RECHERCHE")
private IndexRecherche indexRecherche;

@OneToMany(mappedBy = "demandeRecouv", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<LigneFichierRecouv> ligneFichierRecouvs;

@Getter @Setter @OneToMany(mappedBy = "demandeRecouv", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<JournalDemandeRecouv> journalDemandeRecouvs;

public DemandeRecouv(@NotNull String rcr, Date dateCreation, Date dateModification, @NotNull EtatDemande etatDemande, String commentaire, Utilisateur utilisateur, IndexRecherche indexRecherche) {
super(rcr, dateCreation, dateModification, etatDemande, commentaire, utilisateur);
this.indexRecherche = indexRecherche;
Expand Down
3 changes: 3 additions & 0 deletions core/src/main/java/fr/abes/item/core/entities/item/DemandeSupp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ public TYPE_DEMANDE getTypeDemande() {
@Getter @Setter @OneToMany(mappedBy = "demandeSupp", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<LigneFichierSupp> ligneFichierSupps;

@Getter @Setter @OneToMany(mappedBy = "demandeSupp", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<JournalDemandeSupp> journalDemandeSupps;

public DemandeSupp(String rcr, Date dateCreation, Date dateModification, TYPE_SUPPRESSION typeSuppression,
String comment, EtatDemande etatDemande, Utilisateur utilisateur) {
super(rcr, dateCreation, dateModification, etatDemande, comment, utilisateur);
Expand Down
Loading