Merge pull request #107 from TaskFlow-CLAP/CLAP-113

Clap-113 요청 생성 및 수정에 첨부파일 업로드 로직 추가

Author: joowojr

build.gradle

@@ -93,6 +93,11 @@ dependencies {
     // Spring aop
     implementation 'org.springframework.boot:spring-boot-starter-aop'
 
+    // S3
+    implementation platform('software.amazon.awssdk:bom:2.23.7')
+    implementation 'software.amazon.awssdk:s3'
+    implementation 'ch.qos.logback:logback-classic:1.4.12'
+
 }
 
 tasks.named('test') {

src/main/java/clap/server/adapter/inbound/web/dto/task/AttachmentRequest.java

@@ -4,27 +4,18 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
-import java.util.List;
-
 
 @Schema(description = "작업 생성 요청")
 public record CreateTaskRequest(
         @Schema(description = "카테고리 ID")
         @NotNull
         Long categoryId,
 
-        @Schema(description = "메인 카테고리 ID")
-        @NotNull
-        Long mainCategoryId,
-
         @Schema(description = "작업 제목")
         @NotBlank
         String title,
 
         @Schema(description = "작업 설명")
-        String description,
-
-        @Schema(description = "첨부 파일 URL 목록", example = "[\"https://example.com/file1.png\", \"https://example.com/file2.pdf\"]")
-        List<@NotBlank String> fileUrls
+        String description
 ) {
 }

src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskRequest.java

@@ -9,26 +9,19 @@
 @Schema(description = "작업 업데이트 요청")
 public record UpdateTaskRequest(
 
-        @Schema(description = "작업 ID", example = "123")
-        @NotNull
-        Long taskId,
-
         @Schema(description = "카테고리 ID", example = "1")
         @NotNull
         Long categoryId,
 
-        @Schema(description = "메인 카테고리 ID", example = "10")
-        @NotNull
-        Long mainCategoryId,
-
         @Schema(description = "작업 제목", example = "업데이트된 제목")
         @NotBlank
         String title,
 
         @Schema(description = "작업 설명", example = "업데이트된 설명.")
         String description,
 
-        @Schema(description = "첨부 파일 요청 목록", implementation = AttachmentRequest.class)
-        List<AttachmentRequest> attachmentRequests
+        @Schema(description = "삭제할 파일 ID 목록, 없을 경우 emptylist 전송")
+        @NotNull
+        List<Long> attachmentsToDelete
 ) {}
 

src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskRequest.java

@@ -11,10 +11,15 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 
 @Tag(name = "작업 생성 및 수정")
@@ -28,18 +33,22 @@ public class ManagementTaskController {
     private final UpdateTaskUsecase updateTaskUsecase;
 
     @Operation(summary = "작업 요청 생성")
-    @PostMapping
+    @PostMapping(consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
     public ResponseEntity<CreateTaskResponse> createTask(
-            @RequestBody @Valid CreateTaskRequest createTaskRequest,
-            @AuthenticationPrincipal SecurityUserDetails userInfo){
-            return ResponseEntity.ok(createTaskUsecase.createTask(userInfo.getUserId(), createTaskRequest));
+            @RequestPart(name = "taskInfo") @Valid CreateTaskRequest createTaskRequest,
+            @RequestPart(name = "attachment") @NotNull  List<MultipartFile> attachments,
+            @AuthenticationPrincipal SecurityUserDetails userInfo
+            ){
+            return ResponseEntity.ok(createTaskUsecase.createTask(userInfo.getUserId(), createTaskRequest, attachments));
     }
 
-    @Operation(summary = "요청한 작업 수정")
-    @PatchMapping
+    @Operation(summary = "작업 수정")
+    @PatchMapping(value = "/{taskId}", consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
     public ResponseEntity<UpdateTaskResponse> updateTask(
-            @RequestBody @Valid UpdateTaskRequest updateTaskRequest,
+            @PathVariable @NotNull Long taskId,
+            @RequestPart(name = "taskInfo") @Valid UpdateTaskRequest updateTaskRequest,
+            @RequestPart(name = "attachment") @NotNull  List<MultipartFile> attachments,
             @AuthenticationPrincipal SecurityUserDetails userInfo){
-        return ResponseEntity.ok(updateTaskUsecase.updateTask(userInfo.getUserId(), updateTaskRequest));
+        return ResponseEntity.ok(updateTaskUsecase.updateTask(userInfo.getUserId(), taskId, updateTaskRequest, attachments));
     }
 }

src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java

@@ -0,0 +1,73 @@
+package clap.server.adapter.outbound.infrastructure.s3;
+
+import clap.server.application.port.outbound.s3.S3UploadPort;
+import clap.server.config.s3.KakaoS3Config;
+import clap.server.domain.model.task.FilePath;
+import clap.server.exception.S3Exception;
+import clap.server.exception.code.S3Errorcode;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.List;
+import java.util.UUID;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class S3UploadAdapter implements S3UploadPort {
+    private final KakaoS3Config kakaoS3Config;
+    private final S3Client s3Client;
+
+    public List<String> uploadFiles(FilePath filePrefix, List<MultipartFile> multipartFiles)  {
+        return multipartFiles.stream().map((file) -> uploadSingleFile(filePrefix, file)).toList();
+    }
+
+    public String uploadSingleFile(FilePath filePrefix, MultipartFile file) {
+        try {
+            Path filePath = getFilePath(file);
+            String objectKey = createObjectKey(filePrefix.getPath(), file.getOriginalFilename());
+            uploadToS3(objectKey, filePath);
+            Files.delete(filePath);
+            return getFileUrl(objectKey);
+        } catch (IOException e) {
+            throw new S3Exception(S3Errorcode.FILE_UPLOAD_REQUEST_FAILED);
+        }
+    }
+
+    private String getFileUrl(String objectKey) {
+        return kakaoS3Config.getEndpoint() + "/v1/" + kakaoS3Config.getProjectId() + '/' + kakaoS3Config.getBucketName() + '/' + objectKey;
+    }
+
+    private static Path getFilePath(MultipartFile file) throws IOException {
+        Path path = Files.createTempFile(null,null);
+        Files.copy(file.getInputStream(),path, StandardCopyOption.REPLACE_EXISTING);
+        return path;
+    }
+
+    private void uploadToS3(String filePath, Path path) {
+        PutObjectRequest putObjectRequest = PutObjectRequest.builder()
+                .bucket(kakaoS3Config.getBucketName())
+                .key(filePath)
+                .build();
+
+        s3Client.putObject(putObjectRequest, path);
+    }
+
+    private String createFileId() {
+        return UUID.randomUUID().toString();
+    }
+
+    private String createObjectKey(String filepath, String fileName) {
+        String fileId = createFileId();
+        return String.format("%s/%s-%s", filepath, fileId , fileName);
+    }
+
+}

src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java

@@ -45,6 +45,13 @@ public List<Attachment> findAllByTaskIdAndCommentIsNull(final Long taskId) {
                 .collect(Collectors.toList());
     }
 
+    public List<Attachment> findAllByTaskIdAndCommentIsNullAndAttachmentId(final Long taskId, final List<Long> attachmentIds) {
+        List<AttachmentEntity> attachmentEntities = attachmentRepository.findAllByTask_TaskIdAndCommentIsNullAndAttachmentIdIn(taskId, attachmentIds);
+        return attachmentEntities.stream()
+                .map(attachmentPersistenceMapper::toDomain)
+                .collect(Collectors.toList());
+    }
+
     @Override
     public void deleteByIds(List<Long> attachmentIds) {
         attachmentRepository.deleteAllByAttachmentIdIn(attachmentIds);

src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java

@@ -10,8 +10,6 @@
 import lombok.experimental.SuperBuilder;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
 
 @Entity
 @Table(name = "task")

src/main/java/clap/server/adapter/outbound/persistense/entity/task/TaskEntity.java

@@ -3,11 +3,13 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.Collection;
 import java.util.List;
 
 @Repository
 public interface AttachmentRepository extends JpaRepository<AttachmentEntity, Long> {
     List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNull(Long taskId);
     void deleteAllByAttachmentIdIn(List<Long> attachmentIds);
+    List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNullAndAttachmentIdIn(Long task_taskId, List<Long> attachmentId);
 
 }

src/main/java/clap/server/adapter/outbound/persistense/repository/task/AttachmentRepository.java

@@ -2,28 +2,31 @@
 
 import clap.server.adapter.inbound.web.dto.task.CreateTaskRequest;
 import clap.server.adapter.inbound.web.dto.task.CreateTaskResponse;
-
+import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
+import clap.server.application.mapper.AttachmentMapper;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.CategoryService;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.task.CreateTaskUsecase;
 import clap.server.application.port.outbound.task.CommandAttachmentPort;
 import clap.server.application.port.outbound.task.CommandTaskPort;
-
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.notification.Notification;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Category;
+import clap.server.domain.model.task.FilePath;
 import clap.server.domain.model.task.Task;
 import lombok.RequiredArgsConstructor;
-
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
+import static clap.server.domain.model.notification.Notification.createTaskNotification;
+
 
 @ApplicationService
 @RequiredArgsConstructor
@@ -33,37 +36,36 @@ public class CreateTaskService implements CreateTaskUsecase {
     private final CategoryService categoryService;
     private final CommandTaskPort commandTaskPort;
     private final CommandAttachmentPort commandAttachmentPort;
+    private final S3UploadAdapter s3UploadAdapter;
     private final ApplicationEventPublisher applicationEventPublisher;
 
     @Override
     @Transactional
-    public CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createTaskRequest) {
+    public CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createTaskRequest, List<MultipartFile> files) {
         Member member = memberService.findActiveMember(requesterId);
         Category category = categoryService.findById(createTaskRequest.categoryId());
         Task task = Task.createTask(member, category, createTaskRequest.title(), createTaskRequest.description());
         Task savedTask = commandTaskPort.save(task);
 
-        List<Attachment> attachments = Attachment.createAttachments(savedTask, createTaskRequest.fileUrls());
-        commandAttachmentPort.saveAll(attachments);
-
+        saveAttachments(files, savedTask);
+        publishNotification(savedTask);
+        return TaskMapper.toCreateTaskResponse(savedTask);
+    }
 
-        // requestDto에 알림 데이터 mapping
+    private void saveAttachments(List<MultipartFile> files, Task task) {
+        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePath.TASK_IMAGE, files);
+        List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
+        commandAttachmentPort.saveAll(attachments);
+    }
 
+    private void publishNotification(Task task){
         List<Member> reviewers = memberService.findReviewers();
 
-
         // 검토자들 각각에 대한 알림 생성 후 event 발행
         for (Member reviewer : reviewers) {
-            Notification notification = Notification.builder()
-                    .task(savedTask)
-                    .type(NotificationType.TASK_REQUESTED)
-                    .receiver(reviewer)
-                    .message(null)
-                    .build();
-            // publish event로 event 발행
+            Notification notification = createTaskNotification(task, reviewer, NotificationType.TASK_REQUESTED);
             applicationEventPublisher.publishEvent(notification);
         }
-
-        return TaskMapper.toCreateTaskResponse(savedTask);
     }
-}
+
+}