From 4098015a9488f57dc36f664d1122f3055a6c948f Mon Sep 17 00:00:00 2001
From: Valeryia Andraichuk <andraichuk.valeryia@gmail.com>
Date: Tue, 11 Jul 2023 21:00:41 +0200
Subject: [PATCH] Fix multiple email bug'

---
 .../src/forms/ApplicationAssessmentForm.tsx   |  4 +--
 .../ls1/controller/ApplicationController.java | 25 +++----------------
 .../prompt/ls1/service/MailingService.java    | 10 --------
 3 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/client/src/forms/ApplicationAssessmentForm.tsx b/client/src/forms/ApplicationAssessmentForm.tsx
index 5e52a942..a51c4bd3 100644
--- a/client/src/forms/ApplicationAssessmentForm.tsx
+++ b/client/src/forms/ApplicationAssessmentForm.tsx
@@ -98,7 +98,7 @@ export const ApplicationAssessmentForm = ({
       reasonForBlockedByPM: assessment?.reasonForBlockedByPM ?? '',
       assessmentScore: assessment?.assessmentScore ?? 0,
       accepted: assessment?.accepted ?? false,
-      assessed: assessment?.accepted ?? false,
+      assessed: assessment?.assessed ?? false,
       interviewInviteSent: assessment?.interviewInviteSent ?? false,
     },
   })
@@ -112,7 +112,7 @@ export const ApplicationAssessmentForm = ({
       reasonForBlockedByPM: assessment?.reasonForBlockedByPM ?? '',
       assessmentScore: assessment?.assessmentScore ?? 0,
       accepted: assessment?.accepted ?? false,
-      assessed: assessment?.accepted ?? false,
+      assessed: assessment?.assessed ?? false,
       interviewInviteSent: assessment?.interviewInviteSent ?? false,
     })
     assessmentForm.resetDirty()
diff --git a/server/src/main/java/prompt/ls1/controller/ApplicationController.java b/server/src/main/java/prompt/ls1/controller/ApplicationController.java
index 32e776a4..98b25169 100644
--- a/server/src/main/java/prompt/ls1/controller/ApplicationController.java
+++ b/server/src/main/java/prompt/ls1/controller/ApplicationController.java
@@ -203,18 +203,8 @@ public ResponseEntity<Application> updateDeveloperApplicationAssessment(@PathVar
     @PatchMapping(path = "/coach/{coachApplicationId}/assessment", consumes = "application/json-path+json")
     @PreAuthorize("hasRole('ipraktikum-pm')")
     public ResponseEntity<Application> updateCoachApplicationAssessment(@PathVariable final UUID coachApplicationId,
-                                                                            @RequestBody JsonPatch patchStudentApplicationAssessment)
-            throws JsonPatchException, JsonProcessingException {
-        final CoachApplication coachApplication = applicationService.updateCoachApplicationAssessment(coachApplicationId, patchStudentApplicationAssessment);
-        if (coachApplication.getAssessment().getInterviewInviteSent() != null && coachApplication.getAssessment().getInterviewInviteSent()) {
-            try {
-                mailingService.sendCoachInterviewInvitationEmail(coachApplication.getStudent(), coachApplication.getCourseIteration());
-            } catch (MessagingException e) {
-                log.error(String.format("Failed to send a coach interview invitation email. Error message: %s. Stacktrace: %s",
-                        e.getMessage(), Arrays.toString(e.getStackTrace())));
-            }
-        }
-        return ResponseEntity.ok(coachApplication);
+                                                                            @RequestBody JsonPatch patchStudentApplicationAssessment) throws JsonPatchException, JsonProcessingException {
+        return ResponseEntity.ok(applicationService.updateCoachApplicationAssessment(coachApplicationId, patchStudentApplicationAssessment));
     }
 
     @PatchMapping(path = "/tutor/{tutorApplicationId}/assessment", consumes = "application/json-path+json")
@@ -222,16 +212,7 @@ public ResponseEntity<Application> updateCoachApplicationAssessment(@PathVariabl
     public ResponseEntity<Application> updateTutorApplicationAssessment(@PathVariable final UUID tutorApplicationId,
                                                                             @RequestBody JsonPatch patchStudentApplicationAssessment)
             throws JsonPatchException, JsonProcessingException {
-        final TutorApplication tutorApplication = applicationService.updateTutorApplicationAssessment(tutorApplicationId, patchStudentApplicationAssessment);
-        if (tutorApplication.getAssessment().getInterviewInviteSent() != null && tutorApplication.getAssessment().getInterviewInviteSent()) {
-            try {
-                mailingService.sendTutorInterviewInvitationEmail(tutorApplication.getStudent(), tutorApplication.getCourseIteration());
-            } catch (MessagingException e) {
-                log.error(String.format("Failed to send a tutor interview invitation email. Error message: %s. Stacktrace: %s",
-                        e.getMessage(), Arrays.toString(e.getStackTrace())));
-            }
-        }
-        return ResponseEntity.ok(tutorApplication);
+        return ResponseEntity.ok(applicationService.updateTutorApplicationAssessment(tutorApplicationId, patchStudentApplicationAssessment));
     }
 
     @PostMapping("/developer/{applicationId}/instructor-comments")
diff --git a/server/src/main/java/prompt/ls1/service/MailingService.java b/server/src/main/java/prompt/ls1/service/MailingService.java
index 25a97f40..b02ac21d 100644
--- a/server/src/main/java/prompt/ls1/service/MailingService.java
+++ b/server/src/main/java/prompt/ls1/service/MailingService.java
@@ -354,11 +354,6 @@ public void sendCoachApplicationRejectionEmail(final Student student,
         message.addRecipients(MimeMessage.RecipientType.TO, sender);
         message.setSubject(String.format("Agile Project Management %s Application Rejection", courseIteration.getSemesterName()));
 
-        TimeZone timeZone = TimeZone.getTimeZone("Europe/Paris");
-        SimpleDateFormat dateFormat = new SimpleDateFormat("EEEE, dd.MM.yyyy 'starting at' HH.mm");
-        dateFormat.setTimeZone(timeZone);
-        String dayOfWeek = dateFormat.format(courseIteration.getCoachInterviewDate());
-
         String htmlContent = String.format("""
                         <p>Dear %s %s,</p>
                         
@@ -386,11 +381,6 @@ public void sendTutorApplicationRejectionEmail(final Student student,
         message.addRecipients(MimeMessage.RecipientType.TO, sender);
         message.setSubject(String.format("Teaching iOS %s Application Rejection", courseIteration.getSemesterName()));
 
-        TimeZone timeZone = TimeZone.getTimeZone("Europe/Paris");
-        SimpleDateFormat dateFormat = new SimpleDateFormat("EEEE, dd.MM.yyyy 'starting at' HH.mm");
-        dateFormat.setTimeZone(timeZone);
-        String dayOfWeek = dateFormat.format(courseIteration.getCoachInterviewDate());
-
         String htmlContent = String.format("""
                         <p>Dear %s %s,</p>