Fix email formatting

ls1intum · Aug 22, 2024 · 4f743a3 · 4f743a3
1 parent 57fbde8
commit 4f743a3
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 135 deletions.
diff --git a/server/mail-templates/application-created-chair.html b/server/mail-templates/application-created-chair.html
@@ -1,5 +1,5 @@
 <p>Dear {{recipientName}},</p>
-<p>there is a new thesis application submitted by <strong>{{student.firstName}}&nbsp;{{student.lastName}}</strong>.</p>
+<p>there is a new thesis application submitted by <strong>{{application.user.firstName}}&nbsp;{{application.user.lastName}}</strong>.</p>
 <p>We received the following thesis application details:</p>
 
 <hr/>

diff --git a/server/mail-templates/application-created-student.html b/server/mail-templates/application-created-student.html
@@ -30,7 +30,7 @@
 </p>
 <p>
   <strong>Desired Thesis Start Date:</strong><br/>
-  {{application.desiredThesisStart}}
+  {{application.desiredStartDate}}
 </p>
 <p>
   <strong>Motivation:</strong><br/>

diff --git a/server/mail-templates/thesis-assessment-added.html b/server/mail-templates/thesis-assessment-added.html
@@ -1,6 +1,6 @@
 <p>Dear {{recipientName}},</p>
 
-<p>An assessment has been added to thesis "{{thesis.thesisTitle}}"</p>
+<p>An assessment has been added to thesis "{{thesis.title}}"</p>
 
 <p>
   <strong>Summary</strong><br />

diff --git a/server/mail-templates/thesis-closed.html b/server/mail-templates/thesis-closed.html
@@ -1,6 +1,6 @@
 <p>Dear {{recipientName}},</p>
 
-<p>The thesis "{{thesis.thesisTitle}}" has been closed.</p>
+<p>The thesis "{{thesis.title}}" has been closed.</p>
 
 <p>
   Full Details: <a target="_blank" rel="noopener noreferrer nofollow" href="{{thesisUrl}}">{{thesisUrl}}</a>

diff --git a/server/mail-templates/thesis-comment-posted.html b/server/mail-templates/thesis-comment-posted.html
@@ -1,6 +1,6 @@
 <p>Dear {{recipientName}},</p>
 
-<p>A comment has been added to thesis "{{thesis.thesisTitle}}"</p>
+<p>A comment has been added to thesis "{{thesis.title}}"</p>
 
 <p>
   <strong>Message</strong><br />

diff --git a/server/mail-templates/thesis-created.html b/server/mail-templates/thesis-created.html
@@ -11,5 +11,5 @@
 
 <p>
   <strong>Title</strong><br />
-  {{thesis.thesisTitle}}
+  {{thesis.title}}
 </p>
diff --git a/server/mail-templates/thesis-final-grade.html b/server/mail-templates/thesis-final-grade.html
@@ -1,13 +1,13 @@
 <p>Dear {{recipientName}},</p>
 
-<p>The final grade has been added to your thesis "{{thesis.thesisTitle}}"</p>
+<p>The final grade has been added to your thesis "{{thesis.title}}"</p>
 
 <p>
   <strong>Final Grade</strong> {{thesis.grade.finalGrade}}
 </p>
 
 <p>
-  <strong>Positives</strong><br />
+  <strong>Feedback</strong><br />
   {{thesis.grade.feedback}}
 </p>
 

diff --git a/server/mail-templates/thesis-final-submission.html b/server/mail-templates/thesis-final-submission.html
@@ -1,6 +1,6 @@
 <p>Dear {{recipientName}},</p>
 
-<p>The thesis "{{thesis.thesisTitle}}" has been submitted and is ready for review.</p>
+<p>The thesis "{{thesis.title}}" has been submitted and is ready for review.</p>
 
 <p>The final thesis and presentation is attached to this email.</p>
 

diff --git a/server/mail-templates/thesis-presentation-deleted.html b/server/mail-templates/thesis-presentation-deleted.html
@@ -1,6 +1,6 @@
 <p>Dear {{recipientName}},</p>
 
-<p>A presentation scheduled at {{presentation.scheduledAt}}, has been cancelled for thesis "{{thesis.thesisTitle}}"</p>
+<p>A presentation scheduled at {{presentation.scheduledAt}}, has been cancelled for thesis "{{thesis.title}}"</p>
 
 <p>
   Full Details: <a target="_blank" rel="noopener noreferrer nofollow" href="{{thesisUrl}}">{{thesisUrl}}</a>

diff --git a/server/mail-templates/thesis-presentation-scheduled.html b/server/mail-templates/thesis-presentation-scheduled.html
@@ -1,6 +1,6 @@
 <p>Dear {{recipientName}},</p>
 
-<p>A presentation has been scheduled for thesis "{{thesis.thesisTitle}}"</p>
+<p>A presentation has been scheduled for thesis "{{thesis.title}}"</p>
 
 <p>
   <strong>Type</strong><br />

diff --git a/server/mail-templates/thesis-proposal-uploaded.html b/server/mail-templates/thesis-proposal-uploaded.html
@@ -1,7 +1,7 @@
 <p>Dear {{recipientName}},</p>
 
 <p>
-  An proposal has been uploaded to thesis "{{thesis.thesisTitle}}".
+  An proposal has been uploaded to thesis "{{thesis.title}}".
   The proposal is attached to this email.
 </p>
 

diff --git a/server/src/main/java/thesistrack/ls1/entity/TopicReviewer.java b/server/src/main/java/thesistrack/ls1/entity/TopicReviewer.java
diff --git a/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java b/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java
@@ -148,7 +148,7 @@ public MailBuilder fillApplicationPlaceholders(Application application) {
 
             return Objects.requireNonNullElse(application.getThesisTitle(), "");
         });
-        formatters.put("application.desiredThesisStart", DataFormatter::formatDate);
+        formatters.put("application.desiredStartDate", DataFormatter::formatDate);
         formatters.put("application.user.enrolledAt", DataFormatter::formatDate);
 
         replaceDtoPlaceholders(ApplicationDto.fromApplicationEntity(application, false), "application", formatters);

diff --git a/server/src/test/java/thesistrack/ls1/MailTest.java b/server/src/test/java/thesistrack/ls1/MailTest.java
diff --git a/server/src/test/resources/application.yml b/server/src/test/resources/application.yml