Merge pull request #28 from HediMjid/aline

Aline

.idea/misc.xml

@@ -11,4 +11,7 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="ProjectType">
+    <option name="id" value="jpab" />
+  </component>
 </project>

pom.xml

@@ -2,12 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
+
 	<groupId>fr.organizee</groupId>
 	<artifactId>organizee</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
@@ -16,6 +11,12 @@
 	<properties>
 		<java.version>11</java.version>
 	</properties>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.6.1</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/fr/organizee/model/Contact.java

@@ -11,6 +11,7 @@ public class Contact {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
+    private String couleur;
     private String nom;
     private String prenom;
     private String telephone;
@@ -18,14 +19,15 @@ public class Contact {
     private String adresse;
     private LocalDate dateNaissance;
     @ManyToOne
-    @JoinColumn(name="TEAM_ID")
-    @JsonIgnoreProperties({"contact","membre"})
+    @JoinColumn(name = "TEAM_ID")
+    @JsonIgnoreProperties({"contact", "membre"})
     private Team team;
 
     public Contact() {
     }
 
-    public Contact(String nom, String prenom, String telephone, String email, String adresse, LocalDate dateNaissance, Team team) {
+    public Contact(String couleur, String nom, String prenom, String telephone, String email, String adresse, LocalDate dateNaissance, Team team) {
+        this.couleur = couleur;
         this.nom = nom;
         this.prenom = prenom;
         this.telephone = telephone;
@@ -43,6 +45,14 @@ public class Contact {
         this.id = id;
     }
 
+    public String getCouleur() {
+        return couleur;
+    }
+
+    public void setCouleur(String couleur) {
+        this.couleur = couleur;
+    }
+
     public String getNom() {
         return nom;
     }
@@ -94,6 +104,7 @@ public class Contact {
     public Team getTeam() {
         return team;
     }
+
     public void setTeam(Team team) {
         this.team = team;
     }
@@ -102,6 +113,7 @@ public class Contact {
     public String toString() {
         return "Contact{" +
                 "id=" + id +
+                ", couleur='" + couleur + '\'' +
                 ", nom='" + nom + '\'' +
                 ", prenom='" + prenom + '\'' +
                 ", telephone='" + telephone + '\'' +