From 1ae34165173ce0b346520b51eb7ce8c6fac322a8 Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 6 Jan 2026 00:55:31 +0100 Subject: [PATCH] I give up --- .../controllers/EmailController.java | 5 +--- .../services/SendgridService.java | 29 ++----------------- .../boardmateapi/services/TwilioService.java | 5 +--- 3 files changed, 4 insertions(+), 35 deletions(-) diff --git a/api/src/main/java/be/naaturel/boardmateapi/controllers/EmailController.java b/api/src/main/java/be/naaturel/boardmateapi/controllers/EmailController.java index cd48b826..8a383926 100644 --- a/api/src/main/java/be/naaturel/boardmateapi/controllers/EmailController.java +++ b/api/src/main/java/be/naaturel/boardmateapi/controllers/EmailController.java @@ -29,11 +29,8 @@ public class EmailController { @PostMapping("/mail/send") public ResponseEntity send(@RequestBody String payload) { try { - ObjectMapper mapper = new ObjectMapper(); - Map map = mapper.readValue(payload, new TypeReference>() {}); - - //service.send("laurent0206.cr@gmail.com", "Hello from Board Mate!", map); + service.send("laurent0206.cr@gmail.com", "Hello from Board Mate!", payload); return new ResponseEntity<>(HttpStatus.OK); } catch (Exception e) { diff --git a/api/src/main/java/be/naaturel/boardmateapi/services/SendgridService.java b/api/src/main/java/be/naaturel/boardmateapi/services/SendgridService.java index 2eab2028..c9e68b97 100644 --- a/api/src/main/java/be/naaturel/boardmateapi/services/SendgridService.java +++ b/api/src/main/java/be/naaturel/boardmateapi/services/SendgridService.java @@ -30,9 +30,9 @@ public class SendgridService { this.senderEmail = email; } - public void send(String dst, String subject, Map payload) throws ServiceException { + public void send(String dst, String subject, String payload) throws ServiceException { try { - Content content = new Content("text/plain", formatContent(payload)); + Content content = new Content("text/plain",payload); Mail mail = new Mail(this.senderEmail, subject, new Email(dst), content); Request request = new Request(); @@ -47,29 +47,4 @@ public class SendgridService { throw new ServiceException("Failed to send email : " + e.getMessage()); } } - - private String formatContent(Map payload) throws JsonProcessingException { - - StringBuilder mailBody = new StringBuilder(); - - mailBody.append("White: ") - .append(payload.get("white_name")) - .append("\n"); - - mailBody.append("Black: ") - .append(payload.get("black_name")) - .append("\n"); - - mailBody.append("Time Control: ") - .append(payload.get("time_control")) - .append(" + ") - .append(payload.get("increment")) - .append("\n"); - - mailBody.append("Timestamp: ") - .append(payload.get("timestamp")) - .append("\n\n"); - - return mailBody.toString(); - } } diff --git a/api/src/main/java/be/naaturel/boardmateapi/services/TwilioService.java b/api/src/main/java/be/naaturel/boardmateapi/services/TwilioService.java index ca709e4e..983b3fca 100644 --- a/api/src/main/java/be/naaturel/boardmateapi/services/TwilioService.java +++ b/api/src/main/java/be/naaturel/boardmateapi/services/TwilioService.java @@ -22,10 +22,7 @@ public class TwilioService { public void send(String msg) throws ServiceException { try { - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = mapper.readTree(msg); - String content = jsonNode.get("content").asText(); - Message.creator(new PhoneNumber("+32496533833"), this.serviceId, content).create(); + Message.creator(new PhoneNumber("+32496533833"), this.serviceId, msg).create(); } catch (Exception e){ throw new ServiceException("Failed to send message :" + e.getMessage()); }