From a376bd3df4b1d5547f49058937b2c97f03cf91be Mon Sep 17 00:00:00 2001 From: andrew Date: Thu, 6 Feb 2025 00:19:58 +0900 Subject: [PATCH 1/2] =?UTF-8?q?CLAP-288=20Fix=20:=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20Cod?= =?UTF-8?q?e=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/history/PostCommentService.java | 23 ++++++++----------- .../service/task/ApprovalTaskService.java | 12 +++++----- .../service/task/CreateTaskService.java | 10 ++++---- .../service/task/UpdateTaskBoardService.java | 5 ++-- .../service/task/UpdateTaskService.java | 14 +++++------ .../webhook/SendNotificationService.java | 10 ++++---- 6 files changed, 35 insertions(+), 39 deletions(-) diff --git a/src/main/java/clap/server/application/service/history/PostCommentService.java b/src/main/java/clap/server/application/service/history/PostCommentService.java index 533efeea..5d44e575 100644 --- a/src/main/java/clap/server/application/service/history/PostCommentService.java +++ b/src/main/java/clap/server/application/service/history/PostCommentService.java @@ -51,14 +51,12 @@ public void save(Long userId, Long taskId, CreateCommentRequest request) { TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.COMMENT, task, null, member, savedComment); commandTaskHistoryPort.save(taskHistory); - String taskTitle = task.getTitle(); - Member receiver; + Member processor = task.getProcessor(); + Member requester = task.getRequester(); if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) { - receiver = task.getProcessor(); - publishNotification(receiver, task, request.content(), member.getNickname(), taskTitle, receiver.getMemberInfo().getEmail()); + publishNotification(processor, task, request.content(), requester.getNickname()); } else { - receiver = task.getRequester(); - publishNotification(receiver, task, request.content(), receiver.getNickname(), taskTitle, receiver.getMemberInfo().getEmail()); + publishNotification(requester, task, request.content(), processor.getNickname()); } } } @@ -77,12 +75,12 @@ public void saveCommentAttachment(Long userId, Long taskId, MultipartFile file) TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.COMMENT_FILE, task, null, member, savedComment); commandTaskHistoryPort.save(taskHistory); + Member processor = task.getProcessor(); + Member requester = task.getRequester(); if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) { - Member receiver = task.getProcessor(); - publishNotification(receiver, task, fileName + "(첨부파일)", member.getNickname(), task.getTitle(), receiver.getMemberInfo().getEmail()); + publishNotification(processor, task, fileName + "(첨부파일)", requester.getNickname()); } else { - Member receiver = task.getRequester(); - publishNotification(receiver, task, fileName + "(첨부파일)", task.getProcessor().getNickname(), task.getTitle(), receiver.getMemberInfo().getEmail()); + publishNotification(requester, task, fileName + "(첨부파일)", processor.getNickname()); } } } @@ -94,8 +92,7 @@ private String saveAttachment(MultipartFile file, Task task, Comment comment) { return file.getOriginalFilename(); } - private void publishNotification(Member receiver, Task task, String message, String commenterName, String taskTitle, String email) { - sendNotificationService.sendPushNotification(receiver, email, NotificationType.COMMENT, task, taskTitle, message, commenterName); + private void publishNotification(Member receiver, Task task, String message, String commenterName) { + sendNotificationService.sendPushNotification(receiver, NotificationType.COMMENT, task, message, commenterName); } - } diff --git a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java index 51f814b0..cd522027 100644 --- a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java +++ b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java @@ -57,8 +57,8 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId, commandTaskHistoryPort.save(taskHistory); List receivers = List.of(reviewer, processor); - String processorName = task.getProcessor().getNickname(); - publishNotification(receivers, task, task.getTitle(), processorName); + String processorName = processor.getNickname(); + publishNotification(receivers, task, processorName); return TaskResponseMapper.toApprovalTaskResponse(taskService.upsert(task)); } @@ -71,13 +71,13 @@ public FindApprovalFormResponse findApprovalForm(Long managerId, Long taskId) { return TaskResponseMapper.toFindApprovalFormResponse(task); } - private void publishNotification(List receivers, Task task, String taskTitle, String processorName){ + private void publishNotification(List receivers, Task task, String processorName){ receivers.forEach(receiver -> { - sendNotificationService.sendPushNotification(receiver, receiver.getMemberInfo().getEmail(), NotificationType.PROCESSOR_ASSIGNED, - task, taskTitle, processorName, null); + sendNotificationService.sendPushNotification(receiver, NotificationType.PROCESSOR_ASSIGNED, + task, processorName, null); }); sendNotificationService.sendAgitNotification(NotificationType.PROCESSOR_CHANGED, - task, taskTitle, processorName, null); + task, processorName, null); } } diff --git a/src/main/java/clap/server/application/service/task/CreateTaskService.java b/src/main/java/clap/server/application/service/task/CreateTaskService.java index f3705b34..b9383966 100644 --- a/src/main/java/clap/server/application/service/task/CreateTaskService.java +++ b/src/main/java/clap/server/application/service/task/CreateTaskService.java @@ -49,7 +49,7 @@ public CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createT if (files != null) { saveAttachments(files, savedTask);} - publishNotification(savedTask, savedTask.getTitle()); + publishNotification(savedTask); return TaskResponseMapper.toCreateTaskResponse(savedTask); } @@ -59,12 +59,12 @@ private void saveAttachments(List files, Task task) { commandAttachmentPort.saveAll(attachments); } - private void publishNotification(Task task, String taskTitle) { + private void publishNotification(Task task) { List reviewers = memberService.findReviewers(); - reviewers.forEach(reviewer -> {sendNotificationService.sendPushNotification(reviewer, reviewer.getMemberInfo().getNickname(), NotificationType.TASK_REQUESTED, - task, taskTitle, null, null);}); + reviewers.forEach(reviewer -> {sendNotificationService.sendPushNotification(reviewer, NotificationType.TASK_REQUESTED, + task, null, null);}); sendNotificationService.sendAgitNotification(NotificationType.TASK_REQUESTED, - task, taskTitle, null, null); + task, null, null); } } \ No newline at end of file diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java index caffe70b..dee1a5cd 100644 --- a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java +++ b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java @@ -184,11 +184,10 @@ public void validateRequest(UpdateTaskOrderRequest request, TaskStatus targetSta private void publishNotification(Task task, NotificationType notificationType, String message, String taskTitle) { List receivers = List.of(task.getRequester(), task.getProcessor()); receivers.forEach(receiver -> { - sendNotificationService.sendPushNotification(receiver, receiver.getMemberInfo().getNickname(), notificationType, - task, taskTitle, message, null); + sendNotificationService.sendPushNotification(receiver, notificationType, task, message, null); }); sendNotificationService.sendAgitNotification(notificationType, - task, message, taskTitle, null); + task, message, null); } } diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java index 79a2ada1..5999990b 100644 --- a/src/main/java/clap/server/application/service/task/UpdateTaskService.java +++ b/src/main/java/clap/server/application/service/task/UpdateTaskService.java @@ -88,9 +88,7 @@ public void updateTaskStatus(Long memberId, Long taskId, TaskStatus taskStatus) Task updateTask = taskService.upsert(task); TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.STATUS_SWITCHED, task, taskStatus.getDescription(), null,null); commandTaskHistoryPort.save(taskHistory); - - String taskTitle = task.getTitle(); - publishNotification(updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus()), taskTitle); + publishNotification(updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus())); } } @@ -108,7 +106,7 @@ public void updateTaskProcessor(Long taskId, Long userId, UpdateTaskProcessorReq commandTaskHistoryPort.save(taskHistory); String taskTitle = task.getTitle(); - publishNotification(updateTask, NotificationType.PROCESSOR_CHANGED, updateTask.getProcessor().getNickname(), taskTitle); + publishNotification(updateTask, NotificationType.PROCESSOR_CHANGED, processor.getNickname()); } @Transactional @@ -142,13 +140,13 @@ private List validateAndGetAttachments(List attachmentIdsToDel return attachmentsOfTask; } - private void publishNotification(Task task, NotificationType notificationType, String message, String taskTitle) { + private void publishNotification(Task task, NotificationType notificationType, String message) { List receivers = List.of(task.getRequester(), task.getProcessor()); receivers.forEach(receiver -> { - sendNotificationService.sendPushNotification(receiver, receiver.getMemberInfo().getEmail(), notificationType, - task, taskTitle, message, null); + sendNotificationService.sendPushNotification(receiver, notificationType, + task, message, null); }); - sendNotificationService.sendAgitNotification(notificationType, task, taskTitle, message, null); + sendNotificationService.sendAgitNotification(notificationType, task, message, null); } } diff --git a/src/main/java/clap/server/application/service/webhook/SendNotificationService.java b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java index 3b57cf9e..7e12f07b 100644 --- a/src/main/java/clap/server/application/service/webhook/SendNotificationService.java +++ b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java @@ -25,8 +25,10 @@ public class SendNotificationService { private final CommandNotificationPort commandNotificationPort; @Async("notificationExecutor") - public void sendPushNotification(Member receiver, String email, NotificationType notificationType, - Task task, String taskTitle, String message, String commenterName) { + public void sendPushNotification(Member receiver, NotificationType notificationType, + Task task, String message, String commenterName) { + String email = receiver.getMemberInfo().getEmail(); + String taskTitle = task.getTitle(); String requesterNickname = task.getRequester().getNickname(); Notification notification = createTaskNotification(task, receiver, notificationType, message, taskTitle); @@ -69,11 +71,11 @@ public void sendPushNotification(Member receiver, String email, NotificationType @Async("notificationExecutor") public void sendAgitNotification(NotificationType notificationType, - Task task, String taskTitle, String message, String commenterName) { + Task task, String message, String commenterName) { PushNotificationTemplate pushNotificationTemplate = new PushNotificationTemplate( null, notificationType, - taskTitle, + task.getTitle(), task.getRequester().getNickname(), message, commenterName From 0862c9dde7b0f11f13b67a4262deb3069991cd02 Mon Sep 17 00:00:00 2001 From: andrew Date: Thu, 6 Feb 2025 00:20:27 +0900 Subject: [PATCH 2/2] =?UTF-8?q?CLAP-288=20Fix=20:=20=EB=8C=93=EA=B8=80=20?= =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20=EC=9E=91=EC=84=B1=20Swa?= =?UTF-8?q?gger=20=EC=84=A4=EC=A0=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/inbound/web/history/PostCommentController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java b/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java index cc2b6207..56e4e566 100644 --- a/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java +++ b/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java @@ -12,6 +12,7 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; +import org.springframework.http.MediaType; import org.springframework.security.access.annotation.Secured; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; @@ -40,7 +41,7 @@ public void createComment( @Operation(summary = "댓글 작성(첨부 파일)") @Parameter(name = "taskId", description = "댓글 작성할 작업 고유 ID", required = true, in = ParameterIn.PATH) - @PostMapping("/attachment/{taskId}") + @PostMapping(value = "/attachment/{taskId}", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE}) @Secured({"ROLE_MANAGER", "ROLE_USER"}) public void createAttachmentComment( @AuthenticationPrincipal SecurityUserDetails userInfo,