diff --git a/src/main/java/nl/veenm/paypoint/resource/AppointmentResource.java b/src/main/java/nl/veenm/paypoint/resource/AppointmentResource.java index d6ecf54..33010e1 100644 --- a/src/main/java/nl/veenm/paypoint/resource/AppointmentResource.java +++ b/src/main/java/nl/veenm/paypoint/resource/AppointmentResource.java @@ -32,6 +32,7 @@ public class AppointmentResource { @Produces(MediaType.APPLICATION_JSON) @Path("/date") public List getAppointmentsByDate(@QueryParam("start") String start) { + System.out.println("Getting appointments from " + start); String user = jwt.getClaim("username"); return appointmentService.getAppointmentsByDate(start, user); } diff --git a/src/main/java/nl/veenm/paypoint/service/EmailService.java b/src/main/java/nl/veenm/paypoint/service/EmailService.java index 402a831..d1cc0f4 100644 --- a/src/main/java/nl/veenm/paypoint/service/EmailService.java +++ b/src/main/java/nl/veenm/paypoint/service/EmailService.java @@ -388,7 +388,7 @@ public class EmailService { "link", agendaLink ); - String templatePath = "src/main/resources/templates/agenda-invite.html"; + String templatePath = "templates/agenda-invite.html"; String htmlBody = emailTemplateService.loadTemplate(templatePath, replacements); mailer.send(Mail.withHtml(recipient, "Uitnodiging om agenda te bekijken", htmlBody).setFrom("PayPoint ")); diff --git a/src/main/java/nl/veenm/paypoint/service/EmailTemplateService.java b/src/main/java/nl/veenm/paypoint/service/EmailTemplateService.java index 4f1c9b0..e41e4c0 100644 --- a/src/main/java/nl/veenm/paypoint/service/EmailTemplateService.java +++ b/src/main/java/nl/veenm/paypoint/service/EmailTemplateService.java @@ -3,23 +3,29 @@ package nl.veenm.paypoint.service; import jakarta.enterprise.context.ApplicationScoped; import java.io.IOException; +import java.io.InputStream; import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.Map; @ApplicationScoped public class EmailTemplateService { public String loadTemplate(String templatePath, Map replacements) { - try { - String content = Files.readString(Path.of(templatePath), StandardCharsets.UTF_8); + try (InputStream is = Thread.currentThread().getContextClassLoader() + .getResourceAsStream(templatePath)) { - for (Map.Entry entry : replacements.entrySet()) { - content = content.replace("{{" + entry.getKey() + "}}", entry.getValue()); + if (is == null) { + throw new RuntimeException("Kon e-mailtemplate niet vinden!"); } - return content; + String template = new String(is.readAllBytes(), StandardCharsets.UTF_8); + + + for (Map.Entry entry : replacements.entrySet()) { + template = template.replace("{{" + entry.getKey() + "}}", entry.getValue()); + } + + return template; } catch (IOException e) { throw new RuntimeException("Kon e-mailtemplate niet inladen: " + templatePath, e); }