CLAP-288 Fix : 알림 생성 불필요한 Code 삭제

starboxxxx · starboxxxx · commit a376bd3df4b1 · 2025-02-06T00:19:58.000+09:00
diff --git 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
@@ -57,8 +57,8 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,
         commandTaskHistoryPort.save(taskHistory);
 
         List<Member> 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<Member> receivers, Task task, String taskTitle, String processorName){
+    private void publishNotification(List<Member> 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
@@ -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<MultipartFile> files, Task task) {
         commandAttachmentPort.saveAll(attachments);
     }
 
-    private void publishNotification(Task task, String taskTitle) {
+    private void publishNotification(Task task) {
         List<Member> 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);
     }
 }
diff --git 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<Member> 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
@@ -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<Attachment> validateAndGetAttachments(List<Long> attachmentIdsToDel
         return attachmentsOfTask;
     }
 
-    private void publishNotification(Task task, NotificationType notificationType, String message, String taskTitle) {
+    private void publishNotification(Task task, NotificationType notificationType, String message) {
         List<Member> 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -51,14 +51,12 @@ public void save(Long userId, Long taskId, CreateCommentRequest request) {`
`51`	`51`	`TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.COMMENT, task, null, member, savedComment);`
`52`	`52`	`commandTaskHistoryPort.save(taskHistory);`
`53`	`53`
`54`		`- String taskTitle = task.getTitle();`
`55`		`- Member receiver;`
	`54`	`+ Member processor = task.getProcessor();`
	`55`	`+ Member requester = task.getRequester();`
`56`	`56`	`if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) {`
`57`		`- receiver = task.getProcessor();`
`58`		`- publishNotification(receiver, task, request.content(), member.getNickname(), taskTitle, receiver.getMemberInfo().getEmail());`
	`57`	`+ publishNotification(processor, task, request.content(), requester.getNickname());`
`59`	`58`	`} else {`
`60`		`- receiver = task.getRequester();`
`61`		`- publishNotification(receiver, task, request.content(), receiver.getNickname(), taskTitle, receiver.getMemberInfo().getEmail());`
	`59`	`+ publishNotification(requester, task, request.content(), processor.getNickname());`
`62`	`60`	`}`
`63`	`61`	`}`
`64`	`62`	`}`
`@@ -77,12 +75,12 @@ public void saveCommentAttachment(Long userId, Long taskId, MultipartFile file)`
`77`	`75`	`TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.COMMENT_FILE, task, null, member, savedComment);`
`78`	`76`	`commandTaskHistoryPort.save(taskHistory);`
`79`	`77`
	`78`	`+ Member processor = task.getProcessor();`
	`79`	`+ Member requester = task.getRequester();`
`80`	`80`	`if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) {`
`81`		`- Member receiver = task.getProcessor();`
`82`		`- publishNotification(receiver, task, fileName + "(첨부파일)", member.getNickname(), task.getTitle(), receiver.getMemberInfo().getEmail());`
	`81`	`+ publishNotification(processor, task, fileName + "(첨부파일)", requester.getNickname());`
`83`	`82`	`} else {`
`84`		`- Member receiver = task.getRequester();`
`85`		`- publishNotification(receiver, task, fileName + "(첨부파일)", task.getProcessor().getNickname(), task.getTitle(), receiver.getMemberInfo().getEmail());`
	`83`	`+ publishNotification(requester, task, fileName + "(첨부파일)", processor.getNickname());`
`86`	`84`	`}`
`87`	`85`	`}`
`88`	`86`	`}`
`@@ -94,8 +92,7 @@ private String saveAttachment(MultipartFile file, Task task, Comment comment) {`
`94`	`92`	`return file.getOriginalFilename();`
`95`	`93`	`}`
`96`	`94`
`97`		`- private void publishNotification(Member receiver, Task task, String message, String commenterName, String taskTitle, String email) {`
`98`		`- sendNotificationService.sendPushNotification(receiver, email, NotificationType.COMMENT, task, taskTitle, message, commenterName);`
	`95`	`+ private void publishNotification(Member receiver, Task task, String message, String commenterName) {`
	`96`	`+ sendNotificationService.sendPushNotification(receiver, NotificationType.COMMENT, task, message, commenterName);`
`99`	`97`	`}`
`100`		`-`
`101`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,`
`57`	`57`	`commandTaskHistoryPort.save(taskHistory);`
`58`	`58`
`59`	`59`	`List<Member> receivers = List.of(reviewer, processor);`
`60`		`- String processorName = task.getProcessor().getNickname();`
`61`		`- publishNotification(receivers, task, task.getTitle(), processorName);`
	`60`	`+ String processorName = processor.getNickname();`
	`61`	`+ publishNotification(receivers, task, processorName);`
`62`	`62`
`63`	`63`	`return TaskResponseMapper.toApprovalTaskResponse(taskService.upsert(task));`
`64`	`64`	`}`
`@@ -71,13 +71,13 @@ public FindApprovalFormResponse findApprovalForm(Long managerId, Long taskId) {`
`71`	`71`	`return TaskResponseMapper.toFindApprovalFormResponse(task);`
`72`	`72`	`}`
`73`	`73`
`74`		`- private void publishNotification(List<Member> receivers, Task task, String taskTitle, String processorName){`
	`74`	`+ private void publishNotification(List<Member> receivers, Task task, String processorName){`
`75`	`75`	`receivers.forEach(receiver -> {`
`76`		`- sendNotificationService.sendPushNotification(receiver, receiver.getMemberInfo().getEmail(), NotificationType.PROCESSOR_ASSIGNED,`
`77`		`- task, taskTitle, processorName, null);`
	`76`	`+ sendNotificationService.sendPushNotification(receiver, NotificationType.PROCESSOR_ASSIGNED,`
	`77`	`+ task, processorName, null);`
`78`	`78`	`});`
`79`	`79`	`sendNotificationService.sendAgitNotification(NotificationType.PROCESSOR_CHANGED,`
`80`		`- task, taskTitle, processorName, null);`
	`80`	`+ task, processorName, null);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createT`
`49`	`49`
`50`	`50`	`if (files != null) {`
`51`	`51`	`saveAttachments(files, savedTask);}`
`52`		`- publishNotification(savedTask, savedTask.getTitle());`
	`52`	`+ publishNotification(savedTask);`
`53`	`53`	`return TaskResponseMapper.toCreateTaskResponse(savedTask);`
`54`	`54`	`}`
`55`	`55`
`@@ -59,12 +59,12 @@ private void saveAttachments(List<MultipartFile> files, Task task) {`
`59`	`59`	`commandAttachmentPort.saveAll(attachments);`
`60`	`60`	`}`
`61`	`61`
`62`		`- private void publishNotification(Task task, String taskTitle) {`
	`62`	`+ private void publishNotification(Task task) {`
`63`	`63`	`List<Member> reviewers = memberService.findReviewers();`
`64`		`- reviewers.forEach(reviewer -> {sendNotificationService.sendPushNotification(reviewer, reviewer.getMemberInfo().getNickname(), NotificationType.TASK_REQUESTED,`
`65`		`- task, taskTitle, null, null);});`
	`64`	`+ reviewers.forEach(reviewer -> {sendNotificationService.sendPushNotification(reviewer, NotificationType.TASK_REQUESTED,`
	`65`	`+ task, null, null);});`
`66`	`66`
`67`	`67`	`sendNotificationService.sendAgitNotification(NotificationType.TASK_REQUESTED,`
`68`		`- task, taskTitle, null, null);`
	`68`	`+ task, null, null);`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,11 +184,10 @@ public void validateRequest(UpdateTaskOrderRequest request, TaskStatus targetSta`
`184`	`184`	`private void publishNotification(Task task, NotificationType notificationType, String message, String taskTitle) {`
`185`	`185`	`List<Member> receivers = List.of(task.getRequester(), task.getProcessor());`
`186`	`186`	`receivers.forEach(receiver -> {`
`187`		`- sendNotificationService.sendPushNotification(receiver, receiver.getMemberInfo().getNickname(), notificationType,`
`188`		`- task, taskTitle, message, null);`
	`187`	`+ sendNotificationService.sendPushNotification(receiver, notificationType, task, message, null);`
`189`	`188`	`});`
`190`	`189`	`sendNotificationService.sendAgitNotification(notificationType,`
`191`		`- task, message, taskTitle, null);`
	`190`	`+ task, message, null);`
`192`	`191`	`}`
`193`	`192`
`194`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,7 @@ public void updateTaskStatus(Long memberId, Long taskId, TaskStatus taskStatus)`
`88`	`88`	`Task updateTask = taskService.upsert(task);`
`89`	`89`	`TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.STATUS_SWITCHED, task, taskStatus.getDescription(), null,null);`
`90`	`90`	`commandTaskHistoryPort.save(taskHistory);`
`91`		`-`
`92`		`- String taskTitle = task.getTitle();`
`93`		`- publishNotification(updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus()), taskTitle);`
	`91`	`+ publishNotification(updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus()));`
`94`	`92`	`}`
`95`	`93`	`}`
`96`	`94`
`@@ -108,7 +106,7 @@ public void updateTaskProcessor(Long taskId, Long userId, UpdateTaskProcessorReq`
`108`	`106`	`commandTaskHistoryPort.save(taskHistory);`
`109`	`107`
`110`	`108`	`String taskTitle = task.getTitle();`
`111`		`- publishNotification(updateTask, NotificationType.PROCESSOR_CHANGED, updateTask.getProcessor().getNickname(), taskTitle);`
	`109`	`+ publishNotification(updateTask, NotificationType.PROCESSOR_CHANGED, processor.getNickname());`
`112`	`110`	`}`
`113`	`111`
`114`	`112`	`@Transactional`
`@@ -142,13 +140,13 @@ private List<Attachment> validateAndGetAttachments(List<Long> attachmentIdsToDel`
`142`	`140`	`return attachmentsOfTask;`
`143`	`141`	`}`
`144`	`142`
`145`		`- private void publishNotification(Task task, NotificationType notificationType, String message, String taskTitle) {`
	`143`	`+ private void publishNotification(Task task, NotificationType notificationType, String message) {`
`146`	`144`	`List<Member> receivers = List.of(task.getRequester(), task.getProcessor());`
`147`	`145`	`receivers.forEach(receiver -> {`
`148`		`- sendNotificationService.sendPushNotification(receiver, receiver.getMemberInfo().getEmail(), notificationType,`
`149`		`- task, taskTitle, message, null);`
	`146`	`+ sendNotificationService.sendPushNotification(receiver, notificationType,`
	`147`	`+ task, message, null);`
`150`	`148`	`});`
`151`	`149`
`152`		`- sendNotificationService.sendAgitNotification(notificationType, task, taskTitle, message, null);`
	`150`	`+ sendNotificationService.sendAgitNotification(notificationType, task, message, null);`
`153`	`151`	`}`
`154`	`152`	`}`