Add Google Calendar link to email templates sent out with deadlines

src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java

@@ -11,6 +11,7 @@
 import teammates.it.test.BaseTestCaseWithSqlDatabaseAccess;
 import teammates.storage.sqlapi.AccountRequestsDb;
 import teammates.storage.sqlentity.AccountRequest;
+import teammates.test.TestProperties;
 
 /**
  * SUT: {@link AccountRequestsDb}.
@@ -239,6 +240,9 @@ public void testSqlInjectionInDeleteAccountRequest() throws Exception {
 
     @Test
     public void testSqlInjectionSearchAccountRequestsInWholeSystem() throws Exception {
+        if (!TestProperties.isSearchServiceActive()) {
+            return;
+        }
         ______TS("SQL Injection test in searchAccountRequestsInWholeSystem");
 
         AccountRequest accountRequest =

src/main/java/teammates/common/util/TimeHelper.java

@@ -1,5 +1,7 @@
 package teammates.common.util;
 
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.OffsetDateTime;
@@ -162,4 +164,35 @@ public static Instant parseInstant(String dateTimeString) {
         }
     }
 
+    /**
+     * Generates a Google Calendar link with the given time, title, optional description, and time zone.
+     * @param instant The start time of the event.
+     * @param timeZone The ID of the time zone to be used for time formatting.
+     * @param title The title of the event.
+     * @param description The optional description of the event. Can be null or empty.
+     * @return The URL to create a Google Calendar event.
+     */
+    public static String getGoogleCalendarLink(Instant instant, String timeZone, String title, String description) {
+        if (instant == null || timeZone == null || title == null) {
+            return "";
+        }
+
+        ZonedDateTime zonedDateTime = instant.atZone(ZoneId.of(timeZone));
+
+        // Define formatter with the Google Calendar expected format
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss'Z'")
+                .withZone(ZoneId.of(timeZone));
+
+        String startTime = formatter.format(zonedDateTime);
+        String endTime = formatter.format(zonedDateTime);
+
+        // URL encode title and optionally description to ensure special characters are handled properly
+        String encodedTitle = URLEncoder.encode(title, StandardCharsets.UTF_8);
+        String encodedDescription = (description != null) ? URLEncoder.encode(description, StandardCharsets.UTF_8) : "";
+
+        // Construct the Google Calendar URL
+        return String.format(
+                "https://www.google.com/calendar/render?action=TEMPLATE&text=%s&details=%s&dates=%s/%s",
+                encodedTitle, encodedDescription, startTime, endTime);
+    }
 }

src/main/java/teammates/logic/api/EmailGenerator.java

@@ -56,6 +56,7 @@ public final class EmailGenerator {
     private static final String DATETIME_DISPLAY_FORMAT = "EEE, dd MMM yyyy, hh:mm a z";
 
     private static final long SESSION_LINK_RECOVERY_DURATION_IN_DAYS = 90;
+    private static final String FEEDBACK_DEADLINE_REMINDER_TITLE = "Feedback Session Deadline";
 
     private static final EmailGenerator instance = new EmailGenerator();
 
@@ -317,7 +318,10 @@ public EmailWrapper generateFeedbackSessionSummaryOfCourse(
                     "${deadline}", TimeHelper.formatInstant(endTime, fsa.getTimeZone(), DATETIME_DISPLAY_FORMAT)
                             + (fsa.isClosed() ? " (Passed)" : ""),
                     "${submitUrl}", submitUrlHtml,
-                    "${reportUrl}", reportUrlHtml));
+                    "${reportUrl}", reportUrlHtml,
+                    "${googleCalendarLink}", TimeHelper.getGoogleCalendarLink(endTime,
+                            fsa.getTimeZone(), FEEDBACK_DEADLINE_REMINDER_TITLE,
+                            fsa.getFeedbackSessionName())));
         }
 
         if (linksFragmentValue.length() == 0) {
@@ -686,7 +690,11 @@ private EmailWrapper generateDeadlineExtensionEmail(
                 .replace("${oldEndTime}", SanitizationHelper.sanitizeForHtml(
                         TimeHelper.formatInstant(oldEndTimeFormatted, session.getTimeZone(), DATETIME_DISPLAY_FORMAT)))
                 .replace("${newEndTime}", SanitizationHelper.sanitizeForHtml(
-                        TimeHelper.formatInstant(newEndTimeFormatted, session.getTimeZone(), DATETIME_DISPLAY_FORMAT)));
+                        TimeHelper.formatInstant(newEndTimeFormatted, session.getTimeZone(),
+                                DATETIME_DISPLAY_FORMAT))).replace("${googleCalendarLink}",
+                        TimeHelper.getGoogleCalendarLink(newEndTimeFormatted, session.getTimeZone(),
+                                FEEDBACK_DEADLINE_REMINDER_TITLE,
+                                SanitizationHelper.sanitizeForHtml(session.getFeedbackSessionName())));
         String feedbackAction = FEEDBACK_ACTION_SUBMIT_EDIT_OR_VIEW;
 
         if (isInstructor) {
@@ -761,7 +769,10 @@ private EmailWrapper generateFeedbackSessionEmailBaseForStudents(
                 "${submitUrl}", submitUrl,
                 "${reportUrl}", reportUrl,
                 "${feedbackAction}", feedbackAction,
-                "${additionalContactInformation}", additionalContactInformation);
+                "${additionalContactInformation}", additionalContactInformation,
+                "${googleCalendarLink}", TimeHelper.getGoogleCalendarLink(endTime,
+                        session.getTimeZone(), FEEDBACK_DEADLINE_REMINDER_TITLE,
+                        SanitizationHelper.sanitizeForHtml(session.getFeedbackSessionName())));
 
         EmailWrapper email = getEmptyEmailAddressedToEmail(student.getEmail());
         email.setType(type);
@@ -802,7 +813,10 @@ private EmailWrapper generateFeedbackSessionEmailBaseForInstructors(
                 "${submitUrl}", submitUrl,
                 "${reportUrl}", reportUrl,
                 "${feedbackAction}", feedbackAction,
-                "${additionalContactInformation}", additionalContactInformation);
+                "${additionalContactInformation}", additionalContactInformation,
+                "${googleCalendarLink}", TimeHelper.getGoogleCalendarLink(endTime,
+                        session.getTimeZone(), FEEDBACK_DEADLINE_REMINDER_TITLE,
+                        SanitizationHelper.sanitizeForHtml(session.getFeedbackSessionName())));
 
         EmailWrapper email = getEmptyEmailAddressedToEmail(instructor.getEmail());
         email.setType(type);
@@ -828,7 +842,10 @@ private EmailWrapper generateFeedbackSessionEmailBaseForNotifiedInstructors(
                 "${submitUrl}", "{in the actual email sent to the students, this will be the unique link}",
                 "${reportUrl}", "{in the actual email sent to the students, this will be the unique link}",
                 "${feedbackAction}", feedbackAction,
-                "${additionalContactInformation}", additionalContactInformation);
+                "${additionalContactInformation}", additionalContactInformation,
+                "${googleCalendarLink}", TimeHelper.getGoogleCalendarLink(endTime,
+                        session.getTimeZone(), FEEDBACK_DEADLINE_REMINDER_TITLE,
+                        SanitizationHelper.sanitizeForHtml(session.getFeedbackSessionName())));
 
         EmailWrapper email = getEmptyEmailAddressedToEmail(instructor.getEmail());
         email.setType(type);

src/main/resources/userEmailTemplate-deadlineExtension.html

@@ -73,6 +73,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="${googleCalendarLink}">click here</a>.
+    </li>
   </ul>
 </p>
 

src/main/resources/userEmailTemplate-feedbackSession.html

@@ -62,6 +62,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="${googleCalendarLink}">click here</a>.
+    </li>
   </ul>
 </p>
 

src/main/resources/userEmailTemplate-feedbackSessionOpening.html

@@ -62,6 +62,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="${googleCalendarLink}">click here</a>.
+    </li>
   </ul>
 </p>
 

src/main/resources/userEmailTemplateFragment-feedbackSessionResendAllLinks.html

@@ -11,3 +11,6 @@
 To view the responses for this session, please go to this Web address: ${reportUrl}
 <br>
 <br>
+To add this deadline to your Google Calendar, <a href="${googleCalendarLink}">click here</a>.
+<br>
+<br>

src/test/resources/emails/deadlineExtensionGivenInstructor.html

@@ -73,6 +73,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270501T010000Z/20270501T010000Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/deadlineExtensionGivenStudent.html

@@ -73,6 +73,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270501T010000Z/20270501T010000Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/deadlineExtensionRevokedInstructor.html

@@ -73,6 +73,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/deadlineExtensionRevokedStudent.html

@@ -73,6 +73,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/deadlineExtensionUpdatedInstructor.html

@@ -73,6 +73,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270501T010000Z/20270501T010000Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/deadlineExtensionUpdatedStudent.html

@@ -73,6 +73,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270501T010000Z/20270501T010000Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionClosingEmailCopyToInstructor.html

@@ -66,6 +66,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionClosingEmailForInstructor.html

@@ -62,6 +62,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionClosingEmailForInstructorWithExtension.html

@@ -62,6 +62,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270501T235900Z/20270501T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionClosingEmailForStudent.html

@@ -62,6 +62,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionClosingEmailForStudentWithExtension.html

@@ -62,6 +62,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270501T010000Z/20270501T010000Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionClosingEmailTestingSanitizationCopyToInstructor.html

@@ -66,6 +66,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=Normal+feedback+session+name&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionClosingEmailTestingSanitizationForStudent.html

@@ -62,6 +62,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=Normal+feedback+session+name&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionOpeningEmailCopyToInstructor.html

@@ -66,6 +66,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionOpeningEmailForInstructor.html

@@ -62,6 +62,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionOpeningEmailForStudent.html

@@ -62,6 +62,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionOpeningEmailTestingSanitizationCopyToInstructor.html

@@ -66,6 +66,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=Normal+feedback+session+name&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionOpeningEmailTestingSanitizationForStudent.html

@@ -62,6 +62,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=Normal+feedback+session+name&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionReminderEmailCopyToInstructor.html

@@ -66,6 +66,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionReminderEmailForInstructor.html

@@ -62,6 +62,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>
 

src/test/resources/emails/sessionReminderEmailForStudent.html

@@ -62,6 +62,9 @@
     <li>
       After submitting, you are encouraged to download the proof of submission, which will contain your latest responses.
     </li>
+    <li>
+      To add this deadline to your Google Calendar, <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=Feedback+Session+Deadline&details=First+feedback+session&dates=20270430T235900Z/20270430T235900Z">click here</a>.
+    </li>
   </ul>
 </p>