From b874fb16a24c7c6eddd48715af03ae1cffa5cea4 Mon Sep 17 00:00:00 2001 From: AlineRinquin <90188226+AlineRinquin@users.noreply.github.com> Date: Thu, 20 Jan 2022 09:37:14 +0100 Subject: [PATCH 01/11] commit pour pull --- .idea/Organizee.iml | 9 --------- .idea/compiler.xml | 2 ++ pom.xml | 13 +++++++------ 3 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 .idea/Organizee.iml 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/pom.xml b/pom.xml index 32eb628..9b437f5 100644 --- a/pom.xml +++ b/pom.xml @@ -2,12 +2,7 @@ 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.1 - - + fr.organizee organizee 0.0.1-SNAPSHOT @@ -16,6 +11,12 @@ 11 + + org.springframework.boot + spring-boot-starter-parent + 2.6.1 + + org.springframework.boot From 6c69774bb1a42b4536be6a075120078267fbe789 Mon Sep 17 00:00:00 2001 From: Hedi Date: Thu, 20 Jan 2022 09:41:07 +0100 Subject: [PATCH 02/11] debut de tache controller --- .../controller/EvenementController.java | 37 ++++++ .../organizee/controller/TacheController.java | 85 ++++++++++++++ .../java/fr/organizee/model/Evenement.java | 107 ++++++++++++++++++ .../repository/EvenementRepository.java | 9 ++ .../organizee/repository/TacheRepository.java | 7 +- 5 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 src/main/java/fr/organizee/controller/EvenementController.java create mode 100644 src/main/java/fr/organizee/controller/TacheController.java create mode 100644 src/main/java/fr/organizee/model/Evenement.java create mode 100644 src/main/java/fr/organizee/repository/EvenementRepository.java diff --git a/src/main/java/fr/organizee/controller/EvenementController.java b/src/main/java/fr/organizee/controller/EvenementController.java new file mode 100644 index 0000000..a5c3673 --- /dev/null +++ b/src/main/java/fr/organizee/controller/EvenementController.java @@ -0,0 +1,37 @@ +package fr.organizee.controller; + +import fr.organizee.model.Evenement; +import fr.organizee.model.Membre; +import fr.organizee.model.Team; +import fr.organizee.repository.EvenementRepository; +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 java.util.List; +import java.util.Optional; + +@RestController +@CrossOrigin("*") +@RequestMapping("/evenements") +public class EvenementController { + + @Autowired + private EvenementRepository evenementRepo; + + // Recupérer tout les evenements pour une team {id} + @GetMapping(value = "/all/{id}") + public ResponseEntity getAll(){ + List liste = null; + try + { + liste = evenementRepo.findAll(); + } 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/controller/TacheController.java b/src/main/java/fr/organizee/controller/TacheController.java new file mode 100644 index 0000000..8408ada --- /dev/null +++ b/src/main/java/fr/organizee/controller/TacheController.java @@ -0,0 +1,85 @@ +package fr.organizee.controller; + +import fr.organizee.model.Membre; +import fr.organizee.model.Tache; +import fr.organizee.repository.MembreRepository; +import fr.organizee.repository.TacheRepository; +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("/taches") +public class TacheController { + @Autowired + private TacheRepository tacheRepo; + + @GetMapping(value = "/all") + public ResponseEntity getAll(){ + List liste = null; + try + { + liste = tacheRepo.findAll(); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null); + } + + return ResponseEntity.status(HttpStatus.OK).body(liste); + } + + @GetMapping(value = "/{id}") + public ResponseEntity findById(@PathVariable int id){ + Optional tache = null; + try + { + tache = tacheRepo.findById(id); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null); + } + + return ResponseEntity.status(HttpStatus.OK).body(tache); + } + + @DeleteMapping(value = "/delete/{id}") + public ResponseEntity deleteTache(@PathVariable int id){ + try { + tacheRepo.delete(tacheRepo.getById(id)); + return ResponseEntity.status(HttpStatus.OK).body("Tache effacée !"); + + } catch (EntityNotFoundException e) { + + return ResponseEntity.status(HttpStatus.OK).body("Tache introuvable !"); + } + } + + @PostMapping(value="/add", produces="application/json", consumes="application/json") + public ResponseEntity addTache(@RequestBody Tache tache){ + Tache resultTache = null; + try { + resultTache = tacheRepo.saveAndFlush(tache); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); + } + + return ResponseEntity.status(HttpStatus.CREATED).body(resultTache); + } + + @PutMapping("/update/{id}") + public ResponseEntity updateTache(@RequestBody Tache tache, @PathVariable Integer id) throws Exception { + Tache resultTache = null; + try { + resultTache = tacheRepo.save(tache); + + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.getMessage()); + } + + return ResponseEntity.status(HttpStatus.OK).body(resultTache); + } +} diff --git a/src/main/java/fr/organizee/model/Evenement.java b/src/main/java/fr/organizee/model/Evenement.java new file mode 100644 index 0000000..15a355f --- /dev/null +++ b/src/main/java/fr/organizee/model/Evenement.java @@ -0,0 +1,107 @@ +package fr.organizee.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import javax.persistence.*; +import java.time.LocalDateTime; + +@Entity +public class Evenement { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; + private LocalDateTime eventDebut; + private LocalDateTime eventFin; + private int allDay; + private String libelle; + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name="MEMBRE_ID") + @JsonIgnoreProperties("evenement") + private Membre membre; + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name="TEAM_ID") + @JsonIgnoreProperties("evenement") + private Team team; + + public Evenement() { + } + + public Evenement(int id, LocalDateTime eventDebut, LocalDateTime eventFin, int allDay, String libelle, Membre membre, Team team) { + this.id = id; + this.eventDebut = eventDebut; + this.eventFin = eventFin; + this.allDay = allDay; + this.libelle = libelle; + this.membre = membre; + this.team = team; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public LocalDateTime getEventDebut() { + return eventDebut; + } + + public void setEventDebut(LocalDateTime eventDebut) { + this.eventDebut = eventDebut; + } + + public LocalDateTime getEventFin() { + return eventFin; + } + + public void setEventFin(LocalDateTime eventFin) { + this.eventFin = eventFin; + } + + public int getAllDay() { + return allDay; + } + + public void setAllDay(int allDay) { + this.allDay = allDay; + } + + public String getLibelle() { + return libelle; + } + + public void setLibelle(String libelle) { + this.libelle = libelle; + } + + public Membre getMembre() { + return membre; + } + + public void setMembre(Membre membre) { + this.membre = membre; + } + + public Team getTeam() { + return team; + } + + public void setTeam(Team team) { + this.team = team; + } + + @Override + public String toString() { + return "Evenement{" + + "id=" + id + + ", eventDebut=" + eventDebut + + ", eventFin=" + eventFin + + ", allDay=" + allDay + + ", libelle='" + libelle + '\'' + + ", membre=" + membre + + ", team=" + team + + '}'; + } +} diff --git a/src/main/java/fr/organizee/repository/EvenementRepository.java b/src/main/java/fr/organizee/repository/EvenementRepository.java new file mode 100644 index 0000000..51164c5 --- /dev/null +++ b/src/main/java/fr/organizee/repository/EvenementRepository.java @@ -0,0 +1,9 @@ +package fr.organizee.repository; + +import fr.organizee.model.Evenement; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface EvenementRepository extends JpaRepository { +} diff --git a/src/main/java/fr/organizee/repository/TacheRepository.java b/src/main/java/fr/organizee/repository/TacheRepository.java index 17c22b8..2e52ef2 100644 --- a/src/main/java/fr/organizee/repository/TacheRepository.java +++ b/src/main/java/fr/organizee/repository/TacheRepository.java @@ -1,4 +1,9 @@ package fr.organizee.repository; -public interface TacheRepository { +import fr.organizee.model.Tache; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface TacheRepository extends JpaRepository { } From c33d1282c7f1cc6fc59fa4da1a3ff41b9834d6ba Mon Sep 17 00:00:00 2001 From: Hedi Date: Fri, 21 Jan 2022 14:45:37 +0100 Subject: [PATCH 03/11] fix: pb update en cascade, ajout de Tache et Todolist (class et repository) --- .idea/compiler.xml | 1 + .../controller/ContactController.java | 3 - .../organizee/controller/MenuController.java | 18 +++-- .../organizee/controller/TacheController.java | 22 +++++- .../organizee/controller/TeamController.java | 3 +- .../controller/TodoListController.java | 75 +++++++++++++++++++ src/main/java/fr/organizee/model/Contact.java | 2 +- src/main/java/fr/organizee/model/Membre.java | 2 +- src/main/java/fr/organizee/model/Menu.java | 25 ++++++- src/main/java/fr/organizee/model/Tache.java | 2 +- src/main/java/fr/organizee/model/Team.java | 8 +- .../java/fr/organizee/model/TodoList.java | 24 +++++- .../organizee/repository/TacheRepository.java | 8 ++ .../repository/TodoListRepository.java | 7 ++ 14 files changed, 172 insertions(+), 28 deletions(-) create mode 100644 src/main/java/fr/organizee/controller/TodoListController.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index c75fd2a..a500b21 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,6 +7,7 @@ + diff --git a/src/main/java/fr/organizee/controller/ContactController.java b/src/main/java/fr/organizee/controller/ContactController.java index 5186d12..ef79042 100644 --- a/src/main/java/fr/organizee/controller/ContactController.java +++ b/src/main/java/fr/organizee/controller/ContactController.java @@ -1,10 +1,7 @@ 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; diff --git a/src/main/java/fr/organizee/controller/MenuController.java b/src/main/java/fr/organizee/controller/MenuController.java index f4e4ec8..b7db085 100644 --- a/src/main/java/fr/organizee/controller/MenuController.java +++ b/src/main/java/fr/organizee/controller/MenuController.java @@ -1,6 +1,5 @@ package fr.organizee.controller; -import fr.organizee.model.Contact; import fr.organizee.model.Menu; import fr.organizee.repository.MenuRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -21,8 +20,9 @@ public class MenuController { @Autowired private MenuRepository menuRepository; + //Récupère les infos d'un menu par son ID @GetMapping(value = "/{id}") - @PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") + //@PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") public ResponseEntity findById(@PathVariable int id){ Optional menu = null; try @@ -35,8 +35,9 @@ public class MenuController { return ResponseEntity.status(HttpStatus.OK).body(menu); } + //Récupère les infos des menus par la team ID @GetMapping(value = "team/{team_id}") - @PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") + //@PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") public ResponseEntity findByTeamId(@PathVariable int team_id) { List menus = null; try { @@ -47,8 +48,9 @@ public class MenuController { return ResponseEntity.status(HttpStatus.OK).body(menus); } + //Ajoute un nouveau menu @PostMapping(value="/add") - @PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") + //@PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") public ResponseEntity addMenu(@RequestBody Menu menu){ Menu resultMenu = null; try { @@ -60,8 +62,9 @@ public class MenuController { return ResponseEntity.status(HttpStatus.CREATED).body(resultMenu); } + //Mise a jour d'un menu par son ID @PutMapping("/update/{id}") - @PreAuthorize("hasRole('ROLE_PARENT')") + //@PreAuthorize("hasRole('ROLE_PARENT')") public ResponseEntity updateMenu(@RequestBody Menu menu, @PathVariable Integer id) throws Exception { Menu resultMenu = null; try { @@ -71,11 +74,12 @@ public class MenuController { return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.getMessage()); } - return ResponseEntity.status(HttpStatus.OK).body(menuRepository); + return ResponseEntity.status(HttpStatus.OK).body(resultMenu); } + //Efface un menu par son ID @DeleteMapping(value = "/delete/{id}") - @PreAuthorize("hasRole('ROLE_PARENT')") + //@PreAuthorize("hasRole('ROLE_PARENT')") public ResponseEntity deleteMenu(@PathVariable int id){ try { menuRepository.delete(menuRepository.getById(id)); diff --git a/src/main/java/fr/organizee/controller/TacheController.java b/src/main/java/fr/organizee/controller/TacheController.java index 8408ada..681d760 100644 --- a/src/main/java/fr/organizee/controller/TacheController.java +++ b/src/main/java/fr/organizee/controller/TacheController.java @@ -1,12 +1,11 @@ package fr.organizee.controller; -import fr.organizee.model.Membre; import fr.organizee.model.Tache; -import fr.organizee.repository.MembreRepository; import fr.organizee.repository.TacheRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.persistence.EntityNotFoundException; @@ -20,6 +19,7 @@ public class TacheController { @Autowired private TacheRepository tacheRepo; + // Récupère toutes les taches de toutes la base toutes team confondu @GetMapping(value = "/all") public ResponseEntity getAll(){ List liste = null; @@ -33,6 +33,7 @@ public class TacheController { return ResponseEntity.status(HttpStatus.OK).body(liste); } + // Récupère les infos d'une tache avec son ID @GetMapping(value = "/{id}") public ResponseEntity findById(@PathVariable int id){ Optional tache = null; @@ -46,6 +47,7 @@ public class TacheController { return ResponseEntity.status(HttpStatus.OK).body(tache); } + // Efface une tache avec son ID @DeleteMapping(value = "/delete/{id}") public ResponseEntity deleteTache(@PathVariable int id){ try { @@ -58,6 +60,7 @@ public class TacheController { } } + // Ajoute une tache @PostMapping(value="/add", produces="application/json", consumes="application/json") public ResponseEntity addTache(@RequestBody Tache tache){ Tache resultTache = null; @@ -70,6 +73,7 @@ public class TacheController { return ResponseEntity.status(HttpStatus.CREATED).body(resultTache); } + //Met a jour les informations d'une date avec son ID @PutMapping("/update/{id}") public ResponseEntity updateTache(@RequestBody Tache tache, @PathVariable Integer id) throws Exception { Tache resultTache = null; @@ -82,4 +86,18 @@ public class TacheController { return ResponseEntity.status(HttpStatus.OK).body(resultTache); } + + //A revoir, résultat a chier, passez par la todolist + @GetMapping(value = "team/{team_id}") + public ResponseEntity findByTeamId(@PathVariable int team_id){ + List taches = null; + try + { + taches = tacheRepo.FindTachesByTeam(team_id); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null); + } + + return ResponseEntity.status(HttpStatus.OK).body(taches); + } } diff --git a/src/main/java/fr/organizee/controller/TeamController.java b/src/main/java/fr/organizee/controller/TeamController.java index f8766ca..7b6d9d3 100644 --- a/src/main/java/fr/organizee/controller/TeamController.java +++ b/src/main/java/fr/organizee/controller/TeamController.java @@ -1,6 +1,5 @@ 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; @@ -48,7 +47,7 @@ public class TeamController { } @GetMapping(value = "/{id}") - @PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") + //@PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") public ResponseEntity findTeamById(@PathVariable int id){ Optional liste = null; try diff --git a/src/main/java/fr/organizee/controller/TodoListController.java b/src/main/java/fr/organizee/controller/TodoListController.java new file mode 100644 index 0000000..747eff9 --- /dev/null +++ b/src/main/java/fr/organizee/controller/TodoListController.java @@ -0,0 +1,75 @@ +package fr.organizee.controller; + +import fr.organizee.model.TodoList; +import fr.organizee.repository.TodoListRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.persistence.EntityNotFoundException; +import java.util.List; + +@RestController +@CrossOrigin("*") +@RequestMapping("/todolist") +public class TodoListController { + + @Autowired + private TodoListRepository todolistRepo; + + @GetMapping(value = "/all") + public ResponseEntity getAll(){ + List liste = null; + try + { + liste = todolistRepo.findAll(); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null); + } + + return ResponseEntity.status(HttpStatus.OK).body(liste); + } + + @DeleteMapping(value = "/delete/{id}") + //@PreAuthorize("hasRole('ROLE_PARENT')") + public ResponseEntity deleteTodolist(@PathVariable int id){ + try { + todolistRepo.delete(todolistRepo.getById(id)); + //membreRepo.deleteById(id); + return ResponseEntity.status(HttpStatus.OK).body("Todolist effacée !"); + + } catch (EntityNotFoundException e) { + + return ResponseEntity.status(HttpStatus.OK).body("Todolist introuvable !"); + } + } + + @GetMapping(value = "/team/{team_id}") + public ResponseEntity findByTeamId(@PathVariable int team_id){ + List todoLists = null; + try + { + todoLists = todolistRepo.FindTodolistByTeam(team_id); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null); + } + + return ResponseEntity.status(HttpStatus.OK).body(todoLists); + } + + //Met a jour les informations d'une date avec son ID + @PutMapping("/update/{id}") + public ResponseEntity updateTodolist(@RequestBody TodoList todolist, @PathVariable Integer id) throws Exception { + TodoList resultTodolist = null; + try { + resultTodolist = todolistRepo.save(todolist); + + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.getMessage()); + } + + return ResponseEntity.status(HttpStatus.OK).body(resultTodolist); + } +} diff --git a/src/main/java/fr/organizee/model/Contact.java b/src/main/java/fr/organizee/model/Contact.java index ccd14c6..2c5ffb2 100644 --- a/src/main/java/fr/organizee/model/Contact.java +++ b/src/main/java/fr/organizee/model/Contact.java @@ -16,7 +16,7 @@ public class Contact { private String email; private String adresse; private LocalDate dateNaissance; - @ManyToOne(cascade = CascadeType.MERGE) + @ManyToOne @JoinColumn(name="TEAM_ID") @JsonIgnoreProperties("contact") private Team team; diff --git a/src/main/java/fr/organizee/model/Membre.java b/src/main/java/fr/organizee/model/Membre.java index 2bb7e53..c0dda4c 100644 --- a/src/main/java/fr/organizee/model/Membre.java +++ b/src/main/java/fr/organizee/model/Membre.java @@ -36,7 +36,7 @@ public class Membre { // @ManyToOne // @JoinColumn(name="TEAM_ID") // @JsonIgnore - @ManyToOne(cascade = CascadeType.MERGE) + @ManyToOne @JoinColumn(name="TEAM_ID") @JsonIgnoreProperties("membre") private Team team; diff --git a/src/main/java/fr/organizee/model/Menu.java b/src/main/java/fr/organizee/model/Menu.java index b486e2b..e11cba4 100644 --- a/src/main/java/fr/organizee/model/Menu.java +++ b/src/main/java/fr/organizee/model/Menu.java @@ -13,20 +13,19 @@ public class Menu { private String libelle; private LocalDate dateMenu; private int validationProposition; - @ManyToOne(cascade = CascadeType.MERGE) + @ManyToOne @JoinColumn(name="TEAM_ID") @JsonIgnoreProperties("menu") private Team team; - @ManyToOne - private Membre membre; public Menu() { } - public Menu(String libelle, LocalDate dateMenu, int validationProposition) { + public Menu(String libelle, LocalDate dateMenu, int validationProposition, Team team) { this.libelle = libelle; this.dateMenu = dateMenu; this.validationProposition=validationProposition; + this.team = team; } public int getId() { @@ -53,12 +52,30 @@ public class Menu { this.dateMenu = dateMenu; } + public int getValidationProposition() { + return validationProposition; + } + + public void setValidationProposition(int validationProposition) { + this.validationProposition = validationProposition; + } + + public Team getTeam() { + return team; + } + + public void setTeam(Team team) { + this.team = team; + } + @Override public String toString() { return "Menu{" + "id=" + id + ", libelle='" + libelle + '\'' + ", dateMenu=" + dateMenu + + ", validationProposition=" + validationProposition + + ", team=" + team + '}'; } } diff --git a/src/main/java/fr/organizee/model/Tache.java b/src/main/java/fr/organizee/model/Tache.java index e3d9d03..a21965a 100644 --- a/src/main/java/fr/organizee/model/Tache.java +++ b/src/main/java/fr/organizee/model/Tache.java @@ -11,7 +11,7 @@ public class Tache { private int id; private String texte; private Boolean etat; - @ManyToOne(cascade = CascadeType.MERGE) + @ManyToOne @JoinColumn(name="TODOLIST_ID") @JsonIgnoreProperties("tache") private TodoList todolist; diff --git a/src/main/java/fr/organizee/model/Team.java b/src/main/java/fr/organizee/model/Team.java index 1da65d5..ded5837 100644 --- a/src/main/java/fr/organizee/model/Team.java +++ b/src/main/java/fr/organizee/model/Team.java @@ -12,16 +12,16 @@ public class Team { @GeneratedValue(strategy = GenerationType.IDENTITY) private int id; private String nom; - @OneToMany(mappedBy = "team", fetch=FetchType.LAZY) + @OneToMany(mappedBy = "team", fetch=FetchType.LAZY, cascade = CascadeType.ALL) @JsonIgnoreProperties("team") private List membres = new ArrayList<>(); - @OneToMany(mappedBy = "team", fetch=FetchType.LAZY) + @OneToMany(mappedBy = "team", fetch=FetchType.LAZY, cascade = CascadeType.ALL) @JsonIgnoreProperties("team") private List contacts = new ArrayList<>(); - @OneToMany(mappedBy = "team", fetch=FetchType.LAZY) + @OneToMany(mappedBy = "team", fetch=FetchType.LAZY, cascade = CascadeType.ALL) @JsonIgnoreProperties("team") private List todolists = new ArrayList<>(); - @OneToMany(mappedBy = "team", fetch=FetchType.LAZY) + @OneToMany(mappedBy = "team", fetch=FetchType.LAZY, cascade = CascadeType.ALL) @JsonIgnoreProperties("team") private List menus = new ArrayList<>(); diff --git a/src/main/java/fr/organizee/model/TodoList.java b/src/main/java/fr/organizee/model/TodoList.java index 01f0328..007e68a 100644 --- a/src/main/java/fr/organizee/model/TodoList.java +++ b/src/main/java/fr/organizee/model/TodoList.java @@ -12,10 +12,13 @@ public class TodoList { @GeneratedValue(strategy = GenerationType.IDENTITY) private int id; private String nom; - @ManyToOne(cascade = CascadeType.MERGE) + @ManyToOne @JoinColumn(name="TEAM_ID") @JsonIgnoreProperties("todolist") private Team team; + @OneToMany(mappedBy = "todolist", fetch=FetchType.LAZY, cascade = CascadeType.ALL) + @JsonIgnoreProperties("todolist") + private List taches = new ArrayList<>(); public TodoList() { } @@ -40,11 +43,26 @@ public class TodoList { this.nom = nom; } + public List getTaches() { + return taches; + } + + public void setTaches(List taches) { + this.taches = taches; + } + + public Team getTeam() { + return team; + } + + public void setTeam(Team team) { + this.team = team; + } + @Override public String toString() { return "TodoList{" + "id=" + id + - ", nom='" + nom + '\'' + - '}'; + ", nom='" + nom + ", taches='" + taches + "}"; } } diff --git a/src/main/java/fr/organizee/repository/TacheRepository.java b/src/main/java/fr/organizee/repository/TacheRepository.java index 2e52ef2..a9ac6f9 100644 --- a/src/main/java/fr/organizee/repository/TacheRepository.java +++ b/src/main/java/fr/organizee/repository/TacheRepository.java @@ -2,8 +2,16 @@ package fr.organizee.repository; import fr.organizee.model.Tache; 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; + @Repository public interface TacheRepository extends JpaRepository { + + // N'est plus utilisé normalement + @Query(value = "select * from todo_list, tache where todo_list.team_id = :team_id and todo_list.id = tache.todolist_id", nativeQuery = true) + List FindTachesByTeam(@Param("team_id") int team_id); } diff --git a/src/main/java/fr/organizee/repository/TodoListRepository.java b/src/main/java/fr/organizee/repository/TodoListRepository.java index 32a2e63..c922953 100644 --- a/src/main/java/fr/organizee/repository/TodoListRepository.java +++ b/src/main/java/fr/organizee/repository/TodoListRepository.java @@ -1,9 +1,16 @@ package fr.organizee.repository; +import fr.organizee.model.Menu; import fr.organizee.model.TodoList; 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; + @Repository public interface TodoListRepository extends JpaRepository { + @Query(value = "select * from todo_list where team_id = :team_id", nativeQuery = true) + List FindTodolistByTeam(@Param("team_id") int team_id); } From 865a5847ccc96aa8c158ac2830a3774bcf65e68d Mon Sep 17 00:00:00 2001 From: Blandine Bajard <83599148+BlandineBajard@users.noreply.github.com> Date: Fri, 21 Jan 2022 14:47:59 +0100 Subject: [PATCH 04/11] modif methode sign-up et controller membre et model membre --- src/main/java/fr/organizee/model/Membre.java | 9 ++++++++- .../java/fr/organizee/service/MembreServiceImpl.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/organizee/model/Membre.java b/src/main/java/fr/organizee/model/Membre.java index c0dda4c..a314ef2 100644 --- a/src/main/java/fr/organizee/model/Membre.java +++ b/src/main/java/fr/organizee/model/Membre.java @@ -44,9 +44,10 @@ public class Membre { public Membre() { } - public Membre(String nom, String prenom, LocalDate dateNaissance, Team team, @NotNull String email, @NotNull String password, List roleList) { + public Membre(String nom, String prenom, String couleur, LocalDate dateNaissance, Team team, @NotNull String email, @NotNull String password, List roleList) { this.nom = nom; this.prenom = prenom; + this.couleur = couleur; this.dateNaissance = dateNaissance; this.email = email; this.password = password; @@ -65,6 +66,12 @@ public class Membre { public String getNom() { return nom; } + public String getCouleur() { + return couleur; + } + public void setCouleur(String couleur) { + this.couleur = couleur; + } public void setNom(String nom) { this.nom = nom; } diff --git a/src/main/java/fr/organizee/service/MembreServiceImpl.java b/src/main/java/fr/organizee/service/MembreServiceImpl.java index 2e23b02..2197bbc 100644 --- a/src/main/java/fr/organizee/service/MembreServiceImpl.java +++ b/src/main/java/fr/organizee/service/MembreServiceImpl.java @@ -48,7 +48,7 @@ public class MembreServiceImpl implements MembreService { @Override public String signup(Membre membre) throws ExistingUsernameException { if (!membreRepository.existsByEmail(membre.getEmail())) { - Membre membreToSave = new Membre(membre.getNom(), membre.getPrenom(), membre.getDateNaissance(), membre.getTeam(), membre.getEmail(), passwordEncoder.encode(membre.getPassword()), membre.getRoleList()); + Membre membreToSave = new Membre(membre.getNom(), membre.getPrenom(), membre.getCouleur(), membre.getDateNaissance(), membre.getTeam(), membre.getEmail(), passwordEncoder.encode(membre.getPassword()), membre.getRoleList()); membreRepository.save(membreToSave); return jwtTokenProvider.createToken(membre.getEmail(), membre.getRoleList()); } else { From 165da077289eab1e677564bdd3719c7b6929bec0 Mon Sep 17 00:00:00 2001 From: Hedi Date: Fri, 21 Jan 2022 18:33:37 +0100 Subject: [PATCH 05/11] fix merge bis --- .../java/fr/organizee/controller/MembreController.java | 2 +- src/main/java/fr/organizee/controller/TeamController.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/fr/organizee/controller/MembreController.java b/src/main/java/fr/organizee/controller/MembreController.java index 0ff9b67..89f9a3f 100644 --- a/src/main/java/fr/organizee/controller/MembreController.java +++ b/src/main/java/fr/organizee/controller/MembreController.java @@ -144,7 +144,7 @@ public class MembreController { // } @DeleteMapping(value = "/delete/{id}") - @PreAuthorize("hasRole('ROLE_PARENT')") + //@PreAuthorize("hasRole('ROLE_PARENT')") public ResponseEntity deleteMembre(@PathVariable int id){ try { membreRepo.delete(membreRepo.getById(id)); diff --git a/src/main/java/fr/organizee/controller/TeamController.java b/src/main/java/fr/organizee/controller/TeamController.java index 7b6d9d3..1d96ae5 100644 --- a/src/main/java/fr/organizee/controller/TeamController.java +++ b/src/main/java/fr/organizee/controller/TeamController.java @@ -33,7 +33,7 @@ public class TeamController { // Récupération de toutes les teams @GetMapping(value = "/all") - @PreAuthorize("hasRole('ROLE_PARENT')") + //@PreAuthorize("hasRole('ROLE_PARENT')") public ResponseEntity getAllTeam(){ List liste = null; try @@ -61,7 +61,7 @@ public class TeamController { } @PostMapping(value="/add", produces="application/json", consumes="application/json") - @PreAuthorize("hasRole('ROLE_PARENT')") + //@PreAuthorize("hasRole('ROLE_PARENT')") public ResponseEntity addTeam(@RequestBody Team team){ Team resultTeam = null; try { @@ -74,7 +74,7 @@ public class TeamController { } @PutMapping("/update/{id}") - @PreAuthorize("hasRole('ROLE_PARENT')") + //@PreAuthorize("hasRole('ROLE_PARENT')") public ResponseEntity updateTeam(@RequestBody Team team, @PathVariable Integer id) throws Exception { Team resultTeam = null; try { @@ -88,7 +88,7 @@ public class TeamController { } @DeleteMapping(value = "/delete/{id}") - @PreAuthorize("hasRole('ROLE_PARENT')") + //@PreAuthorize("hasRole('ROLE_PARENT')") public ResponseEntity deleteTeam(@PathVariable int id){ try { teamRepo.delete(teamRepo.getById(id)); From 8a96240fd691befe8beea99d2ec4c3256b952252 Mon Sep 17 00:00:00 2001 From: AlineRinquin <90188226+AlineRinquin@users.noreply.github.com> Date: Sun, 13 Feb 2022 14:39:49 +0100 Subject: [PATCH 06/11] =?UTF-8?q?ALINE:controller=20contact=20blocage=20pr?= =?UTF-8?q?=C3=A9authorize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/organizee/controller/ContactController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/fr/organizee/controller/ContactController.java b/src/main/java/fr/organizee/controller/ContactController.java index ef79042..e93e926 100644 --- a/src/main/java/fr/organizee/controller/ContactController.java +++ b/src/main/java/fr/organizee/controller/ContactController.java @@ -21,7 +21,7 @@ public class ContactController { private ContactRepository contactRepo; @GetMapping(value = "/{id}") - @PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") + //@PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") public ResponseEntity findById(@PathVariable int id){ Optional contact = null; try @@ -35,7 +35,7 @@ public class ContactController { } @GetMapping(value = "team/{team_id}") - @PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") + //@PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") public ResponseEntity findByTeamId(@PathVariable int team_id){ List contacts = null; try @@ -49,7 +49,7 @@ public class ContactController { } @PostMapping(value="/add") - @PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") + //@PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") public ResponseEntity addContact(@RequestBody Contact contact){ Contact resultContact = null; try { @@ -62,7 +62,7 @@ public class ContactController { } @PutMapping("/update/{id}") - @PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") + //@PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") public ResponseEntity updateContact(@RequestBody Contact contact, @PathVariable Integer id) throws Exception { Contact resultContact = null; try { @@ -76,7 +76,7 @@ public class ContactController { } @DeleteMapping(value = "/delete/{id}") - @PreAuthorize("hasRole('ROLE_PARENT')") + //@PreAuthorize("hasRole('ROLE_PARENT')") public ResponseEntity deleteContact(@PathVariable int id){ try { contactRepo.delete(contactRepo.getById(id)); From 31ec70f02e5f46174536ed4797f10e78061587be Mon Sep 17 00:00:00 2001 From: HarmandI Date: Tue, 15 Feb 2022 15:39:35 +0100 Subject: [PATCH 07/11] addTache --- .../java/fr/organizee/controller/TacheController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/organizee/controller/TacheController.java b/src/main/java/fr/organizee/controller/TacheController.java index 681d760..82ce274 100644 --- a/src/main/java/fr/organizee/controller/TacheController.java +++ b/src/main/java/fr/organizee/controller/TacheController.java @@ -1,6 +1,7 @@ package fr.organizee.controller; import fr.organizee.model.Tache; +import fr.organizee.model.TodoList; import fr.organizee.repository.TacheRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -61,10 +62,13 @@ public class TacheController { } // Ajoute une tache - @PostMapping(value="/add", produces="application/json", consumes="application/json") - public ResponseEntity addTache(@RequestBody Tache tache){ + @PostMapping(value="/add/{idTodoList}", produces="application/json", consumes="application/json") + public ResponseEntity addTache(@RequestBody Tache tache,@PathVariable Integer idTodoList){ Tache resultTache = null; try { + TodoList todolist=new TodoList(); + todolist.setId(idTodoList); + tache.setTodolist(todolist); resultTache = tacheRepo.saveAndFlush(tache); } catch (Exception e) { return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); From 54bf69a436d93b28c1d014c108a8d597022fbada Mon Sep 17 00:00:00 2001 From: AlineRinquin Date: Thu, 17 Feb 2022 10:40:56 +0100 Subject: [PATCH 08/11] modification des contact ajout couleur --- .idea/misc.xml | 3 +++ src/main/java/fr/organizee/model/Contact.java | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 06e8b35..2289c27 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,4 +11,7 @@ + + \ No newline at end of file diff --git a/src/main/java/fr/organizee/model/Contact.java b/src/main/java/fr/organizee/model/Contact.java index 826b2db..25b2d2d 100644 --- a/src/main/java/fr/organizee/model/Contact.java +++ b/src/main/java/fr/organizee/model/Contact.java @@ -11,6 +11,7 @@ public class Contact { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private int id; + private String couleur; private String nom; private String prenom; private String telephone; @@ -18,14 +19,15 @@ public class Contact { private String adresse; private LocalDate dateNaissance; @ManyToOne - @JoinColumn(name="TEAM_ID") - @JsonIgnoreProperties({"contact","membre"}) + @JoinColumn(name = "TEAM_ID") + @JsonIgnoreProperties({"contact", "membre"}) private Team team; public Contact() { } - public Contact(String nom, String prenom, String telephone, String email, String adresse, LocalDate dateNaissance, Team team) { + public Contact(String couleur, String nom, String prenom, String telephone, String email, String adresse, LocalDate dateNaissance, Team team) { + this.couleur = couleur; this.nom = nom; this.prenom = prenom; this.telephone = telephone; @@ -43,6 +45,14 @@ public class Contact { this.id = id; } + public String getCouleur() { + return couleur; + } + + public void setCouleur(String couleur) { + this.couleur = couleur; + } + public String getNom() { return nom; } @@ -94,6 +104,7 @@ public class Contact { public Team getTeam() { return team; } + public void setTeam(Team team) { this.team = team; } @@ -102,6 +113,7 @@ public class Contact { public String toString() { return "Contact{" + "id=" + id + + ", couleur='" + couleur + '\'' + ", nom='" + nom + '\'' + ", prenom='" + prenom + '\'' + ", telephone='" + telephone + '\'' + From eb7b7777ec8b3a755b31784f947825923a4f8589 Mon Sep 17 00:00:00 2001 From: HarmandI Date: Thu, 17 Feb 2022 11:38:46 +0100 Subject: [PATCH 09/11] update tache --- src/main/java/fr/organizee/controller/TacheController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/organizee/controller/TacheController.java b/src/main/java/fr/organizee/controller/TacheController.java index 82ce274..58e5ccc 100644 --- a/src/main/java/fr/organizee/controller/TacheController.java +++ b/src/main/java/fr/organizee/controller/TacheController.java @@ -77,11 +77,14 @@ public class TacheController { return ResponseEntity.status(HttpStatus.CREATED).body(resultTache); } - //Met a jour les informations d'une date avec son ID + //Met a jour les informations d'une tache avec son ID @PutMapping("/update/{id}") public ResponseEntity updateTache(@RequestBody Tache tache, @PathVariable Integer id) throws Exception { Tache resultTache = null; try { + TodoList todolist=new TodoList(); + todolist.setId(tacheRepo.findById(tache.getId()).get().getTodolist().getId()); + tache.setTodolist(todolist); resultTache = tacheRepo.save(tache); } catch (Exception e) { From 9c72f95494b2d845fc6f0d5076a9ce9941e4d1b9 Mon Sep 17 00:00:00 2001 From: Blandine Bajard <83599148+BlandineBajard@users.noreply.github.com> Date: Thu, 17 Feb 2022 11:42:52 +0100 Subject: [PATCH 10/11] addMenu --- .../organizee/controller/MenuController.java | 8 ++++++-- src/main/java/fr/organizee/model/Menu.java | 19 +++++++++---------- .../organizee/repository/MenuRepository.java | 1 + 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/fr/organizee/controller/MenuController.java b/src/main/java/fr/organizee/controller/MenuController.java index b7db085..0ea98e3 100644 --- a/src/main/java/fr/organizee/controller/MenuController.java +++ b/src/main/java/fr/organizee/controller/MenuController.java @@ -1,6 +1,7 @@ package fr.organizee.controller; import fr.organizee.model.Menu; +import fr.organizee.model.Team; import fr.organizee.repository.MenuRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -49,11 +50,14 @@ public class MenuController { } //Ajoute un nouveau menu - @PostMapping(value="/add") + @PostMapping(value="/add/{team_id}", produces="application/json", consumes= "application/json") //@PreAuthorize("hasRole('ROLE_PARENT') or hasRole('ROLE_ENFANT')") - public ResponseEntity addMenu(@RequestBody Menu menu){ + public ResponseEntity addMenu(@RequestBody Menu menu, @PathVariable Integer team_id){ Menu resultMenu = null; try { + Team team=new Team(); + team.setId(team_id); + menu.setTeam(team); resultMenu = menuRepository.saveAndFlush(menu); } catch (Exception e) { return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage()); diff --git a/src/main/java/fr/organizee/model/Menu.java b/src/main/java/fr/organizee/model/Menu.java index dcc5cb0..22a1ab1 100644 --- a/src/main/java/fr/organizee/model/Menu.java +++ b/src/main/java/fr/organizee/model/Menu.java @@ -12,7 +12,7 @@ public class Menu { private int id; private String libelle; private LocalDate dateMenu; - private int validationProposition; + // private int validationProposition; @ManyToOne @JoinColumn(name="TEAM_ID") @JsonIgnoreProperties({"menu","membre"}) @@ -21,10 +21,10 @@ public class Menu { public Menu() { } - public Menu(String libelle, LocalDate dateMenu, int validationProposition, Team team) { + public Menu(String libelle, LocalDate dateMenu, Team team) { this.libelle = libelle; this.dateMenu = dateMenu; - this.validationProposition=validationProposition; + //this.validationProposition=validationProposition; this.team = team; } @@ -52,13 +52,13 @@ public class Menu { this.dateMenu = dateMenu; } - public int getValidationProposition() { - return validationProposition; - } + // public int getValidationProposition() { + // return validationProposition; + //} - public void setValidationProposition(int validationProposition) { - this.validationProposition = validationProposition; - } + //public void setValidationProposition(int validationProposition) { + // this.validationProposition = validationProposition; + // } public Team getTeam() { return team; @@ -74,7 +74,6 @@ public class Menu { "id=" + id + ", libelle='" + libelle + '\'' + ", dateMenu=" + dateMenu + - ", validationProposition=" + validationProposition + ", team=" + team + '}'; } diff --git a/src/main/java/fr/organizee/repository/MenuRepository.java b/src/main/java/fr/organizee/repository/MenuRepository.java index 1f22d7d..7c5d0cb 100644 --- a/src/main/java/fr/organizee/repository/MenuRepository.java +++ b/src/main/java/fr/organizee/repository/MenuRepository.java @@ -14,4 +14,5 @@ public interface MenuRepository extends JpaRepository { @Query(value = "select * from menu where team_id = :team_id", nativeQuery = true) List FindMenusByTeam(@Param("team_id") int team_id); + } From 34722797eea8cb3de5cdcf4c531302f9fdbc171a Mon Sep 17 00:00:00 2001 From: AlineRinquin Date: Thu, 17 Feb 2022 14:40:45 +0100 Subject: [PATCH 11/11] re push pull du projet avec les modfs --- .../fr/organizee/{ => dto}/controller/ContactController.java | 2 +- .../fr/organizee/{ => dto}/controller/EvenementController.java | 2 +- .../java/fr/organizee/{ => dto}/controller/MailController.java | 2 +- .../fr/organizee/{ => dto}/controller/MembreController.java | 2 +- .../java/fr/organizee/{ => dto}/controller/MenuController.java | 2 +- .../java/fr/organizee/{ => dto}/controller/TacheController.java | 2 +- .../java/fr/organizee/{ => dto}/controller/TeamController.java | 2 +- .../fr/organizee/{ => dto}/controller/TodoListController.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename src/main/java/fr/organizee/{ => dto}/controller/ContactController.java (98%) rename src/main/java/fr/organizee/{ => dto}/controller/EvenementController.java (98%) rename src/main/java/fr/organizee/{ => dto}/controller/MailController.java (97%) rename src/main/java/fr/organizee/{ => dto}/controller/MembreController.java (99%) rename src/main/java/fr/organizee/{ => dto}/controller/MenuController.java (98%) rename src/main/java/fr/organizee/{ => dto}/controller/TacheController.java (99%) rename src/main/java/fr/organizee/{ => dto}/controller/TeamController.java (98%) rename src/main/java/fr/organizee/{ => dto}/controller/TodoListController.java (98%) diff --git a/src/main/java/fr/organizee/controller/ContactController.java b/src/main/java/fr/organizee/dto/controller/ContactController.java similarity index 98% rename from src/main/java/fr/organizee/controller/ContactController.java rename to src/main/java/fr/organizee/dto/controller/ContactController.java index e93e926..e9eeacc 100644 --- a/src/main/java/fr/organizee/controller/ContactController.java +++ b/src/main/java/fr/organizee/dto/controller/ContactController.java @@ -1,4 +1,4 @@ -package fr.organizee.controller; +package fr.organizee.dto.controller; import fr.organizee.model.Contact; import fr.organizee.repository.ContactRepository; diff --git a/src/main/java/fr/organizee/controller/EvenementController.java b/src/main/java/fr/organizee/dto/controller/EvenementController.java similarity index 98% rename from src/main/java/fr/organizee/controller/EvenementController.java rename to src/main/java/fr/organizee/dto/controller/EvenementController.java index f6a32a8..c1a3582 100644 --- a/src/main/java/fr/organizee/controller/EvenementController.java +++ b/src/main/java/fr/organizee/dto/controller/EvenementController.java @@ -1,4 +1,4 @@ -package fr.organizee.controller; +package fr.organizee.dto.controller; import fr.organizee.model.Evenement; import fr.organizee.model.Menu; diff --git a/src/main/java/fr/organizee/controller/MailController.java b/src/main/java/fr/organizee/dto/controller/MailController.java similarity index 97% rename from src/main/java/fr/organizee/controller/MailController.java rename to src/main/java/fr/organizee/dto/controller/MailController.java index 3543668..e89b43f 100644 --- a/src/main/java/fr/organizee/controller/MailController.java +++ b/src/main/java/fr/organizee/dto/controller/MailController.java @@ -1,4 +1,4 @@ -package fr.organizee.controller; +package fr.organizee.dto.controller; import fr.organizee.model.Mail; import fr.organizee.service.SendMailService; diff --git a/src/main/java/fr/organizee/controller/MembreController.java b/src/main/java/fr/organizee/dto/controller/MembreController.java similarity index 99% rename from src/main/java/fr/organizee/controller/MembreController.java rename to src/main/java/fr/organizee/dto/controller/MembreController.java index 93df3d8..5db618c 100644 --- a/src/main/java/fr/organizee/controller/MembreController.java +++ b/src/main/java/fr/organizee/dto/controller/MembreController.java @@ -1,4 +1,4 @@ -package fr.organizee.controller; +package fr.organizee.dto.controller; import fr.organizee.dto.JsonWebToken; import fr.organizee.dto.MembreDto; diff --git a/src/main/java/fr/organizee/controller/MenuController.java b/src/main/java/fr/organizee/dto/controller/MenuController.java similarity index 98% rename from src/main/java/fr/organizee/controller/MenuController.java rename to src/main/java/fr/organizee/dto/controller/MenuController.java index 0ea98e3..c0b5c3b 100644 --- a/src/main/java/fr/organizee/controller/MenuController.java +++ b/src/main/java/fr/organizee/dto/controller/MenuController.java @@ -1,4 +1,4 @@ -package fr.organizee.controller; +package fr.organizee.dto.controller; import fr.organizee.model.Menu; import fr.organizee.model.Team; diff --git a/src/main/java/fr/organizee/controller/TacheController.java b/src/main/java/fr/organizee/dto/controller/TacheController.java similarity index 99% rename from src/main/java/fr/organizee/controller/TacheController.java rename to src/main/java/fr/organizee/dto/controller/TacheController.java index 58e5ccc..224dd14 100644 --- a/src/main/java/fr/organizee/controller/TacheController.java +++ b/src/main/java/fr/organizee/dto/controller/TacheController.java @@ -1,4 +1,4 @@ -package fr.organizee.controller; +package fr.organizee.dto.controller; import fr.organizee.model.Tache; import fr.organizee.model.TodoList; diff --git a/src/main/java/fr/organizee/controller/TeamController.java b/src/main/java/fr/organizee/dto/controller/TeamController.java similarity index 98% rename from src/main/java/fr/organizee/controller/TeamController.java rename to src/main/java/fr/organizee/dto/controller/TeamController.java index 1d96ae5..67f7907 100644 --- a/src/main/java/fr/organizee/controller/TeamController.java +++ b/src/main/java/fr/organizee/dto/controller/TeamController.java @@ -1,4 +1,4 @@ -package fr.organizee.controller; +package fr.organizee.dto.controller; import fr.organizee.model.Team; import fr.organizee.repository.TeamRepository; diff --git a/src/main/java/fr/organizee/controller/TodoListController.java b/src/main/java/fr/organizee/dto/controller/TodoListController.java similarity index 98% rename from src/main/java/fr/organizee/controller/TodoListController.java rename to src/main/java/fr/organizee/dto/controller/TodoListController.java index 747eff9..f166cf3 100644 --- a/src/main/java/fr/organizee/controller/TodoListController.java +++ b/src/main/java/fr/organizee/dto/controller/TodoListController.java @@ -1,4 +1,4 @@ -package fr.organizee.controller; +package fr.organizee.dto.controller; import fr.organizee.model.TodoList; import fr.organizee.repository.TodoListRepository;