From 56b9fbadb3ec28b6f6e2f698b39ce9f041c288bb Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Mon, 13 Dec 2021 12:55:33 +0100
Subject: [PATCH 01/13] test

---
 .idea/compiler.xml | 3 +++
 .idea/modules.xml  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 6f8f4ad..8793a57 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -9,6 +9,9 @@
         <module name="organizee" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="organizee" target="11" />
+    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c487121..78e41bd 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Organizee.iml" filepath="$PROJECT_DIR$/.idea/Organizee.iml" />
+      <module fileurl="file://$PROJECT_DIR$/organizee.iml" filepath="$PROJECT_DIR$/organizee.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file

From c12222a047416dd657adf19988fe62ca61a896d5 Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Mon, 13 Dec 2021 14:33:19 +0100
Subject: [PATCH 02/13] from hedi

---
 .idea/compiler.xml                           | 4 ----
 .idea/misc.xml                               | 4 ----
 .idea/vcs.xml                                | 4 ----
 pom.xml                                      | 2 +-
 src/main/java/fr/organizee/model/Membre.java | 2 +-
 src/main/resources/application.properties    | 1 -
 6 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 8793a57..a8c4885 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,12 +6,8 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="organizee" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="organizee" target="11" />
-    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 53931a6..06e8b35 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-<<<<<<< HEAD
-  <component name="ProjectRootManager">
-=======
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">
@@ -12,7 +9,6 @@
     </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
->>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index b24858b..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-<<<<<<< HEAD
-    <mapping directory="" vcs="Git" />
-=======
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
->>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11
   </component>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f417ba8..32eb628 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,4 +51,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/java/fr/organizee/model/Membre.java b/src/main/java/fr/organizee/model/Membre.java
index a3a0d96..c99664f 100644
--- a/src/main/java/fr/organizee/model/Membre.java
+++ b/src/main/java/fr/organizee/model/Membre.java
@@ -3,6 +3,7 @@ package fr.organizee.model;
 import javax.persistence.*;
 import java.time.LocalDate;
 
+
 @Entity
 public class Membre {
     @Id
@@ -14,7 +15,6 @@ public class Membre {
     private String email;
     private String password;
     private String isAdmin;
-    private String testGit;
     @ManyToOne(fetch= FetchType.EAGER)
     @JoinColumn(name="TEAM_ID")
     private Team team;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 810eee5..1c67b23 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,4 +20,3 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDial
 # Permet d'exécuter le data.sql
 # ===============================
 ## spring.datasource.initialization-mode=always
-

From efa6e62984f088d89c6619962ba4ecf50d4fc4f2 Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Mon, 13 Dec 2021 23:33:44 +0100
Subject: [PATCH 03/13] Ajout class

---
 .gitignore                                    |   2 +
 src/main/java/fr/organizee/model/Contact.java | 101 ++++++++++++++++++
 src/main/java/fr/organizee/model/Membre.java  |  90 ++++++++++++++++
 src/main/java/fr/organizee/model/Menu.java    |  55 ++++++++++
 src/main/java/fr/organizee/model/Smiley.java  |  46 ++++++++
 src/main/java/fr/organizee/model/Tache.java   |  56 ++++++++++
 src/main/java/fr/organizee/model/Team.java    |  43 +++++++-
 .../java/fr/organizee/model/TodoList.java     |  46 ++++++++
 .../repository/ContactRepository.java         |   4 +
 .../repository/MembreRepository.java          |   4 +
 .../organizee/repository/MenuRepository.java  |   4 +
 .../repository/SmileyRepository.java          |   4 +
 .../organizee/repository/TacheRepository.java |   4 +
 .../organizee/repository/TeamRepository.java  |   4 +
 .../repository/TodoListRepository.java        |   4 +
 15 files changed, 466 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/fr/organizee/model/Contact.java
 create mode 100644 src/main/java/fr/organizee/model/Menu.java
 create mode 100644 src/main/java/fr/organizee/model/Smiley.java
 create mode 100644 src/main/java/fr/organizee/model/Tache.java
 create mode 100644 src/main/java/fr/organizee/model/TodoList.java
 create mode 100644 src/main/java/fr/organizee/repository/ContactRepository.java
 create mode 100644 src/main/java/fr/organizee/repository/MembreRepository.java
 create mode 100644 src/main/java/fr/organizee/repository/MenuRepository.java
 create mode 100644 src/main/java/fr/organizee/repository/SmileyRepository.java
 create mode 100644 src/main/java/fr/organizee/repository/TacheRepository.java
 create mode 100644 src/main/java/fr/organizee/repository/TeamRepository.java
 create mode 100644 src/main/java/fr/organizee/repository/TodoListRepository.java

diff --git a/.gitignore b/.gitignore
index 549e00a..2ea2eec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@ build/
 
 ### VS Code ###
 .vscode/
+/.idea/
+/src/main/resources/
diff --git a/src/main/java/fr/organizee/model/Contact.java b/src/main/java/fr/organizee/model/Contact.java
new file mode 100644
index 0000000..35a57ec
--- /dev/null
+++ b/src/main/java/fr/organizee/model/Contact.java
@@ -0,0 +1,101 @@
+package fr.organizee.model;
+
+import javax.persistence.*;
+import java.time.LocalDate;
+
+@Entity
+public class Contact {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+    private String nom ;
+    private String prenom;
+    private String telephone;
+    private String email;
+    private String adresse;
+    private LocalDate dateNaissance;
+    @ManyToOne(fetch= FetchType.EAGER)
+    @JoinColumn(name="TEAM_ID")
+    private Team team;
+
+    public Contact() {
+    }
+
+    public Contact(String nom, String prenom, String telephone, String email, String adresse, LocalDate dateNaissance) {
+        this.nom = nom;
+        this.prenom = prenom;
+        this.telephone = telephone;
+        this.email = email;
+        this.adresse = adresse;
+        this.dateNaissance = dateNaissance;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getNom() {
+        return nom;
+    }
+
+    public void setNom(String nom) {
+        this.nom = nom;
+    }
+
+    public String getPrenom() {
+        return prenom;
+    }
+
+    public void setPrenom(String prenom) {
+        this.prenom = prenom;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getAdresse() {
+        return adresse;
+    }
+
+    public void setAdresse(String adresse) {
+        this.adresse = adresse;
+    }
+
+    public LocalDate getDateNaissance() {
+        return dateNaissance;
+    }
+
+    public void setDateNaissance(LocalDate dateNaissance) {
+        this.dateNaissance = dateNaissance;
+    }
+
+    @Override
+    public String toString() {
+        return "Contact{" +
+                "id=" + id +
+                ", nom='" + nom + '\'' +
+                ", prenom='" + prenom + '\'' +
+                ", telephone='" + telephone + '\'' +
+                ", email='" + email + '\'' +
+                ", adresse='" + adresse + '\'' +
+                ", dateNaissance=" + dateNaissance +
+                '}';
+    }
+}
diff --git a/src/main/java/fr/organizee/model/Membre.java b/src/main/java/fr/organizee/model/Membre.java
index c99664f..cccd898 100644
--- a/src/main/java/fr/organizee/model/Membre.java
+++ b/src/main/java/fr/organizee/model/Membre.java
@@ -15,7 +15,97 @@ public class Membre {
     private String email;
     private String password;
     private String isAdmin;
+    private String couleur;
     @ManyToOne(fetch= FetchType.EAGER)
     @JoinColumn(name="TEAM_ID")
     private Team team;
+//    @ManyToOne
+//    private Smiley smiley;
+
+    public Membre() {
+    }
+
+    public Membre(String nom, String prenom, LocalDate dateNaissance, String email, String password, String isAdmin, String couleur, Team team) {
+        this.nom = nom;
+        this.prenom = prenom;
+        this.dateNaissance = dateNaissance;
+        this.email = email;
+        this.password = password;
+        this.isAdmin = isAdmin;
+        this.couleur = couleur;
+        this.team = team;
+    }
+
+    public int getId() {
+        return id;
+    }
+    public void setId(int id) {
+        this.id = id;
+    }
+    public String getNom() {
+        return nom;
+    }
+    public void setNom(String nom) {
+        this.nom = nom;
+    }
+    public String getPrenom() {
+        return prenom;
+    }
+    public void setPrenom(String prenom) {
+        this.prenom = prenom;
+    }
+    public LocalDate getDateNaissance() {
+        return dateNaissance;
+    }
+    public void setDateNaissance(LocalDate dateNaissance) {
+        this.dateNaissance = dateNaissance;
+    }
+    public String getEmail() {
+        return email;
+    }
+    public void setEmail(String email) {
+        this.email = email;
+    }
+    public String getPassword() {
+        return password;
+    }
+    public void setPassword(String password) {
+        this.password = password;
+    }
+    public String getIsAdmin() {
+        return isAdmin;
+    }
+    public void setIsAdmin(String isAdmin) {
+        this.isAdmin = isAdmin;
+    }
+    public Team getTeam() {
+        return team;
+    }
+    public void setTeam(Team team) {
+        this.team = team;
+    }
+
+    public String getCouleur() {
+        return couleur;
+    }
+
+    public void setCouleur(String couleur) {
+        this.couleur = couleur;
+    }
+
+    @Override
+    public String toString() {
+        return "Membre{" +
+                "id=" + id +
+                ", nom='" + nom + '\'' +
+                ", prenom='" + prenom + '\'' +
+                ", dateNaissance=" + dateNaissance +
+                ", email='" + email + '\'' +
+                ", password='" + password + '\'' +
+                ", isAdmin='" + isAdmin + '\'' +
+                ", couleur='" + couleur + '\'' +
+                ", team=" + team +
+                '}';
+    }
 }
+
diff --git a/src/main/java/fr/organizee/model/Menu.java b/src/main/java/fr/organizee/model/Menu.java
new file mode 100644
index 0000000..4a4fc92
--- /dev/null
+++ b/src/main/java/fr/organizee/model/Menu.java
@@ -0,0 +1,55 @@
+package fr.organizee.model;
+
+import javax.persistence.*;
+import java.time.LocalDate;
+
+@Entity
+public class Menu {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+    private String libelle;
+    private LocalDate dateMenu;
+
+
+    public Menu() {
+    }
+
+    public Menu(String libelle, LocalDate dateMenu) {
+        this.libelle = libelle;
+        this.dateMenu = dateMenu;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getLibelle() {
+        return libelle;
+    }
+
+    public void setLibelle(String libelle) {
+        this.libelle = libelle;
+    }
+
+    public LocalDate getDateMenu() {
+        return dateMenu;
+    }
+
+    public void setDateMenu(LocalDate dateMenu) {
+        this.dateMenu = dateMenu;
+    }
+
+    @Override
+    public String toString() {
+        return "Menu{" +
+                "id=" + id +
+                ", libelle='" + libelle + '\'' +
+                ", dateMenu=" + dateMenu +
+                '}';
+    }
+}
diff --git a/src/main/java/fr/organizee/model/Smiley.java b/src/main/java/fr/organizee/model/Smiley.java
new file mode 100644
index 0000000..59cb411
--- /dev/null
+++ b/src/main/java/fr/organizee/model/Smiley.java
@@ -0,0 +1,46 @@
+package fr.organizee.model;
+
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+public class Smiley {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+    private String smileyUrl;
+    @OneToMany
+    private List<Membre> membres = new ArrayList<>();
+
+    public Smiley() {
+    }
+
+    public Smiley(String smileyUrl) {
+        this.smileyUrl = smileyUrl;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getSmileyUrl() {
+        return smileyUrl;
+    }
+
+    public void setSmileyUrl(String smileyUrl) {
+        this.smileyUrl = smileyUrl;
+    }
+
+    @Override
+    public String toString() {
+        return "Smiley{" +
+                "id=" + id +
+                ", smileyUrl='" + smileyUrl + '\'' +
+                '}';
+    }
+}
diff --git a/src/main/java/fr/organizee/model/Tache.java b/src/main/java/fr/organizee/model/Tache.java
new file mode 100644
index 0000000..28dd8b1
--- /dev/null
+++ b/src/main/java/fr/organizee/model/Tache.java
@@ -0,0 +1,56 @@
+package fr.organizee.model;
+
+import javax.persistence.*;
+
+@Entity
+public class Tache {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+    private String texte;
+    private boolean etat;
+    @ManyToOne
+    @JoinColumn(name = "todolist_id")
+    private TodoList todolist;
+
+    public Tache(String texte, boolean etat) {
+        this.texte = texte;
+        this.etat = etat;
+    }
+
+    public Tache() {
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getTexte() {
+        return texte;
+    }
+
+    public void setTexte(String texte) {
+        this.texte = texte;
+    }
+
+    public boolean isEtat() {
+        return etat;
+    }
+
+    public void setEtat(boolean etat) {
+        this.etat = etat;
+    }
+
+    @Override
+    public String toString() {
+        return "Tache{" +
+                "id=" + id +
+                ", texte='" + texte + '\'' +
+                ", etat=" + etat +
+                '}';
+    }
+}
diff --git a/src/main/java/fr/organizee/model/Team.java b/src/main/java/fr/organizee/model/Team.java
index ac4546f..fb2755c 100644
--- a/src/main/java/fr/organizee/model/Team.java
+++ b/src/main/java/fr/organizee/model/Team.java
@@ -11,5 +11,46 @@ public class Team {
     private int id;
     private String nom;
     @OneToMany
-    private List<Membre> membre = new ArrayList<>();
+    private List<Membre> membres = new ArrayList<>();
+    @OneToMany
+    @JoinTable(name = "repertoire")
+    private List<Contact> contacts = new ArrayList<>();
+    @OneToMany
+    @JoinTable(name = "team_todolist")
+    private List<TodoList> todolists = new ArrayList<>();
+
+    public Team() {
+        super();
+    }
+
+    public Team(int id, String nom, List<Membre> membre) {
+        super();
+        this.id = id;
+        this.nom = nom;
+        this.membres = membre;
+    }
+
+    public int getId() {
+        return id;
+    }
+    public void setId(int id) {
+        this.id = id;
+    }
+    public String getNom() {
+        return nom;
+    }
+    public void setNom(String nom) {
+        this.nom = nom;
+    }
+    public List<Membre> getMembre() {
+        return membres;
+    }
+    public void setMembre(List<Membre> membre) {
+        this.membres = membre;
+    }
+
+    @Override
+    public String toString() {
+        return "Team [id=" + id + ", nom=" + nom + ", membre=" + membres + "]";
+    }
 }
diff --git a/src/main/java/fr/organizee/model/TodoList.java b/src/main/java/fr/organizee/model/TodoList.java
new file mode 100644
index 0000000..c86b70c
--- /dev/null
+++ b/src/main/java/fr/organizee/model/TodoList.java
@@ -0,0 +1,46 @@
+package fr.organizee.model;
+
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+public class TodoList {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+    private String nom;
+    @OneToMany(mappedBy = "todolist")
+    private List<Tache> taches = new ArrayList<>();
+
+    public TodoList() {
+    }
+
+    public TodoList(String nom) {
+        this.nom = nom;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getNom() {
+        return nom;
+    }
+
+    public void setNom(String nom) {
+        this.nom = nom;
+    }
+
+    @Override
+    public String toString() {
+        return "TodoList{" +
+                "id=" + id +
+                ", nom='" + nom + '\'' +
+                '}';
+    }
+}
diff --git a/src/main/java/fr/organizee/repository/ContactRepository.java b/src/main/java/fr/organizee/repository/ContactRepository.java
new file mode 100644
index 0000000..b670634
--- /dev/null
+++ b/src/main/java/fr/organizee/repository/ContactRepository.java
@@ -0,0 +1,4 @@
+package fr.organizee.repository;
+
+public interface ContactRepository {
+}
diff --git a/src/main/java/fr/organizee/repository/MembreRepository.java b/src/main/java/fr/organizee/repository/MembreRepository.java
new file mode 100644
index 0000000..a469a02
--- /dev/null
+++ b/src/main/java/fr/organizee/repository/MembreRepository.java
@@ -0,0 +1,4 @@
+package fr.organizee.repository;
+
+public interface MembreRepository {
+}
diff --git a/src/main/java/fr/organizee/repository/MenuRepository.java b/src/main/java/fr/organizee/repository/MenuRepository.java
new file mode 100644
index 0000000..b9bb652
--- /dev/null
+++ b/src/main/java/fr/organizee/repository/MenuRepository.java
@@ -0,0 +1,4 @@
+package fr.organizee.repository;
+
+public interface MenuRepository {
+}
diff --git a/src/main/java/fr/organizee/repository/SmileyRepository.java b/src/main/java/fr/organizee/repository/SmileyRepository.java
new file mode 100644
index 0000000..f4d2d5d
--- /dev/null
+++ b/src/main/java/fr/organizee/repository/SmileyRepository.java
@@ -0,0 +1,4 @@
+package fr.organizee.repository;
+
+public interface SmileyRepository {
+}
diff --git a/src/main/java/fr/organizee/repository/TacheRepository.java b/src/main/java/fr/organizee/repository/TacheRepository.java
new file mode 100644
index 0000000..17c22b8
--- /dev/null
+++ b/src/main/java/fr/organizee/repository/TacheRepository.java
@@ -0,0 +1,4 @@
+package fr.organizee.repository;
+
+public interface TacheRepository {
+}
diff --git a/src/main/java/fr/organizee/repository/TeamRepository.java b/src/main/java/fr/organizee/repository/TeamRepository.java
new file mode 100644
index 0000000..433e4d2
--- /dev/null
+++ b/src/main/java/fr/organizee/repository/TeamRepository.java
@@ -0,0 +1,4 @@
+package fr.organizee.repository;
+
+public interface TeamRepository {
+}
diff --git a/src/main/java/fr/organizee/repository/TodoListRepository.java b/src/main/java/fr/organizee/repository/TodoListRepository.java
new file mode 100644
index 0000000..2a0cd58
--- /dev/null
+++ b/src/main/java/fr/organizee/repository/TodoListRepository.java
@@ -0,0 +1,4 @@
+package fr.organizee.repository;
+
+public interface TodoListRepository {
+}

From 1d392594ba03e3823c1ca7810936fb4ef4056248 Mon Sep 17 00:00:00 2001
From: HediMjid <91838340+HediMjid@users.noreply.github.com>
Date: Mon, 13 Dec 2021 23:35:01 +0100
Subject: [PATCH 04/13] Update application.properties

---
 src/main/resources/application.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1c67b23..68c9e5c 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,9 +1,9 @@
 # ===============================
-# base de données MySQL
+# base de données MySQL
 # ===============================
 spring.datasource.url=jdbc:mysql://192.168.1.16:3306/jpa?useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=UTC
-spring.datasource.username=desktop
-spring.datasource.password=Cosmoc4t$77
+spring.datasource.username=
+spring.datasource.password=
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 # log
 logging.level.root=INFO
@@ -17,6 +17,6 @@ spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 # ===============================
-# Permet d'exécuter le data.sql
+# Permet d'exécuter le data.sql
 # ===============================
 ## spring.datasource.initialization-mode=always

From 8e79242d21072122f69444f5d91e6bc0dd01d4f5 Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Tue, 14 Dec 2021 00:06:28 +0100
Subject: [PATCH 05/13] Ajout class

---
 src/main/java/fr/organizee/model/Contact.java        |  6 +++---
 src/main/java/fr/organizee/model/Membre.java         | 12 ++++++------
 .../fr/organizee/repository/MembreRepository.java    |  7 ++++++-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/fr/organizee/model/Contact.java b/src/main/java/fr/organizee/model/Contact.java
index 35a57ec..38a8111 100644
--- a/src/main/java/fr/organizee/model/Contact.java
+++ b/src/main/java/fr/organizee/model/Contact.java
@@ -8,15 +8,15 @@ public class Contact {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
-    private String nom ;
+    private String nom;
     private String prenom;
     private String telephone;
     private String email;
     private String adresse;
     private LocalDate dateNaissance;
-    @ManyToOne(fetch= FetchType.EAGER)
+/*    @ManyToOne(fetch= FetchType.EAGER)
     @JoinColumn(name="TEAM_ID")
-    private Team team;
+    private Team team;*/
 
     public Contact() {
     }
diff --git a/src/main/java/fr/organizee/model/Membre.java b/src/main/java/fr/organizee/model/Membre.java
index cccd898..c485e14 100644
--- a/src/main/java/fr/organizee/model/Membre.java
+++ b/src/main/java/fr/organizee/model/Membre.java
@@ -16,9 +16,9 @@ public class Membre {
     private String password;
     private String isAdmin;
     private String couleur;
-    @ManyToOne(fetch= FetchType.EAGER)
+/*    @ManyToOne(fetch= FetchType.EAGER)
     @JoinColumn(name="TEAM_ID")
-    private Team team;
+    private Team team;*/
 //    @ManyToOne
 //    private Smiley smiley;
 
@@ -33,7 +33,7 @@ public class Membre {
         this.password = password;
         this.isAdmin = isAdmin;
         this.couleur = couleur;
-        this.team = team;
+/*        this.team = team;*/
     }
 
     public int getId() {
@@ -78,12 +78,12 @@ public class Membre {
     public void setIsAdmin(String isAdmin) {
         this.isAdmin = isAdmin;
     }
-    public Team getTeam() {
+ /*   public Team getTeam() {
         return team;
     }
     public void setTeam(Team team) {
         this.team = team;
-    }
+    }*/
 
     public String getCouleur() {
         return couleur;
@@ -104,7 +104,7 @@ public class Membre {
                 ", password='" + password + '\'' +
                 ", isAdmin='" + isAdmin + '\'' +
                 ", couleur='" + couleur + '\'' +
-                ", team=" + team +
+                /*", team=" + team +*/
                 '}';
     }
 }
diff --git a/src/main/java/fr/organizee/repository/MembreRepository.java b/src/main/java/fr/organizee/repository/MembreRepository.java
index a469a02..82ca702 100644
--- a/src/main/java/fr/organizee/repository/MembreRepository.java
+++ b/src/main/java/fr/organizee/repository/MembreRepository.java
@@ -1,4 +1,9 @@
 package fr.organizee.repository;
 
-public interface MembreRepository {
+import fr.organizee.model.Membre;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MembreRepository extends JpaRepository<Membre, Integer> {
 }

From 47e9456877485cce9e447dc2b69ab2b097e6d166 Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Tue, 14 Dec 2021 00:09:03 +0100
Subject: [PATCH 06/13] Ajout class

---
 src/main/java/fr/organizee/model/Team.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/fr/organizee/model/Team.java b/src/main/java/fr/organizee/model/Team.java
index fb2755c..d02b4d7 100644
--- a/src/main/java/fr/organizee/model/Team.java
+++ b/src/main/java/fr/organizee/model/Team.java
@@ -19,6 +19,7 @@ public class Team {
     @JoinTable(name = "team_todolist")
     private List<TodoList> todolists = new ArrayList<>();
 
+    /* Constructor */
     public Team() {
         super();
     }

From 87dc17f4789d811e565985a20b8f4cfbae3b0cea Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Tue, 14 Dec 2021 00:10:41 +0100
Subject: [PATCH 07/13] Ajout class

---
 src/main/java/fr/organizee/model/Team.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/fr/organizee/model/Team.java b/src/main/java/fr/organizee/model/Team.java
index d02b4d7..fb2755c 100644
--- a/src/main/java/fr/organizee/model/Team.java
+++ b/src/main/java/fr/organizee/model/Team.java
@@ -19,7 +19,6 @@ public class Team {
     @JoinTable(name = "team_todolist")
     private List<TodoList> todolists = new ArrayList<>();
 
-    /* Constructor */
     public Team() {
         super();
     }

From fc741838e437a4e9a39f45afb7f33918ca0c3357 Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Tue, 14 Dec 2021 09:16:50 +0100
Subject: [PATCH 08/13] Ajout class

---
 src/main/resources/application.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1c67b23..4035790 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,11 +2,11 @@
 # base de données MySQL
 # ===============================
 spring.datasource.url=jdbc:mysql://192.168.1.16:3306/jpa?useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=UTC
-spring.datasource.username=desktop
-spring.datasource.password=Cosmoc4t$77
+spring.datasource.username=
+spring.datasource.password=
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 # log
-logging.level.root=INFO
+#logging.level.root=INFO
 logging.file=d:/data/log-hibernate-jpa.log
 logging.level.org.springframework.jdbc.core.JdbcTemplate=debug
 # ===============================
@@ -19,4 +19,4 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDial
 # ===============================
 # Permet d'exécuter le data.sql
 # ===============================
-## spring.datasource.initialization-mode=always
+#spring.datasource.initialization-mode=always

From 8d36e19c89d0314f5d994f4d2294a4d66d286810 Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Tue, 14 Dec 2021 09:19:30 +0100
Subject: [PATCH 09/13] test

---
 .gitignore                                | 1 -
 .idea/modules.xml                         | 8 --------
 src/main/resources/application.properties | 4 ++--
 3 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 .idea/modules.xml

diff --git a/.gitignore b/.gitignore
index 2ea2eec..1a03347 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,3 @@ build/
 ### VS Code ###
 .vscode/
 /.idea/
-/src/main/resources/
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 78e41bd..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/organizee.iml" filepath="$PROJECT_DIR$/organizee.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4035790..f286e8c 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,8 +2,8 @@
 # base de données MySQL
 # ===============================
 spring.datasource.url=jdbc:mysql://192.168.1.16:3306/jpa?useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=UTC
-spring.datasource.username=
-spring.datasource.password=
+spring.datasource.username=desktop
+spring.datasource.password=Cosmoc4t$77
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 # log
 #logging.level.root=INFO

From fb162d97bde83a30aadb3aaa6b27af0fb1f44c08 Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Tue, 14 Dec 2021 09:22:59 +0100
Subject: [PATCH 10/13] test

---
 src/main/resources/application.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 46855ec..8dc34fb 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,8 +2,8 @@
 # base de données MySQL
 # ===============================
 spring.datasource.url=jdbc:mysql://192.168.1.16:3306/jpa?useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=UTC
-spring.datasource.username=
-spring.datasource.password=
+spring.datasource.username=desktop
+spring.datasource.password=Cosmoc4t$77
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 # log
 #logging.level.root=INFO

From 75dbe1c4b8c0a60169b521ade2c04e67447e73be Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Tue, 14 Dec 2021 10:04:50 +0100
Subject: [PATCH 11/13] controller

---
 .../controller/MembreController.java          | 44 ++++++++++++
 src/main/resources/data.sql                   | 70 +++++++++++++++++++
 2 files changed, 114 insertions(+)
 create mode 100644 src/main/java/fr/organizee/controller/MembreController.java
 create mode 100644 src/main/resources/data.sql

diff --git a/src/main/java/fr/organizee/controller/MembreController.java b/src/main/java/fr/organizee/controller/MembreController.java
new file mode 100644
index 0000000..d62951a
--- /dev/null
+++ b/src/main/java/fr/organizee/controller/MembreController.java
@@ -0,0 +1,44 @@
+package fr.organizee.controller;
+
+import fr.organizee.model.Membre;
+import fr.organizee.repository.MembreRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+/* toto */
+@RestController
+@CrossOrigin("*")
+public class MembreController {
+
+    @Autowired
+    private MembreRepository membreRepo;
+
+    @GetMapping("/")
+    @ResponseBody
+    public String home()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("<h1>Affichages des membres</h1>");
+        sb.append("<ul><li><a href='http://localhost:8080/membres'>Liste des <strong>membres</strong></a></li>");
+        return  sb.toString();
+    }
+
+    @GetMapping(value = "/membres")
+    public ResponseEntity<?> getAll(){
+        List<Membre> liste = null;
+        try
+        {
+            liste = membreRepo.findAll();
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
+        }
+
+        return ResponseEntity.status(HttpStatus.OK).body(liste);
+    }
+}
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
new file mode 100644
index 0000000..f5f354a
--- /dev/null
+++ b/src/main/resources/data.sql
@@ -0,0 +1,70 @@
+INSERT INTO `team` (`id`, `nom`) VALUES
+	(1, 'Team JAVA'),
+	(2, 'Team Angular'),
+	(3, 'Team PHP'),
+	(4, 'Team Bancal');
+
+INSERT INTO `membre` (`id`, `couleur`, `date_naissance`, `email`, `is_admin`, `nom`, `password`, `prenom`) VALUES
+	(1, '#fcba03', '2021-12-13', 'hedi@simplon.com', '0', 'SKYWALKER', 'toto', 'Hédi'),
+	(2, '#8df505', '2021-07-03', 'aline@simplon.com', '0', 'FETT', 'tata', 'Aline'),
+	(3, '#091ced', '2021-01-20', 'isabelle@simplon.com', '0', 'SOLO', 'titi', 'Isabelle'),
+	(4, '#ed09de', '2021-06-29', 'blandine@simplon.com', '0', 'VADER', 'tutu', 'Blandine');
+
+INSERT INTO `todo_list` (`id`, `nom`) VALUES
+	(1, 'Pour Blandine'),
+	(2, 'Corvées'),
+	(3, 'Noel');
+
+INSERT INTO `contact` (`id`, `adresse`, `date_naissance`, `email`, `nom`, `prenom`, `telephone`) VALUES
+	(1, '7554 Messerschmidt Center', '2021-01-24', 'oogleasane0@cargocollective.com', 'Ophelia', 'O\'Gleasane', '913-198-6499'),
+	(2, '534 Jay Way', '2021-03-26', 'fmowett1@ocn.ne.jp', 'Fiann', 'Mowett', '248-224-7233'),
+	(3, '077 Buell Place', '2021-06-24', 'vlewknor2@spotify.com', 'Vladamir', 'Lewknor', '922-822-3626'),
+	(4, '6226 Esker Street', '2021-04-13', 'jbarmadier3@opensource.org', 'Jervis', 'Barmadier', '838-581-8112'),
+	(5, '28531 Luster Circle', '2021-06-15', 'tmee4@ameblo.jp', 'Tuesday', 'Mee', '761-975-7324'),
+	(6, '96 Hallows Avenue', '2021-08-13', 'tcolvine5@elegantthemes.com', 'Toni', 'Colvine', '348-778-7679'),
+	(7, '6401 Jay Crossing', '2021-01-14', 'rrielly6@netlog.com', 'Riane', 'Rielly', '740-571-0835'),
+	(8, '3273 Cascade Pass', '2021-03-22', 'jlauder7@rambler.ru', 'Juieta', 'Lauder', '928-408-6855'),
+	(9, '1170 Burning Wood Road', '2021-05-31', 'tbolver8@google.ca', 'Thibaut', 'Bolver', '681-860-8291'),
+	(10, '1 Westridge Road', '2021-03-11', 'emebs9@uol.com.br', 'Evered', 'Mebs', '898-483-6075');
+
+
+INSERT INTO `smiley` (`id`, `smiley_url`) VALUES
+	(1, 'https://assets.wprock.fr/emoji/joypixels/512/1f600.png'),
+	(2, 'https://assets.wprock.fr/emoji/joypixels/512/1f618.png'),
+	(3, 'https://assets.wprock.fr/emoji/joypixels/512/1f92e.png'),
+	(4, 'https://assets.wprock.fr/emoji/joypixels/512/1f92c.png');
+
+INSERT INTO `repertoire` (`team_id`, `contacts_id`) VALUES
+	(1, 1),
+	(1, 2),
+	(1, 3),
+	(1, 4),
+	(2, 5),
+	(2, 6),
+	(2, 7),
+	(2, 8),
+	(3, 9),
+	(3, 10);
+
+INSERT INTO `smiley_membres` (`smiley_id`, `membres_id`) VALUES
+	(1, 3),
+	(3, 2),
+	(4, 1);
+
+INSERT INTO `tache` (`id`, `etat`, `texte`, `todolist_id`) VALUES
+	(1, b'0', 'Apprendre le PHP', 1),
+	(2, b'0', 'Revoir CRUD', 1),
+	(3, b'0', 'Acheter des guirlandes', 3),
+	(4, b'0', 'Acheter un sapin', 3),
+	(5, b'0', 'Trouver un repas', 3);
+
+INSERT INTO `team_membres` (`team_id`, `membres_id`) VALUES
+	(1, 1),
+	(1, 2),
+	(2, 3),
+	(3, 4);
+
+INSERT INTO `team_todolist` (`team_id`, `todolists_id`) VALUES
+	(2, 2),
+	(2, 3),
+	(3, 1);
\ No newline at end of file

From 8895d30b228dd9257e38e89ddba96a5abc7cff6d Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Tue, 14 Dec 2021 16:11:23 +0100
Subject: [PATCH 12/13] Ajout class+controller

---
 .../controller/MembreController.java          | 62 +++++++++++++++++--
 src/main/java/fr/organizee/model/Membre.java  | 24 ++++---
 src/main/java/fr/organizee/model/Menu.java    |  5 +-
 src/main/java/fr/organizee/model/Smiley.java  | 46 --------------
 src/main/java/fr/organizee/model/Team.java    |  6 +-
 .../repository/MembreRepository.java          |  1 +
 .../organizee/repository/TeamRepository.java  |  7 ++-
 .../repository/TodoListRepository.java        |  7 ++-
 8 files changed, 95 insertions(+), 63 deletions(-)
 delete mode 100644 src/main/java/fr/organizee/model/Smiley.java

diff --git a/src/main/java/fr/organizee/controller/MembreController.java b/src/main/java/fr/organizee/controller/MembreController.java
index d62951a..d96e0a9 100644
--- a/src/main/java/fr/organizee/controller/MembreController.java
+++ b/src/main/java/fr/organizee/controller/MembreController.java
@@ -1,16 +1,17 @@
 package fr.organizee.controller;
 
 import fr.organizee.model.Membre;
+import fr.organizee.model.Team;
 import fr.organizee.repository.MembreRepository;
+import fr.organizee.repository.TeamRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Optional;
+
 /* toto */
 @RestController
 @CrossOrigin("*")
@@ -19,17 +20,20 @@ public class MembreController {
     @Autowired
     private MembreRepository membreRepo;
 
+    @Autowired
+    private TeamRepository teamRepo;
+
     @GetMapping("/")
     @ResponseBody
     public String home()
     {
         StringBuilder sb = new StringBuilder();
         sb.append("<h1>Affichages des membres</h1>");
-        sb.append("<ul><li><a href='http://localhost:8080/membres'>Liste des <strong>membres</strong></a></li>");
+        sb.append("<ul><li><a href='http://localhost:8080/membres/all'>Liste des <strong>membres</strong></a></li>");
         return  sb.toString();
     }
 
-    @GetMapping(value = "/membres")
+    @GetMapping(value = "/membres/all")
     public ResponseEntity<?> getAll(){
         List<Membre> liste = null;
         try
@@ -41,4 +45,50 @@ public class MembreController {
 
         return ResponseEntity.status(HttpStatus.OK).body(liste);
     }
+
+    @GetMapping(value = "/team/all")
+    public ResponseEntity<?> getAllTeam(){
+        List<Team> liste = null;
+        try
+        {
+            liste = teamRepo.findAll();
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
+        }
+
+        return ResponseEntity.status(HttpStatus.OK).body(liste);
+    }
+
+    @GetMapping(value = "/membres/{id}")
+    public ResponseEntity<?> findById(@PathVariable int id){
+        Optional<Membre> membre = null;
+        try
+        {
+            membre = membreRepo.findById(id);
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
+        }
+
+        return ResponseEntity.status(HttpStatus.OK).body(membre);
+    }
+
+    @GetMapping(value = "/membres/delete/{id}")
+    public void deleteMembreId(@PathVariable("id") Integer id) {
+
+            membreRepo.deleteById(id);
+
+    }
+
+    @GetMapping(value = "/team/{id}")
+    public ResponseEntity<?> findTeamById(@PathVariable int id){
+        Optional<Team> liste = null;
+        try
+        {
+            liste = teamRepo.findById(id);
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
+        }
+
+        return ResponseEntity.status(HttpStatus.OK).body(liste);
+    }
 }
diff --git a/src/main/java/fr/organizee/model/Membre.java b/src/main/java/fr/organizee/model/Membre.java
index c485e14..7924e70 100644
--- a/src/main/java/fr/organizee/model/Membre.java
+++ b/src/main/java/fr/organizee/model/Membre.java
@@ -16,16 +16,15 @@ public class Membre {
     private String password;
     private String isAdmin;
     private String couleur;
-/*    @ManyToOne(fetch= FetchType.EAGER)
+    private String smiley;
+    @ManyToOne
     @JoinColumn(name="TEAM_ID")
-    private Team team;*/
-//    @ManyToOne
-//    private Smiley smiley;
+    private Team team;
 
     public Membre() {
     }
 
-    public Membre(String nom, String prenom, LocalDate dateNaissance, String email, String password, String isAdmin, String couleur, Team team) {
+    public Membre(String nom, String prenom, LocalDate dateNaissance, String email, String password, String isAdmin, String couleur, String smiley, Team team) {
         this.nom = nom;
         this.prenom = prenom;
         this.dateNaissance = dateNaissance;
@@ -33,6 +32,7 @@ public class Membre {
         this.password = password;
         this.isAdmin = isAdmin;
         this.couleur = couleur;
+        this.smiley = smiley;
 /*        this.team = team;*/
     }
 
@@ -78,12 +78,13 @@ public class Membre {
     public void setIsAdmin(String isAdmin) {
         this.isAdmin = isAdmin;
     }
- /*   public Team getTeam() {
+
+    public Team getTeam() {
         return team;
     }
     public void setTeam(Team team) {
         this.team = team;
-    }*/
+    }
 
     public String getCouleur() {
         return couleur;
@@ -93,6 +94,14 @@ public class Membre {
         this.couleur = couleur;
     }
 
+    public String getSmiley() {
+        return smiley;
+    }
+
+    public void setSmiley(String smiley) {
+        this.smiley = smiley;
+    }
+
     @Override
     public String toString() {
         return "Membre{" +
@@ -104,6 +113,7 @@ public class Membre {
                 ", password='" + password + '\'' +
                 ", isAdmin='" + isAdmin + '\'' +
                 ", couleur='" + couleur + '\'' +
+                ", smiley='" + smiley + '\'' +
                 /*", team=" + team +*/
                 '}';
     }
diff --git a/src/main/java/fr/organizee/model/Menu.java b/src/main/java/fr/organizee/model/Menu.java
index 4a4fc92..0444921 100644
--- a/src/main/java/fr/organizee/model/Menu.java
+++ b/src/main/java/fr/organizee/model/Menu.java
@@ -10,7 +10,10 @@ public class Menu {
     private int id;
     private String libelle;
     private LocalDate dateMenu;
-
+    @ManyToOne
+    private Team team;
+    @ManyToOne
+    private Membre membre;
 
     public Menu() {
     }
diff --git a/src/main/java/fr/organizee/model/Smiley.java b/src/main/java/fr/organizee/model/Smiley.java
deleted file mode 100644
index 59cb411..0000000
--- a/src/main/java/fr/organizee/model/Smiley.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package fr.organizee.model;
-
-import javax.persistence.*;
-import java.util.ArrayList;
-import java.util.List;
-
-@Entity
-public class Smiley {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private int id;
-    private String smileyUrl;
-    @OneToMany
-    private List<Membre> membres = new ArrayList<>();
-
-    public Smiley() {
-    }
-
-    public Smiley(String smileyUrl) {
-        this.smileyUrl = smileyUrl;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getSmileyUrl() {
-        return smileyUrl;
-    }
-
-    public void setSmileyUrl(String smileyUrl) {
-        this.smileyUrl = smileyUrl;
-    }
-
-    @Override
-    public String toString() {
-        return "Smiley{" +
-                "id=" + id +
-                ", smileyUrl='" + smileyUrl + '\'' +
-                '}';
-    }
-}
diff --git a/src/main/java/fr/organizee/model/Team.java b/src/main/java/fr/organizee/model/Team.java
index fb2755c..ce562e2 100644
--- a/src/main/java/fr/organizee/model/Team.java
+++ b/src/main/java/fr/organizee/model/Team.java
@@ -10,7 +10,8 @@ public class Team {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
     private String nom;
-    @OneToMany
+    @OneToMany(mappedBy = "team", cascade = CascadeType.ALL, orphanRemoval = true)
+    //@OneToMany
     private List<Membre> membres = new ArrayList<>();
     @OneToMany
     @JoinTable(name = "repertoire")
@@ -18,6 +19,9 @@ public class Team {
     @OneToMany
     @JoinTable(name = "team_todolist")
     private List<TodoList> todolists = new ArrayList<>();
+    @OneToMany
+    @JoinTable(name="team_menu")
+    private List<Menu> menus = new ArrayList<>();
 
     public Team() {
         super();
diff --git a/src/main/java/fr/organizee/repository/MembreRepository.java b/src/main/java/fr/organizee/repository/MembreRepository.java
index 82ca702..61ec145 100644
--- a/src/main/java/fr/organizee/repository/MembreRepository.java
+++ b/src/main/java/fr/organizee/repository/MembreRepository.java
@@ -6,4 +6,5 @@ import org.springframework.stereotype.Repository;
 
 @Repository
 public interface MembreRepository extends JpaRepository<Membre, Integer> {
+
 }
diff --git a/src/main/java/fr/organizee/repository/TeamRepository.java b/src/main/java/fr/organizee/repository/TeamRepository.java
index 433e4d2..d0b5a00 100644
--- a/src/main/java/fr/organizee/repository/TeamRepository.java
+++ b/src/main/java/fr/organizee/repository/TeamRepository.java
@@ -1,4 +1,9 @@
 package fr.organizee.repository;
 
-public interface TeamRepository {
+import fr.organizee.model.Team;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TeamRepository extends JpaRepository<Team, Integer> {
 }
diff --git a/src/main/java/fr/organizee/repository/TodoListRepository.java b/src/main/java/fr/organizee/repository/TodoListRepository.java
index 2a0cd58..32a2e63 100644
--- a/src/main/java/fr/organizee/repository/TodoListRepository.java
+++ b/src/main/java/fr/organizee/repository/TodoListRepository.java
@@ -1,4 +1,9 @@
 package fr.organizee.repository;
 
-public interface TodoListRepository {
+import fr.organizee.model.TodoList;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TodoListRepository extends JpaRepository<TodoList, Integer> {
 }

From b3c5c08a9d875e36f3c2480353b8fde9e5bc82bc Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Tue, 14 Dec 2021 16:13:36 +0100
Subject: [PATCH 13/13] moins les properties

---
 .gitignore                                    |   1 +
 .../repository/SmileyRepository.java          |   4 -
 src/main/resources/application.properties     |   8 +-
 src/main/resources/data.sql                   | 231 +++++++++++++++---
 4 files changed, 197 insertions(+), 47 deletions(-)
 delete mode 100644 src/main/java/fr/organizee/repository/SmileyRepository.java

diff --git a/.gitignore b/.gitignore
index 1a03347..2ea2eec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ build/
 ### VS Code ###
 .vscode/
 /.idea/
+/src/main/resources/
diff --git a/src/main/java/fr/organizee/repository/SmileyRepository.java b/src/main/java/fr/organizee/repository/SmileyRepository.java
deleted file mode 100644
index f4d2d5d..0000000
--- a/src/main/java/fr/organizee/repository/SmileyRepository.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package fr.organizee.repository;
-
-public interface SmileyRepository {
-}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8dc34fb..65eea51 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,9 +1,9 @@
 # ===============================
-# base de données MySQL
+# base de données MySQL toto
 # ===============================
 spring.datasource.url=jdbc:mysql://192.168.1.16:3306/jpa?useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=UTC
-spring.datasource.username=desktop
-spring.datasource.password=Cosmoc4t$77
+spring.datasource.username=
+spring.datasource.password=
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 # log
 #logging.level.root=INFO
@@ -13,7 +13,7 @@ logging.level.org.springframework.jdbc.core.JdbcTemplate=debug
 # JPA / HIBERNATE
 # ===============================
 spring.jpa.show-sql=true
-## spring.jpa.hibernate.ddl-auto=update
+#spring.jpa.hibernate.ddl-auto=update
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 # ===============================
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index f5f354a..1461cab 100644
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -1,39 +1,214 @@
+
+-- Export de la structure de la table jpa. team
+CREATE TABLE IF NOT EXISTS `team` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `nom` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4;
+
+-- Export de données de la table jpa.team : ~0 rows (environ)
+/*!40000 ALTER TABLE `team` DISABLE KEYS */;
 INSERT INTO `team` (`id`, `nom`) VALUES
 	(1, 'Team JAVA'),
 	(2, 'Team Angular'),
 	(3, 'Team PHP'),
 	(4, 'Team Bancal');
+/*!40000 ALTER TABLE `team` ENABLE KEYS */;
 
-INSERT INTO `membre` (`id`, `couleur`, `date_naissance`, `email`, `is_admin`, `nom`, `password`, `prenom`) VALUES
-	(1, '#fcba03', '2021-12-13', 'hedi@simplon.com', '0', 'SKYWALKER', 'toto', 'Hédi'),
-	(2, '#8df505', '2021-07-03', 'aline@simplon.com', '0', 'FETT', 'tata', 'Aline'),
-	(3, '#091ced', '2021-01-20', 'isabelle@simplon.com', '0', 'SOLO', 'titi', 'Isabelle'),
-	(4, '#ed09de', '2021-06-29', 'blandine@simplon.com', '0', 'VADER', 'tutu', 'Blandine');
 
+-- Export de la structure de la table jpa. membre
+CREATE TABLE IF NOT EXISTS `membre` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `couleur` varchar(255) DEFAULT NULL,
+  `date_naissance` date DEFAULT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `is_admin` varchar(255) DEFAULT NULL,
+  `nom` varchar(255) DEFAULT NULL,
+  `password` varchar(255) DEFAULT NULL,
+  `prenom` varchar(255) DEFAULT NULL,
+  `team_id` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `FKll5mmgkw1h2kmxnuo4885x2fn` (`team_id`),
+  CONSTRAINT `FKll5mmgkw1h2kmxnuo4885x2fn` FOREIGN KEY (`team_id`) REFERENCES `team` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4;
+
+-- Export de données de la table jpa.membre : ~0 rows (environ)
+/*!40000 ALTER TABLE `membre` DISABLE KEYS */;
+INSERT INTO `membre` (`id`, `couleur`, `date_naissance`, `email`, `is_admin`, `nom`, `password`, `prenom`, `team_id`) VALUES
+	(1, '#fcba03', '2021-12-13', 'hedi@simplon.com', '0', 'SKYWALKER', 'toto', 'Hédi', 1),
+	(2, '#8df505', '2021-07-03', 'aline@simplon.com', '0', 'FETT', 'tata', 'Aline', 1),
+	(3, '#091ced', '2021-01-20', 'isabelle@simplon.com', '0', 'SOLO', 'titi', 'Isabelle', 2),
+	(4, '#ed09de', '2021-06-29', 'blandine@simplon.com', '0', 'VADER', 'tutu', 'Blandine', 3);
+/*!40000 ALTER TABLE `membre` ENABLE KEYS */;
+
+
+-- Export de la structure de la table jpa. team_membres
+CREATE TABLE IF NOT EXISTS `team_membres` (
+  `team_id` int(11) NOT NULL,
+  `membres_id` int(11) NOT NULL,
+  UNIQUE KEY `UK_9e71olu3b26ah1kdrljr5i004` (`membres_id`),
+  KEY `FK83yf7h5v4bhum1i9bsj8io105` (`team_id`),
+  CONSTRAINT `FK7w6e9srma4vxmthpdvo9130qp` FOREIGN KEY (`membres_id`) REFERENCES `membre` (`id`),
+  CONSTRAINT `FK83yf7h5v4bhum1i9bsj8io105` FOREIGN KEY (`team_id`) REFERENCES `team` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- Export de données de la table jpa.team_membres : ~0 rows (environ)
+/*!40000 ALTER TABLE `team_membres` DISABLE KEYS */;
+INSERT INTO `team_membres` (`team_id`, `membres_id`) VALUES
+	(1, 1),
+	(1, 2),
+	(2, 3),
+	(3, 4);
+/*!40000 ALTER TABLE `team_membres` ENABLE KEYS */;
+
+
+-- Export de la structure de la table jpa. todo_list
+CREATE TABLE IF NOT EXISTS `todo_list` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `nom` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4;
+
+-- Export de données de la table jpa.todo_list : ~0 rows (environ)
+/*!40000 ALTER TABLE `todo_list` DISABLE KEYS */;
 INSERT INTO `todo_list` (`id`, `nom`) VALUES
 	(1, 'Pour Blandine'),
 	(2, 'Corvées'),
 	(3, 'Noel');
+/*!40000 ALTER TABLE `todo_list` ENABLE KEYS */;
 
-INSERT INTO `contact` (`id`, `adresse`, `date_naissance`, `email`, `nom`, `prenom`, `telephone`) VALUES
-	(1, '7554 Messerschmidt Center', '2021-01-24', 'oogleasane0@cargocollective.com', 'Ophelia', 'O\'Gleasane', '913-198-6499'),
-	(2, '534 Jay Way', '2021-03-26', 'fmowett1@ocn.ne.jp', 'Fiann', 'Mowett', '248-224-7233'),
-	(3, '077 Buell Place', '2021-06-24', 'vlewknor2@spotify.com', 'Vladamir', 'Lewknor', '922-822-3626'),
-	(4, '6226 Esker Street', '2021-04-13', 'jbarmadier3@opensource.org', 'Jervis', 'Barmadier', '838-581-8112'),
-	(5, '28531 Luster Circle', '2021-06-15', 'tmee4@ameblo.jp', 'Tuesday', 'Mee', '761-975-7324'),
-	(6, '96 Hallows Avenue', '2021-08-13', 'tcolvine5@elegantthemes.com', 'Toni', 'Colvine', '348-778-7679'),
-	(7, '6401 Jay Crossing', '2021-01-14', 'rrielly6@netlog.com', 'Riane', 'Rielly', '740-571-0835'),
-	(8, '3273 Cascade Pass', '2021-03-22', 'jlauder7@rambler.ru', 'Juieta', 'Lauder', '928-408-6855'),
-	(9, '1170 Burning Wood Road', '2021-05-31', 'tbolver8@google.ca', 'Thibaut', 'Bolver', '681-860-8291'),
-	(10, '1 Westridge Road', '2021-03-11', 'emebs9@uol.com.br', 'Evered', 'Mebs', '898-483-6075');
+-- Export de la structure de la table jpa. tache
+CREATE TABLE IF NOT EXISTS `tache` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `etat` bit(1) NOT NULL,
+  `texte` varchar(255) DEFAULT NULL,
+  `todolist_id` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `FK50q0ja9qvoud7ujsudc9jj9yk` (`todolist_id`),
+  CONSTRAINT `FK50q0ja9qvoud7ujsudc9jj9yk` FOREIGN KEY (`todolist_id`) REFERENCES `todo_list` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4;
 
+-- Export de données de la table jpa.tache : ~0 rows (environ)
+/*!40000 ALTER TABLE `tache` DISABLE KEYS */;
+INSERT INTO `tache` (`id`, `etat`, `texte`, `todolist_id`) VALUES
+	(1, b'0', 'Apprendre le PHP', 1),
+	(2, b'0', 'Revoir CRUD', 1),
+	(3, b'0', 'Acheter des guirlandes', 3),
+	(4, b'0', 'Acheter un sapin', 3),
+	(5, b'0', 'Trouver un repas', 3);
+/*!40000 ALTER TABLE `tache` ENABLE KEYS */;
 
+-- Export de la structure de la table jpa. team_todolist
+CREATE TABLE IF NOT EXISTS `team_todolist` (
+  `team_id` int(11) NOT NULL,
+  `todolists_id` int(11) NOT NULL,
+  UNIQUE KEY `UK_fjwjvprqqeeugglduq8rdhsyw` (`todolists_id`),
+  KEY `FK7jh4kgpji05rll7nagp4dsago` (`team_id`),
+  CONSTRAINT `FK4ntj6ub8hheh7f4w79qy3ql40` FOREIGN KEY (`todolists_id`) REFERENCES `todo_list` (`id`),
+  CONSTRAINT `FK7jh4kgpji05rll7nagp4dsago` FOREIGN KEY (`team_id`) REFERENCES `team` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- Export de données de la table jpa.team_todolist : ~0 rows (environ)
+/*!40000 ALTER TABLE `team_todolist` DISABLE KEYS */;
+INSERT INTO `team_todolist` (`team_id`, `todolists_id`) VALUES
+	(2, 2),
+	(2, 3),
+	(3, 1);
+/*!40000 ALTER TABLE `team_todolist` ENABLE KEYS */;
+
+-- Export de la structure de la table jpa. smiley
+CREATE TABLE IF NOT EXISTS `smiley` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `smiley_url` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4;
+
+-- Export de données de la table jpa.smiley : ~0 rows (environ)
+/*!40000 ALTER TABLE `smiley` DISABLE KEYS */;
 INSERT INTO `smiley` (`id`, `smiley_url`) VALUES
 	(1, 'https://assets.wprock.fr/emoji/joypixels/512/1f600.png'),
 	(2, 'https://assets.wprock.fr/emoji/joypixels/512/1f618.png'),
 	(3, 'https://assets.wprock.fr/emoji/joypixels/512/1f92e.png'),
 	(4, 'https://assets.wprock.fr/emoji/joypixels/512/1f92c.png');
+/*!40000 ALTER TABLE `smiley` ENABLE KEYS */;
 
+
+-- Export de la structure de la table jpa. smiley_membres
+CREATE TABLE IF NOT EXISTS `smiley_membres` (
+  `smiley_id` int(11) NOT NULL,
+  `membres_id` int(11) NOT NULL,
+  UNIQUE KEY `UK_haqfbvq4lbo8rb77uew2yvwuw` (`membres_id`),
+  KEY `FK9msxvne1uolrrrg8aq9p53sc4` (`smiley_id`),
+  CONSTRAINT `FK4fj42p25xaldnw9koqktnhil2` FOREIGN KEY (`membres_id`) REFERENCES `membre` (`id`),
+  CONSTRAINT `FK9msxvne1uolrrrg8aq9p53sc4` FOREIGN KEY (`smiley_id`) REFERENCES `smiley` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- Export de données de la table jpa.smiley_membres : ~0 rows (environ)
+/*!40000 ALTER TABLE `smiley_membres` DISABLE KEYS */;
+INSERT INTO `smiley_membres` (`smiley_id`, `membres_id`) VALUES
+	(1, 3),
+	(3, 2),
+	(4, 1);
+/*!40000 ALTER TABLE `smiley_membres` ENABLE KEYS */;
+
+
+-- Export de la structure de la table jpa. menu
+CREATE TABLE IF NOT EXISTS `menu` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `date_menu` date DEFAULT NULL,
+  `libelle` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- Export de données de la table jpa.menu : ~0 rows (environ)
+/*!40000 ALTER TABLE `menu` DISABLE KEYS */;
+/*!40000 ALTER TABLE `menu` ENABLE KEYS */;
+
+
+-- Export de la structure de la table jpa. contact
+CREATE TABLE IF NOT EXISTS `contact` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `adresse` varchar(255) DEFAULT NULL,
+  `date_naissance` date DEFAULT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `nom` varchar(255) DEFAULT NULL,
+  `prenom` varchar(255) DEFAULT NULL,
+  `telephone` varchar(255) DEFAULT NULL,
+  `team_id` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `FK7gyd9s84tx9eeuigeu3uv984x` (`team_id`),
+  CONSTRAINT `FK7gyd9s84tx9eeuigeu3uv984x` FOREIGN KEY (`team_id`) REFERENCES `team` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4;
+
+-- Export de données de la table jpa.contact : ~0 rows (environ)
+/*!40000 ALTER TABLE `contact` DISABLE KEYS */;
+INSERT INTO `contact` (`id`, `adresse`, `date_naissance`, `email`, `nom`, `prenom`, `telephone`, `team_id`) VALUES
+	(1, '7554 Messerschmidt Center', '2021-01-24', 'oogleasane0@cargocollective.com', 'Ophelia', 'O\'Gleasane', '913-198-6499', 1),
+	(2, '534 Jay Way', '2021-03-26', 'fmowett1@ocn.ne.jp', 'Fiann', 'Mowett', '248-224-7233', 1),
+	(3, '077 Buell Place', '2021-06-24', 'vlewknor2@spotify.com', 'Vladamir', 'Lewknor', '922-822-3626', 1),
+	(4, '6226 Esker Street', '2021-04-13', 'jbarmadier3@opensource.org', 'Jervis', 'Barmadier', '838-581-8112', 1),
+	(5, '28531 Luster Circle', '2021-06-15', 'tmee4@ameblo.jp', 'Tuesday', 'Mee', '761-975-7324', 2),
+	(6, '96 Hallows Avenue', '2021-08-13', 'tcolvine5@elegantthemes.com', 'Toni', 'Colvine', '348-778-7679', 2),
+	(7, '6401 Jay Crossing', '2021-01-14', 'rrielly6@netlog.com', 'Riane', 'Rielly', '740-571-0835', 2),
+	(8, '3273 Cascade Pass', '2021-03-22', 'jlauder7@rambler.ru', 'Juieta', 'Lauder', '928-408-6855', 2),
+	(9, '1170 Burning Wood Road', '2021-05-31', 'tbolver8@google.ca', 'Thibaut', 'Bolver', '681-860-8291', 3),
+	(10, '1 Westridge Road', '2021-03-11', 'emebs9@uol.com.br', 'Evered', 'Mebs', '898-483-6075', 3);
+/*!40000 ALTER TABLE `contact` ENABLE KEYS */;
+
+
+
+-- Export de la structure de la table jpa. repertoire
+CREATE TABLE IF NOT EXISTS `repertoire` (
+  `team_id` int(11) NOT NULL,
+  `contacts_id` int(11) NOT NULL,
+  UNIQUE KEY `UK_g91q6p6ssjxdhcallbd9yfary` (`contacts_id`),
+  KEY `FK7u57nrpbtl5yhuh3nyx0ccy88` (`team_id`),
+  CONSTRAINT `FK7u57nrpbtl5yhuh3nyx0ccy88` FOREIGN KEY (`team_id`) REFERENCES `team` (`id`),
+  CONSTRAINT `FKe3fy0q6urmw03kn29mj7h7vf5` FOREIGN KEY (`contacts_id`) REFERENCES `contact` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- Export de données de la table jpa.repertoire : ~0 rows (environ)
+/*!40000 ALTER TABLE `repertoire` DISABLE KEYS */;
 INSERT INTO `repertoire` (`team_id`, `contacts_id`) VALUES
 	(1, 1),
 	(1, 2),
@@ -45,26 +220,4 @@ INSERT INTO `repertoire` (`team_id`, `contacts_id`) VALUES
 	(2, 8),
 	(3, 9),
 	(3, 10);
-
-INSERT INTO `smiley_membres` (`smiley_id`, `membres_id`) VALUES
-	(1, 3),
-	(3, 2),
-	(4, 1);
-
-INSERT INTO `tache` (`id`, `etat`, `texte`, `todolist_id`) VALUES
-	(1, b'0', 'Apprendre le PHP', 1),
-	(2, b'0', 'Revoir CRUD', 1),
-	(3, b'0', 'Acheter des guirlandes', 3),
-	(4, b'0', 'Acheter un sapin', 3),
-	(5, b'0', 'Trouver un repas', 3);
-
-INSERT INTO `team_membres` (`team_id`, `membres_id`) VALUES
-	(1, 1),
-	(1, 2),
-	(2, 3),
-	(3, 4);
-
-INSERT INTO `team_todolist` (`team_id`, `todolists_id`) VALUES
-	(2, 2),
-	(2, 3),
-	(3, 1);
\ No newline at end of file
+/*!40000 ALTER TABLE `repertoire` ENABLE KEYS */;
\ No newline at end of file