From 4e2ea2b3ca23be970055ba8727c2a8763e730732 Mon Sep 17 00:00:00 2001
From: Laurent <laurent0206.cr@gmail.com>
Date: Mon, 5 Jan 2026 23:51:39 +0100
Subject: [PATCH] Fix mail

---
 .../services/SendgridService.java             | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

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 25012e2c..e52bbc35 100644
--- a/api/src/main/java/be/naaturel/boardmateapi/services/SendgridService.java
+++ b/api/src/main/java/be/naaturel/boardmateapi/services/SendgridService.java
@@ -50,21 +50,38 @@ public class SendgridService {
         ObjectMapper mapper = new ObjectMapper();
         JsonNode root = mapper.readTree(content);
 
+        JsonNode node = root.has("content") ? root.path("content") : root;
+
+        if (node.isTextual()) {
+            return node.asText();
+        }
+
         StringBuilder mailBody = new StringBuilder();
 
-        mailBody.append("White: ").append(root.get("white_name").asText()).append("\n");
-        mailBody.append("Black: ").append(root.get("black_name").asText()).append("\n");
-        mailBody.append("Time Control: ")
-                .append(root.get("time_control").asInt())
-                .append(" + ")
-                .append(root.get("increment").asInt())
+        mailBody.append("White: ")
+                .append(node.path("white_name").asText("N/A"))
                 .append("\n");
-        mailBody.append("Timestamp: ").append(root.get("timestamp").asLong()).append("\n\n");
+
+        mailBody.append("Black: ")
+                .append(node.path("black_name").asText("N/A"))
+                .append("\n");
+
+        mailBody.append("Time Control: ")
+                .append(node.path("time_control").asInt(0))
+                .append(" + ")
+                .append(node.path("increment").asInt(0))
+                .append("\n");
+
+        mailBody.append("Timestamp: ")
+                .append(node.path("timestamp").asLong(0))
+                .append("\n\n");
 
         mailBody.append("Moves:\n");
         int i = 1;
-        for (JsonNode move : root.get("moves")) {
-            mailBody.append(i++).append(". ").append(move.asText()).append("\n");
+        for (JsonNode move : node.path("moves")) {
+            mailBody.append(i++).append(". ")
+                    .append(move.asText())
+                    .append("\n");
         }
 
         return mailBody.toString();