CLAP-369 Fix: git conflict solve

TaskFlow-CLAP · Feb 12, 2025 · a311299 · a311299
1 parent 8ea7e06
commit a311299
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/src/main/java/clap/server/adapter/outbound/api/kakaoWork/KakaoWorkBlockBuilder.java b/src/main/java/clap/server/adapter/outbound/api/kakaoWork/KakaoWorkBlockBuilder.java
@@ -405,7 +405,7 @@ private String makeTerminatedStatusBlock(PushNotificationTemplate request, Strin
                         "inlines", new Object[]{
                                 Map.of(
                                         "type", "styled",
-                                        "text", " - 거절 사유 : " + request.reason(),
+                                        "text", " - 반려 사유 : " + request.reason(),
                                         "bold", false
                                 )
                         }

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/mapper/TaskPersistenceMapper.java b/src/main/java/clap/server/adapter/outbound/persistense/mapper/TaskPersistenceMapper.java
@@ -1,9 +1,7 @@
 package clap.server.adapter.outbound.persistense.mapper;
 
-import clap.server.adapter.outbound.persistense.entity.task.CommentEntity;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.mapper.common.PersistenceMapper;
-import clap.server.domain.model.task.Comment;
 import clap.server.domain.model.task.Task;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskOrderAndStstusService.java b/src/main/java/clap/server/application/service/task/UpdateTaskOrderAndStstusService.java
@@ -141,7 +141,7 @@ private void publishNotification(Task task, NotificationType notificationType, S
         List<Member> receivers = List.of(task.getRequester(), task.getProcessor());
         receivers.forEach(receiver -> {
             boolean isManager = receiver.getMemberInfo().getRole() == MemberRole.ROLE_MANAGER;
-            sendNotificationService.sendPushNotification(receiver, notificationType, task, message, null, isManager);
+            sendNotificationService.sendPushNotification(receiver, notificationType, task, message, null, null, isManager);
         });
         sendNotificationService.sendAgitNotification(notificationType,
                 task, message, null);