Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine

.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/controller/TacheController.java

@@ -1,6 +1,7 @@
 package fr.organizee.controller;
 
 import fr.organizee.model.Tache;
+import fr.organizee.model.TodoList;
 import fr.organizee.repository.TacheRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -61,10 +62,13 @@ public class TacheController {
     }
 
     // Ajoute une tache
-    @PostMapping(value="/add", produces="application/json", consumes="application/json")
-    public ResponseEntity<?> addTache(@RequestBody Tache tache){
+    @PostMapping(value="/add/{idTodoList}", produces="application/json", consumes="application/json")
+    public ResponseEntity<?> addTache(@RequestBody Tache tache,@PathVariable Integer idTodoList){
         Tache resultTache = null;
         try {
+            TodoList todolist=new TodoList();
+            todolist.setId(idTodoList);
+            tache.setTodolist(todolist);
             resultTache = tacheRepo.saveAndFlush(tache);
         } catch (Exception e) {
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage());
@@ -73,11 +77,14 @@ public class TacheController {
         return ResponseEntity.status(HttpStatus.CREATED).body(resultTache);
     }
 
-    //Met a jour les informations d'une date avec son ID
+    //Met a jour les informations d'une tache avec son ID
     @PutMapping("/update/{id}")
     public ResponseEntity<?> updateTache(@RequestBody Tache tache, @PathVariable Integer id) throws Exception {
         Tache resultTache = null;
         try {
+            TodoList todolist=new TodoList();
+            todolist.setId(tacheRepo.findById(tache.getId()).get().getTodolist().getId());
+            tache.setTodolist(todolist);
             resultTache = tacheRepo.save(tache);
 
         } catch (Exception e) {

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;
@@ -25,7 +26,8 @@ public class Contact {
     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 + '\'' +