From 13a9d1d377dfde9bfff75a20e12ae936a6797a7d Mon Sep 17 00:00:00 2001
From: djuarezgf <d.juarez@dkfz-heidelberg.de>
Date: Mon, 15 Apr 2024 12:47:31 +0200
Subject: [PATCH] Added: Send message while rejecting a project

---
 CHANGELOG.md                                     |  1 +
 .../de/samply/app/ProjectManagerController.java  | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d7d170..4fb1f5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -129,3 +129,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Project and project view url in email context
 - Create notification after sending an email
 - Send message while requesting changes in script or project
+- Send message while rejecting a project
diff --git a/src/main/java/de/samply/app/ProjectManagerController.java b/src/main/java/de/samply/app/ProjectManagerController.java
index 7a9a486..23020bb 100644
--- a/src/main/java/de/samply/app/ProjectManagerController.java
+++ b/src/main/java/de/samply/app/ProjectManagerController.java
@@ -483,7 +483,9 @@ public ResponseEntity<String> acceptProject(
     @FrontendAction(action = ProjectManagerConst.REJECT_PROJECT_ACTION)
     @PostMapping(value = ProjectManagerConst.REJECT_PROJECT)
     public ResponseEntity<String> rejectProject(
-            @ProjectCode @RequestParam(name = ProjectManagerConst.PROJECT_CODE) String projectCode
+            @ProjectCode @RequestParam(name = ProjectManagerConst.PROJECT_CODE) String projectCode,
+            // Message is sent per email
+            @Message @RequestParam(name = ProjectManagerConst.MESSAGE, required = false) String message
     ) {
         return convertToResponseEntity(() -> projectEventService.reject(projectCode));
     }
@@ -509,7 +511,9 @@ public ResponseEntity<String> acceptBridgeheadProject(
     @PostMapping(value = ProjectManagerConst.REJECT_BRIDGEHEAD_PROJECT)
     public ResponseEntity<String> rejectBridgeheadProject(
             @ProjectCode @RequestParam(name = ProjectManagerConst.PROJECT_CODE) String projectCode,
-            @Bridgehead @RequestParam(name = ProjectManagerConst.BRIDGEHEAD) String bridgehead
+            @Bridgehead @RequestParam(name = ProjectManagerConst.BRIDGEHEAD) String bridgehead,
+            // Message is sent per email
+            @Message @RequestParam(name = ProjectManagerConst.MESSAGE, required = false) String message
     ) {
         return convertToResponseEntity(() -> projectBridgeheadService.rejectProject(projectCode, bridgehead));
     }
@@ -537,7 +541,9 @@ public ResponseEntity<String> acceptScript(
     @PostMapping(value = ProjectManagerConst.REJECT_SCRIPT)
     public ResponseEntity<String> rejectScript(
             @ProjectCode @RequestParam(name = ProjectManagerConst.PROJECT_CODE) String projectCode,
-            @Bridgehead @RequestParam(name = ProjectManagerConst.BRIDGEHEAD) String bridgehead
+            @Bridgehead @RequestParam(name = ProjectManagerConst.BRIDGEHEAD) String bridgehead,
+            // Message is sent per email
+            @Message @RequestParam(name = ProjectManagerConst.MESSAGE, required = false) String message
     ) {
         return convertToResponseEntity(() -> userService.rejectProject(projectCode, bridgehead));
     }
@@ -579,7 +585,9 @@ public ResponseEntity<String> acceptProjectResults(
     @PostMapping(value = ProjectManagerConst.REJECT_PROJECT_RESULTS)
     public ResponseEntity<String> rejectProjectResults(
             @ProjectCode @RequestParam(name = ProjectManagerConst.PROJECT_CODE) String projectCode,
-            @Bridgehead @RequestParam(name = ProjectManagerConst.BRIDGEHEAD) String bridgehead
+            @Bridgehead @RequestParam(name = ProjectManagerConst.BRIDGEHEAD) String bridgehead,
+            // Message is sent per email
+            @Message @RequestParam(name = ProjectManagerConst.MESSAGE, required = false) String message
     ) {
         return convertToResponseEntity(() -> userService.rejectProject(projectCode, bridgehead));
     }