Refactoring start
This commit is contained in:
@@ -16,70 +16,137 @@ import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Entity
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Table(name = "agent")
|
||||
@Entity
|
||||
@Table(name = "agents")
|
||||
public class Agent {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@GeneratedValue
|
||||
private Long id;
|
||||
|
||||
private String code;
|
||||
private String profile;
|
||||
private String principalCode;
|
||||
private String caisseProfile;
|
||||
private StatutAgent statut;
|
||||
private String statut;
|
||||
private String zone;
|
||||
private String kiosk;
|
||||
private String fonction;
|
||||
@Pattern(regexp = "^\\d{2}/\\d{2}/\\d{4}$", message = "La date doit être au format dd/MM/yyyy")
|
||||
@JsonFormat(pattern = "dd/MM/yyyy", shape = JsonFormat.Shape.STRING)
|
||||
private LocalDate dateEmbauche;
|
||||
@NotBlank(message = "Le nom est obligatoire")
|
||||
|
||||
@Column(name = "date_embauche")
|
||||
private LocalDateTime dateEmbauche;
|
||||
|
||||
private String nom;
|
||||
private String prenom;
|
||||
private String autresNoms;
|
||||
@Pattern(regexp = "^\\d{2}/\\d{2}/\\d{4}$", message = "La date de naissance doit être au format dd/MM/yyyy")
|
||||
@Column(name = "date_naissance", nullable = false)
|
||||
@JsonFormat(pattern = "dd/MM/yyyy", shape = JsonFormat.Shape.STRING)
|
||||
|
||||
@Column(name = "date_naissance")
|
||||
private LocalDate dateNaissance;
|
||||
|
||||
private String lieuNaissance;
|
||||
private String ville;
|
||||
private String adresse;
|
||||
private Boolean autoriserAides;
|
||||
private String phone;
|
||||
private String pin;
|
||||
|
||||
private Double limiteInferieure;
|
||||
private Double limiteSuperieure;
|
||||
private Double limiteParTransaction;
|
||||
private Double limiteMinAirtime;
|
||||
private Double limiteMaxAirtime;
|
||||
|
||||
private Integer maxPeripheriques;
|
||||
private String limitId;
|
||||
// Légales
|
||||
|
||||
@Column(name = "limit_id")
|
||||
private Long limitId;
|
||||
|
||||
private String nationalite;
|
||||
private String cni;
|
||||
private String cniDelivreeLe;
|
||||
|
||||
@Column(name = "cni_delivree_le")
|
||||
private LocalDate cniDelivreeLe;
|
||||
|
||||
private String cniDelivreeA;
|
||||
private String residence;
|
||||
private String autreAdresse1;
|
||||
private String statutMarital;
|
||||
private String epoux;
|
||||
private String autreTelephone;
|
||||
// Situation familiale
|
||||
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
|
||||
@JoinTable(name = "agent_famille",
|
||||
joinColumns = @JoinColumn(name = "agent_id"),
|
||||
inverseJoinColumns = @JoinColumn(name = "famille_id"))
|
||||
private List<AgentFamilyMember> famille;
|
||||
// TPE assignés
|
||||
private String [] assignedTpeIds;
|
||||
@CreationTimestamp
|
||||
|
||||
@Column(name = "created_at")
|
||||
private LocalDateTime createdAt;
|
||||
@UpdateTimestamp
|
||||
|
||||
@Column(name = "updated_at")
|
||||
private LocalDateTime updatedAt;
|
||||
|
||||
@Column(name = "created_by")
|
||||
private String createdBy;
|
||||
}
|
||||
|
||||
// @Table(name = "agent")
|
||||
// public class Agent {
|
||||
// @Id
|
||||
// @GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
// private Long id;
|
||||
|
||||
// private String code;
|
||||
// private String profile;
|
||||
// private String principalCode;
|
||||
// private String caisseProfile;
|
||||
// private StatutAgent statut;
|
||||
// private String zone;
|
||||
// private String kiosk;
|
||||
// private String fonction;
|
||||
// @Pattern(regexp = "^\\d{2}/\\d{2}/\\d{4}$", message = "La date doit être au format dd/MM/yyyy")
|
||||
// @JsonFormat(pattern = "dd/MM/yyyy", shape = JsonFormat.Shape.STRING)
|
||||
// private LocalDate dateEmbauche;
|
||||
// @NotBlank(message = "Le nom est obligatoire")
|
||||
// private String nom;
|
||||
// private String prenom;
|
||||
// private String autresNoms;
|
||||
// @Pattern(regexp = "^\\d{2}/\\d{2}/\\d{4}$", message = "La date de naissance doit être au format dd/MM/yyyy")
|
||||
// @Column(name = "date_naissance", nullable = false)
|
||||
// @JsonFormat(pattern = "dd/MM/yyyy", shape = JsonFormat.Shape.STRING)
|
||||
// private LocalDate dateNaissance;
|
||||
// private String lieuNaissance;
|
||||
// private String ville;
|
||||
// private String adresse;
|
||||
// private Boolean autoriserAides;
|
||||
// private String phone;
|
||||
// private String pin;
|
||||
// private Double limiteInferieure;
|
||||
// private Double limiteSuperieure;
|
||||
// private Double limiteParTransaction;
|
||||
// private Double limiteMinAirtime;
|
||||
// private Double limiteMaxAirtime;
|
||||
// private Integer maxPeripheriques;
|
||||
// private String limitId;
|
||||
// // Légales
|
||||
// private String nationalite;
|
||||
// private String cni;
|
||||
// private String cniDelivreeLe;
|
||||
// private String cniDelivreeA;
|
||||
// private String residence;
|
||||
// private String autreAdresse1;
|
||||
// private String statutMarital;
|
||||
// private String epoux;
|
||||
// private String autreTelephone;
|
||||
// // Situation familiale
|
||||
// @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
|
||||
// @JoinTable(name = "agent_famille",
|
||||
// joinColumns = @JoinColumn(name = "agent_id"),
|
||||
// inverseJoinColumns = @JoinColumn(name = "famille_id"))
|
||||
// private List<AgentFamilyMember> famille;
|
||||
// // TPE assignés
|
||||
// private String [] assignedTpeIds;
|
||||
// @CreationTimestamp
|
||||
// private LocalDateTime createdAt;
|
||||
// @UpdateTimestamp
|
||||
// private LocalDateTime updatedAt;
|
||||
// private String createdBy;
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user