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

hyoseong-Choi · hyoseong-Choi · commit 458de6e97e82 · 2025-02-12T23:01:01.000+09:00
diff --git a/src/main/java/clap/server/adapter/outbound/api/agit/AgitTemplateBuilder.java b/src/main/java/clap/server/adapter/outbound/api/agit/AgitTemplateBuilder.java
@@ -52,8 +52,8 @@ public String createMessage(PushNotificationTemplate request, String taskDetailU
 
             case PROCESSOR_CHANGED -> "담당자가 " + "*" + request.message() + "*" + "으로 변경되었습니다.";
 
-            case PROCESSOR_ASSIGNED -> "작업이 *승인*되었습니다.*\n"
-                    + "\\t\\t*• 👤 담당자:* " + "*" + request.message() + "*";
+            case PROCESSOR_ASSIGNED -> "*작업*이 *승인*되었습니다.\\n"
+                    + "\\t\\t*•담당자:* " + "*" + request.message() + "*";
 
             default -> null;
         };
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java
@@ -63,4 +63,10 @@ public class MemberEntity extends BaseTimeEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "admin_id")
     private MemberEntity admin;
+
+    @Column(nullable = true)
+    private Integer inProgressTaskCount;
+
+    @Column(nullable = true)
+    private Integer inReviewingTaskCount;
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
@@ -32,7 +32,7 @@ public interface MemberRepository extends JpaRepository<MemberEntity, Long>,  Me
 
     Optional<MemberEntity> findByEmail(String email);
 
-    @Query("SELECT COUNT(m) > 0 FROM MemberEntity m WHERE m.nickname IN :nicknames OR m.email IN :emails")
+    @Query("SELECT COUNT(m) > 0 FROM MemberEntity m WHERE m.status <> 'DELETED' AND (m.nickname IN :nicknames OR m.email IN :emails)")
     boolean existsByNicknamesOrEmails(@Param("nicknames") Set<String> nicknames, @Param("emails") Set<String> emails);
 }
 
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java
@@ -25,7 +25,7 @@ Slice<NotificationEntity> findAllByReceiver_MemberIdOrderByCreatedAtDesc(
     @Query("SELECT n FROM NotificationEntity n " +
             "WHERE n.receiver.memberId = :receiverId " +
             "AND n.task.isDeleted = false")
-    List<NotificationEntity> findAllByReceiver_MemberId(Long memberId);
+    List<NotificationEntity> findAllByReceiver_MemberId(Long receiverId);
 
     List<NotificationEntity> findByTask_TaskId(Long taskId);
 
diff --git a/src/main/java/clap/server/application/service/task/TerminateTaskService.java b/src/main/java/clap/server/application/service/task/TerminateTaskService.java
@@ -28,7 +28,6 @@ public class TerminateTaskService implements TerminateTaskUsecase {
 
     @Override
     public void terminateTask(Long memberId, Long taskId, String reason) {
-        memberService.findReviewer(memberId);
         Task task = taskService.findById(taskId);
         task.terminateTask();
         taskService.upsert(task);
@@ -42,5 +41,6 @@ public void terminateTask(Long memberId, Long taskId, String reason) {
 
     private void publishNotification(Member receiver, Task task, String message, String reason) {
         sendNotificationService.sendPushNotification(receiver, NotificationType.STATUS_SWITCHED, task, message, reason, null, false);
+        sendNotificationService.sendAgitNotification(NotificationType.STATUS_SWITCHED, 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
@@ -63,14 +63,16 @@ public void updateTask(Long requesterId, Long taskId, UpdateTaskRequest request,
         memberService.findActiveMember(requesterId);
         Category category = categoryService.findById(request.categoryId());
         Task task = taskService.findById(taskId);
+        int attachmentCount = getAttachmentCount(request, files, task);
 
-        int attachmentToAdd = files==null? 0 : files.size();
-        int attachmentCount = task.getAttachmentCount() - request.attachmentsToDelete().size() + attachmentToAdd;
-        if (attachmentCount > TASK_MAX_FILE_COUNT) {
-            throw new ApplicationException(TaskErrorCode.FILE_COUNT_EXCEEDED);
-        }
         if (!request.attachmentsToDelete().isEmpty()) {
-            updateAttachments(request.attachmentsToDelete(), files, task);
+            List<Attachment> attachmentsToDelete = validateAndGetAttachments(request.attachmentsToDelete(), task);
+            attachmentsToDelete.stream()
+                    .peek(Attachment::softDelete)
+                    .forEach(commandAttachmentPort::save);
+        }
+        if (files != null) {
+            updateAttachments(files, task);
         }
         task.updateTask(requesterId, category, request.title(), request.description(), attachmentCount);
         taskService.upsert(task);
@@ -126,18 +128,19 @@ public void updateTaskLabel(Long taskId, Long memberId, UpdateTaskLabelRequest r
         taskService.upsert(task);
     }
 
-    private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartFile> files, Task task) {
-        List<Attachment> attachmentsToDelete = validateAndGetAttachments(attachmentIdsToDelete, task);
-        attachmentsToDelete.stream()
-                .peek(Attachment::softDelete)
-                .forEach(commandAttachmentPort::save);
+    private void updateAttachments(List<MultipartFile> files, Task task) {
+        List<String> fileUrls = s3UploadPort.uploadFiles(FilePathConstants.TASK_FILE, files);
+        List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
+        commandAttachmentPort.saveAll(attachments);
+    }
 
-        if (files != null) {
-            List<String> fileUrls = s3UploadPort.uploadFiles(FilePathConstants.TASK_FILE, files);
-            List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
-            commandAttachmentPort.saveAll(attachments);
+    private static int getAttachmentCount(UpdateTaskRequest request, List<MultipartFile> files, Task task) {
+        int attachmentToAdd = files == null ? 0 : files.size();
+        int attachmentCount = task.getAttachmentCount() - request.attachmentsToDelete().size() + attachmentToAdd;
+        if (attachmentCount > TASK_MAX_FILE_COUNT) {
+            throw new ApplicationException(TaskErrorCode.FILE_COUNT_EXCEEDED);
         }
-
+        return attachmentCount;
     }
 
     private List<Attachment> validateAndGetAttachments(List<Long> attachmentIdsToDelete, Task 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
@@ -7,6 +7,7 @@
 import clap.server.domain.model.task.Task;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
@@ -15,6 +16,7 @@ public class SendAgitService {
     private final SendAgitPort agitPort;
     private final TaskService taskService;
 
+    @Transactional
     public void sendAgit(PushNotificationTemplate request, Task task, String taskDetailUrl) {
         Long agitPostId = agitPort.sendAgit(request, task, taskDetailUrl);
 
diff --git a/src/main/java/clap/server/application/service/webhook/SendNotificationService.java b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java
@@ -86,7 +86,6 @@ public void sendPushNotification(Member receiver, NotificationType notificationT
     }
 
     @Async("notificationExecutor")
-    @Transactional
     public void sendAgitNotification(NotificationType notificationType,
                                      Task task, String message, String commenterName) {
         PushNotificationTemplate pushNotificationTemplate = new PushNotificationTemplate(
diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java
@@ -2,6 +2,7 @@
 
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import clap.server.domain.model.common.BaseTime;
+import jakarta.persistence.Column;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -23,6 +24,8 @@ public class Member extends BaseTime {
     private MemberStatus status;
     private String password;
     private Department department;
+    private Integer inProgressTaskCount;
+    private Integer inReviewingTaskCount;
 
     public Member(MemberInfo memberInfo, Boolean emailNotificationEnabled, Boolean kakaoworkNotificationEnabled,
                   Member admin, String imageUrl, MemberStatus status, String password) {
diff --git a/src/main/resources/db/migration/dev/V20250212404__Add_Task_Count_Columns_To_Member.sql b/src/main/resources/db/migration/dev/V20250212404__Add_Task_Count_Columns_To_Member.sql
@@ -0,0 +1,5 @@
+alter table member
+    add in_progress_task_count INTEGER null;
+
+alter table member
+    add in_reviewing_task_count INTEGER null;
diff --git a/src/main/resources/db/migration/prod/V1__Initial_Schema.sql b/src/main/resources/db/migration/prod/V1__Initial_Schema.sql
@@ -0,0 +1,227 @@
+create table api_log (
+                         dtype varchar(31) not null,
+                         log_id bigint not null auto_increment,
+                         client_ip varchar(255) not null,
+                         request_url varchar(4096) not null,
+                         request_method enum ('DELETE','GET','PATCH','POST','PUT','UNKNOWN') not null,
+                         status_code integer not null,
+                         custom_status_code varchar(255) not null,
+                         request_body TEXT not null,
+                         response_body TEXT not null,
+                         request_at datetime(6) not null,
+                         log_status enum ('ASSIGNER_CHANGED','COMMENT_ADDED','COMMENT_UPDATED','LOGIN','REQUEST_APPROVED','REQUEST_CANCELLED','REQUEST_CREATED','REQUEST_UPDATED','STATUS_CHANGED','TASK_VIEWED') not null,
+                         version bigint,
+                         member_id bigint,
+                         login_nickname varchar(255),
+                         created_at datetime(6) not null,
+                         updated_at datetime(6) not null,
+                         primary key (log_id)
+) engine=InnoDB;
+
+create table attachment (
+                            attachment_id bigint not null auto_increment,
+                            original_name varchar(255) not null,
+                            task_id bigint,
+                            file_url varchar(255) not null,
+                            file_size varchar(255) not null,
+                            is_deleted bit not null,
+                            created_at datetime(6) not null,
+                            updated_at datetime(6) not null,
+                            primary key (attachment_id)
+) engine=InnoDB;
+
+create table category (
+                          category_id bigint not null auto_increment,
+                          admin_id bigint not null,
+                          code varchar(255) not null,
+                          name varchar(255) not null,
+                          main_category_id bigint,
+                          is_deleted bit not null,
+                          description_example varchar(255),
+                          created_at datetime(6) not null,
+                          updated_at datetime(6) not null,
+                          primary key (category_id)
+) engine=InnoDB;
+
+create table comment (
+                         comment_id bigint not null auto_increment,
+                         member_id bigint not null,
+                         task_id bigint not null,
+                         content varchar(255),
+                         original_name varchar(255),
+                         file_size varchar(255),
+                         file_url varchar(255),
+                         is_modified bit not null,
+                         is_deleted bit not null,
+                         created_at datetime(6) not null,
+                         updated_at datetime(6) not null,
+                         primary key (comment_id)
+) engine=InnoDB;
+
+create table department (
+                            department_id bigint not null auto_increment,
+                            admin_id bigint,
+                            name varchar(255) not null,
+                            status enum ('ACTIVE','INACTIVE') not null,
+                            is_manager bit not null,
+                            created_at datetime(6) not null,
+                            updated_at datetime(6) not null,
+                            primary key (department_id)
+) engine=InnoDB;
+
+create table label (
+                       label_id bigint not null auto_increment,
+                       admin_id bigint not null,
+                       label_name varchar(255) not null,
+                       label_color enum ('BLUE','GREEN','GREY','INDIGO','ORANGE','PURPLE','RED','YELLOW') not null,
+                       is_deleted bit not null,
+                       created_at datetime(6) not null,
+                       updated_at datetime(6) not null,
+                       primary key (label_id)
+) engine=InnoDB;
+
+create table member (
+                        member_id bigint not null auto_increment,
+                        name varchar(255) not null,
+                        nickname varchar(255) not null,
+                        password varchar(255),
+                        image_url varchar(255),
+                        email varchar(255) not null,
+                        role enum ('ROLE_ADMIN','ROLE_MANAGER','ROLE_USER') not null,
+                        status enum ('ACTIVE','APPROVAL_REQUEST','DELETED','INACTIVE','PENDING') not null,
+                        is_reviewer bit not null,
+                        department_role varchar(255),
+                        admin_id bigint,
+                        department_id bigint,
+                        created_at datetime(6) not null,
+                        updated_at datetime(6) not null,
+                        email_notification_enabled bit,
+                        kakaowork_notification_enabled bit,
+                        in_progress_task_count integer,
+                        in_reviewing_task_count integer,
+                        primary key (member_id)
+) engine=InnoDB;
+
+create table notification (
+                              notification_id bigint not null auto_increment,
+                              is_read bit not null,
+                              message varchar(255),
+                              task_title varchar(255) not null,
+                              receiver_id bigint not null,
+                              task_id bigint,
+                              type enum ('COMMENT','INVITATION','PROCESSOR_ASSIGNED','PROCESSOR_CHANGED','STATUS_SWITCHED','TASK_REQUESTED') not null,
+                              created_at datetime(6) not null,
+                              updated_at datetime(6) not null,
+                              primary key (notification_id)
+) engine=InnoDB;
+
+create table task (
+                      task_id bigint not null auto_increment,
+                      attachment_count integer not null,
+                      description varchar(255),
+                      task_code varchar(255) not null,
+                      title varchar(255) not null,
+                      category_id bigint not null,
+                      task_status enum ('COMPLETED','IN_PROGRESS','IN_REVIEWING','REQUESTED','TERMINATED') not null,
+                      due_date datetime(6),
+                      finished_at datetime(6),
+                      label_id bigint,
+                      processor_id bigint,
+                      processor_order bigint,
+                      requester_id bigint not null,
+                      reviewer_id bigint,
+                      agit_post_id bigint,
+                      is_deleted bit not null,
+                      created_at datetime(6) not null,
+                      updated_at datetime(6) not null,
+                      primary key (task_id)
+) engine=InnoDB;
+
+create table task_history (
+                              task_history_id bigint not null auto_increment,
+                              is_deleted bit not null,
+                              comment_id bigint,
+                              modified_member_id bigint,
+                              task_id bigint,
+                              modified_status varchar(255),
+                              type enum ('COMMENT','COMMENT_FILE','PROCESSOR_ASSIGNED','PROCESSOR_CHANGED','STATUS_SWITCHED','TASK_TERMINATED') not null,
+                              created_at datetime(6) not null,
+                              updated_at datetime(6) not null,
+                              primary key (task_history_id)
+) engine=InnoDB;
+
+alter table member
+    add constraint UKmbmcqelty0fbrvxp1q58dn57t unique (email),
+    add constraint UKhh9kg6jti4n1eoiertn2k6qsc unique (nickname);
+alter table task_history
+    add constraint UK4wh19gakb7pv1u0cseyw1yjmw unique (comment_id);
+alter table api_log
+    add constraint FKftyva6u4tm4iarfrjpbxyf4c9
+        foreign key (member_id)
+            references member (member_id);
+alter table attachment
+    add constraint FKliwb3s1jmhbcrq2upsyo2cftn
+        foreign key (task_id)
+            references task (task_id);
+alter table category
+    add constraint FKrny90rsn1w2b1ik1on39ucu7f
+        foreign key (admin_id)
+            references member (member_id),
+    add constraint FKtrd7kl5dwdxbvra30i22nrpod
+        foreign key (main_category_id)
+            references category (category_id);
+alter table comment
+    add constraint FKmrrrpi513ssu63i2783jyiv9m
+        foreign key (member_id)
+            references member (member_id),
+    add constraint FKfknte4fhjhet3l1802m1yqa50
+        foreign key (task_id)
+            references task (task_id);
+alter table department
+    add constraint FKetxumrlg416i5l73fd31axwi1
+        foreign key (admin_id)
+            references member (member_id);
+alter table label
+    add constraint FKgoxqkxje84e1jhc8weu7tdkee
+        foreign key (admin_id)
+            references member (member_id);
+alter table member
+    add constraint FKai3spm9ctynftc6y5u1ycq7po
+        foreign key (admin_id)
+            references member (member_id),
+    add constraint FKlmd4h7lh9acdyvi0xxbvsqrmk
+        foreign key (department_id)
+            references department (department_id);
+alter table notification
+    add constraint FK1jpw68rbaxvu8u5l1dniain1l
+        foreign key (receiver_id)
+            references member (member_id),
+    add constraint FKg6e8dcyvu9qdcfds2o3pj9qen
+        foreign key (task_id)
+            references task (task_id);
+alter table task
+    add constraint FKkjb4pwpo8oqc8fvkgbmiitsu9
+        foreign key (category_id)
+            references category (category_id),
+    add constraint FKcvxhsvaa4b0eqvoknwdjoqb8e
+        foreign key (label_id)
+            references label (label_id),
+    add constraint FK7h14q3t26nc05voash0c85a98
+        foreign key (processor_id)
+            references member (member_id),
+    add constraint FKhmhrmkyhc8fnprgehf2tnqgxv
+        foreign key (requester_id)
+            references member (member_id),
+    add constraint FK85w35u60hn4o1mpa8lo9ef2ae
+        foreign key (reviewer_id)
+            references member (member_id);
+alter table task_history
+    add constraint FK2ud4b2im20aa3smlseuca0br5
+        foreign key (comment_id)
+            references comment (comment_id),
+    add constraint FK3rh6bjds4lcdwd25ya6dnvxwu
+        foreign key (modified_member_id)
+            references member (member_id),
+    add constraint FKer57q2libi1e9njpj6faoxd2i
+        foreign key (task_id)
+            references task (task_id);
diff --git a/src/main/resources/db/migration/prod/V20250212405__Add_Index_From_task.sql b/src/main/resources/db/migration/prod/V20250212405__Add_Index_From_task.sql
@@ -0,0 +1,8 @@
+CREATE INDEX idx_task_processor_created
+    ON task (processor_id ASC, created_at DESC);
+CREATE INDEX idx_task_requester_created
+    ON task (requester_id ASC, created_at DESC);
+CREATE INDEX idx_task_status_created
+    ON task (task_status ASC, created_at DESC);
+CREATE INDEX idx_task_created
+    ON task (created_at DESC);
diff --git a/src/main/resources/mysql.yml b/src/main/resources/mysql.yml

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public interface MemberRepository extends JpaRepository<MemberEntity, Long>, Me`
`32`	`32`
`33`	`33`	`Optional<MemberEntity> findByEmail(String email);`
`34`	`34`
`35`		`- @Query("SELECT COUNT(m) > 0 FROM MemberEntity m WHERE m.nickname IN :nicknames OR m.email IN :emails")`
	`35`	`+ @Query("SELECT COUNT(m) > 0 FROM MemberEntity m WHERE m.status <> 'DELETED' AND (m.nickname IN :nicknames OR m.email IN :emails)")`
`36`	`36`	`boolean existsByNicknamesOrEmails(@Param("nicknames") Set<String> nicknames, @Param("emails") Set<String> emails);`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ public class TerminateTaskService implements TerminateTaskUsecase {`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public void terminateTask(Long memberId, Long taskId, String reason) {`
`31`		`- memberService.findReviewer(memberId);`
`32`	`31`	`Task task = taskService.findById(taskId);`
`33`	`32`	`task.terminateTask();`
`34`	`33`	`taskService.upsert(task);`
`@@ -42,5 +41,6 @@ public void terminateTask(Long memberId, Long taskId, String reason) {`
`42`	`41`
`43`	`42`	`private void publishNotification(Member receiver, Task task, String message, String reason) {`
`44`	`43`	`sendNotificationService.sendPushNotification(receiver, NotificationType.STATUS_SWITCHED, task, message, reason, null, false);`
	`44`	`+ sendNotificationService.sendAgitNotification(NotificationType.STATUS_SWITCHED, task, message, null);`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@ public void sendPushNotification(Member receiver, NotificationType notificationT`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Async("notificationExecutor")`
`89`		`- @Transactional`
`90`	`89`	`public void sendAgitNotification(NotificationType notificationType,`
`91`	`90`	`Task task, String message, String commenterName) {`
`92`	`91`	`PushNotificationTemplate pushNotificationTemplate = new PushNotificationTemplate(`