Send invitation when presentation is scheduled

.github/workflows/deploy_docker.yml

@@ -113,6 +113,7 @@ jobs:
             echo "STUDY_PROGRAMS=${{ vars.STUDY_PROGRAMS }}" >> .env.prod
             echo "STUDY_DEGREES=${{ vars.STUDY_DEGREES }}" >> .env.prod
             echo "GENDERS=${{ vars.GENDERS }}" >> .env.prod
+            echo "LANGUAGES=${{ vars.LANGUAGES }}" >> .env.prod
             echo "CUSTOM_DATA=${{ vars.CUSTOM_DATA }}" >> .env.prod
 
             echo "MAIL_SENDER=${{ vars.MAIL_SENDER }}" >> .env.prod

client/public/generate-runtime-env.js

@@ -16,6 +16,7 @@ const ALLOWED_ENVIRONMENT_VARIABLES = [
   'GENDERS',
   'STUDY_DEGREES',
   'STUDY_PROGRAMS',
+  'LANGUAGES',
   'CUSTOM_DATA',
   'CALDAV_URL',
 ]

client/src/components/PresentationsTable/PresentationsTable.tsx

@@ -2,6 +2,7 @@ import React from 'react'
 import { DataTable, DataTableColumn } from 'mantine-datatable'
 import { IPublishedPresentation, IThesisPresentation } from '../../requests/responses/thesis'
 import { formatDate, formatPresentationType } from '../../utils/format'
+import { GLOBAL_CONFIG } from '../../config/global'
 
 interface IPresentationsTableProps<T> {
   presentations: T[] | undefined
@@ -46,6 +47,13 @@ const PresentationsTable = <T extends IThesisPresentation | IPublishedPresentati
         </a>
       ),
     },
+    {
+      accessor: 'language',
+      title: 'Language',
+      width: 120,
+      ellipsis: true,
+      render: (presentation) => GLOBAL_CONFIG.languages[presentation.language] ?? presentation.language,
+    },
     {
       accessor: 'scheduledAt',
       title: 'Scheduled At',

client/src/config/global.ts

@@ -49,6 +49,11 @@ export const GLOBAL_CONFIG: IGlobalConfig = {
     GUIDED_RESEARCH: 'Guided Research',
   },
 
+  languages: getEnvironmentVariable<Record<string, string>>('LANGUAGES', true) || {
+    ENGLISH: 'English',
+    GERMAN: 'German',
+  },
+
   custom_data: getEnvironmentVariable<Record<string, string>>('CUSTOM_DATA', true) || {
     GITHUB: 'Github Profile',
   },

client/src/config/types.ts

@@ -13,6 +13,7 @@ export interface IGlobalConfig {
   study_degrees: Record<string, string>
   thesis_types: Record<string, string>
   custom_data: Record<string, string>
+  languages: Record<string, string>
 
   privacy_text: string
   imprint_text: string

client/src/pages/ThesisPage/components/ThesisWritingSection/components/CreatePresentationModal/CreatePresentationModal.tsx

@@ -26,6 +26,7 @@ const CreatePresentationModal = (props: ICreatePresentationModalProps) => {
     visibility: string
     location: string
     streamUrl: string
+    language: string | null
     date: DateValue
   }>({
     mode: 'controlled',
@@ -34,6 +35,7 @@ const CreatePresentationModal = (props: ICreatePresentationModalProps) => {
       visibility: 'PUBLIC',
       location: '',
       streamUrl: '',
+      language: null,
       date: null,
     },
     validateInputOnBlur: true,
@@ -50,6 +52,7 @@ const CreatePresentationModal = (props: ICreatePresentationModalProps) => {
           return 'Location or Stream URL is required'
         }
       },
+      language: isNotEmpty('Language is required'),
       date: (value) => {
         if (!value) {
           return 'Date is required'
@@ -80,6 +83,7 @@ const CreatePresentationModal = (props: ICreatePresentationModalProps) => {
         visibility: form.values.visibility,
         location: form.values.location,
         streamUrl: form.values.streamUrl,
+        language: form.values.language,
         date: form.values.date,
       },
     })

client/src/requests/responses/thesis.ts

@@ -15,6 +15,7 @@ export interface IThesisPresentation {
   type: string
   location: string | null
   streamUrl: string | null
+  language: string
   scheduledAt: string
   createdAt: string
   createdBy: ILightUser
@@ -92,6 +93,7 @@ export interface IPublishedPresentation {
   type: string
   location: string | null
   streamUrl: string | null
+  language: string
   scheduledAt: string
   thesis: IPublishedThesis
 }

docker-compose.prod.yml

@@ -104,6 +104,7 @@ services:
       - STUDY_PROGRAMS
       - STUDY_DEGREES
       - GENDERS
+      - LANGUAGES
       - CUSTOM_DATA
       - APPLICATION_TITLE
       - CHAIR_NAME

docs/CONFIGURATION.md

@@ -36,6 +36,7 @@
 | STUDY_PROGRAMS                      | client         | `{"COMPUTER_SCIENCE":"Computer Science","INFORMATION_SYSTEMS":"Information Systems","GAMES_ENGINEERING":"Games Engineering","MANAGEMENT_AND_TECHNOLOGY":"Management and Technology","OTHER":"Other"}` | Available study programs                                                                                  |
 | CUSTOM_DATA                         | client         | `{"GITHUB":"Github Profile"}`                                                                                                                                                                         | Additional data the user can add to the profile                                                           |
 | THESIS_TYPES                        | client         | `{"BACHELOR":"Bachelor Thesis","MASTER":"Master Thesis","INTERDISCIPLINARY_PROJECT":"Interdisciplinary Project","GUIDED_RESEARCH":"Guided Research"}`                                                 | Available thesis types                                                                                    |
+| LANGUAGES                           | client         | `{"ENGLISH":"English","GERMAN":"German"}`                                                                                                                                                             | Available languages for presentations                                                                     |
 | DEFAULT_SUPERVISOR_UUID             | client         |                                                                                                                                                                                                       | The user UUID from the database if a default supervisor should be selected when creating topics or theses |
 | PRIVACY                             | client         |                                                                                                                                                                                                       | Privacy content (Allows richtext format)                                                                  |
 | IMPRINT                             | client         |                                                                                                                                                                                                       | Imprint content (Allows richtext format)                                                                  |

server/mail-templates/application-created-student.html

@@ -54,9 +54,11 @@
 </p>
 <br/>
 
-<p><strong>You can find the submitted files in the attachment part of this email.</strong></p>
-
-<p>We are currently experiencing a high volume of thesis applications, and each one requires careful review.
+<p>
+  We are currently experiencing a high volume of thesis applications, and each one requires careful review.
   While we aim to respond as quickly as possible, the combination of the application volume and the intensive teaching
   and research commitments of our group may result in a response time of up to four weeks.
-  We appreciate your patience and understanding during this period.</p>
+  We appreciate your patience and understanding during this period.
+</p>
+
+<p><strong>You can find the submitted files in the attachment part of this email.</strong></p>

server/mail-templates/thesis-presentation-invitation.html

@@ -0,0 +1,34 @@
+<p>Dear {{recipientName}},</p>
+
+<p>
+  As part of their {{thesis.type}}'s thesis <strong>{{thesis.students}}</strong> will give their {{presentation.type}} presentation.
+</p>
+
+<p>
+  The presentation will be in {{presentation.language}}. Everybody is cordially invited to attend.
+</p>
+
+<p>
+  <strong>Title</strong><br />
+  {{thesis.title}}
+</p>
+
+<p>
+  <strong>Offline Location</strong><br />
+  {{presentation.location}}
+</p>
+
+<p>
+  <strong>Online Stream URL</strong><br />
+  {{presentation.streamUrl}}
+</p>
+
+<p>
+  <strong>Scheduled At</strong><br />
+  {{presentation.scheduledAt}}
+</p>
+
+<p>
+  <strong>Abstract</strong><br />
+  {{thesis.abstractText}}
+</p>

server/src/main/java/thesistrack/ls1/controller/ThesisController.java

@@ -372,6 +372,7 @@ public ResponseEntity<ThesisDto> createPresentation(
                 RequestValidator.validateNotNull(payload.visibility()),
                 RequestValidator.validateStringMaxLength(payload.location(), StringLimits.SHORTTEXT.getLimit()),
                 RequestValidator.validateStringMaxLength(payload.streamUrl(), StringLimits.SHORTTEXT.getLimit()),
+                RequestValidator.validateStringMaxLength(payload.language(), StringLimits.SHORTTEXT.getLimit()),
                 RequestValidator.validateNotNull(payload.date())
         );
 

server/src/main/java/thesistrack/ls1/controller/payload/CreatePresentationPayload.java

@@ -10,5 +10,6 @@ public record CreatePresentationPayload(
         ThesisPresentationVisibility visibility,
         String location,
         String streamUrl,
+        String language,
         Instant date
 ) { }

server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java

@@ -11,6 +11,7 @@ public record PublishedPresentationDto (
         ThesisPresentationType type,
         String location,
         String streamUrl,
+        String language,
         Instant scheduledAt,
         PublishedThesisDto thesis
 ) {
@@ -24,6 +25,7 @@ public static PublishedPresentationDto fromPresentationEntity(ThesisPresentation
                 presentation.getType(),
                 presentation.getLocation(),
                 presentation.getStreamUrl(),
+                presentation.getLanguage(),
                 presentation.getScheduledAt(),
                 PublishedThesisDto.fromThesisEntity(presentation.getThesis())
         );

server/src/main/java/thesistrack/ls1/dto/ThesisDto.java

@@ -85,6 +85,7 @@ public record ThesisPresentationDto(
             ThesisPresentationType type,
             String location,
             String streamUrl,
+            String language,
             Instant scheduledAt,
             Instant createdAt,
             LightUserDto createdBy
@@ -99,6 +100,7 @@ public static ThesisPresentationDto fromPresentationEntity(ThesisPresentation pr
                     presentation.getType(),
                     presentation.getLocation(),
                     presentation.getStreamUrl(),
+                    presentation.getLanguage(),
                     presentation.getScheduledAt(),
                     presentation.getCreatedAt(),
                     LightUserDto.fromUserEntity(presentation.getCreatedBy())

server/src/main/java/thesistrack/ls1/entity/ThesisPresentation.java

@@ -42,6 +42,9 @@ public class ThesisPresentation {
     @Column(name = "stream_url")
     private String streamUrl;
 
+    @Column(name = "language")
+    private String language;
+
     @Column(name = "calendar_event")
     private String calendarEvent;
 

server/src/main/java/thesistrack/ls1/repository/UserRepository.java

@@ -27,6 +27,6 @@ public interface UserRepository extends JpaRepository<User, UUID> {
     )
     Page<User> searchUsers(@Param("searchQuery") String searchQuery, @Param("groups") Set<String> groups, Pageable page);
 
-    @Query("SELECT DISTINCT u FROM User u LEFT JOIN UserGroup g ON (u.id = g.id.userId) WHERE g.id.group IN (\"supervisor\", \"advisor\", \"admin\")")
-    List<User> getChairMembers();
+    @Query("SELECT DISTINCT u FROM User u LEFT JOIN UserGroup g ON (u.id = g.id.userId) WHERE g.id.group IN :roles")
+    List<User> getRoleMembers(@Param("roles") Set<String> roles);
 }

server/src/main/java/thesistrack/ls1/service/MailingService.java

@@ -1,5 +1,6 @@
 package thesistrack.ls1.service;
 
+import jakarta.mail.util.ByteArrayDataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.stereotype.Service;
@@ -9,21 +10,25 @@
 import thesistrack.ls1.utility.MailBuilder;
 import thesistrack.ls1.utility.MailConfig;
 
+import java.nio.charset.StandardCharsets;
+
 @Service
 public class MailingService {
     private final JavaMailSender javaMailSender;
     private final UploadService uploadService;
     private final MailConfig config;
+    private final ThesisPresentationService thesisPresentationService;
 
     @Autowired
     public MailingService(
             JavaMailSender javaMailSender,
             UploadService uploadService,
-            MailConfig config
-    ) {
+            MailConfig config,
+            ThesisPresentationService thesisPresentationService) {
         this.javaMailSender = javaMailSender;
         this.uploadService = uploadService;
         this.config = config;
+        this.thesisPresentationService = thesisPresentationService;
     }
 
     public void sendApplicationCreatedEmail(Application application) {
@@ -156,6 +161,28 @@ public void sendPresentationDeletedEmail(User deletingUser, ThesisPresentation p
                 .send(javaMailSender, uploadService);
     }
 
+    public void sendPresentationInvitation(ThesisPresentation presentation) {
+        MailBuilder builder = new MailBuilder(config, "Thesis Presentation Invitation", "thesis-presentation-invitation");
+        builder
+                .sendToChairMembers()
+                .sendToChairStudents()
+                .fillThesisPresentationPlaceholders(presentation);
+
+        for (ThesisRole role : presentation.getThesis().getRoles()) {
+            builder.addPrimarySender(role.getUser());
+        }
+
+        builder.addRawAttatchment(
+                "event.ics",
+                new ByteArrayDataSource(
+                        thesisPresentationService.getPresentationEvent(presentation).toString().getBytes(StandardCharsets.UTF_8),
+                        "application/octet-stream"
+                )
+        );
+
+        builder.send(javaMailSender, uploadService);
+    }
+
     public void sendFinalSubmissionEmail(Thesis thesis) {
         MailBuilder builder = new MailBuilder(config, "Thesis Submitted", "thesis-final-submission");
         builder

server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java

@@ -36,10 +36,8 @@ public ThesisPresentationService(CalendarService calendarService, ThesisReposito
     }
 
     public Calendar getPresentationCalendar() {
-        Calendar calendar = new Calendar();
+        Calendar calendar = createEmptyCalendar();
 
-        calendar.add(new ProdId("-//Thesis Track//Thesis Presentations//EN"));
-        calendar.add(ImmutableCalScale.GREGORIAN);
         calendar.add(ImmutableMethod.PUBLISH);
 
         List<ThesisPresentation> presentations = thesisPresentationRepository.findAllPresentations(
@@ -53,6 +51,14 @@ public Calendar getPresentationCalendar() {
         return calendar;
     }
 
+    public Calendar getPresentationEvent(ThesisPresentation presentation) {
+        Calendar calendar = createEmptyCalendar();
+
+        calendar.add(calendarService.createVEvent(presentation.getId().toString(), createPresentationCalendarEvent(presentation)));
+
+        return calendar;
+    }
+
     @Transactional
     public Thesis createPresentation(
             User creatingUser,
@@ -61,6 +67,7 @@ public Thesis createPresentation(
             ThesisPresentationVisibility visibility,
             String location,
             String streamUrl,
+            String language,
             Instant date
     ) {
         ThesisPresentation presentation = new ThesisPresentation();
@@ -70,6 +77,7 @@ public Thesis createPresentation(
         presentation.setVisibility(visibility);
         presentation.setLocation(location);
         presentation.setStreamUrl(streamUrl);
+        presentation.setLanguage(language);
         presentation.setScheduledAt(date);
         presentation.setCreatedBy(creatingUser);
         presentation.setCreatedAt(Instant.now());
@@ -79,6 +87,8 @@ public Thesis createPresentation(
         if (visibility.equals(ThesisPresentationVisibility.PUBLIC)) {
             presentation.setCalendarEvent(calendarService.createEvent(createPresentationCalendarEvent(presentation)));
             presentation = thesisPresentationRepository.save(presentation);
+
+            mailingService.sendPresentationInvitation(presentation);
         }
 
         List<ThesisPresentation> presentations = thesis.getPresentations();
@@ -134,6 +144,15 @@ public ThesisPresentation findById(UUID thesisId, UUID presentationId) {
         return presentation;
     }
 
+    private Calendar createEmptyCalendar() {
+        Calendar calendar = new Calendar();
+
+        calendar.add(new ProdId("-//Thesis Track//Thesis Presentations//EN"));
+        calendar.add(ImmutableCalScale.GREGORIAN);
+
+        return calendar;
+    }
+
     private CalendarService.CalendarEvent createPresentationCalendarEvent(ThesisPresentation presentation) {
         String location = presentation.getLocation();
         String streamUrl = presentation.getStreamUrl();
@@ -143,6 +162,7 @@ private CalendarService.CalendarEvent createPresentationCalendarEvent(ThesisPres
                 location == null || location.isBlank() ? streamUrl : location,
                 "Title: " + presentation.getThesis().getTitle() + "\n" +
                         (streamUrl != null && !streamUrl.isBlank() ? "Stream URL: " + streamUrl + "\n" : "") + "\n" +
+                        "Language: " + presentation.getLanguage() + "\n" +
                         "Abstract:\n\n" + presentation.getThesis().getAbstractField(),
                 presentation.getScheduledAt(),
                 presentation.getScheduledAt().plus(60, ChronoUnit.MINUTES),