PayPoint/paypoint-backend
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix betreft email voor invite pt 3
Some checks failed
Docker Image CI / build-and-push (push) Failing after 10m19s
Details
Docker Image CI / deploy (push) Has been skipped
Details
Docker Image CI / notify-failure (push) Successful in 12s
Details

Browse Source
This commit is contained in:
Mel van Veen
2025-04-19 20:21:37 +02:00
parent 764f931a29
commit 99cd5f2e66
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/nl/veenm/paypoint/resource/AppointmentResource.java
View File

@@ -32,6 +32,7 @@ public class AppointmentResource {
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@Path("/date") @Path("/date")
public List<AppointmentDTO> getAppointmentsByDate(@QueryParam("start") String start) { public List<AppointmentDTO> getAppointmentsByDate(@QueryParam("start") String start) {
System.out.println("Getting appointments from " + start);
String user = jwt.getClaim("username"); String user = jwt.getClaim("username");
return appointmentService.getAppointmentsByDate(start, user); return appointmentService.getAppointmentsByDate(start, user);
} }

2
src/main/java/nl/veenm/paypoint/service/EmailService.java
View File

@@ -388,7 +388,7 @@ public class EmailService {
"link", agendaLink "link", agendaLink
); );
String templatePath = "src/main/resources/templates/agenda-invite.html"; String templatePath = "templates/agenda-invite.html";
String htmlBody = emailTemplateService.loadTemplate(templatePath, replacements); String htmlBody = emailTemplateService.loadTemplate(templatePath, replacements);
mailer.send(Mail.withHtml(recipient, "Uitnodiging om agenda te bekijken", htmlBody).setFrom("PayPoint <paypoint@melvanveen.nl>")); mailer.send(Mail.withHtml(recipient, "Uitnodiging om agenda te bekijken", htmlBody).setFrom("PayPoint <paypoint@melvanveen.nl>"));

20
src/main/java/nl/veenm/paypoint/service/EmailTemplateService.java
View File

@@ -3,23 +3,29 @@ package nl.veenm.paypoint.service;
import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.ApplicationScoped;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Map; import java.util.Map;
@ApplicationScoped @ApplicationScoped
public class EmailTemplateService { public class EmailTemplateService {
public String loadTemplate(String templatePath, Map<String, String> replacements) { public String loadTemplate(String templatePath, Map<String, String> replacements) {
try { try (InputStream is = Thread.currentThread().getContextClassLoader()
String content = Files.readString(Path.of(templatePath), StandardCharsets.UTF_8); .getResourceAsStream(templatePath)) {
for (Map.Entry<String, String> entry : replacements.entrySet()) { if (is == null) {
content = content.replace("{{" + entry.getKey() + "}}", entry.getValue()); throw new RuntimeException("Kon e-mailtemplate niet vinden!");
} }
return content; String template = new String(is.readAllBytes(), StandardCharsets.UTF_8);
for (Map.Entry<String, String> entry : replacements.entrySet()) {
template = template.replace("{{" + entry.getKey() + "}}", entry.getValue());
}
return template;
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException("Kon e-mailtemplate niet inladen: " + templatePath, e); throw new RuntimeException("Kon e-mailtemplate niet inladen: " + templatePath, e);
} }