CLAP-375 Fix: comment 속성 추가 스키마 분리

Author: parkjaehak

src/main/java/clap/server/application/mapper/response/TaskHistoryResponseMapper.java

@@ -59,8 +59,8 @@ public static FindTaskHistoryResponse toFindTaskHistoryResponse(List<TaskHistory
                             };
                     return new FindTaskHistoryResponse.TaskHistoryResponse(
                             taskHistory.getTaskHistoryId(),
-                            taskHistory.getUpdatedAt().toLocalDate(),
-                            taskHistory.getUpdatedAt().toLocalTime(),
+                            taskHistory.getCreatedAt().toLocalDate(),
+                            taskHistory.getCreatedAt().toLocalTime(),
                             taskHistory.getType(),
                             details
                     );

src/main/java/clap/server/application/service/history/PostCommentService.java

@@ -27,6 +27,8 @@
 
 import java.util.Objects;
 
+import static clap.server.domain.model.task.Attachment.formatFileSize;
+
 @ApplicationService
 @RequiredArgsConstructor
 public class PostCommentService implements SaveCommentUsecase, SaveCommentAttachmentUsecase {
@@ -48,7 +50,7 @@ public void save(Long memberId, Long taskId, CreateCommentRequest request) {
 
         // 일반 회원일 경우 => 요청자인지 확인
         taskCommentPolicy.validateCommentPermission(task, member);
-        Comment comment = Comment.createComment(member, task, request.content());
+        Comment comment = Comment.createComment(member, task, request.content(), null, null, null);
         Comment savedComment = commandCommentPort.saveComment(comment);
 
         TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.COMMENT, task, null, member, savedComment);
@@ -71,11 +73,14 @@ public void saveCommentAttachment(Long memberId, Long taskId, MultipartFile file
         Member member = memberService.findActiveMember(memberId);
 
         taskCommentPolicy.validateCommentPermission(task, member);
-        Comment comment = Comment.createComment(member, task, null);
+
+        String fileUrl = s3UploadPort.uploadSingleFile(FilePathConstants.TASK_COMMENT, file);
+        String fileName = file.getOriginalFilename();
+
+        Comment comment = Comment.createComment(member, task, null, fileName, fileUrl,   formatFileSize(file.getSize()));
         Comment savedComment = commandCommentPort.saveComment(comment);
-        String fileName = saveAttachment(file, task);
 
-        TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.COMMENT_FILE, task, null, member, savedComment);
+        TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.COMMENT_FILE, null, null, null, savedComment);
         commandTaskHistoryPort.save(taskHistory);
 
         Member processor = task.getProcessor();
@@ -88,12 +93,13 @@ public void saveCommentAttachment(Long memberId, Long taskId, MultipartFile file
 
     }
 
-    private String saveAttachment(MultipartFile file, Task task) {
-        String fileUrl = s3UploadPort.uploadSingleFile(FilePathConstants.TASK_COMMENT, file);
-        Attachment attachment = Attachment.createCommentAttachment(task, file.getOriginalFilename(), fileUrl, file.getSize());
-        commandAttachmentPort.save(attachment);
-        return file.getOriginalFilename();
-    }
+    @Deprecated
+//    private String saveAttachment(MultipartFile file, Task task) {
+//        String fileUrl = s3UploadPort.uploadSingleFile(FilePathConstants.TASK_COMMENT, file);
+//        Attachment attachment = Attachment.createCommentAttachment(task, null, file.getOriginalFilename(), fileUrl, file.getSize());
+//        commandAttachmentPort.save(attachment);
+//        return file.getOriginalFilename();
+//    }
 
     private void publishNotification(Member receiver, Task task, String message, String commenterName) {
         boolean isManager = receiver.getMemberInfo().getRole() == MemberRole.ROLE_MANAGER;

src/main/java/clap/server/domain/model/task/Attachment.java

@@ -27,6 +27,7 @@ public static Attachment createAttachment(Task task, String originalName, String
                 .build();
     }
 
+    @Deprecated
     public static Attachment createCommentAttachment(Task task, Comment comment, String originalName, String fileUrl, long fileSize) {
         return Attachment.builder()
                 .task(task)
@@ -50,5 +51,4 @@ public static String formatFileSize(long size) {
             return String.format("%.1f MB", size / (1024.0 * 1024.0));
         }
     }
-
 }

src/main/java/clap/server/domain/model/task/Comment.java

@@ -22,11 +22,14 @@ public class Comment extends BaseTime {
     private boolean isModified;
     private boolean isDeleted;
 
-    public static Comment createComment(Member member, Task task, String content) {
+    public static Comment createComment(Member member, Task task, String content, String originalName, String fileUrl, String fileSize) {
         return Comment.builder()
                 .member(member)
                 .task(task)
                 .content(content)
+                .originalName(originalName)
+                .fileUrl(fileUrl)
+                .fileSize(fileSize)
                 .build();
     }
 

src/main/resources/db/migration/dev/V20250211374__Add_From_Comment.sql

@@ -0,0 +1,4 @@
+ALTER TABLE comment
+    ADD COLUMN original_name VARCHAR(255),
+    ADD COLUMN file_url VARCHAR(255),
+    ADD COLUMN file_size VARCHAR(255);

src/main/resources/db/migration/dev/V20250211375__Modify_From_Comment_And_Attachment.sql

@@ -1,21 +1,16 @@
--- Step 1: comment 테이블에 컬럼 추가
-ALTER TABLE comment
-    ADD COLUMN original_name VARCHAR(255),
-    ADD COLUMN file_url VARCHAR(255),
-    ADD COLUMN file_size VARCHAR(255);
-
--- Step 2: attachment 데이터 복사
 START TRANSACTION;
+-- Step 1: attachment 데이터 복사
 UPDATE comment c
     JOIN attachment a ON c.comment_id = a.comment_id
     SET
         c.original_name = a.original_name,
         c.file_url = a.file_url,
-        c.file_size = a.file_size,
-WHERE c.attachment_id IS NOT NULL;
+        c.file_size = a.file_size
+WHERE a.attachment_id IS NOT NULL;
 COMMIT;
 
--- Step 3: attachment 테이블에 제약조건 제거
+-- Step 2: attachment 테이블에 제약조건 제거
 ALTER TABLE attachment
     DROP FOREIGN KEY FKds6u1rptrsif835t89kb15cyo,
-    DROP COLUMN comment_id;
+    DROP COLUMN comment_id;
+