diff --git a/pom.xml b/pom.xml index dbaf653..0d03dbb 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,10 @@ org.springframework.boot spring-boot-starter-web - + + org.springframework.boot + spring-boot-starter-mail + mysql mysql-connector-java 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)); diff --git a/src/main/java/fr/organizee/controller/MailController.java b/src/main/java/fr/organizee/controller/MailController.java new file mode 100644 index 0000000..3543668 --- /dev/null +++ b/src/main/java/fr/organizee/controller/MailController.java @@ -0,0 +1,43 @@ +package fr.organizee.controller; + +import fr.organizee.model.Mail; +import fr.organizee.service.SendMailService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.mail.MessagingException; + +@RestController +@RequestMapping("/sendmail") +public class MailController { + SendMailService service; + + public MailController(SendMailService service) { + this.service = service; + } + + // Envoi de mail en text brut + @PostMapping("/text") + public ResponseEntity sendMail(@RequestBody Mail mail) { + service.sendMail(mail); + return new ResponseEntity<>("Email Sent successfully", HttpStatus.OK); + } + + // Envoi de mail au format HTML + @PostMapping("/html") + public ResponseEntity sendMailHTML(@RequestBody Mail mail) throws MessagingException { + service.sendMailHTML(mail); + return new ResponseEntity<>("HTML mail sent successfully", HttpStatus.OK); + } + + // Envoi du mail avec une piece jointe + @PostMapping("/attachment") + public ResponseEntity sendAttachmentEmail(@RequestBody Mail mail) throws MessagingException { + service.sendMailWithAttachments(mail); + return new ResponseEntity<>("Attachment mail sent successfully", HttpStatus.OK); + } +} \ 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 2c5ffb2..826b2db 100644 --- a/src/main/java/fr/organizee/model/Contact.java +++ b/src/main/java/fr/organizee/model/Contact.java @@ -1,5 +1,6 @@ package fr.organizee.model; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.persistence.*; @@ -18,7 +19,7 @@ public class Contact { private LocalDate dateNaissance; @ManyToOne @JoinColumn(name="TEAM_ID") - @JsonIgnoreProperties("contact") + @JsonIgnoreProperties({"contact","membre"}) private Team team; public Contact() { diff --git a/src/main/java/fr/organizee/model/Evenement.java b/src/main/java/fr/organizee/model/Evenement.java index 15a355f..936cdaa 100644 --- a/src/main/java/fr/organizee/model/Evenement.java +++ b/src/main/java/fr/organizee/model/Evenement.java @@ -1,5 +1,6 @@ package fr.organizee.model; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.persistence.*; @@ -14,13 +15,13 @@ public class Evenement { private LocalDateTime eventFin; private int allDay; private String libelle; - @ManyToOne(cascade = CascadeType.MERGE) + @ManyToOne @JoinColumn(name="MEMBRE_ID") @JsonIgnoreProperties("evenement") private Membre membre; - @ManyToOne(cascade = CascadeType.MERGE) + @ManyToOne @JoinColumn(name="TEAM_ID") - @JsonIgnoreProperties("evenement") + @JsonIgnoreProperties({"evenement", "membre"}) private Team team; public Evenement() { diff --git a/src/main/java/fr/organizee/model/Mail.java b/src/main/java/fr/organizee/model/Mail.java new file mode 100644 index 0000000..cbd551b --- /dev/null +++ b/src/main/java/fr/organizee/model/Mail.java @@ -0,0 +1,41 @@ +package fr.organizee.model; + +public class Mail { + private String recipient; + private String subject; + private String message; + + public Mail() { + } + + public Mail(String recipient, String subject, String message) { + this.recipient = recipient; + this.subject = subject; + this.message = message; + } + + public String getRecipient() { + return recipient; + } + + public void setRecipient(String recipient) { + this.recipient = recipient; + } + + public String getSubject() { + return subject; + } + + public void setSubject(String subject) { + this.subject = subject; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} + diff --git a/src/main/java/fr/organizee/model/Menu.java b/src/main/java/fr/organizee/model/Menu.java index e11cba4..dcc5cb0 100644 --- a/src/main/java/fr/organizee/model/Menu.java +++ b/src/main/java/fr/organizee/model/Menu.java @@ -15,7 +15,7 @@ public class Menu { private int validationProposition; @ManyToOne @JoinColumn(name="TEAM_ID") - @JsonIgnoreProperties("menu") + @JsonIgnoreProperties({"menu","membre"}) private Team team; public Menu() { diff --git a/src/main/java/fr/organizee/model/Team.java b/src/main/java/fr/organizee/model/Team.java index ded5837..14ff97e 100644 --- a/src/main/java/fr/organizee/model/Team.java +++ b/src/main/java/fr/organizee/model/Team.java @@ -1,5 +1,6 @@ package fr.organizee.model; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.persistence.*; @@ -12,17 +13,24 @@ public class Team { @GeneratedValue(strategy = GenerationType.IDENTITY) private int id; private String nom; + @OneToMany(mappedBy = "team", fetch=FetchType.LAZY, cascade = CascadeType.ALL) @JsonIgnoreProperties("team") private List membres = new ArrayList<>(); + @OneToMany(mappedBy = "team", fetch=FetchType.LAZY, cascade = CascadeType.ALL) @JsonIgnoreProperties("team") + @JsonIgnore private List contacts = new ArrayList<>(); + @OneToMany(mappedBy = "team", fetch=FetchType.LAZY, cascade = CascadeType.ALL) @JsonIgnoreProperties("team") + @JsonIgnore private List todolists = new ArrayList<>(); + @OneToMany(mappedBy = "team", fetch=FetchType.LAZY, cascade = CascadeType.ALL) @JsonIgnoreProperties("team") + @JsonIgnore private List menus = new ArrayList<>(); public Team() { diff --git a/src/main/java/fr/organizee/model/TodoList.java b/src/main/java/fr/organizee/model/TodoList.java index 007e68a..f8ec979 100644 --- a/src/main/java/fr/organizee/model/TodoList.java +++ b/src/main/java/fr/organizee/model/TodoList.java @@ -1,5 +1,6 @@ package fr.organizee.model; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.persistence.*; @@ -14,7 +15,7 @@ public class TodoList { private String nom; @ManyToOne @JoinColumn(name="TEAM_ID") - @JsonIgnoreProperties("todolist") + @JsonIgnoreProperties({"todolist","membre"}) private Team team; @OneToMany(mappedBy = "todolist", fetch=FetchType.LAZY, cascade = CascadeType.ALL) @JsonIgnoreProperties("todolist") diff --git a/src/main/java/fr/organizee/service/SendMailService.java b/src/main/java/fr/organizee/service/SendMailService.java new file mode 100644 index 0000000..9437b10 --- /dev/null +++ b/src/main/java/fr/organizee/service/SendMailService.java @@ -0,0 +1,15 @@ +package fr.organizee.service; + +import fr.organizee.model.Mail; + +import javax.mail.MessagingException; + +public interface SendMailService { + void sendMail(Mail mail); + + void sendMailHTML(Mail mail) throws MessagingException; + + void sendMailWithAttachments(Mail mail) throws MessagingException; +} + + diff --git a/src/main/java/fr/organizee/service/SendMailServiceImpl.java b/src/main/java/fr/organizee/service/SendMailServiceImpl.java new file mode 100644 index 0000000..c9974ca --- /dev/null +++ b/src/main/java/fr/organizee/service/SendMailServiceImpl.java @@ -0,0 +1,68 @@ +package fr.organizee.service; + + +import fr.organizee.model.Mail; +import org.springframework.core.io.ClassPathResource; +import org.springframework.mail.SimpleMailMessage; +import org.springframework.mail.javamail.JavaMailSender; +import org.springframework.mail.javamail.MimeMessageHelper; +import org.springframework.stereotype.Service; + +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; + +@Service +public class SendMailServiceImpl implements SendMailService { + private final JavaMailSender javaMailSender; + + public SendMailServiceImpl(JavaMailSender javaMailSender) { + this.javaMailSender = javaMailSender; + } + + @Override + public void sendMail(Mail mail) { + + SimpleMailMessage msg = new SimpleMailMessage(); + msg.setTo(mail.getRecipient(), mail.getRecipient()); + + msg.setSubject(mail.getSubject()); + msg.setText(mail.getMessage()); + + javaMailSender.send(msg); + } + + @Override + public void sendMailHTML(Mail mail) throws MessagingException { + MimeMessage msg = javaMailSender.createMimeMessage(); + + MimeMessageHelper helper = new MimeMessageHelper(msg, true, "utf-8"); + + helper.setTo(mail.getRecipient()); + + helper.setSubject(mail.getSubject()); + + String htmlMsg = "

Test d'envoi de mail au format HTML

" + +""; + + msg.setContent(htmlMsg, "text/html"); + + javaMailSender.send(msg); + } + + @Override + public void sendMailWithAttachments(Mail mail) throws MessagingException { + MimeMessage msg = javaMailSender.createMimeMessage(); + + MimeMessageHelper helper = new MimeMessageHelper(msg, true); + + helper.setTo("destinataire@email"); + + helper.setSubject("Testing from Spring Boot"); + + helper.setText("Find the attached image", true); + + helper.addAttachment("hero.jpg", new ClassPathResource("hero.jpg")); + + javaMailSender.send(msg); + } +} \ No newline at end of file