From 0c2f4081dd04904ec221496959e5c0fee0beef30 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 11:45:14 +0900
Subject: [PATCH 01/17] =?UTF-8?q?CLAP-113=20Config:=20s3=20=EC=9D=98?=
 =?UTF-8?q?=EC=A1=B4=EC=84=B1=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build.gradle b/build.gradle
index b87517d6..c17d55e7 100644
--- a/build.gradle
+++ b/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') {

From 38f664752f70fb59908a7a1ef8a8b95b06e02c72 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 11:45:42 +0900
Subject: [PATCH 02/17] =?UTF-8?q?CLAP-113=20Config:=20kakao=20s3=20config?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../clap/server/config/s3/KakaoS3Config.java  | 72 +++++++++++++++++++
 src/main/resources/application.yml            |  1 +
 src/main/resources/s3.yml                     |  9 +++
 3 files changed, 82 insertions(+)
 create mode 100644 src/main/java/clap/server/config/s3/KakaoS3Config.java
 create mode 100644 src/main/resources/s3.yml

diff --git a/src/main/java/clap/server/config/s3/KakaoS3Config.java b/src/main/java/clap/server/config/s3/KakaoS3Config.java
new file mode 100644
index 00000000..70a0cdd4
--- /dev/null
+++ b/src/main/java/clap/server/config/s3/KakaoS3Config.java
@@ -0,0 +1,72 @@
+package clap.server.config.s3;
+
+import lombok.Getter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3Configuration;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+
+import java.net.URI;
+
+@Configuration
+public class KakaoS3Config {
+
+    @Getter
+    private final String projectId;
+    @Getter
+    private final String endpoint;
+    private final String accessKey;
+    private final String secretKey;
+    private final String region;
+    @Getter
+    private String bucketName;
+
+    public KakaoS3Config(
+            @Value("${cloud.kakao.project-id}") String projectId,
+            @Value("${cloud.kakao.object-storage.endpoint}") String endpoint,
+            @Value("${cloud.kakao.object-storage.access-key}") String accessKey,
+            @Value("${cloud.kakao.object-storage.secret-key}") String secretKey,
+            @Value("${cloud.kakao.region}") String region,
+            @Value("${cloud.kakao.object-storage.bucket-name}") String bucketName
+    ) {
+        this.projectId = projectId;
+        this.endpoint = endpoint;
+        this.accessKey = accessKey;
+        this.secretKey = secretKey;
+        this.region = region;
+        this.bucketName = bucketName;
+    }
+
+
+    @Bean
+    public S3Presigner s3Presigner() {
+        S3Configuration s3Configuration = S3Configuration.builder()
+                .pathStyleAccessEnabled(true)
+                .build();
+
+        return S3Presigner.builder()
+                .region(Region.of(region))
+                .credentialsProvider(StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(accessKey, secretKey)))
+                .endpointOverride(URI.create(endpoint))
+                .serviceConfiguration(s3Configuration)
+                .build();
+    }
+
+
+    @Bean
+    public S3Client s3Client() {
+        return S3Client.builder()
+                .region(Region.of(region))
+                .credentialsProvider(StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(accessKey, secretKey)))
+                .endpointOverride(URI.create(endpoint))
+                .forcePathStyle(true)
+                .build();
+    }
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d5fbaff7..f4527cd4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,6 +8,7 @@ spring:
       - redis.yml
       - auth.yml
       - elasticsearch.yml
+      - s3.yml
   application:
     name: taskflow
   web.resources.add-mappings: false
diff --git a/src/main/resources/s3.yml b/src/main/resources/s3.yml
new file mode 100644
index 00000000..d04485c8
--- /dev/null
+++ b/src/main/resources/s3.yml
@@ -0,0 +1,9 @@
+cloud:
+  kakao:
+    project-id: ${KAKAO_PROJECT_ID}
+    region: ${KAKAO_REGION}
+    object-storage:
+      endpoint: ${KAKAO_OBJECT_STORAGE_ENDPOINT}
+      access-key: ${KAKAO_OBJECT_STORAGE_ACCESS_KEY}
+      secret-key: ${KAKAO_OBJECT_STORAGE_SECRET_KEY}
+      bucketName: ${KAKAO_OBJECT_STORAGE_BUCKET_NAME}
\ No newline at end of file

From da181decaefdc9dea248548bc10d3e1331fcd41e Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 12:05:24 +0900
Subject: [PATCH 03/17] =?UTF-8?q?CLAP-113=20Feat:=20s3=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=84=9C=EB=B9=84?=
 =?UTF-8?q?=EC=8A=A4=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../infrastructure/s3/S3UploadService.java    | 74 +++++++++++++++++++
 .../server/domain/model/task/FilePath.java    | 15 ++++
 .../server/exception/ExceptionAdvice.java     | 13 ----
 .../clap/server/exception/S3Exception.java    | 13 ++++
 .../server/exception/code/S3Errorcode.java    | 15 ++++
 .../server/exception/code/TaskErrorCode.java  |  2 +-
 6 files changed, 118 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadService.java
 create mode 100644 src/main/java/clap/server/domain/model/task/FilePath.java
 create mode 100644 src/main/java/clap/server/exception/S3Exception.java
 create mode 100644 src/main/java/clap/server/exception/code/S3Errorcode.java

diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadService.java b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadService.java
new file mode 100644
index 00000000..036dc475
--- /dev/null
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadService.java
@@ -0,0 +1,74 @@
+package clap.server.adapter.outbound.infrastructure.s3;
+
+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 S3UploadService {
+    private final KakaoS3Config kakaoS3Config;
+    private final S3Client s3Client;
+
+    public List<String> uploadFiles(FilePath filePrefix, List<MultipartFile> multipartFiles)  {
+        return multipartFiles.stream().map((file) -> {
+            try {
+                return uploadSingleFile(filePrefix, file);
+            } catch (IOException e) {
+                throw new S3Exception(S3Errorcode.FILE_UPLOAD_REQUEST_FAILED);
+            }
+        }).toList();
+    }
+
+    public String uploadSingleFile(FilePath filePrefix, MultipartFile file) throws IOException {
+        Path filePath = getFilePath(file);
+        String objectKey = createObjectKey(filePrefix.getPath(), file.getOriginalFilename());
+        uploadToS3(objectKey, filePath);
+        Files.delete(filePath);
+        return getFileUrl(objectKey);
+    }
+
+    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);
+    }
+
+}
diff --git a/src/main/java/clap/server/domain/model/task/FilePath.java b/src/main/java/clap/server/domain/model/task/FilePath.java
new file mode 100644
index 00000000..6786b741
--- /dev/null
+++ b/src/main/java/clap/server/domain/model/task/FilePath.java
@@ -0,0 +1,15 @@
+package clap.server.domain.model.task;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum FilePath {
+    TASK_IMAGE("task/image"),
+    TASK_DOCUMENT("task/docs"),
+    MEMBER_IMAGE("member/image"),
+    ;
+    private final String path;
+
+}
diff --git a/src/main/java/clap/server/exception/ExceptionAdvice.java b/src/main/java/clap/server/exception/ExceptionAdvice.java
index bf29d87a..1a9c0e78 100644
--- a/src/main/java/clap/server/exception/ExceptionAdvice.java
+++ b/src/main/java/clap/server/exception/ExceptionAdvice.java
@@ -3,7 +3,6 @@
 import clap.server.exception.code.AuthErrorCode;
 import clap.server.exception.code.BaseErrorCode;
 import clap.server.exception.code.CommonErrorCode;
-import clap.server.exception.code.StatisticsErrorCode;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
@@ -171,16 +170,4 @@ public ResponseEntity<Object> handleAccessDeniedException(AccessDeniedException
                 AuthErrorCode.FORBIDDEN.getMessage()
         );
     }
-
-    @ExceptionHandler(StatisticsException.class)
-    public ResponseEntity<Object> handleAccessDeniedException(StatisticsException e, WebRequest request) {
-        return handleExceptionInternalFalse(
-                e,
-                StatisticsErrorCode.STATISTICS_BAD_REQUEST,
-                HttpHeaders.EMPTY,
-                HttpStatus.BAD_REQUEST,
-                request,
-                StatisticsErrorCode.STATISTICS_BAD_REQUEST.getMessage()
-        );
-    }
 }
diff --git a/src/main/java/clap/server/exception/S3Exception.java b/src/main/java/clap/server/exception/S3Exception.java
new file mode 100644
index 00000000..45416cb8
--- /dev/null
+++ b/src/main/java/clap/server/exception/S3Exception.java
@@ -0,0 +1,13 @@
+package clap.server.exception;
+
+import clap.server.exception.code.BaseErrorCode;
+
+public class S3Exception extends BaseException {
+    public S3Exception(BaseErrorCode code) {
+        super(code);
+    }
+
+    public BaseErrorCode getErrorCode() {
+        return (BaseErrorCode)super.getCode();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/exception/code/S3Errorcode.java b/src/main/java/clap/server/exception/code/S3Errorcode.java
new file mode 100644
index 00000000..30fc1cf6
--- /dev/null
+++ b/src/main/java/clap/server/exception/code/S3Errorcode.java
@@ -0,0 +1,15 @@
+package clap.server.exception.code;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+
+@Getter
+@RequiredArgsConstructor
+public enum S3Errorcode implements BaseErrorCode {
+    FILE_UPLOAD_REQUEST_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "TASK_004", "파일 업로드에 실패하였습니다.");
+
+    private final HttpStatus httpStatus;
+    private final String customCode;
+    private final String message;
+}
diff --git a/src/main/java/clap/server/exception/code/TaskErrorCode.java b/src/main/java/clap/server/exception/code/TaskErrorCode.java
index 189d1d61..0d9311c0 100644
--- a/src/main/java/clap/server/exception/code/TaskErrorCode.java
+++ b/src/main/java/clap/server/exception/code/TaskErrorCode.java
@@ -10,7 +10,7 @@ public enum TaskErrorCode implements BaseErrorCode {
     TASK_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_001", "작업을 찾을 수 없습니다."),
     CATEGORY_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_002", "카테고리를 찾을 수 없습니다."),
     TASK_STATUS_MISMATCH(HttpStatus.BAD_REQUEST, "TASK_003", "작업 상태가 일치하지 않습니다.");
-    ;
+
 
     private final HttpStatus httpStatus;
     private final String customCode;

From 13530bc2a02dda3d65a9fdeacb114ec65ab356ea Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 12:06:55 +0900
Subject: [PATCH 04/17] =?UTF-8?q?CLAP-113=20Refactor:=20mapper=20=ED=86=B5?=
 =?UTF-8?q?=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../application/mapper/MemberInfoMapper.java  | 24 -------------------
 .../application/mapper/MemberMapper.java      | 15 ++++++++++++
 2 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 src/main/java/clap/server/application/mapper/MemberInfoMapper.java

diff --git a/src/main/java/clap/server/application/mapper/MemberInfoMapper.java b/src/main/java/clap/server/application/mapper/MemberInfoMapper.java
deleted file mode 100644
index 647c6b81..00000000
--- a/src/main/java/clap/server/application/mapper/MemberInfoMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package clap.server.application.mapper;
-
-import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
-import clap.server.domain.model.member.Department;
-import clap.server.domain.model.member.MemberInfo;
-
-public class MemberInfoMapper {
-    private MemberInfoMapper() {
-        throw new IllegalArgumentException();
-    }
-
-    public static MemberInfo toMemberInfo(String name, String email, String nickname, boolean isReviewer,
-                                          Department department, MemberRole role, String departmentRole) {
-        return MemberInfo.builder()
-                .name(name)
-                .email(email)
-                .nickname(nickname)
-                .isReviewer(isReviewer)
-                .department(department)
-                .role(role)
-                .departmentRole(departmentRole)
-                .build();
-    }
-}
diff --git a/src/main/java/clap/server/application/mapper/MemberMapper.java b/src/main/java/clap/server/application/mapper/MemberMapper.java
index f7f14d34..a8221927 100644
--- a/src/main/java/clap/server/application/mapper/MemberMapper.java
+++ b/src/main/java/clap/server/application/mapper/MemberMapper.java
@@ -1,5 +1,7 @@
 package clap.server.application.mapper;
 
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
+import clap.server.domain.model.member.Department;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.member.MemberInfo;
 
@@ -13,4 +15,17 @@ public static Member toMember(MemberInfo memberInfo) {
                 .memberInfo(memberInfo)
                 .build();
     }
+
+    public static MemberInfo toMemberInfo(String name, String email, String nickname, boolean isReviewer,
+                                          Department department, MemberRole role, String departmentRole) {
+        return MemberInfo.builder()
+                .name(name)
+                .email(email)
+                .nickname(nickname)
+                .isReviewer(isReviewer)
+                .department(department)
+                .role(role)
+                .departmentRole(departmentRole)
+                .build();
+    }
 }
\ No newline at end of file

From 5da90aec677b0ddaaa011512a757c22f2950f3c3 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 12:08:46 +0900
Subject: [PATCH 05/17] =?UTF-8?q?CLAP-113=20Refactor:=20=EC=9A=94=EC=B2=AD?=
 =?UTF-8?q?=20=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EC=97=90=20=ED=8C=8C=EC=9D=BC=20=EC=97=85?=
 =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../application/Task/CreateTaskService.java   | 40 ++++++++++---------
 .../application/Task/UpdateTaskService.java   | 23 ++++++-----
 .../port/inbound/task/CreateTaskUsecase.java  |  5 ++-
 .../port/inbound/task/UpdateTaskUsecase.java  |  5 ++-
 .../service/admin/RegisterMemberService.java  |  2 +-
 5 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/src/main/java/clap/server/application/Task/CreateTaskService.java b/src/main/java/clap/server/application/Task/CreateTaskService.java
index f1c8a46b..3090c720 100644
--- a/src/main/java/clap/server/application/Task/CreateTaskService.java
+++ b/src/main/java/clap/server/application/Task/CreateTaskService.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.S3UploadService;
 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 S3UploadService s3UploadService;
     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 = s3UploadService.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);
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/Task/UpdateTaskService.java b/src/main/java/clap/server/application/Task/UpdateTaskService.java
index e83d1b7f..185a2c16 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskService.java
@@ -2,6 +2,7 @@
 
 import clap.server.adapter.inbound.web.dto.task.UpdateTaskRequest;
 import clap.server.adapter.inbound.web.dto.task.UpdateTaskResponse;
+import clap.server.adapter.outbound.infrastructure.s3.S3UploadService;
 import clap.server.application.mapper.AttachmentMapper;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.CategoryService;
@@ -10,16 +11,15 @@
 import clap.server.application.port.inbound.task.UpdateTaskUsecase;
 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.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 lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -35,23 +35,28 @@ public class UpdateTaskService implements UpdateTaskUsecase {
     private final TaskService taskService;
     private final CommandTaskPort commandTaskPort;
     private final CommandAttachmentPort commandAttachmentPort;
-
+    private final S3UploadService s3UploadService;
 
     @Override
     @Transactional
-    public UpdateTaskResponse updateTask(Long requesterId, UpdateTaskRequest updateTaskRequest) {
+    public UpdateTaskResponse updateTask(Long requesterId, Long taskId, UpdateTaskRequest updateTaskRequest, List<MultipartFile> files) {
         memberService.findActiveMember(requesterId);
         Category category = categoryService.findById(updateTaskRequest.categoryId());
-        Task task = taskService.findById(updateTaskRequest.taskId());
+        Task task = taskService.findById(taskId);
         //TODO: 작업이 요청 상태인 경우만 업데이트 가능
         task.updateTask(category, updateTaskRequest.title(), updateTaskRequest.description());
         Task updatedTask = commandTaskPort.save(task);
 
-        List<Long> attachmentIds = AttachmentMapper.toAttachmentIds(updateTaskRequest.attachmentRequests());
+        updateAttachments(updateTaskRequest, files, task);
+        return TaskMapper.toUpdateTaskResponse(updatedTask);
+    }
+
+    private void updateAttachments(UpdateTaskRequest updateTaskRequest, List<MultipartFile> files, Task task) {
+        List<Long> attachmentIds = updateTaskRequest.attachmentsToDelete();
         commandAttachmentPort.deleteByIds(attachmentIds);
 
-        List<Attachment> attachments = Attachment.updateAttachments(updatedTask, updateTaskRequest.attachmentRequests());
+        List<String> fileUrls = s3UploadService.uploadFiles(FilePath.TASK_IMAGE, files);
+        List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
         commandAttachmentPort.saveAll(attachments);
-        return TaskMapper.toUpdateTaskResponse(updatedTask);
     }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/task/CreateTaskUsecase.java b/src/main/java/clap/server/application/port/inbound/task/CreateTaskUsecase.java
index 9529e066..758c0476 100644
--- a/src/main/java/clap/server/application/port/inbound/task/CreateTaskUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/task/CreateTaskUsecase.java
@@ -2,7 +2,10 @@
 
 import clap.server.adapter.inbound.web.dto.task.CreateTaskRequest;
 import clap.server.adapter.inbound.web.dto.task.CreateTaskResponse;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 public interface CreateTaskUsecase {
-    CreateTaskResponse createTask(Long memberId, CreateTaskRequest createTaskRequest);
+    CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createTaskRequest, List<MultipartFile> files);
 }
diff --git a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskUsecase.java
index 18d27670..ee3f6f98 100644
--- a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskUsecase.java
@@ -3,7 +3,10 @@
 
 import clap.server.adapter.inbound.web.dto.task.UpdateTaskRequest;
 import clap.server.adapter.inbound.web.dto.task.UpdateTaskResponse;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 public interface UpdateTaskUsecase {
-    UpdateTaskResponse updateTask(Long memberId, UpdateTaskRequest updateTaskRequest);
+    UpdateTaskResponse updateTask(Long memberId, Long taskId, UpdateTaskRequest updateTaskRequest, List<MultipartFile> files);
 }
diff --git a/src/main/java/clap/server/application/service/admin/RegisterMemberService.java b/src/main/java/clap/server/application/service/admin/RegisterMemberService.java
index 906cf06b..3e163d3b 100644
--- a/src/main/java/clap/server/application/service/admin/RegisterMemberService.java
+++ b/src/main/java/clap/server/application/service/admin/RegisterMemberService.java
@@ -15,7 +15,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.transaction.annotation.Transactional;
 
-import static clap.server.application.mapper.MemberInfoMapper.toMemberInfo;
+import static clap.server.application.mapper.MemberMapper.toMemberInfo;
 import static clap.server.application.mapper.MemberMapper.toMember;
 
 @ApplicationService

From 84a813190ea89288754cb5263ac08299a0f9103b Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 12:09:51 +0900
Subject: [PATCH 06/17] =?UTF-8?q?CLAP-113=20Feat:=20Attachment=20=EB=8F=84?=
 =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EB=A1=9C=EC=A7=81=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../server/domain/model/task/Attachment.java  | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/main/java/clap/server/domain/model/task/Attachment.java b/src/main/java/clap/server/domain/model/task/Attachment.java
index db733936..1646eada 100644
--- a/src/main/java/clap/server/domain/model/task/Attachment.java
+++ b/src/main/java/clap/server/domain/model/task/Attachment.java
@@ -1,15 +1,12 @@
 package clap.server.domain.model.task;
 
-import clap.server.adapter.inbound.web.dto.task.AttachmentRequest;
 import clap.server.domain.model.common.BaseTime;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Getter
 @SuperBuilder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -21,24 +18,29 @@ public class Attachment extends BaseTime {
     private String fileUrl;
     private String fileSize;
 
-    public static List<Attachment> createAttachments(Task task, List<String> fileUrls) {
-        return fileUrls.stream()
-                .map(fileUrl -> Attachment.builder()
-                        .task(task)
-                        .fileUrl(fileUrl)
-                        .originalName("파일 이름")
-                        .fileSize("16MB") //TODO: 하드코딩 제거
-                        .build())
-                .collect(Collectors.toList());
+    @Builder
+    public Attachment(Task task, Comment comment, String originalName, String fileUrl, String fileSize) {
+        this.task = task;
+        this.comment = comment;
+        this.originalName = originalName;
+        this.fileUrl = fileUrl;
+        this.fileSize = fileSize;
+    }
+
+    public static Attachment createAttachment(Task task, String originalName, String fileUrl, long fileSize) {
+        return Attachment.builder()
+                .task(task)
+                .comment(null)
+                .originalName(originalName)
+                .fileUrl(fileUrl)
+                .fileSize(formatFileSize(fileSize))
+                .build();
+    }
+
+    public static String formatFileSize(long size) {
+        if (size < 1024) return size + " B";
+        int z = (63 - Long.numberOfLeadingZeros(size)) / 10;
+        return String.format("%.1f %sB", (double) size / (1L << (z * 10)), " KMGTPE".charAt(z));
     }
 
-    public static List<Attachment> updateAttachments(Task task, List<AttachmentRequest> attachmentRequests) {
-        return attachmentRequests.stream()
-                .map(request -> Attachment.builder()
-                        .task(task)
-                        .fileUrl(request.fileUrl())
-                        .originalName("수정된 파일 이름")
-                        .fileSize("17MB")
-                        .build())
-                .collect(Collectors.toList());
-    }}
+}

From ddbcd280ad97fa60706a43b519f4467f725e0b27 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 12:10:10 +0900
Subject: [PATCH 07/17] =?UTF-8?q?CLAP-113=20Feat:=20Notification=20?=
 =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=EB=A1=9C=EC=A7=81=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../server/domain/model/notification/Notification.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/clap/server/domain/model/notification/Notification.java b/src/main/java/clap/server/domain/model/notification/Notification.java
index 91ae10f9..26001af7 100644
--- a/src/main/java/clap/server/domain/model/notification/Notification.java
+++ b/src/main/java/clap/server/domain/model/notification/Notification.java
@@ -34,4 +34,13 @@ public Notification(Task task, NotificationType type, Member receiver, String me
         this.message = message;
         this.isRead = false;
     }
+
+    public static Notification createTaskNotification(Task task, Member reviewer, NotificationType type) {
+        return Notification.builder()
+                .task(task)
+                .type(type)
+                .receiver(reviewer)
+                .message(null)
+                .build();
+    }
 }

From 465ddc16bbae405179a98ced25e5000f9bf82eda Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 12:11:22 +0900
Subject: [PATCH 08/17] =?UTF-8?q?CLAP-113=20Feat:=20multifile=EA=B3=BC=20f?=
 =?UTF-8?q?ile=20url=EC=9D=84=20=20Attachment=EB=A1=9C=20=EB=A7=A4?=
 =?UTF-8?q?=ED=95=91=ED=95=98=EB=8A=94=20=EB=A7=A4=ED=8D=BC=20=EB=A9=94?=
 =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../application/mapper/AttachmentMapper.java  | 21 +++++++++++--------
 .../server/application/mapper/TaskMapper.java |  3 +--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/clap/server/application/mapper/AttachmentMapper.java b/src/main/java/clap/server/application/mapper/AttachmentMapper.java
index 9387bbad..121dd9fe 100644
--- a/src/main/java/clap/server/application/mapper/AttachmentMapper.java
+++ b/src/main/java/clap/server/application/mapper/AttachmentMapper.java
@@ -1,24 +1,27 @@
 package clap.server.application.mapper;
 
-import clap.server.adapter.inbound.web.dto.task.AttachmentRequest;
-import clap.server.adapter.inbound.web.dto.task.AttachmentResponse;
-import clap.server.adapter.inbound.web.dto.task.FindTaskDetailsResponse;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Task;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static clap.server.domain.model.task.Attachment.createAttachment;
 
 public class AttachmentMapper {
     private AttachmentMapper() {
         throw new IllegalArgumentException();
     }
 
-    public static List<Long> toAttachmentIds(List<AttachmentRequest> attachmentRequests) {
-        return attachmentRequests.stream()
-                .map(AttachmentRequest::fileId)
-                .filter(Objects::nonNull)
+    public static List<Attachment> toTaskAttachments(Task task, List<MultipartFile> files, List<String> fileUrls) {
+        return IntStream.range(0, files.size())
+                .mapToObj(i -> createAttachment(
+                        task,
+                        files.get(i).getOriginalFilename(),
+                        fileUrls.get(i),
+                        files.get(i).getSize()
+                ))
                 .toList();
     }
 
diff --git a/src/main/java/clap/server/application/mapper/TaskMapper.java b/src/main/java/clap/server/application/mapper/TaskMapper.java
index 7fce4e8f..b491aaf5 100644
--- a/src/main/java/clap/server/application/mapper/TaskMapper.java
+++ b/src/main/java/clap/server/application/mapper/TaskMapper.java
@@ -2,9 +2,7 @@
 
 
 import clap.server.adapter.inbound.web.dto.task.*;
-
 import clap.server.domain.model.task.Attachment;
-
 import clap.server.domain.model.task.Task;
 
 import java.util.List;
@@ -14,6 +12,7 @@ public class TaskMapper {
     private TaskMapper() {
         throw new IllegalArgumentException();
     }
+
     public static CreateTaskResponse toCreateTaskResponse(Task task) {
         return new CreateTaskResponse(task.getTaskId(), task.getCategory().getCategoryId(), task.getTitle());
     }

From efa00b39ac5900ea142711d467247807e436864d Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 12:12:16 +0900
Subject: [PATCH 09/17] =?UTF-8?q?CLAP-113=20Feat:=20=EC=B2=A8=EB=B6=80?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EA=B8=B0?=
 =?UTF-8?q?=ED=9A=8D=20=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=94=B0=EB=A5=B8=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EC=83=9D=EC=84=B1/=EC=88=98=EC=A0=95=20dt?=
 =?UTF-8?q?o=20=EC=8A=A4=ED=8E=99=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../inbound/web/dto/task/AttachmentRequest.java     | 13 -------------
 .../inbound/web/dto/task/CreateTaskRequest.java     | 11 +----------
 .../inbound/web/dto/task/UpdateTaskRequest.java     | 13 +++----------
 3 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/task/AttachmentRequest.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/AttachmentRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/AttachmentRequest.java
deleted file mode 100644
index 96a038c7..00000000
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/AttachmentRequest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package clap.server.adapter.inbound.web.dto.task;
-
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-public record AttachmentRequest(
-        @Schema(description = "파일 ID", example = "45")
-        Long fileId,
-
-        @Schema(description = "파일 URL", example = "https://example.com/file.png")
-        String fileUrl
-) {
-}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskRequest.java
index df1a3512..423b3683 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskRequest.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskRequest.java
@@ -4,8 +4,6 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
-import java.util.List;
-
 
 @Schema(description = "작업 생성 요청")
 public record CreateTaskRequest(
@@ -13,18 +11,11 @@ public record CreateTaskRequest(
         @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
 ) {
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskRequest.java
index 166bdb64..7451d3fd 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskRequest.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskRequest.java
@@ -9,18 +9,10 @@
 @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,
@@ -28,7 +20,8 @@ public record UpdateTaskRequest(
         @Schema(description = "작업 설명", example = "업데이트된 설명.")
         String description,
 
-        @Schema(description = "첨부 파일 요청 목록", implementation = AttachmentRequest.class)
-        List<AttachmentRequest> attachmentRequests
+        @Schema(description = "삭제할 파일 ID 목록, 없을 경우 emptylist 전송")
+        @NotNull
+        List<Long> attachmentsToDelete
 ) {}
 

From 66cb6110bc1df5c9b5a150861776b1d8982aa660 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 12:12:46 +0900
Subject: [PATCH 10/17] =?UTF-8?q?CLAP-113=20Feat:=20=EC=B2=A8=EB=B6=80?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EB=A9=80?=
 =?UTF-8?q?=ED=8B=B0=ED=8C=8C=ED=8A=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../web/task/ManagementTaskController.java    | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
index a87f30bb..5e30f255 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.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));
     }
 }

From 845f1eb4fea0a8463d63546d2cbf6ce92e9c4e4d Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 12:23:36 +0900
Subject: [PATCH 11/17] =?UTF-8?q?CLAP-113=20Feat:=20=ED=95=B4=EB=8B=B9=20t?=
 =?UTF-8?q?ask=EC=97=90=20=ED=95=B4=EB=8B=B9=ED=95=98=EB=8A=94=20=EC=B2=A8?=
 =?UTF-8?q?=EB=B6=80=ED=8C=8C=EC=9D=BC=20id=EC=9D=B8=EC=A7=80=20=EA=B2=80?=
 =?UTF-8?q?=EC=A6=9D=ED=95=98=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../AttachmentPersistenceAdapter.java         |  7 +++++++
 .../persistense/entity/task/TaskEntity.java   |  2 --
 .../repository/task/AttachmentRepository.java |  2 ++
 .../application/Task/UpdateTaskService.java   | 19 +++++++++++++++----
 .../outbound/task/LoadAttachmentPort.java     |  1 +
 .../server/exception/code/TaskErrorCode.java  |  3 ++-
 6 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java
index 6a08cc30..5caf32bb 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java
@@ -45,6 +45,13 @@ public List<Attachment> findAllByTaskIdAndCommentIsNull(final Long taskId) {
                 .collect(Collectors.toList());
     }
 
+    public List<Attachment> findAllByTaskIdAndAttachmentIdIn(final Long taskId, final List<Long> attachmentIds) {
+        List<AttachmentEntity> attachmentEntities = attachmentRepository.findAllByTask_TaskIdAndAttachmentIdIn(taskId, attachmentIds);
+        return attachmentEntities.stream()
+                .map(attachmentPersistenceMapper::toDomain)
+                .collect(Collectors.toList());
+    }
+
     @Override
     public void deleteByIds(List<Long> attachmentIds) {
         attachmentRepository.deleteAllByAttachmentIdIn(attachmentIds);
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/TaskEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/TaskEntity.java
index 21ffde35..1dfe9961 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/TaskEntity.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/TaskEntity.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")
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/AttachmentRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/AttachmentRepository.java
index fd7db8be..e8481cab 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/AttachmentRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/AttachmentRepository.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_TaskIdAndAttachmentIdIn(Long task_taskId, List<Long> attachmentId);
 
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/Task/UpdateTaskService.java b/src/main/java/clap/server/application/Task/UpdateTaskService.java
index 185a2c16..325d1b93 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskService.java
@@ -11,11 +11,14 @@
 import clap.server.application.port.inbound.task.UpdateTaskUsecase;
 import clap.server.application.port.outbound.task.CommandAttachmentPort;
 import clap.server.application.port.outbound.task.CommandTaskPort;
+import clap.server.application.port.outbound.task.LoadAttachmentPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 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 clap.server.exception.ApplicationException;
+import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,6 +37,7 @@ public class UpdateTaskService implements UpdateTaskUsecase {
     private final CategoryService categoryService;
     private final TaskService taskService;
     private final CommandTaskPort commandTaskPort;
+    private final LoadAttachmentPort loadAttachmentPort;
     private final CommandAttachmentPort commandAttachmentPort;
     private final S3UploadService s3UploadService;
 
@@ -47,13 +51,20 @@ public UpdateTaskResponse updateTask(Long requesterId, Long taskId, UpdateTaskRe
         task.updateTask(category, updateTaskRequest.title(), updateTaskRequest.description());
         Task updatedTask = commandTaskPort.save(task);
 
-        updateAttachments(updateTaskRequest, files, task);
+        if (!updateTaskRequest.attachmentsToDelete().isEmpty()){
+            updateAttachments(updateTaskRequest.attachmentsToDelete(), files, task);
+        }
         return TaskMapper.toUpdateTaskResponse(updatedTask);
     }
 
-    private void updateAttachments(UpdateTaskRequest updateTaskRequest, List<MultipartFile> files, Task task) {
-        List<Long> attachmentIds = updateTaskRequest.attachmentsToDelete();
-        commandAttachmentPort.deleteByIds(attachmentIds);
+    private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartFile> files, Task task) {
+        List<Attachment> attachmentsOfTask = loadAttachmentPort.findAllByTaskIdAndAttachmentIdIn(task.getTaskId(), attachmentIdsToDelete);
+
+        if(attachmentsOfTask.size() != attachmentIdsToDelete.size()) {
+            throw new ApplicationException(TaskErrorCode.TASK_ATTACHMENT_NOT_FOUND);
+        }
+
+        commandAttachmentPort.deleteByIds(attachmentIdsToDelete);
 
         List<String> fileUrls = s3UploadService.uploadFiles(FilePath.TASK_IMAGE, files);
         List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
diff --git a/src/main/java/clap/server/application/port/outbound/task/LoadAttachmentPort.java b/src/main/java/clap/server/application/port/outbound/task/LoadAttachmentPort.java
index 6796877d..8943255e 100644
--- a/src/main/java/clap/server/application/port/outbound/task/LoadAttachmentPort.java
+++ b/src/main/java/clap/server/application/port/outbound/task/LoadAttachmentPort.java
@@ -7,4 +7,5 @@
 
 public interface LoadAttachmentPort {
     List<Attachment> findAllByTaskIdAndCommentIsNull(Long task);
+    List<Attachment> findAllByTaskIdAndAttachmentIdIn(Long taskId, List<Long> attachmentIds);
 }
diff --git a/src/main/java/clap/server/exception/code/TaskErrorCode.java b/src/main/java/clap/server/exception/code/TaskErrorCode.java
index 0d9311c0..4f6c8c64 100644
--- a/src/main/java/clap/server/exception/code/TaskErrorCode.java
+++ b/src/main/java/clap/server/exception/code/TaskErrorCode.java
@@ -9,7 +9,8 @@
 public enum TaskErrorCode implements BaseErrorCode {
     TASK_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_001", "작업을 찾을 수 없습니다."),
     CATEGORY_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_002", "카테고리를 찾을 수 없습니다."),
-    TASK_STATUS_MISMATCH(HttpStatus.BAD_REQUEST, "TASK_003", "작업 상태가 일치하지 않습니다.");
+    TASK_STATUS_MISMATCH(HttpStatus.BAD_REQUEST, "TASK_003", "작업 상태가 일치하지 않습니다."),
+    TASK_ATTACHMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_004", "첨부파일을 찾을 수 없습니다.");
 
 
     private final HttpStatus httpStatus;

From 69dac4d4ff43f47cb396d9fd10e9d7e79dfe55c4 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 12:31:57 +0900
Subject: [PATCH 12/17] =?UTF-8?q?CLAP-113=20Refactor:=20=EB=A9=94=EC=84=9C?=
 =?UTF-8?q?=EB=93=9C=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../infrastructure/s3/S3UploadService.java    | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadService.java b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadService.java
index 036dc475..e822934c 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadService.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadService.java
@@ -26,21 +26,19 @@ public class S3UploadService {
     private final S3Client s3Client;
 
     public List<String> uploadFiles(FilePath filePrefix, List<MultipartFile> multipartFiles)  {
-        return multipartFiles.stream().map((file) -> {
-            try {
-                return uploadSingleFile(filePrefix, file);
-            } catch (IOException e) {
-                throw new S3Exception(S3Errorcode.FILE_UPLOAD_REQUEST_FAILED);
-            }
-        }).toList();
+        return multipartFiles.stream().map((file) -> uploadSingleFileAndGetUrl(filePrefix, file)).toList();
     }
 
-    public String uploadSingleFile(FilePath filePrefix, MultipartFile file) throws IOException {
-        Path filePath = getFilePath(file);
-        String objectKey = createObjectKey(filePrefix.getPath(), file.getOriginalFilename());
-        uploadToS3(objectKey, filePath);
-        Files.delete(filePath);
-        return getFileUrl(objectKey);
+    private String uploadSingleFileAndGetUrl(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) {

From cf7315d16cf86717231eaf37ded17697e2eff4fa Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 12:49:52 +0900
Subject: [PATCH 13/17] =?UTF-8?q?CLAP-113=20Refactor:=20=EC=9C=A0=ED=9A=A8?=
 =?UTF-8?q?=EC=84=B1=20=EA=B2=80=EC=A6=9D=20=EB=A9=94=EC=84=9C=EB=93=9C=20?=
 =?UTF-8?q?=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../server/application/Task/UpdateTaskService.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/clap/server/application/Task/UpdateTaskService.java b/src/main/java/clap/server/application/Task/UpdateTaskService.java
index 325d1b93..27987160 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskService.java
@@ -58,16 +58,18 @@ public UpdateTaskResponse updateTask(Long requesterId, Long taskId, UpdateTaskRe
     }
 
     private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartFile> files, Task task) {
-        List<Attachment> attachmentsOfTask = loadAttachmentPort.findAllByTaskIdAndAttachmentIdIn(task.getTaskId(), attachmentIdsToDelete);
-
-        if(attachmentsOfTask.size() != attachmentIdsToDelete.size()) {
-            throw new ApplicationException(TaskErrorCode.TASK_ATTACHMENT_NOT_FOUND);
-        }
-
+        validateAttachments(attachmentIdsToDelete, task);
         commandAttachmentPort.deleteByIds(attachmentIdsToDelete);
 
         List<String> fileUrls = s3UploadService.uploadFiles(FilePath.TASK_IMAGE, files);
         List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
         commandAttachmentPort.saveAll(attachments);
     }
+
+    private void validateAttachments(List<Long> attachmentIdsToDelete, Task task) {
+        List<Attachment> attachmentsOfTask = loadAttachmentPort.findAllByTaskIdAndAttachmentIdIn(task.getTaskId(), attachmentIdsToDelete);
+        if(attachmentsOfTask.size() != attachmentIdsToDelete.size()) {
+            throw new ApplicationException(TaskErrorCode.TASK_ATTACHMENT_NOT_FOUND);
+        }
+    }
 }

From a4ba2f82ce4d18888ce5dc8958710e76d62a6f11 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 12:50:40 +0900
Subject: [PATCH 14/17] =?UTF-8?q?CLAP-113=20Remove:=20s3presigner=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../clap/server/config/s3/KakaoS3Config.java     | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/main/java/clap/server/config/s3/KakaoS3Config.java b/src/main/java/clap/server/config/s3/KakaoS3Config.java
index 70a0cdd4..649b1b3d 100644
--- a/src/main/java/clap/server/config/s3/KakaoS3Config.java
+++ b/src/main/java/clap/server/config/s3/KakaoS3Config.java
@@ -43,22 +43,6 @@ public KakaoS3Config(
     }
 
 
-    @Bean
-    public S3Presigner s3Presigner() {
-        S3Configuration s3Configuration = S3Configuration.builder()
-                .pathStyleAccessEnabled(true)
-                .build();
-
-        return S3Presigner.builder()
-                .region(Region.of(region))
-                .credentialsProvider(StaticCredentialsProvider.create(
-                        AwsBasicCredentials.create(accessKey, secretKey)))
-                .endpointOverride(URI.create(endpoint))
-                .serviceConfiguration(s3Configuration)
-                .build();
-    }
-
-
     @Bean
     public S3Client s3Client() {
         return S3Client.builder()

From d3baac222c749e8f3dfe40133b7da809e600ac07 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 14:44:34 +0900
Subject: [PATCH 15/17] =?UTF-8?q?CLAP-113=20Rename:=20=ED=97=A5=EC=82=AC?=
 =?UTF-8?q?=EA=B3=A0=EB=82=A0=20=EC=95=84=ED=82=A4=ED=85=8D=EC=B2=98=20?=
 =?UTF-8?q?=EB=B0=8F=20=EB=AA=85=EB=AA=85=20=EA=B7=9C=EC=B9=99=EC=97=90=20?=
 =?UTF-8?q?=EB=A7=9E=EA=B2=8C=20=ED=8C=8C=EC=9D=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../{S3UploadService.java => S3UploadAdapter.java}   |  7 ++++---
 .../server/application/Task/CreateTaskService.java   |  6 +++---
 .../server/application/Task/UpdateTaskService.java   |  6 +++---
 .../application/port/outbound/s3/S3UploadPort.java   | 12 ++++++++++++
 4 files changed, 22 insertions(+), 9 deletions(-)
 rename src/main/java/clap/server/adapter/outbound/infrastructure/s3/{S3UploadService.java => S3UploadAdapter.java} (91%)
 create mode 100644 src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java

diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadService.java b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java
similarity index 91%
rename from src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadService.java
rename to src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java
index e822934c..450dba10 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadService.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java
@@ -1,5 +1,6 @@
 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;
@@ -21,15 +22,15 @@
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class S3UploadService {
+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) -> uploadSingleFileAndGetUrl(filePrefix, file)).toList();
+        return multipartFiles.stream().map((file) -> uploadSingleFile(filePrefix, file)).toList();
     }
 
-    private String uploadSingleFileAndGetUrl(FilePath filePrefix, MultipartFile file) {
+    public String uploadSingleFile(FilePath filePrefix, MultipartFile file) {
         try {
             Path filePath = getFilePath(file);
             String objectKey = createObjectKey(filePrefix.getPath(), file.getOriginalFilename());
diff --git a/src/main/java/clap/server/application/Task/CreateTaskService.java b/src/main/java/clap/server/application/Task/CreateTaskService.java
index 3090c720..1ebedf16 100644
--- a/src/main/java/clap/server/application/Task/CreateTaskService.java
+++ b/src/main/java/clap/server/application/Task/CreateTaskService.java
@@ -2,7 +2,7 @@
 
 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.S3UploadService;
+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;
@@ -36,7 +36,7 @@ public class CreateTaskService implements CreateTaskUsecase {
     private final CategoryService categoryService;
     private final CommandTaskPort commandTaskPort;
     private final CommandAttachmentPort commandAttachmentPort;
-    private final S3UploadService s3UploadService;
+    private final S3UploadAdapter s3UploadAdapter;
     private final ApplicationEventPublisher applicationEventPublisher;
 
     @Override
@@ -53,7 +53,7 @@ public CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createT
     }
 
     private void saveAttachments(List<MultipartFile> files, Task task) {
-        List<String> fileUrls = s3UploadService.uploadFiles(FilePath.TASK_IMAGE, files);
+        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePath.TASK_IMAGE, files);
         List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
         commandAttachmentPort.saveAll(attachments);
     }
diff --git a/src/main/java/clap/server/application/Task/UpdateTaskService.java b/src/main/java/clap/server/application/Task/UpdateTaskService.java
index 27987160..7550c47c 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskService.java
@@ -2,7 +2,7 @@
 
 import clap.server.adapter.inbound.web.dto.task.UpdateTaskRequest;
 import clap.server.adapter.inbound.web.dto.task.UpdateTaskResponse;
-import clap.server.adapter.outbound.infrastructure.s3.S3UploadService;
+import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter;
 import clap.server.application.mapper.AttachmentMapper;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.CategoryService;
@@ -39,7 +39,7 @@ public class UpdateTaskService implements UpdateTaskUsecase {
     private final CommandTaskPort commandTaskPort;
     private final LoadAttachmentPort loadAttachmentPort;
     private final CommandAttachmentPort commandAttachmentPort;
-    private final S3UploadService s3UploadService;
+    private final S3UploadAdapter s3UploadAdapter;
 
     @Override
     @Transactional
@@ -61,7 +61,7 @@ private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartF
         validateAttachments(attachmentIdsToDelete, task);
         commandAttachmentPort.deleteByIds(attachmentIdsToDelete);
 
-        List<String> fileUrls = s3UploadService.uploadFiles(FilePath.TASK_IMAGE, files);
+        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePath.TASK_IMAGE, files);
         List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
         commandAttachmentPort.saveAll(attachments);
     }
diff --git a/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java b/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java
new file mode 100644
index 00000000..a55f06a9
--- /dev/null
+++ b/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java
@@ -0,0 +1,12 @@
+package clap.server.application.port.outbound.s3;
+
+import clap.server.domain.model.task.FilePath;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+public interface S3UploadPort {
+    List<String> uploadFiles(FilePath filePrefix, List<MultipartFile> multipartFiles);
+
+    String uploadSingleFile(FilePath filePrefix, MultipartFile file);
+}

From 4f218b8f8652dd6b318e8d0e312fcfad870b0611 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 15:41:31 +0900
Subject: [PATCH 16/17] =?UTF-8?q?CLAP-113=20Refactor:=20attachment=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20comment=20null=20=EC=A1=B0?=
 =?UTF-8?q?=EA=B1=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 .../outbound/persistense/AttachmentPersistenceAdapter.java    | 4 ++--
 .../persistense/repository/task/AttachmentRepository.java     | 2 +-
 .../java/clap/server/application/Task/UpdateTaskService.java  | 2 +-
 .../application/port/outbound/task/LoadAttachmentPort.java    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java
index 5caf32bb..6fb71188 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java
@@ -45,8 +45,8 @@ public List<Attachment> findAllByTaskIdAndCommentIsNull(final Long taskId) {
                 .collect(Collectors.toList());
     }
 
-    public List<Attachment> findAllByTaskIdAndAttachmentIdIn(final Long taskId, final List<Long> attachmentIds) {
-        List<AttachmentEntity> attachmentEntities = attachmentRepository.findAllByTask_TaskIdAndAttachmentIdIn(taskId, attachmentIds);
+    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());
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/AttachmentRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/AttachmentRepository.java
index e8481cab..60e708f5 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/AttachmentRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/AttachmentRepository.java
@@ -10,6 +10,6 @@
 public interface AttachmentRepository extends JpaRepository<AttachmentEntity, Long> {
     List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNull(Long taskId);
     void deleteAllByAttachmentIdIn(List<Long> attachmentIds);
-    List<AttachmentEntity> findAllByTask_TaskIdAndAttachmentIdIn(Long task_taskId, List<Long> attachmentId);
+    List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNullAndAttachmentIdIn(Long task_taskId, List<Long> attachmentId);
 
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/Task/UpdateTaskService.java b/src/main/java/clap/server/application/Task/UpdateTaskService.java
index 7550c47c..4bafb347 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskService.java
@@ -67,7 +67,7 @@ private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartF
     }
 
     private void validateAttachments(List<Long> attachmentIdsToDelete, Task task) {
-        List<Attachment> attachmentsOfTask = loadAttachmentPort.findAllByTaskIdAndAttachmentIdIn(task.getTaskId(), attachmentIdsToDelete);
+        List<Attachment> attachmentsOfTask = loadAttachmentPort.findAllByTaskIdAndCommentIsNullAndAttachmentId(task.getTaskId(), attachmentIdsToDelete);
         if(attachmentsOfTask.size() != attachmentIdsToDelete.size()) {
             throw new ApplicationException(TaskErrorCode.TASK_ATTACHMENT_NOT_FOUND);
         }
diff --git a/src/main/java/clap/server/application/port/outbound/task/LoadAttachmentPort.java b/src/main/java/clap/server/application/port/outbound/task/LoadAttachmentPort.java
index 8943255e..7b2f350f 100644
--- a/src/main/java/clap/server/application/port/outbound/task/LoadAttachmentPort.java
+++ b/src/main/java/clap/server/application/port/outbound/task/LoadAttachmentPort.java
@@ -7,5 +7,5 @@
 
 public interface LoadAttachmentPort {
     List<Attachment> findAllByTaskIdAndCommentIsNull(Long task);
-    List<Attachment> findAllByTaskIdAndAttachmentIdIn(Long taskId, List<Long> attachmentIds);
+    List<Attachment> findAllByTaskIdAndCommentIsNullAndAttachmentId(Long taskId, List<Long> attachmentIds);
 }

From 045583c1fe3de4ea220974721c7cf76d12cac98d Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 15:46:08 +0900
Subject: [PATCH 17/17] =?UTF-8?q?CLAP-113=20Fix:=20=EC=98=A4=ED=83=80=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #76
---
 src/main/java/clap/server/application/mapper/MemberMapper.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/application/mapper/MemberMapper.java b/src/main/java/clap/server/application/mapper/MemberMapper.java
index e1731b52..2dace59d 100644
--- a/src/main/java/clap/server/application/mapper/MemberMapper.java
+++ b/src/main/java/clap/server/application/mapper/MemberMapper.java
@@ -18,7 +18,6 @@ public static Member toMember(MemberInfo memberInfo) {
                 .build();
     }
 
-
     public static MemberInfo toMemberInfo(String name, String email, String nickname, boolean isReviewer,
                                           Department department, MemberRole role, String departmentRole) {
         return MemberInfo.builder()
@@ -30,6 +29,7 @@ public static MemberInfo toMemberInfo(String name, String email, String nickname
                 .role(role)
                 .departmentRole(departmentRole)
                 .build();
+    }
 
     public static MemberProfileResponse toMemberProfileResponse(Member member) {
         return new MemberProfileResponse(
@@ -39,6 +39,5 @@ public static MemberProfileResponse toMemberProfileResponse(Member member) {
                 member.getImageUrl(),
                 member.getMemberInfo().getRole()
         );
-
     }
 }
\ No newline at end of file