Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

hyoseong-Choi · hyoseong-Choi · commit 5aa1bec71b24 · 2025-02-06T23:08:50.000+09:00
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java
@@ -1,11 +1,13 @@
 package clap.server.adapter.inbound.web.task;
 
+import clap.server.adapter.inbound.security.service.SecurityUserDetails;
 import clap.server.application.port.inbound.task.CancelTaskUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.annotation.Secured;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,9 +20,9 @@ public class CancelTaskController {
     private final CancelTaskUsecase cancelTaskUsecase;
 
     @Operation(summary = "작업 취소")
-    @Secured("ROLE_USER")
+    @Secured({"ROLE_USER","ROLE_MANAGER"})
     @PatchMapping("/{taskId}/cancel")
-    public void cancelTask(@PathVariable Long taskId) {
-        cancelTaskUsecase.cancleTask(taskId);
+    public void cancelTask(@PathVariable Long taskId, @AuthenticationPrincipal SecurityUserDetails userDetails) {
+        cancelTaskUsecase.cancleTask(taskId, userDetails.getUserId());
     }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/api/AgitClient.java b/src/main/java/clap/server/adapter/outbound/api/AgitClient.java
@@ -29,9 +29,9 @@ public class AgitClient implements SendAgitPort {
     private final ObjectMapper objectMapper;
 
     @Override
-    public Long sendAgit(PushNotificationTemplate request, Task task) {
+    public Long sendAgit(PushNotificationTemplate request, Task task, String taskDetailUrl) {
 
-        HttpEntity<String> entity = agitTemplateBuilder.createAgitEntity(request, task);
+        HttpEntity<String> entity = agitTemplateBuilder.createAgitEntity(request, task, taskDetailUrl);
 
         RestTemplate restTemplate = new RestTemplate();
         if (request.notificationType() == NotificationType.TASK_REQUESTED) {
diff --git a/src/main/java/clap/server/adapter/outbound/api/AgitTemplateBuilder.java b/src/main/java/clap/server/adapter/outbound/api/AgitTemplateBuilder.java
@@ -10,8 +10,8 @@
 @Component
 public class AgitTemplateBuilder {
 
-    public HttpEntity<String> createAgitEntity(PushNotificationTemplate request, Task task) {
-        return new HttpEntity<>(createPayLoad(request, task), createHeaders());
+    public HttpEntity<String> createAgitEntity(PushNotificationTemplate request, Task task, String taskDetailUrl) {
+        return new HttpEntity<>(createPayLoad(request, task, taskDetailUrl), createHeaders());
     }
 
 
@@ -21,41 +21,40 @@ public HttpHeaders createHeaders() {
         return headers;
     }
 
-    public String createPayLoad(PushNotificationTemplate request, Task task) {
+    public String createPayLoad(PushNotificationTemplate request, Task task, String taskDetailUrl) {
 
         String payload;
         if (request.notificationType() == NotificationType.TASK_REQUESTED) {
             payload = "{"
-                    + "\"text\": \"" + createMessage(request) + "\","
+                    + "\"text\": \"" + createMessage(request, taskDetailUrl) + "\","
                     + "\"mrkdwn\": true" + "}";
         }
 
         else {
             payload = "{"
                     + "\"parent_id\": " + task.getAgitPostId() + ","
-                    + "\"text\": \"" + createMessage(request) + "\","
+                    + "\"text\": \"" + createMessage(request, taskDetailUrl) + "\","
                     + "\"mrkdwn\": true"
                     + "}";
         }
         return payload;
     }
 
-    public String createMessage(PushNotificationTemplate request) {
-        String taskUrl = "https://www.naver.com"; //Todo 작업 상세페이지 url 추가
+    public String createMessage(PushNotificationTemplate request, String taskDetailUrl) {
 
         return  switch (request.notificationType()) {
             case TASK_REQUESTED -> "📌 *새 작업 요청:* `" + request.taskName() + "`\\n"
                     + "\\t\\t*•요청자: " + request.senderName() + "*\\n"
-                    + "\\t\\t[OPEN](" + taskUrl + ")";
+                    + "[확인하러 가기](" + taskDetailUrl + ")";
             case STATUS_SWITCHED -> "⚙️ *작업 상태 변경:* `" + request.taskName() + "\\n"
                     + "\\t\\t*•작업 상태: " + request.message() + "*\\n"
-                    + "\\t\\t[OPEN](" + taskUrl + ")";
+                    + "[확인하러 가기](" + taskDetailUrl + ")";
             case PROCESSOR_CHANGED -> "🔄 *담당자 변경:* `" + request.taskName() + "\\n"
                     + "\\t\\t*•새 담당자: " + request.message() + "*\\n"
-                    + "\\t\\t[OPEN](" + taskUrl + ")";
+                    + "[확인하러 가기](" + taskDetailUrl + ")";
             case PROCESSOR_ASSIGNED -> "👤 *작업 담당자 배정:* `" + request.taskName() + "\\n"
                     + "\\t\\t*•담당자: " + request.message() + "*\\n"
-                    + "\\t\\t[OPEN](" + taskUrl + ")";
+                    + "[확인하러 가기](" + taskDetailUrl + ")";
             default -> null;
         };
     }
diff --git a/src/main/java/clap/server/adapter/outbound/api/EmailClient.java b/src/main/java/clap/server/adapter/outbound/api/EmailClient.java
@@ -37,12 +37,12 @@ public void sendWebhookEmail(PushNotificationTemplate request, String taskDetail
     }
 
     @Override
-    public void sendInvitationEmail(String memberEmail, String receiverName, String initialPassword) {
+    public void sendInvitationEmail(String memberEmail, String receiverName, String initialPassword, String userNickname) {
         try {
             MimeMessage mimeMessage = mailSender.createMimeMessage();
             MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
 
-            EmailTemplate template = emailTemplateBuilder.createInvitationTemplate(memberEmail, receiverName, initialPassword);
+            EmailTemplate template = emailTemplateBuilder.createInvitationTemplate(memberEmail, receiverName, initialPassword, userNickname);
             helper.setTo(template.email());
             helper.setSubject(template.subject());
             helper.setText(template.body(), true);
@@ -71,4 +71,4 @@ public void sendVerificationEmail(String memberEmail, String receiverName, Strin
     }
 
 
-}
+}
diff --git a/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java b/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java
@@ -60,11 +60,13 @@ public EmailTemplate createWebhookTemplate(PushNotificationTemplate request, Str
         return new EmailTemplate(request.email(), subject, body);
     }
 
-    public EmailTemplate createInvitationTemplate(String receiver, String receiverName, String initialPassword) {
+    public EmailTemplate createInvitationTemplate(String receiver, String receiverName,
+                                                  String initialPassword, String userNickname) {
         Context context = new Context();
         String templateName = "invitation";
         String subject = "[TaskFlow 초대] 회원가입을 환영합니다.";
-        context.setVariable("invitationLink", "https://example.com/reset-password"); //TODO:비밀번호 설정 링크로 변경 예정
+        context.setVariable("userNickname", userNickname);
+        context.setVariable("invitationLink", "http://localhost:5173/login");
         context.setVariable("initialPassword", initialPassword);
         context.setVariable("receiverName", receiverName);
         String body = templateEngine.process(templateName, context);
@@ -80,4 +82,4 @@ public EmailTemplate createVerificationCodeTemplate(String receiver, String rece
         String body = templateEngine.process(templateName, context);
         return new EmailTemplate(receiver, subject, body);
     }
-}
+}
diff --git a/src/main/java/clap/server/application/mapper/MemberResponseMapper.java b/src/main/java/clap/server/application/mapper/MemberResponseMapper.java
@@ -62,7 +62,7 @@ public static MemberDetailsResponse toMemberDetailsResponse(Member member) {
                 member.getImageUrl(),
                 member.getMemberInfo().getName(),
                 member.getMemberInfo().getNickname(),
-                member.getImageUrl(),
+                member.getMemberInfo().getEmail(),
                 member.isReviewer(),
                 member.getMemberInfo().getRole(),
                 member.getMemberInfo().getDepartment().getDepartmentId(),
diff --git a/src/main/java/clap/server/application/port/inbound/task/CancelTaskUsecase.java b/src/main/java/clap/server/application/port/inbound/task/CancelTaskUsecase.java
@@ -1,5 +1,5 @@
 package clap.server.application.port.inbound.task;
 
 public interface CancelTaskUsecase {
-    void cancleTask(Long taskId);
+    void cancleTask(Long taskId, Long memberId);
 }
diff --git a/src/main/java/clap/server/application/port/outbound/email/SendEmailPort.java b/src/main/java/clap/server/application/port/outbound/email/SendEmailPort.java
@@ -2,7 +2,7 @@
 
 public interface SendEmailPort {
 
-    void sendInvitationEmail(String memberEmail, String receiverName, String initialPassword);
+    void sendInvitationEmail(String memberEmail, String receiverName, String initialPassword, String userNickname);
 
     void sendVerificationEmail(String memberEmail, String receiverName, String verificationCode);
 
diff --git a/src/main/java/clap/server/application/port/outbound/webhook/SendAgitPort.java b/src/main/java/clap/server/application/port/outbound/webhook/SendAgitPort.java
@@ -4,5 +4,5 @@
 import clap.server.domain.model.task.Task;
 
 public interface SendAgitPort {
-    Long sendAgit(PushNotificationTemplate request, Task task);
+    Long sendAgit(PushNotificationTemplate request, Task task, String taskDetailUrl);
 }
diff --git a/src/main/java/clap/server/application/service/admin/ManageMemberService.java b/src/main/java/clap/server/application/service/admin/ManageMemberService.java
@@ -26,7 +26,7 @@ class ManageMemberService implements UpdateMemberUsecase, MemberDetailUsecase {
     @Override
     @Transactional
     public void updateMemberInfo(Long adminId, Long memberId, UpdateMemberRequest request) {
-        Member member = memberService.findActiveMember(memberId);
+        Member member = memberService.findById(memberId);
         Department department = loadDepartmentPort.findById(request.departmentId()).orElseThrow(() ->
                 new ApplicationException(DepartmentErrorCode.DEPARTMENT_NOT_FOUND));
 
@@ -40,7 +40,7 @@ public void updateMemberInfo(Long adminId, Long memberId, UpdateMemberRequest re
     @Override
     @Transactional(readOnly = true)
     public MemberDetailsResponse getMemberDetail(Long memberId) {
-        Member member = memberService.findActiveMember(memberId);
+        Member member = memberService.findById(memberId);
         return MemberResponseMapper.toMemberDetailsResponse(member);
     }
 }
diff --git a/src/main/java/clap/server/application/service/admin/SendInvitationService.java b/src/main/java/clap/server/application/service/admin/SendInvitationService.java
@@ -44,7 +44,8 @@ public void sendInvitation(SendInvitationRequest request) {
         sendEmailPort.sendInvitationEmail(
                 member.getMemberInfo().getEmail(),
                 member.getMemberInfo().getName(),
-                initialPassword
+                initialPassword,
+                member.getNickname()
         );
     }
-}
+}
diff --git a/src/main/java/clap/server/application/service/task/CancelTaskService.java b/src/main/java/clap/server/application/service/task/CancelTaskService.java
@@ -5,17 +5,21 @@
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.task.Task;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
 
 
 @ApplicationService
 @RequiredArgsConstructor
+@Transactional
 public class CancelTaskService implements CancelTaskUsecase {
     private final TaskService taskService;
 
     @Override
-    public void cancleTask(Long taskId) {
+    public void cancleTask(Long taskId, Long memberId) {
         Task task = taskService.findById(taskId);
-        task.cancelTask();
+        task.cancelTask(memberId);
         taskService.upsert(task);
     }
 }
diff --git a/src/main/java/clap/server/application/service/webhook/SendAgitService.java b/src/main/java/clap/server/application/service/webhook/SendAgitService.java
@@ -15,8 +15,8 @@ public class SendAgitService {
     private final SendAgitPort agitPort;
     private final TaskService taskService;
 
-    public void sendAgit(PushNotificationTemplate request, Task task) {
-        Long agitPostId = agitPort.sendAgit(request, task);
+    public void sendAgit(PushNotificationTemplate request, Task task, String taskDetailUrl) {
+        Long agitPostId = agitPort.sendAgit(request, task, taskDetailUrl);
 
         if (request.notificationType().equals(NotificationType.TASK_REQUESTED)) {
             task.updateAgitPostId(agitPostId);
diff --git a/src/main/java/clap/server/application/service/webhook/SendNotificationService.java b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java
@@ -18,7 +18,7 @@
 @RequiredArgsConstructor
 public class SendNotificationService {
 
-    private final SendSseService sendSseService;
+    //private final SendSseService sendSseService;
     private final SendAgitService sendAgitService;
     private final SendWebhookEmailService sendWebhookEmailService;
     private final SendKaKaoWorkService sendKaKaoWorkService;
@@ -74,19 +74,6 @@ public void sendPushNotification(Member receiver, NotificationType notificationT
         allOf.join();
     }
 
-    private String extractTaskUrl(NotificationType notificationType, Task task, Boolean isManager) {
-        String taskDetailUrl = "http://localhost:5173/my-request?taskId=" + task.getTaskId();
-        if (isManager) {
-            if (notificationType == NotificationType.TASK_REQUESTED) {
-                taskDetailUrl = "http://localhost:5173/requested?taskId=" + task.getTaskId();
-            }
-            else {
-                taskDetailUrl = "http://localhost:5173/my-task?taskId=" + task.getTaskId();
-            }
-        }
-        return taskDetailUrl;
-    }
-
     @Async("notificationExecutor")
     public void sendAgitNotification(NotificationType notificationType,
                                      Task task, String message, String commenterName) {
@@ -98,6 +85,22 @@ public void sendAgitNotification(NotificationType notificationType,
                 message,
                 commenterName
         );
-        sendAgitService.sendAgit(pushNotificationTemplate, task);
+
+        String taskDetailUrl = extractTaskUrl(notificationType, task, true);
+
+        sendAgitService.sendAgit(pushNotificationTemplate, task, taskDetailUrl);
+    }
+
+    private String extractTaskUrl(NotificationType notificationType, Task task, Boolean isManager) {
+        String taskDetailUrl = "http://localhost:5173/my-request?taskId=" + task.getTaskId();
+        if (isManager) {
+            if (notificationType == NotificationType.TASK_REQUESTED) {
+                taskDetailUrl = "http://localhost:5173/requested?taskId=" + task.getTaskId();
+            }
+            else {
+                taskDetailUrl = "http://localhost:5173/my-task?taskId=" + task.getTaskId();
+            }
+        }
+        return taskDetailUrl;
     }
 }
diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
@@ -4,6 +4,7 @@
 import clap.server.domain.model.common.BaseTime;
 import clap.server.domain.model.member.Member;
 import clap.server.exception.ApplicationException;
+import clap.server.exception.DomainException;
 import clap.server.exception.code.TaskErrorCode;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -15,6 +16,7 @@
 import java.util.Objects;
 
 import static clap.server.domain.policy.task.TaskPolicyConstants.DEFAULT_PROCESSOR_ORDER_GAP;
+import static clap.server.exception.code.TaskErrorCode.NOT_A_REQUESTER;
 
 @Getter
 @SuperBuilder
@@ -48,7 +50,7 @@ public static Task createTask(Member member, Category category, String title, St
 
     public void updateTask(Long requesterId, Category category, String title, String description) {
         if (!Objects.equals(requesterId, this.requester.getMemberId())) {
-            throw new ApplicationException(TaskErrorCode.NOT_A_REQUESTER);
+            throw new ApplicationException(NOT_A_REQUESTER);
         }
         this.category = category;
         this.title = title;
@@ -103,7 +105,10 @@ public void updateProcessorOrder(long newProcessorOrder) {
         this.processorOrder = newProcessorOrder;
     }
 
-    public void cancelTask() {
+    public void cancelTask(Long requesterId) {
+        if (!Objects.equals(this.requester.getMemberId(), requesterId)) {
+            throw new DomainException(NOT_A_REQUESTER);
+        }
         this.taskStatus = TaskStatus.TERMINATED;
         this.finishedAt = LocalDateTime.now();
     }
diff --git a/src/main/java/clap/server/exception/code/TaskErrorCode.java b/src/main/java/clap/server/exception/code/TaskErrorCode.java
@@ -16,8 +16,8 @@ public enum TaskErrorCode implements BaseErrorCode {
     INVALID_TASK_ORDER(HttpStatus.INTERNAL_SERVER_ERROR, "TASK_007", "유효하지 않은 task order입니다."),
     INVALID_TASK_STATUS_TRANSITION(HttpStatus.BAD_REQUEST, "TASK_008", "유효하지 않은 작업 상태 전환입니다."),
     NOT_A_REVIEWER(HttpStatus.FORBIDDEN, "TASK_009", "작업 승인 및 수정 권한이 없습니다."),
-    NOT_A_REQUESTER(HttpStatus.FORBIDDEN, "TASK_009", "작업 수정 권한이 없습니다."),
-    TASK_STATUS_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "TASK_010", "변경할 수 없는 작업 상태입니다. 다른 API를 사용해주세요")
+    NOT_A_REQUESTER(HttpStatus.FORBIDDEN, "TASK_010", "작업 수정 및 취소 권한이 없습니다."),
+    TASK_STATUS_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "TASK_011", "변경할 수 없는 작업 상태입니다. 다른 API를 사용해주세요")
     ;
 
     private final HttpStatus httpStatus;
diff --git a/src/main/resources/templates/invitation.html b/src/main/resources/templates/invitation.html
@@ -72,7 +72,7 @@
         <p>안녕하세요, <strong th:text="${receiverName}"></strong>님!</p>
         <p>TaskFlow 회원가입 초대 메일입니다.</p>
         <ul>
-            <li>초대 링크: <a href="https://example.com/register" target="_blank" th:href="${invitationLink}">회원가입 링크</a></li>
+            <li>아이디: <strong th:text="${userNickname}"></strong></li>
             <li>초기 비밀번호: <strong th:text="${initialPassword}"></strong></li>
         </ul>
         <div class="cta-button">
@@ -86,4 +86,4 @@
     </div>
 </div>
 </body>
-</html>
+</html>
diff --git a/src/test/java/clap/server/TestDataFactory.java b/src/test/java/clap/server/TestDataFactory.java
@@ -138,6 +138,7 @@ public static Task createTask(Long id, String taskCode, String title, TaskStatus
                 .category(category)
                 .taskStatus(taskStatus)
                 .finishedAt(finishedAt)
+                .requester(createUser())
                 .processor(processor)
                 .label(createLabel())
                 .build();

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package clap.server.application.port.inbound.task;`
`2`	`2`
`3`	`3`	`public interface CancelTaskUsecase {`
`4`		`- void cancleTask(Long taskId);`
	`4`	`+ void cancleTask(Long taskId, Long memberId);`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@`
`4`	`4`	`import clap.server.domain.model.task.Task;`
`5`	`5`
`6`	`6`	`public interface SendAgitPort {`
`7`		`- Long sendAgit(PushNotificationTemplate request, Task task);`
	`7`	`+ Long sendAgit(PushNotificationTemplate request, Task task, String taskDetailUrl);`
`8`	`8`	`}`