@@ -56,6 +56,8 @@ private enum CompletionEmailType { REVIEWERS, SUPERVISOR }
5656 private record ReviewPeriodInfo (String subject , LocalDate closeDate ) {}
5757 @ Value ("classpath:mjml/feedback_request.mjml" )
5858 private Readable feedbackRequestTemplate ;
59+ @ Value ("classpath:mjml/external_feedback_request.mjml" )
60+ private Readable externalFeedbackRequestTemplate ;
5961 @ Value ("classpath:mjml/update_request.mjml" )
6062 private Readable updateRequestTemplate ;
6163 @ Value ("classpath:mjml/reviewer_email.mjml" )
@@ -152,30 +154,32 @@ public void sendNewRequestEmail(FeedbackRequest storedRequest) {
152154 MemberProfile requestee = memberProfileServices .getById (storedRequest .getRequesteeId ());
153155 String senderName = MemberProfileUtils .getFullName (creator );
154156 UUID recipientOrExternalRecipientId ;
155- String reviewerFirstName , reviewerEmail , urlFeedbackSubmit ;
157+ String reviewerFirstName , reviewerEmail , urlFeedbackSubmit , template ;
156158
157159 if (storedRequest .getExternalRecipientId () != null ) {
158160 recipientOrExternalRecipientId = storedRequest .getExternalRecipientId ();
159161 reviewerExternalRecipient = feedbackExternalRecipientServices .getById (recipientOrExternalRecipientId );
160162 reviewerFirstName = reviewerExternalRecipient .getFirstName ();
161163 reviewerEmail = reviewerExternalRecipient .getEmail ();
162164 urlFeedbackSubmit = "/externalFeedback/submit?request=" ;
165+ template = externalFeedbackRequestTemplate ;
163166 } else {
164167 recipientOrExternalRecipientId = storedRequest .getRecipientId ();
165168 reviewerMemberProfile = memberProfileServices .getById (recipientOrExternalRecipientId );
166169 recipientOrExternalRecipientId = storedRequest .getRecipientId ();
167170 reviewerFirstName = reviewerMemberProfile .getFirstName ();
168171 reviewerEmail = reviewerMemberProfile .getWorkEmail ();
169172 urlFeedbackSubmit = "/feedback/submit?request=" ;
173+ template = feedbackRequestTemplate ;
170174 }
171175
172176 String newContent = String .format (
173- templateToString (feedbackRequestTemplate ),
177+ templateToString (template ),
174178 reviewerFirstName , senderName ,
175179 recipientOrExternalRecipientId .equals (storedRequest .getRequesteeId ()) ? "" : String .format ("on <strong>%s</strong> " , MemberProfileUtils .getFullName (requestee )),
176180 storedRequest .getDueDate () == null ?
177- "This request does not have a due date. " :
178- String .format ("This request is due on %s %d, %d. " ,
181+ "soon " :
182+ String .format ("before %s %d, %d" ,
179183 storedRequest .getDueDate ().getMonth (),
180184 storedRequest .getDueDate ().getDayOfMonth (),
181185 storedRequest .getDueDate ().getYear ()),
0 commit comments