Add mail templates configuration

ls1intum · Jul 29, 2024 · aa65356 · aa65356
1 parent 51dce35
commit aa65356
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 4 deletions.
diff --git a/server/Dockerfile b/server/Dockerfile
@@ -10,6 +10,6 @@ EXPOSE 8080
 RUN mkdir /app
 
 COPY --from=build /home/gradle/src/build/libs/*.jar /app/server.jar
-COPY --from=build /home/gradle/src/mails /app/mails
+COPY ./mail-templates /default-mail-templates
 
 ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom","-jar","/app/server.jar"]
diff --git a/server/mails/application-acceptance.html → ...ail-templates/application-acceptance.html b/server/mails/application-acceptance.html → ...ail-templates/application-acceptance.html
diff --git a/server/mails/application-created-chair.html → ...-templates/application-created-chair.html b/server/mails/application-created-chair.html → ...-templates/application-created-chair.html
diff --git a/...er/mails/application-created-student.html → ...emplates/application-created-student.html b/...er/mails/application-created-student.html → ...emplates/application-created-student.html
diff --git a/server/mails/application-rejection.html → ...mail-templates/application-rejection.html b/server/mails/application-rejection.html → ...mail-templates/application-rejection.html
diff --git a/server/src/main/java/thesistrack/ls1/service/MailingService.java b/server/src/main/java/thesistrack/ls1/service/MailingService.java
@@ -34,13 +34,14 @@ public class MailingService {
     private final String workspaceUrl;
     private final String sender;
     private final List<String> chairMemberRecipientsList;
-    private final Path rootLocation;
+    private final Path mailTemplateLocation;
 
     @Autowired
     public MailingService(
             JavaMailSender javaMailSender,
             UploadService uploadService,
             @Value("${thesis-track.mail.enabled}") boolean enabled,
+            @Value("${thesis-track.mail.mail-template-location}") String mailTemplateLocation,
             @Value("${thesis-track.mail.sender}") String sender,
             @Value("${thesis-track.mail.chair-member-recipients}") String chairMemberRecipientsList,
             @Value("${thesis-track.mail.footer}") String mailFooter,
@@ -53,7 +54,7 @@ public MailingService(
         this.sender = sender;
         this.workspaceUrl = workspaceUrl;
         this.mailFooter = mailFooter;
-        this.rootLocation = Paths.get("mails");
+        this.mailTemplateLocation = Paths.get(mailTemplateLocation);
 
         if (chairMemberRecipientsList != null && !chairMemberRecipientsList.isEmpty()) {
             this.chairMemberRecipientsList = Arrays.asList(chairMemberRecipientsList.split(";"));
@@ -172,7 +173,7 @@ public void sendApplicationRejectionEmail(Application application) throws Mailin
     }
 
     private String getMailTemplate(String name) throws MailingException {
-        Path filePath = rootLocation.resolve(name + ".html");
+        Path filePath = mailTemplateLocation.resolve(name + ".html");
 
         try {
             byte[] fileBytes = Files.readAllBytes(filePath);

diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
@@ -58,6 +58,7 @@ thesis-track:
     footer: ${MAIL_FOOTER:}
     workspace-url: ${MAIL_WORKSPACE_URL:https://slack.com}
     chair-member-recipients: ${MAIL_CHAIR_RECIPIENTS:}
+    mail-template-location: ${MAIL_TEMPLATE_FOLDER:/default-mail-templates}
   storage:
     upload-location: ${UPLOAD_FOLDER:uploads}