Skip to content

CLAP-399 작업 요청 파일 업로드 오류 #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 12, 2025
Merged

CLAP-399 작업 요청 파일 업로드 오류 #512

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
650c84a
CLAP-399 HotFix: 작업 요청 파일 업로드 오류
parkjaehak Feb 12, 2025
bdbd949
CLAP-399 HotFix: 삭제 파일 로직과 파일 업로드 로직 분리
parkjaehak Feb 12, 2025
65a1d34
CLAP-399 Refactor: 첨부파일 개수 저장 로직 분리
parkjaehak Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions src/main/java/clap/server/application/service/task/UpdateTaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down