Merge pull request #7 from HediMjid/dev

Dev

.gitignore

@@ -3,6 +3,7 @@ target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/
+/src/main/resources/application.properties
 
 ### STS ###
 .apt_generated
@@ -32,4 +33,5 @@ build/
 ### VS Code ###
 .vscode/
 /.idea/
-/src/main/resources/
+/.idea/
+/.mvn/

src/main/java/fr/organizee/controller/MembreController.java

@@ -1,29 +1,31 @@
 package fr.organizee.controller;
 
 import fr.organizee.model.Membre;
-import fr.organizee.model.Team;
+//import fr.organizee.model.Team;
 import fr.organizee.repository.MembreRepository;
-import fr.organizee.repository.TeamRepository;
+//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.*;
 
+import javax.persistence.EntityNotFoundException;
 import java.util.List;
 import java.util.Optional;
 
 /* toto */
 @RestController
 @CrossOrigin("*")
+@RequestMapping("/membres")
 public class MembreController {
 
     @Autowired
     private MembreRepository membreRepo;
 
-    @Autowired
+//    @Autowired
-    private TeamRepository teamRepo;
+//    private TeamRepository teamRepo;
 
-    @GetMapping("/")
+//    @RequestMapping("/membres")
     @ResponseBody
     public String home()
     {
@@ -33,7 +35,7 @@ public class MembreController {
         return  sb.toString();
     }
 
-    @GetMapping(value = "/membres/all")
+    @GetMapping(value = "/all")
     public ResponseEntity<?> getAll(){
         List<Membre> liste = null;
         try
@@ -46,20 +48,20 @@ public class MembreController {
         return ResponseEntity.status(HttpStatus.OK).body(liste);
     }
 
-    @GetMapping(value = "/team/all")
+//    @GetMapping(value = "/team/all")
-    public ResponseEntity<?> getAllTeam(){
+//    public ResponseEntity<?> getAllTeam(){
-        List<Team> liste = null;
+//        List<Team> liste = null;
-        try
+//        try
-        {
+//        {
-            liste = teamRepo.findAll();
+//            liste = teamRepo.findAll();
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
+//            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
-        }
+//        }
+//
+//        return ResponseEntity.status(HttpStatus.OK).body(liste);
+//    }
 
-        return ResponseEntity.status(HttpStatus.OK).body(liste);
+    @GetMapping(value = "/{id}")
-    }
-
-    @GetMapping(value = "/membres/{id}")
     public ResponseEntity<?> findById(@PathVariable int id){
         Optional<Membre> membre = null;
         try
@@ -72,23 +74,96 @@ public class MembreController {
         return ResponseEntity.status(HttpStatus.OK).body(membre);
     }
 
-    @GetMapping(value = "/membres/delete/{id}")
+//    @GetMapping(value = "/membres/delete/{id}")
-    public void deleteMembreId(@PathVariable("id") Integer id) {
+//    public void deleteMembreId(@PathVariable("id") Integer id) {
+//
+//            membreRepo.deleteById(id);
+//
+//    }
 
-            membreRepo.deleteById(id);
+    @DeleteMapping(value = "/delete/{id}")
+    public ResponseEntity<?> deleteMembre(@PathVariable int id){
+        try {
+            membreRepo.delete(membreRepo.getById(id));
+            //membreRepo.deleteById(id);
+            return ResponseEntity.status(HttpStatus.OK).body("Membre effacée !");
 
+        } catch (EntityNotFoundException e) {
+
+            return ResponseEntity.status(HttpStatus.OK).body("Membre introuvable !");
+        }
     }
 
-    @GetMapping(value = "/team/{id}")
+    @PostMapping(value="/add", produces="application/json", consumes="application/json")
-    public ResponseEntity<?> findTeamById(@PathVariable int id){
+    public ResponseEntity<?> addMembre(@RequestBody Membre membre){
-        Optional<Team> liste = null;
+        Membre resultMembre = null;
-        try
+        try {
-        {
+            resultMembre = membreRepo.saveAndFlush(membre);
-            liste = teamRepo.findById(id);
         } catch (Exception e) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage());
         }
 
-        return ResponseEntity.status(HttpStatus.OK).body(liste);
+        return ResponseEntity.status(HttpStatus.CREATED).body(resultMembre);
+    }
+
+    @PutMapping("/update/{id}")
+    public ResponseEntity<?> updateMembre(@RequestBody Membre membre, @PathVariable Integer id) throws Exception {
+        Membre resultMembre = null;
+        try {
+            resultMembre = membreRepo.save(membre);
+
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.getMessage());
+        }
+
+        return ResponseEntity.status(HttpStatus.OK).body(resultMembre);
+    }
+
+//    UPDATE SUR UN CHAMPS
+//    @PutMapping("/update/{id}")
+//    public ResponseEntity<?> updateMembre(@RequestBody Membre membre, @PathVariable Integer id) throws Exception {
+//        Membre resultMembre = null;
+//        Membre oldMembre = membreRepo.getById(id);
+//        oldMembre.setNom(membre.getNom());
+//        //Membre resultMembre = membreRepo.getById(id);
+//        try {
+//            resultMembre = membreRepo.save(oldMembre);
+//
+//        } catch (Exception e) {
+//            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.getMessage());
+//        }
+//
+//        return ResponseEntity.status(HttpStatus.OK).body(resultMembre);
+//    }
+
+//    @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);
+//    }
+
+    @PostMapping(value="/login", produces="application/json", consumes="application/json")
+    public ResponseEntity<?> login(@RequestBody Membre membre){
+        Membre resultMembre = null;
+        try {
+            resultMembre = membreRepo.findByNom(membre.getNom());
+            if(resultMembre == null){
+                throw new RuntimeException("User inexistant.");
+            }
+            if(!resultMembre.getPassword().equals(membre.getPassword())){
+                throw new RuntimeException("mauvais password.");
+            }
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage());
+        }
+
+        return ResponseEntity.status(HttpStatus.CREATED).body(resultMembre);
     }
 }

src/main/java/fr/organizee/controller/TeamController.java

@@ -0,0 +1,60 @@
+package fr.organizee.controller;
+
+import fr.organizee.model.Team;
+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.*;
+
+import javax.persistence.EntityNotFoundException;
+import java.util.List;
+import java.util.Optional;
+
+/* toto */
+@RestController
+@CrossOrigin("*")
+@RequestMapping("/teams")
+public class TeamController {
+
+    @Autowired
+    private TeamRepository teamRepo;
+
+//    @RequestMapping("/teams")
+    @ResponseBody
+    public String home()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("<h1>Affichages des teams</h1>");
+        sb.append("<ul><li><a href='http://localhost:8080/teams/all'>Liste des <strong>teams</strong></a></li>");
+        return  sb.toString();
+    }
+
+    // Récupération de toutes les teams
+    @GetMapping(value = "/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 = "/{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);
+    }
+
+}

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

@@ -1,5 +1,7 @@
 package fr.organizee.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import javax.persistence.*;
 import java.time.LocalDate;
 
@@ -14,20 +16,22 @@ public class Contact {
     private String email;
     private String adresse;
     private LocalDate dateNaissance;
-/*    @ManyToOne(fetch= FetchType.EAGER)
+    @ManyToOne(cascade = CascadeType.MERGE)
     @JoinColumn(name="TEAM_ID")
-    private Team team;*/
+    @JsonIgnoreProperties("contact")
+    private Team team;
 
     public Contact() {
     }
 
-    public Contact(String nom, String prenom, String telephone, String email, String adresse, LocalDate dateNaissance) {
+    public Contact(String nom, String prenom, String telephone, String email, String adresse, LocalDate dateNaissance, Team team) {
         this.nom = nom;
         this.prenom = prenom;
         this.telephone = telephone;
         this.email = email;
         this.adresse = adresse;
         this.dateNaissance = dateNaissance;
+        this.team = team;
     }
 
     public int getId() {
@@ -86,6 +90,13 @@ public class Contact {
         this.dateNaissance = dateNaissance;
     }
 
+    public Team getTeam() {
+        return team;
+    }
+    public void setTeam(Team team) {
+        this.team = team;
+    }
+
     @Override
     public String toString() {
         return "Contact{" +

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

@@ -1,5 +1,8 @@
 package fr.organizee.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import javax.persistence.*;
 import java.time.LocalDate;
 
@@ -17,8 +20,12 @@ public class Membre {
     private String isAdmin;
     private String couleur;
     private String smiley;
-    @ManyToOne
+//    @ManyToOne
+//    @JoinColumn(name="TEAM_ID")
+//    @JsonIgnore
+    @ManyToOne(cascade = CascadeType.MERGE)
     @JoinColumn(name="TEAM_ID")
+    @JsonIgnoreProperties("membre")
     private Team team;
 
     public Membre() {
@@ -33,7 +40,7 @@ public class Membre {
         this.isAdmin = isAdmin;
         this.couleur = couleur;
         this.smiley = smiley;
-/*        this.team = team;*/
+        this.team = team;
     }
 
     public int getId() {

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

@@ -1,5 +1,7 @@
 package fr.organizee.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import javax.persistence.*;
 import java.time.LocalDate;
 
@@ -10,7 +12,9 @@ public class Menu {
     private int id;
     private String libelle;
     private LocalDate dateMenu;
-    @ManyToOne
+    @ManyToOne(cascade = CascadeType.MERGE)
+    @JoinColumn(name="TEAM_ID")
+    @JsonIgnoreProperties("menu")
     private Team team;
     @ManyToOne
     private Membre membre;

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

@@ -1,5 +1,7 @@
 package fr.organizee.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import javax.persistence.*;
 
 @Entity
@@ -8,12 +10,13 @@ public class Tache {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
     private String texte;
-    private boolean etat;
+    private Boolean etat;
-    @ManyToOne
+    @ManyToOne(cascade = CascadeType.MERGE)
-    @JoinColumn(name = "todolist_id")
+    @JoinColumn(name="TODOLIST_ID")
+    @JsonIgnoreProperties("tache")
     private TodoList todolist;
 
-    public Tache(String texte, boolean etat) {
+    public Tache(String texte, Boolean etat) {
         this.texte = texte;
         this.etat = etat;
     }
@@ -37,14 +40,22 @@ public class Tache {
         this.texte = texte;
     }
 
-    public boolean isEtat() {
+    public Boolean getEtat() {
         return etat;
     }
 
-    public void setEtat(boolean etat) {
+    public void setEtat(Boolean etat) {
         this.etat = etat;
     }
 
+    public TodoList getTodolist() {
+        return todolist;
+    }
+
+    public void setTodolist(TodoList todolist) {
+        this.todolist = todolist;
+    }
+
     @Override
     public String toString() {
         return "Tache{" +

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

@@ -1,5 +1,7 @@
 package fr.organizee.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -10,17 +12,17 @@ public class Team {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
     private String nom;
-    @OneToMany(mappedBy = "team", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(mappedBy = "team", fetch=FetchType.LAZY)
-    //@OneToMany
+    @JsonIgnoreProperties("team")
     private List<Membre> membres = new ArrayList<>();
-    @OneToMany
+    @OneToMany(mappedBy = "team", fetch=FetchType.LAZY)
-    @JoinTable(name = "repertoire")
+    @JsonIgnoreProperties("team")
     private List<Contact> contacts = new ArrayList<>();
-    @OneToMany
+    @OneToMany(mappedBy = "team", fetch=FetchType.LAZY)
-    @JoinTable(name = "team_todolist")
+    @JsonIgnoreProperties("team")
     private List<TodoList> todolists = new ArrayList<>();
-    @OneToMany
+    @OneToMany(mappedBy = "team", fetch=FetchType.LAZY)
-    @JoinTable(name="team_menu")
+    @JsonIgnoreProperties("team")
     private List<Menu> menus = new ArrayList<>();
 
     public Team() {

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

@@ -1,5 +1,7 @@
 package fr.organizee.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -10,8 +12,10 @@ public class TodoList {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
     private String nom;
-    @OneToMany(mappedBy = "todolist")
+    @ManyToOne(cascade = CascadeType.MERGE)
-    private List<Tache> taches = new ArrayList<>();
+    @JoinColumn(name="TEAM_ID")
+    @JsonIgnoreProperties("todolist")
+    private Team team;
 
     public TodoList() {
     }

src/main/java/fr/organizee/repository/MembreRepository.java

@@ -6,5 +6,5 @@ import org.springframework.stereotype.Repository;
 
 @Repository
 public interface MembreRepository extends JpaRepository<Membre, Integer> {
-
+    Membre findByNom(String nom);
 }

src/main/resources/application.properties

@@ -1,20 +0,0 @@
-# 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.driver-class-name=com.mysql.cj.jdbc.Driver
-# log
-#logging.level.root=INFO
-logging.file=d:/data/log-hibernate-jpa.log
-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=create-drop
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
-# ===============================
-# Permet d'exécuter le data.sql
-# ===============================
-#spring.datasource.initialization-mode=always

src/main/resources/data.sql

@@ -1,169 +1,15 @@
+-- --------------------------------------------------------
+-- Hôte :                        192.168.1.16
+-- Version du serveur:           10.3.32-MariaDB-0ubuntu0.20.04.1 - Ubuntu 20.04
+-- SE du serveur:                debian-linux-gnu
+-- HeidiSQL Version:             9.5.0.5196
+-- --------------------------------------------------------
 
--- Export de la structure de la table jpa. team
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-CREATE TABLE IF NOT EXISTS `team` (
+/*!40101 SET NAMES utf8 */;
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+/*!50503 SET NAMES utf8mb4 */;
-  `nom` varchar(255) DEFAULT NULL,
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-  PRIMARY KEY (`id`)
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-) 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 */;
-
-
--- 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 */;
-
--- 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` (
@@ -186,38 +32,116 @@ INSERT INTO `contact` (`id`, `adresse`, `date_naissance`, `email`, `nom`, `preno
 	(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),
+	(4, '6226 Esker Street', '2021-04-13', 'jbarmadier3@opensource.org', 'Jervis', 'Barmadier', '838-581-8112', 2),
 	(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),
+	(7, '6401 Jay Crossing', '2021-01-14', 'rrielly6@netlog.com', 'Riane', 'Rielly', '740-571-0835', 3),
-	(8, '3273 Cascade Pass', '2021-03-22', 'jlauder7@rambler.ru', 'Juieta', 'Lauder', '928-408-6855', 2),
+	(8, '3273 Cascade Pass', '2021-03-22', 'jlauder7@rambler.ru', 'Juieta', 'Lauder', '928-408-6855', 3),
-	(9, '1170 Burning Wood Road', '2021-05-31', 'tbolver8@google.ca', 'Thibaut', 'Bolver', '681-860-8291', 3),
+	(9, '1170 Burning Wood Road', '2021-05-31', 'tbolver8@google.ca', 'Thibaut', 'Bolver', '681-860-8291', 4),
-	(10, '1 Westridge Road', '2021-03-11', 'emebs9@uol.com.br', 'Evered', 'Mebs', '898-483-6075', 3);
+	(10, '1 Westridge Road', '2021-03-11', 'emebs9@uol.com.br', 'Evered', 'Mebs', '898-483-6075', 4);
 /*!40000 ALTER TABLE `contact` ENABLE KEYS */;
 
+-- 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,
+  `smiley` 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=7 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`, `smiley`, `team_id`) VALUES
+	(1, '#fcba03', '2021-12-13', 'hedi@simplon.com', '0', 'SKYWALKER', 'toto', 'Hédi', NULL, 1),
+	(2, '#8df505', '2021-07-03', 'aline@simplon.com', '0', 'FETT', 'tata', 'Aline', NULL, 1),
+	(3, '#091ced', '2021-01-20', 'isabelle@simplon.com', '0', 'SOLO', 'titi', 'Isabelle', NULL, 2),
+	(4, '#ed09de', '2021-06-29', 'blandine@simplon.com', '0', 'VADER', 'tutu', 'Blandine', NULL, 3),
+	(5, '#ed09de', '2021-08-29', 'sana@simplon.com', '0', 'C3PO', 'riri', 'Sana', NULL, 4),
+	(6, '#ed09de', '2021-10-29', 'cecile@simplon.com', '0', 'R2D2', 'loulou', 'Cecile', NULL, 4);
+/*!40000 ALTER TABLE `membre` ENABLE KEYS */;
 
--- Export de la structure de la table jpa. repertoire
+-- Export de la structure de la table jpa. menu
-CREATE TABLE IF NOT EXISTS `repertoire` (
+CREATE TABLE IF NOT EXISTS `menu` (
-  `team_id` int(11) NOT NULL,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `contacts_id` int(11) NOT NULL,
+  `date_menu` date DEFAULT NULL,
-  UNIQUE KEY `UK_g91q6p6ssjxdhcallbd9yfary` (`contacts_id`),
+  `libelle` varchar(255) DEFAULT NULL,
-  KEY `FK7u57nrpbtl5yhuh3nyx0ccy88` (`team_id`),
+  `membre_id` int(11) DEFAULT NULL,
-  CONSTRAINT `FK7u57nrpbtl5yhuh3nyx0ccy88` FOREIGN KEY (`team_id`) REFERENCES `team` (`id`),
+  `team_id` int(11) DEFAULT NULL,
-  CONSTRAINT `FKe3fy0q6urmw03kn29mj7h7vf5` FOREIGN KEY (`contacts_id`) REFERENCES `contact` (`id`)
+  PRIMARY KEY (`id`),
+  KEY `FK9k2sad7pn2qsivwavhptvm3u6` (`membre_id`),
+  KEY `FKky2j5l3syborv9dtqtprgpr28` (`team_id`),
+  CONSTRAINT `FK9k2sad7pn2qsivwavhptvm3u6` FOREIGN KEY (`membre_id`) REFERENCES `membre` (`id`),
+  CONSTRAINT `FKky2j5l3syborv9dtqtprgpr28` FOREIGN KEY (`team_id`) REFERENCES `team` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
--- Export de données de la table jpa.repertoire : ~0 rows (environ)
+-- Export de données de la table jpa.menu : ~0 rows (environ)
-/*!40000 ALTER TABLE `repertoire` DISABLE KEYS */;
+/*!40000 ALTER TABLE `menu` DISABLE KEYS */;
-INSERT INTO `repertoire` (`team_id`, `contacts_id`) VALUES
+/*!40000 ALTER TABLE `menu` ENABLE KEYS */;
-	(1, 1),
+
-	(1, 2),
+-- Export de la structure de la table jpa. tache
-	(1, 3),
+CREATE TABLE IF NOT EXISTS `tache` (
-	(1, 4),
+  `id` int(11) NOT NULL AUTO_INCREMENT,
-	(2, 5),
+  `etat` bit(1) DEFAULT NULL,
-	(2, 6),
+  `texte` varchar(255) DEFAULT NULL,
-	(2, 7),
+  `todolist_id` int(11) DEFAULT NULL,
-	(2, 8),
+  PRIMARY KEY (`id`),
-	(3, 9),
+  KEY `FK50q0ja9qvoud7ujsudc9jj9yk` (`todolist_id`),
-	(3, 10);
+  CONSTRAINT `FK50q0ja9qvoud7ujsudc9jj9yk` FOREIGN KEY (`todolist_id`) REFERENCES `todo_list` (`id`)
-/*!40000 ALTER TABLE `repertoire` ENABLE KEYS */;
+) 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
+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 */;
+
+-- 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,
+  `team_id` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `FK6ty40hkdysbql7xaewhujsjg` (`team_id`),
+  CONSTRAINT `FK6ty40hkdysbql7xaewhujsjg` FOREIGN KEY (`team_id`) REFERENCES `team` (`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`, `team_id`) VALUES
+	(1, 'Pour Blandine', 1),
+	(2, 'Corvées', 1),
+	(3, 'Noel', 1);
+/*!40000 ALTER TABLE `todo_list` ENABLE KEYS */;
+
+/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
+/*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;