CSCEXAM-000 Email composer in Scala

CSCfi · May 23, 2024 · 25e76cd · 25e76cd
1 parent d17b6b6
commit 25e76cd
Show file tree

Hide file tree

Showing 37 changed files with 1,043 additions and 1,516 deletions.
diff --git a/app/controllers/assessment/ExamInspectionController.java b/app/controllers/assessment/ExamInspectionController.java
@@ -7,7 +7,7 @@
 import be.objectify.deadbolt.java.actions.Group;
 import be.objectify.deadbolt.java.actions.Restrict;
 import controllers.base.BaseController;
-import impl.EmailComposer;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import io.ebean.Model;
 import java.util.Optional;

diff --git a/app/controllers/assessment/ExamRecordController.java b/app/controllers/assessment/ExamRecordController.java
@@ -7,7 +7,7 @@
 import be.objectify.deadbolt.java.actions.Group;
 import be.objectify.deadbolt.java.actions.Restrict;
 import controllers.base.BaseController;
-import impl.EmailComposer;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import java.io.ByteArrayOutputStream;
 import java.io.File;

diff --git a/app/controllers/assessment/LanguageInspectionController.java b/app/controllers/assessment/LanguageInspectionController.java
@@ -9,7 +9,7 @@
 import be.objectify.deadbolt.java.actions.Pattern;
 import be.objectify.deadbolt.java.actions.Restrict;
 import controllers.base.BaseController;
-import impl.EmailComposer;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import io.ebean.ExpressionList;
 import io.ebean.FetchConfig;

diff --git a/app/controllers/assessment/ReviewController.java b/app/controllers/assessment/ReviewController.java
@@ -8,7 +8,7 @@
 import be.objectify.deadbolt.java.actions.Restrict;
 import com.fasterxml.jackson.databind.JsonNode;
 import controllers.base.BaseController;
-import impl.EmailComposer;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import io.ebean.ExpressionList;
 import io.ebean.FetchConfig;

diff --git a/app/controllers/calendar/CalendarController.java b/app/controllers/calendar/CalendarController.java
@@ -10,7 +10,7 @@
 import controllers.iop.transfer.api.ExternalReservationHandler;
 import exceptions.NotFoundException;
 import impl.CalendarHandler;
-import impl.EmailComposer;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import io.ebean.Transaction;
 import java.util.Collection;
@@ -40,6 +40,7 @@
 import sanitizers.Attrs;
 import sanitizers.CalendarReservationSanitizer;
 import scala.concurrent.duration.Duration;
+import scala.jdk.javaapi.OptionConverters;
 import security.Authenticated;
 
 public class CalendarController extends BaseController {
@@ -101,7 +102,7 @@ public Result removeReservation(long id, Http.Request request) throws NotFoundEx
                     emailComposer.composeReservationCancellationNotification(
                         enrolment.getUser(),
                         reservation,
-                        "",
+                        OptionConverters.toScala(Optional.empty()),
                         isStudentUser,
                         enrolment
                     );

diff --git a/app/controllers/enrolment/EnrolmentController.java b/app/controllers/enrolment/EnrolmentController.java
@@ -8,8 +8,8 @@
 import be.objectify.deadbolt.java.actions.Restrict;
 import controllers.base.BaseController;
 import controllers.iop.transfer.api.ExternalReservationHandler;
-import impl.EmailComposer;
 import impl.ExternalCourseHandler;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import io.ebean.Transaction;
 import java.io.IOException;
@@ -644,13 +644,14 @@ public Result removeExaminationEvent(Long configId) {
         });
         config.delete();
         event.delete();
+        var users = enrolments.stream().map(ExamEnrolment::getUser).collect(Collectors.toSet());
         actor
             .scheduler()
             .scheduleOnce(
                 Duration.create(1, TimeUnit.SECONDS),
                 () -> {
                     emailComposer.composeExaminationEventCancellationNotification(
-                        enrolments.stream().map(ExamEnrolment::getUser).collect(Collectors.toSet()),
+                        CollectionConverters.asScala(users).toSet(),
                         exam,
                         event
                     );

diff --git a/app/controllers/enrolment/ReservationController.java b/app/controllers/enrolment/ReservationController.java
@@ -12,7 +12,7 @@
 import controllers.iop.collaboration.api.CollaborativeExamLoader;
 import controllers.iop.transfer.api.ExternalReservationHandler;
 import exceptions.NotFoundException;
-import impl.EmailComposer;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import io.ebean.FetchConfig;
 import io.ebean.text.PathProperties;
@@ -39,6 +39,7 @@
 import play.mvc.Http;
 import play.mvc.Result;
 import sanitizers.Attrs;
+import scala.jdk.javaapi.OptionConverters;
 import security.Authenticated;
 import system.interceptors.Anonymous;
 
@@ -147,7 +148,13 @@ public CompletionStage<Result> removeReservation(long id, Http.Request request)
         // Let's not send emails about historical reservations
         if (reservation.getEndAt().isAfter(DateTime.now())) {
             var student = enrolment.getUser();
-            emailComposer.composeReservationCancellationNotification(student, reservation, msg, false, enrolment);
+            emailComposer.composeReservationCancellationNotification(
+                student,
+                reservation,
+                OptionConverters.toScala(Optional.of(msg)),
+                false,
+                enrolment
+            );
         }
 
         if (reservation.getExternalReservation() != null) {

diff --git a/app/controllers/exam/ExamController.java b/app/controllers/exam/ExamController.java
@@ -9,8 +9,8 @@
 import be.objectify.deadbolt.java.actions.Restrict;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import controllers.base.BaseController;
-import impl.EmailComposer;
 import impl.ExamUpdater;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import io.ebean.ExpressionList;
 import io.ebean.FetchConfig;

diff --git a/app/controllers/examination/ExaminationController.java b/app/controllers/examination/ExaminationController.java
@@ -12,7 +12,7 @@
 import controllers.base.BaseController;
 import controllers.iop.transfer.api.ExternalAttachmentLoader;
 import impl.AutoEvaluationHandler;
-import impl.EmailComposer;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import io.ebean.text.PathProperties;
 import java.io.IOException;

diff --git a/app/controllers/iop/collaboration/impl/CollaborativeCalendarController.java b/app/controllers/iop/collaboration/impl/CollaborativeCalendarController.java
@@ -8,7 +8,7 @@
 import be.objectify.deadbolt.java.actions.Group;
 import be.objectify.deadbolt.java.actions.Restrict;
 import impl.CalendarHandler;
-import impl.EmailComposer;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import io.ebean.Transaction;
 import io.ebean.text.PathProperties;

diff --git a/app/controllers/iop/collaboration/impl/CollaborativeExamController.java b/app/controllers/iop/collaboration/impl/CollaborativeExamController.java
@@ -8,7 +8,7 @@
 import be.objectify.deadbolt.java.actions.Group;
 import be.objectify.deadbolt.java.actions.Restrict;
 import com.fasterxml.jackson.databind.JsonNode;
-import impl.EmailComposer;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import java.net.URL;
 import java.util.List;
@@ -41,6 +41,7 @@
 import sanitizers.EmailSanitizer;
 import sanitizers.ExamUpdateSanitizer;
 import scala.concurrent.duration.Duration;
+import scala.jdk.javaapi.CollectionConverters;
 import security.Authenticated;
 
 public class CollaborativeExamController extends CollaborationController {
@@ -237,7 +238,12 @@ public CompletionStage<Result> updateExam(Long id, Http.Request request) {
                                         .scheduler()
                                         .scheduleOnce(
                                             Duration.create(1, TimeUnit.SECONDS),
-                                            () -> composer.composeCollaborativeExamAnnouncement(receivers, user, exam),
+                                            () ->
+                                                composer.composeCollaborativeExamAnnouncement(
+                                                    CollectionConverters.asScala(receivers).toSet(),
+                                                    user,
+                                                    exam
+                                                ),
                                             as.dispatcher()
                                         );
                                 }

diff --git a/app/controllers/iop/collaboration/impl/CollaborativeReviewController.java b/app/controllers/iop/collaboration/impl/CollaborativeReviewController.java
@@ -10,7 +10,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.NullNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import impl.EmailComposer;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import io.vavr.control.Either;
 import java.io.File;

diff --git a/app/controllers/iop/transfer/impl/ExternalCalendarController.java b/app/controllers/iop/transfer/impl/ExternalCalendarController.java
@@ -54,6 +54,7 @@
 import play.mvc.With;
 import sanitizers.Attrs;
 import sanitizers.ExternalCalendarReservationSanitizer;
+import scala.jdk.javaapi.OptionConverters;
 import security.Authenticated;
 
 public class ExternalCalendarController extends CalendarController {
@@ -370,7 +371,10 @@ public CompletionStage<Result> requestReservationRevocation(String ref, Http.Req
                 return internalServerError(root.get("message").asText("Connection refused"));
             }
             String msg = request.body().asJson().path("msg").asText("");
-            emailComposer.composeExternalReservationCancellationNotification(reservation, msg);
+            emailComposer.composeExternalReservationCancellationNotification(
+                reservation,
+                OptionConverters.toScala(Optional.of(msg))
+            );
             reservation.delete();
             return ok();
         };

diff --git a/app/controllers/iop/transfer/impl/ExternalExamController.java b/app/controllers/iop/transfer/impl/ExternalExamController.java
@@ -15,8 +15,8 @@
 import controllers.iop.transfer.api.ExternalAttachmentLoader;
 import controllers.iop.transfer.api.ExternalExamAPI;
 import impl.AutoEvaluationHandler;
-import impl.EmailComposer;
 import impl.NoShowHandler;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import io.ebean.Query;
 import io.ebean.text.PathProperties;

diff --git a/app/controllers/iop/transfer/impl/ExternalExaminationController.java b/app/controllers/iop/transfer/impl/ExternalExaminationController.java
@@ -12,7 +12,7 @@
 import controllers.examination.ExaminationController;
 import controllers.iop.transfer.api.ExternalAttachmentLoader;
 import impl.AutoEvaluationHandler;
-import impl.EmailComposer;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import io.ebean.text.PathProperties;
 import io.vavr.Tuple;

diff --git a/app/controllers/iop/transfer/impl/ExternalReservationHandlerImpl.java b/app/controllers/iop/transfer/impl/ExternalReservationHandlerImpl.java
@@ -7,7 +7,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import controllers.iop.transfer.api.ExternalReservationHandler;
-import impl.EmailComposer;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -36,6 +36,7 @@
 import play.mvc.Result;
 import play.mvc.Results;
 import scala.concurrent.duration.Duration;
+import scala.jdk.javaapi.OptionConverters;
 
 public class ExternalReservationHandlerImpl implements ExternalReservationHandler {
 
@@ -128,7 +129,7 @@ private CompletionStage<Result> requestRemoval(String ref, User user, String msg
                         emailComposer.composeReservationCancellationNotification(
                             enrolment.getUser(),
                             reservation,
-                            msg,
+                            OptionConverters.toScala(Optional.of(msg)),
                             isStudentUser,
                             enrolment
                         );

diff --git a/app/impl/AutoEvaluationHandlerImpl.scala b/app/impl/AutoEvaluationHandlerImpl.scala
@@ -4,8 +4,9 @@
 
 package impl
 
-import models.assessment.{AutoEvaluationConfig, GradeEvaluation}
-import models.exam.{Exam, Grade, GradeScale}
+import impl.mail.EmailComposer
+import models.assessment.AutoEvaluationConfig
+import models.exam.{Exam, GradeScale}
 import org.apache.pekko.actor.ActorSystem
 import org.joda.time.DateTime
 import play.api.Logging
@@ -14,7 +15,7 @@ import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration.Duration
-import scala.jdk.CollectionConverters._
+import scala.jdk.CollectionConverters.*
 
 class AutoEvaluationHandlerImpl @Inject (
     private val composer: EmailComposer,

diff --git a/app/impl/CalendarHandlerImpl.java b/app/impl/CalendarHandlerImpl.java
@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2024 The members of the EXAM Consortium
-// SPDX-FileCopyrightText: 2024. The members of the EXAM Consortium
 //
 // SPDX-License-Identifier: EUPL-1.2
 
@@ -10,6 +9,7 @@
 import controllers.admin.SettingsController;
 import controllers.iop.transfer.api.ExternalReservationHandler;
 import exceptions.NotFoundException;
+import impl.mail.EmailComposer;
 import io.ebean.DB;
 import java.util.ArrayList;
 import java.util.Collection;