Skip to content

CLAP-200 첨부파일 파라미터에 not null 해제 #203

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
joowojr merged 2 commits into from
Feb 1, 2025
Merged

CLAP-200 첨부파일 파라미터에 not null 해제 #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a0e8e1
CLAP-200 Fix: 작업 생성 및 수정 시 파일 파라미터 null 허용
joowojr Feb 1, 2025
6837365
CLAP-200 Fix: 파일 배열에 대해 null 체크 추가
joowojr Feb 1, 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
4 changes: 2 additions & 2 deletions src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class ManagementTaskController {
@Secured({"ROLE_MANAGER", "ROLE_USER"})
public ResponseEntity<CreateTaskResponse> createTask(
@RequestPart(name = "taskInfo") @Valid CreateTaskRequest createTaskRequest,
@RequestPart(name = "attachment", required = false) @NotNull List<MultipartFile> attachments,
@RequestPart(name = "attachment", required = false) List<MultipartFile> attachments,
@AuthenticationPrincipal SecurityUserDetails userInfo
){
return ResponseEntity.ok(createTaskUsecase.createTask(userInfo.getUserId(), createTaskRequest, attachments));
Expand All @@ -46,7 +46,7 @@ public ResponseEntity<CreateTaskResponse> createTask(
public ResponseEntity<UpdateTaskResponse> updateTask(
@PathVariable @NotNull Long taskId,
@RequestPart(name = "taskInfo") @Valid UpdateTaskRequest updateTaskRequest,
@RequestPart(name = "attachment", required = false) @NotNull List<MultipartFile> attachments,
@RequestPart(name = "attachment", required = false) List<MultipartFile> attachments,
@AuthenticationPrincipal SecurityUserDetails userInfo){
return ResponseEntity.ok(updateTaskUsecase.updateTask(userInfo.getUserId(), taskId, updateTaskRequest, attachments));
}
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/clap/server/application/service/task/CreateTaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ public CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createT
savedTask.setInitialProcessorOrder();
commandTaskPort.save(savedTask);

saveAttachments(files, savedTask);
if (files != null) {
saveAttachments(files, savedTask);
}

publishNotification(savedTask);
return TaskMapper.toCreateTaskResponse(savedTask);
}
Expand All @@ -66,7 +69,7 @@ private void saveAttachments(List<MultipartFile> files, Task task) {
commandAttachmentPort.saveAll(attachments);
}

private void publishNotification(Task task){
private void publishNotification(Task task) {
List<Member> reviewers = memberService.findReviewers();

// 검토자들 각각에 대한 알림 생성 후 event 발행
Expand All @@ -90,5 +93,4 @@ private void publishNotification(Task task){
}



}
8 changes: 5 additions & 3 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 @@ -122,9 +122,11 @@ private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartF
List<Attachment> attachmentsToDelete = validateAndGetAttachments(attachmentIdsToDelete, task);
attachmentsToDelete.forEach(Attachment::softDelete);

List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePathConstants.TASK_IMAGE, files);
List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
commandAttachmentPort.saveAll(attachments);
if(files != null) {
List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePathConstants.TASK_IMAGE, files);
List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
commandAttachmentPort.saveAll(attachments);
}
}

private List<Attachment> validateAndGetAttachments(List<Long> attachmentIdsToDelete, Task task) {
Expand Down