diff --git a/.idea/Organizee.iml b/.idea/Organizee.iml deleted file mode 100644 index d6ebd48..0000000 --- a/.idea/Organizee.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index a8c4885..c75fd2a 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,11 +6,13 @@ + diff --git a/src/main/java/fr/organizee/controller/ContactController.java b/src/main/java/fr/organizee/controller/ContactController.java new file mode 100644 index 0000000..27d0d32 --- /dev/null +++ b/src/main/java/fr/organizee/controller/ContactController.java @@ -0,0 +1,87 @@ +package fr.organizee.controller; + +import fr.organizee.model.Contact; +import fr.organizee.model.Membre; +import fr.organizee.model.Team; +import fr.organizee.repository.ContactRepository; +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; + +@RestController +@CrossOrigin("*") +@RequestMapping("/contacts") +public class ContactController { + + @Autowired + private ContactRepository contactRepo; + + @GetMapping(value = "/{id}") + public ResponseEntity findById(@PathVariable int id){ + Optional contact = null; + try + { + contact = contactRepo.findById(id); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null); + } + + return ResponseEntity.status(HttpStatus.OK).body(contact); + } + + @GetMapping(value = "team/{team_id}") + public ResponseEntity findByTeamId(@PathVariable int team_id){ + List contacts = null; + try + { + contacts = contactRepo.FindContactsByTeam(team_id); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null); + } + + return ResponseEntity.status(HttpStatus.OK).body(contacts); + } + + @PostMapping(value="/add") + public ResponseEntity addContact(@RequestBody Contact contact){ + Contact resultContact = null; + try { + resultContact = contactRepo.saveAndFlush(contact); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); + } + + return ResponseEntity.status(HttpStatus.CREATED).body(resultContact); + } + + @PutMapping("/update/{id}") + public ResponseEntity updateContact(@RequestBody Contact contact, @PathVariable Integer id) throws Exception { + Contact resultContact = null; + try { + resultContact = contactRepo.save(contact); + + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.getMessage()); + } + + return ResponseEntity.status(HttpStatus.OK).body(resultContact); + } + + @DeleteMapping(value = "/delete/{id}") + public ResponseEntity deleteContact(@PathVariable int id){ + try { + contactRepo.delete(contactRepo.getById(id)); + return ResponseEntity.status(HttpStatus.OK).body("Contact effacé !"); + + } catch (EntityNotFoundException e) { + + return ResponseEntity.status(HttpStatus.OK).body("Contact introuvable !"); + } + } +} diff --git a/src/main/java/fr/organizee/controller/MembreController.java b/src/main/java/fr/organizee/controller/MembreController.java index d200dc3..dc0edf7 100644 --- a/src/main/java/fr/organizee/controller/MembreController.java +++ b/src/main/java/fr/organizee/controller/MembreController.java @@ -148,22 +148,4 @@ public class MembreController { // // 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); - } } diff --git a/src/main/java/fr/organizee/controller/TeamController.java b/src/main/java/fr/organizee/controller/TeamController.java index 632f368..aa01915 100644 --- a/src/main/java/fr/organizee/controller/TeamController.java +++ b/src/main/java/fr/organizee/controller/TeamController.java @@ -1,5 +1,6 @@ package fr.organizee.controller; +import fr.organizee.model.Membre; import fr.organizee.model.Team; import fr.organizee.repository.TeamRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -57,4 +58,41 @@ public class TeamController { return ResponseEntity.status(HttpStatus.OK).body(liste); } + @PostMapping(value="/add", produces="application/json", consumes="application/json") + public ResponseEntity addTeam(@RequestBody Team team){ + Team resultTeam = null; + try { + resultTeam = teamRepo.saveAndFlush(team); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); + } + + return ResponseEntity.status(HttpStatus.CREATED).body(resultTeam); + } + + @PutMapping("/update/{id}") + public ResponseEntity updateTeam(@RequestBody Team team, @PathVariable Integer id) throws Exception { + Team resultTeam = null; + try { + resultTeam = teamRepo.save(team); + + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.getMessage()); + } + + return ResponseEntity.status(HttpStatus.OK).body(resultTeam); + } + + @DeleteMapping(value = "/delete/{id}") + public ResponseEntity deleteTeam(@PathVariable int id){ + try { + teamRepo.delete(teamRepo.getById(id)); + //membreRepo.deleteById(id); + return ResponseEntity.status(HttpStatus.OK).body("Team effacée !"); + + } catch (EntityNotFoundException e) { + + return ResponseEntity.status(HttpStatus.OK).body("Team introuvable !"); + } + } } diff --git a/src/main/java/fr/organizee/model/Team.java b/src/main/java/fr/organizee/model/Team.java index 0b9ddbe..1da65d5 100644 --- a/src/main/java/fr/organizee/model/Team.java +++ b/src/main/java/fr/organizee/model/Team.java @@ -55,8 +55,16 @@ public class Team { this.membres = membre; } + public List getContacts() { + return contacts; + } + + public void setContacts(List contacts) { + this.contacts = contacts; + } + @Override public String toString() { - return "Team [id=" + id + ", nom=" + nom + ", membre=" + membres + "]"; + return "Team [id=" + id + ", nom=" + nom + ", membre=" + membres + ", contact=" + contacts + "]"; } } diff --git a/src/main/java/fr/organizee/repository/ContactRepository.java b/src/main/java/fr/organizee/repository/ContactRepository.java index b670634..ed1612a 100644 --- a/src/main/java/fr/organizee/repository/ContactRepository.java +++ b/src/main/java/fr/organizee/repository/ContactRepository.java @@ -1,4 +1,19 @@ package fr.organizee.repository; -public interface ContactRepository { +import fr.organizee.model.Contact; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + +@Repository +public interface ContactRepository extends JpaRepository { + +@Query(value = "select * from contact where team_id = :team_id", nativeQuery = true) + List FindContactsByTeam(@Param("team_id") int team_id); + + } diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 298f168..0af0130 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -1,65 +1,21 @@ --- -------------------------------------------------------- --- 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 --- -------------------------------------------------------- - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET NAMES utf8 */; -/*!50503 SET NAMES utf8mb4 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; - --- 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 `team` (`id`, `nom`) VALUES + (1, 'Team JAVA'), + (2, 'Team Angular'), + (3, 'Team PHP'), + (4, 'Team Bancal'); + 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', 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', 3), - (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', 4), - (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 */; + (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','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','3'), + (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','4'), + (10, '1 Westridge Road', '2021-03-11', 'emebs9@uol.com.br', 'Evered', 'Mebs', '898-483-6075','4'); + 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), @@ -67,81 +23,19 @@ INSERT INTO `membre` (`id`, `couleur`, `date_naissance`, `email`, `is_admin`, `n (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. menu -CREATE TABLE IF NOT EXISTS `menu` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `date_menu` date DEFAULT NULL, - `libelle` varchar(255) DEFAULT NULL, - `membre_id` int(11) DEFAULT NULL, - `team_id` int(11) DEFAULT NULL, - 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.menu : ~0 rows (environ) -/*!40000 ALTER TABLE `menu` DISABLE KEYS */; -/*!40000 ALTER TABLE `menu` 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) DEFAULT 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 -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 */; + (1, 'Pour Blandine',1), + (2, 'Corvées',1), + (3, 'Noel',1); -/*!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 */; + +INSERT INTO `tache` (`id`, `etat`, `texte`, `todolist_id`) VALUES + (1, 0, 'Apprendre le PHP', 1), + (2, 0, 'Revoir CRUD', 1), + (3, 0, 'Acheter des guirlandes', 3), + (4, 0, 'Acheter un sapin', 3), + (5, 0, 'Trouver un repas', 3); + +INSERT INTO `evenement` (`id`, `all_day`, `event_debut`, `event_fin`, `libelle`, `membre_id`, `team_id`) VALUES + (1, 0, '2022-01-13 09:00:33', '2022-01-13 13:04:38', 'Simplon', 1, 1); \ No newline at end of file