CLAP-278 Fix : Notification entity taskTitle 컬럼 추가

starboxxxx · starboxxxx · commit 315121083c10 · 2025-02-05T14:43:57.000+09:00
diff --git a/src/main/java/clap/server/adapter/outbound/api/dto/PushNotificationTemplate.java b/src/main/java/clap/server/adapter/outbound/api/dto/PushNotificationTemplate.java
@@ -4,7 +4,6 @@
 
 public record PushNotificationTemplate(
 
-        Long taskId,
         String email,
         NotificationType notificationType,
         String taskName,
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/notification/NotificationEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/notification/NotificationEntity.java
@@ -37,6 +37,9 @@ public class NotificationEntity extends BaseTimeEntity {
     @Column(nullable = true)
     private String message;
 
+    @Column(nullable = false)
+    private String taskTitle;
+
     @Column(nullable = false)
     private boolean isRead;
 }
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,10 +51,14 @@ 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;
             if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) {
-                publishNotification(task.getProcessor(), task, comment.getContent(), member.getNickname());
+                receiver = task.getProcessor();
+                publishNotification(receiver, task, request.content(), member.getNickname(), taskTitle, receiver.getMemberInfo().getEmail());
             } else {
-                publishNotification(task.getRequester(), task, comment.getContent(), task.getProcessor().getNickname());
+                receiver = task.getRequester();
+                publishNotification(receiver, task, request.content(), receiver.getNickname(), taskTitle, receiver.getMemberInfo().getEmail());
             }
         }
     }
@@ -74,9 +78,11 @@ public void saveCommentAttachment(Long userId, Long taskId, MultipartFile file)
             commandTaskHistoryPort.save(taskHistory);
 
             if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) {
-                publishNotification(task.getProcessor(), task, fileName + "(첨부파일)", member.getNickname());
+                Member receiver = task.getProcessor();
+                publishNotification(receiver, task, fileName + "(첨부파일)", member.getNickname(), task.getTitle(), receiver.getMemberInfo().getEmail());
             } else {
-                publishNotification(task.getRequester(), task, fileName + "(첨부파일)", task.getProcessor().getNickname());
+                Member receiver = task.getRequester();
+                publishNotification(receiver, task, fileName + "(첨부파일)", task.getProcessor().getNickname(), task.getTitle(), receiver.getMemberInfo().getEmail());
             }
         }
     }
@@ -88,8 +94,8 @@ private String saveAttachment(MultipartFile file, Task task, Comment comment) {
         return file.getOriginalFilename();
     }
 
-    private void publishNotification(Member receiver, Task task, String message, String commenterName) {
-        sendNotificationService.sendPushNotification(receiver, NotificationType.COMMENT, task, message, commenterName);
+    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);
     }
 
 }
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,7 +57,8 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,
         commandTaskHistoryPort.save(taskHistory);
 
         List<Member> receivers = List.of(reviewer, processor);
-        publishNotification(receivers, task);
+        String processorName = task.getProcessor().getNickname();
+        publishNotification(receivers, task, task.getTitle(), processorName);
 
         return TaskResponseMapper.toApprovalTaskResponse(taskService.upsert(task));
     }
@@ -70,13 +71,13 @@ public FindApprovalFormResponse findApprovalForm(Long managerId, Long taskId) {
         return TaskResponseMapper.toFindApprovalFormResponse(task);
     }
 
-    private void publishNotification(List<Member> receivers, Task task){
+    private void publishNotification(List<Member> receivers, Task task, String taskTitle, String processorName){
         receivers.forEach(receiver -> {
-            sendNotificationService.sendPushNotification(receiver, NotificationType.PROCESSOR_ASSIGNED,
-                    task, task.getProcessor().getNickname(), null);
+            sendNotificationService.sendPushNotification(receiver, receiver.getMemberInfo().getEmail(), NotificationType.PROCESSOR_ASSIGNED,
+                    task, taskTitle, processorName, null);
         });
         sendNotificationService.sendAgitNotification(NotificationType.PROCESSOR_CHANGED,
-                task, task.getProcessor().getNickname(), null);
+                task, taskTitle, 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);
+        publishNotification(savedTask, savedTask.getTitle());
         return TaskResponseMapper.toCreateTaskResponse(savedTask);
     }
 
@@ -59,12 +59,12 @@ private void saveAttachments(List<MultipartFile> files, Task task) {
         commandAttachmentPort.saveAll(attachments);
     }
 
-    private void publishNotification(Task task) {
+    private void publishNotification(Task task, String taskTitle) {
         List<Member> reviewers = memberService.findReviewers();
-        reviewers.forEach(reviewer -> {sendNotificationService.sendPushNotification(reviewer, NotificationType.TASK_REQUESTED,
-                task, null, null);});
+        reviewers.forEach(reviewer -> {sendNotificationService.sendPushNotification(reviewer, reviewer.getMemberInfo().getNickname(), NotificationType.TASK_REQUESTED,
+                task, taskTitle, null, null);});
 
         sendNotificationService.sendAgitNotification(NotificationType.TASK_REQUESTED,
-                task, null, null);
+                task, taskTitle, 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
@@ -181,14 +181,14 @@ public void validateRequest(UpdateTaskOrderRequest request, TaskStatus targetSta
         }
     }
 
-    private void publishNotification(Task task, NotificationType notificationType, String message) {
+    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, notificationType,
-                    task, message, null);
+            sendNotificationService.sendPushNotification(receiver, receiver.getMemberInfo().getNickname(), notificationType,
+                    task, taskTitle, message, null);
         });
         sendNotificationService.sendAgitNotification(notificationType,
-                task, message, null);
+                task, message, taskTitle, 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
@@ -56,7 +56,6 @@ public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUse
     private final CommandAttachmentPort commandAttachmentPort;
     private final CommandTaskHistoryPort commandTaskHistoryPort;
     private final S3UploadPort s3UploadPort;
-    private final ObjectMapper objectMapper;
 
     @Override
     @Transactional
@@ -89,7 +88,9 @@ 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);
-            publishNotification(updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus()));
+
+            String taskTitle = task.getTitle();
+            publishNotification(updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus()), taskTitle);
         }
     }
 
@@ -106,7 +107,8 @@ public void updateTaskProcessor(Long taskId, Long userId, UpdateTaskProcessorReq
         TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.PROCESSOR_CHANGED, task, null, processor,null);
         commandTaskHistoryPort.save(taskHistory);
 
-        publishNotification(updateTask, NotificationType.PROCESSOR_CHANGED, updateTask.getProcessor().getNickname());
+        String taskTitle = task.getTitle();
+        publishNotification(updateTask, NotificationType.PROCESSOR_CHANGED, updateTask.getProcessor().getNickname(), taskTitle);
     }
 
     @Transactional
@@ -140,13 +142,13 @@ private List<Attachment> validateAndGetAttachments(List<Long> attachmentIdsToDel
         return attachmentsOfTask;
     }
 
-    private void publishNotification(Task task, NotificationType notificationType, String message) {
+    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, notificationType,
-                    task, message, null);
+            sendNotificationService.sendPushNotification(receiver, receiver.getMemberInfo().getEmail(), notificationType,
+                    task, taskTitle, message, null);
         });
 
-            sendNotificationService.sendAgitNotification(notificationType, task, message, null);
+            sendNotificationService.sendAgitNotification(notificationType, task, taskTitle, 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,23 +25,21 @@ public class SendNotificationService {
     private final CommandNotificationPort commandNotificationPort;
 
     @Async("notificationExecutor")
-    public void sendPushNotification(Member receiver, NotificationType notificationType,
-                                        Task task, String message, String commenterName) {
-        String email = receiver.getMemberInfo().getEmail();
-        String taskTitle = task.getTitle();
+    public void sendPushNotification(Member receiver, String email, NotificationType notificationType,
+                                        Task task, String taskTitle, String message, String commenterName) {
         String requesterNickname = task.getRequester().getNickname();
 
-        Notification notification = createTaskNotification(task, receiver, notificationType, message);
+        Notification notification = createTaskNotification(task, receiver, notificationType, message, taskTitle);
 
         SseRequest sseRequest = new SseRequest(
-                task.getTitle(),
+                taskTitle,
                 notificationType,
                 receiver.getMemberId(),
                 message
         );
 
         PushNotificationTemplate pushNotificationTemplate = new PushNotificationTemplate(
-                task.getTaskId(), email, notificationType, taskTitle, requesterNickname, message, commenterName
+                email, notificationType, taskTitle, requesterNickname, message, commenterName
         );
 
         CompletableFuture<Void> saveNotification = CompletableFuture.runAsync(() -> {
@@ -71,12 +69,11 @@ public void sendPushNotification(Member receiver, NotificationType notificationT
 
     @Async("notificationExecutor")
     public void sendAgitNotification(NotificationType notificationType,
-                                     Task task, String message, String commenterName) {
+                                     Task task, String taskTitle, String message, String commenterName) {
         PushNotificationTemplate pushNotificationTemplate = new PushNotificationTemplate(
-                task.getTaskId(),
                 null,
                 notificationType,
-                task.getTitle(),
+                taskTitle,
                 task.getRequester().getNickname(),
                 message,
                 commenterName
diff --git a/src/main/java/clap/server/domain/model/notification/Notification.java b/src/main/java/clap/server/domain/model/notification/Notification.java
@@ -24,27 +24,30 @@ public class Notification extends BaseTime {
     private NotificationType type;
     private Member receiver;
     private String message;
+    private String taskTitle;
     private boolean isRead;
 
     @Builder
-    public Notification(Task task, NotificationType type, Member receiver, String message) {
+    public Notification(Task task, NotificationType type, Member receiver, String message, String taskTitle) {
         this.task = task;
         this.type = type;
         this.receiver = receiver;
         this.message = message;
+        this.taskTitle = taskTitle;
         this.isRead = false;
     }
 
     public void updateNotificationIsRead() {
         this.isRead = true;
     }
 
-    public static Notification createTaskNotification(Task task, Member reviewer, NotificationType type, String message) {
+    public static Notification createTaskNotification(Task task, Member reviewer, NotificationType type, String message, String taskTitle) {
         return Notification.builder()
                 .task(task)
                 .type(type)
                 .receiver(reviewer)
                 .message(message)
+                .taskTitle(taskTitle)
                 .build();
     }
 }
diff --git a/src/main/resources/db/migration/dev/V20250205278__Insert_Task_Title_Into_Notification.sql b/src/main/resources/db/migration/dev/V20250205278__Insert_Task_Title_Into_Notification.sql
@@ -0,0 +1,2 @@
+alter table notification
+    add task_title VARCHAR(20) not null;

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,9 @@ public class NotificationEntity extends BaseTimeEntity {`
`37`	`37`	`@Column(nullable = true)`
`38`	`38`	`private String message;`
`39`	`39`
	`40`	`+ @Column(nullable = false)`
	`41`	`+ private String taskTitle;`
	`42`	`+`
`40`	`43`	`@Column(nullable = false)`
`41`	`44`	`private boolean isRead;`
`42`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,14 @@ 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`	`56`	`if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) {`
`55`		`- publishNotification(task.getProcessor(), task, comment.getContent(), member.getNickname());`
	`57`	`+ receiver = task.getProcessor();`
	`58`	`+ publishNotification(receiver, task, request.content(), member.getNickname(), taskTitle, receiver.getMemberInfo().getEmail());`
`56`	`59`	`} else {`
`57`		`- publishNotification(task.getRequester(), task, comment.getContent(), task.getProcessor().getNickname());`
	`60`	`+ receiver = task.getRequester();`
	`61`	`+ publishNotification(receiver, task, request.content(), receiver.getNickname(), taskTitle, receiver.getMemberInfo().getEmail());`
`58`	`62`	`}`
`59`	`63`	`}`
`60`	`64`	`}`
`@@ -74,9 +78,11 @@ public void saveCommentAttachment(Long userId, Long taskId, MultipartFile file)`
`74`	`78`	`commandTaskHistoryPort.save(taskHistory);`
`75`	`79`
`76`	`80`	`if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) {`
`77`		`- publishNotification(task.getProcessor(), task, fileName + "(첨부파일)", member.getNickname());`
	`81`	`+ Member receiver = task.getProcessor();`
	`82`	`+ publishNotification(receiver, task, fileName + "(첨부파일)", member.getNickname(), task.getTitle(), receiver.getMemberInfo().getEmail());`
`78`	`83`	`} else {`
`79`		`- publishNotification(task.getRequester(), task, fileName + "(첨부파일)", task.getProcessor().getNickname());`
	`84`	`+ Member receiver = task.getRequester();`
	`85`	`+ publishNotification(receiver, task, fileName + "(첨부파일)", task.getProcessor().getNickname(), task.getTitle(), receiver.getMemberInfo().getEmail());`
`80`	`86`	`}`
`81`	`87`	`}`
`82`	`88`	`}`
`@@ -88,8 +94,8 @@ private String saveAttachment(MultipartFile file, Task task, Comment comment) {`
`88`	`94`	`return file.getOriginalFilename();`
`89`	`95`	`}`
`90`	`96`
`91`		`- private void publishNotification(Member receiver, Task task, String message, String commenterName) {`
`92`		`- sendNotificationService.sendPushNotification(receiver, NotificationType.COMMENT, task, message, commenterName);`
	`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);`
`93`	`99`	`}`
`94`	`100`
`95`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +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`		`- publishNotification(receivers, task);`
	`60`	`+ String processorName = task.getProcessor().getNickname();`
	`61`	`+ publishNotification(receivers, task, task.getTitle(), processorName);`
`61`	`62`
`62`	`63`	`return TaskResponseMapper.toApprovalTaskResponse(taskService.upsert(task));`
`63`	`64`	`}`
`@@ -70,13 +71,13 @@ public FindApprovalFormResponse findApprovalForm(Long managerId, Long taskId) {`
`70`	`71`	`return TaskResponseMapper.toFindApprovalFormResponse(task);`
`71`	`72`	`}`
`72`	`73`
`73`		`- private void publishNotification(List<Member> receivers, Task task){`
	`74`	`+ private void publishNotification(List<Member> receivers, Task task, String taskTitle, String processorName){`
`74`	`75`	`receivers.forEach(receiver -> {`
`75`		`- sendNotificationService.sendPushNotification(receiver, NotificationType.PROCESSOR_ASSIGNED,`
`76`		`- task, task.getProcessor().getNickname(), null);`
	`76`	`+ sendNotificationService.sendPushNotification(receiver, receiver.getMemberInfo().getEmail(), NotificationType.PROCESSOR_ASSIGNED,`
	`77`	`+ task, taskTitle, processorName, null);`
`77`	`78`	`});`
`78`	`79`	`sendNotificationService.sendAgitNotification(NotificationType.PROCESSOR_CHANGED,`
`79`		`- task, task.getProcessor().getNickname(), null);`
	`80`	`+ task, taskTitle, processorName, null);`
`80`	`81`	`}`
`81`	`82`
`82`	`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);`
	`52`	`+ publishNotification(savedTask, savedTask.getTitle());`
`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) {`
	`62`	`+ private void publishNotification(Task task, String taskTitle) {`
`63`	`63`	`List<Member> reviewers = memberService.findReviewers();`
`64`		`- reviewers.forEach(reviewer -> {sendNotificationService.sendPushNotification(reviewer, NotificationType.TASK_REQUESTED,`
`65`		`- task, null, null);});`
	`64`	`+ reviewers.forEach(reviewer -> {sendNotificationService.sendPushNotification(reviewer, reviewer.getMemberInfo().getNickname(), NotificationType.TASK_REQUESTED,`
	`65`	`+ task, taskTitle, null, null);});`
`66`	`66`
`67`	`67`	`sendNotificationService.sendAgitNotification(NotificationType.TASK_REQUESTED,`
`68`		`- task, null, null);`
	`68`	`+ task, taskTitle, null, null);`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,14 +181,14 @@ public void validateRequest(UpdateTaskOrderRequest request, TaskStatus targetSta`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`
`184`		`- private void publishNotification(Task task, NotificationType notificationType, String message) {`
	`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, notificationType,`
`188`		`- task, message, null);`
	`187`	`+ sendNotificationService.sendPushNotification(receiver, receiver.getMemberInfo().getNickname(), notificationType,`
	`188`	`+ task, taskTitle, message, null);`
`189`	`189`	`});`
`190`	`190`	`sendNotificationService.sendAgitNotification(notificationType,`
`191`		`- task, message, null);`
	`191`	`+ task, message, taskTitle, null);`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+alter table notification`
	`2`	`+ add task_title VARCHAR(20) not null;`