diff --git a/pom.xml b/pom.xml
index 24a4c4a..648d3fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,12 +70,6 @@
test
- org.junit.jupiter
- junit-jupiter-api
- 5.12.2
- test
-
-
org.projectlombok
lombok
1.18.38
@@ -89,6 +83,11 @@
org.springframework.boot
spring-boot-maven-plugin
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 3.2.5
+
diff --git a/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Personne.java b/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Personne.java
index 88539c4..01dd701 100644
--- a/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Personne.java
+++ b/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Personne.java
@@ -4,121 +4,43 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.ElementCollection;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
@Entity
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
public class Personne {
- private int id;
- private String nom;
- private String prenom;
- private String email;
- private String password;
- private Collection preference = new ArrayList<>();
- private List roleList;
-
- public Personne() {
- super();
- }
-
- public Personne(String nom, String prenom, String email, String password, List roleList) {
- super();
- this.nom = nom;
- this.prenom = prenom;
- this.email = email;
- this.password = password;
- this.roleList = roleList;
- }
-
- public Personne(String email, String password, List roleList) {
- super();
- this.email = email;
- this.password = password;
- this.roleList = roleList;
- }
-
-
- public Personne(String nom, String prenom, String email, String password) {
- super();
- this.nom = nom;
- this.prenom = prenom;
- this.email = email;
- this.password = password;
- }
@Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "id_personne")
- public int getId() {
- return id;
- }
- public void setId(int id) {
- this.id = id;
- }
-
- @Column(nullable = false)
- public String getNom() {
- return nom;
- }
- public void setNom(String nom) {
- this.nom = nom;
- }
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id_personne")
+ private int id;
- @Column(nullable = false)
- public String getPrenom() {
- return prenom;
- }
- public void setPrenom(String prenom) {
- this.prenom = prenom;
- }
+ @Column(nullable = false)
+ private String nom;
- @Column(nullable = false)
- public String getEmail() {
- return email;
- }
- public void setEmail(String email) {
- this.email = email;
- }
+ @Column(nullable = false)
+ private String prenom;
- @Column(nullable = false)
- public String getPassword() {
- return password;
- }
- public void setPassword(String password) {
- this.password = password;
- }
-
+ @Column(nullable = false)
+ private String email;
- @OneToMany(mappedBy = "preferencePK.personne", cascade = CascadeType.REMOVE)
- //@JsonIgnore
- public Collection getPreference() {
- return preference;
- }
+ @Column(nullable = false)
+ private String password;
+ @OneToMany(mappedBy = "preferencePK.personne", cascade = CascadeType.REMOVE)
+ //@JsonIgnore
+ @Builder.Default
+ private Collection preference = new ArrayList<>();
- public void setPreference(Collection preference) {
- this.preference = preference;
- }
-
-
- @ElementCollection(fetch = FetchType.EAGER)
- @Enumerated(EnumType.STRING)
- public List getRoleList() {
- return roleList;
- }
-
-
- public void setRoleList(List roleList) {
- this.roleList = roleList;
- }
+ @ElementCollection(fetch = FetchType.EAGER)
+ @Enumerated(EnumType.STRING)
+ private List roleList;
}
diff --git a/src/test/java/fr/vincent/ramiere/mangerautourdesimplonback/models/PersonneTest.java b/src/test/java/fr/vincent/ramiere/mangerautourdesimplonback/models/PersonneTest.java
new file mode 100644
index 0000000..3ac4cdf
--- /dev/null
+++ b/src/test/java/fr/vincent/ramiere/mangerautourdesimplonback/models/PersonneTest.java
@@ -0,0 +1,13 @@
+package fr.vincent.ramiere.mangerautourdesimplonback.models;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+class PersonneTest {
+ @Test
+ void testBuilder() {
+ Personne p = Personne.builder().nom("Test").prenom("Test").email("t@t.fr").password("1234").build();
+ assertEquals("Test", p.getNom());
+ }
+}