@@ -70,10 +70,14 @@ public void updateTask(Long requesterId, Long taskId, UpdateTaskRequest request,
7070 throw new ApplicationException (TaskErrorCode .FILE_COUNT_EXCEEDED );
7171 }
7272 if (!request .attachmentsToDelete ().isEmpty ()) {
73- updateAttachments (request .attachmentsToDelete (), files , task );
73+ List <Attachment > attachmentsToDelete = validateAndGetAttachments (request .attachmentsToDelete (), task );
74+ attachmentsToDelete .stream ()
75+ .peek (Attachment ::softDelete )
76+ .forEach (commandAttachmentPort ::save );
77+ updateAttachments (files , task );
7478 }
7579 else {
76- updateAttachmentWithoutAttachmentsToDelete (files , task );
80+ updateAttachments (files , task );
7781 }
7882 task .updateTask (requesterId , category , request .title (), request .description (), attachmentCount );
7983 taskService .upsert (task );
@@ -129,20 +133,7 @@ public void updateTaskLabel(Long taskId, Long memberId, UpdateTaskLabelRequest r
129133 taskService .upsert (task );
130134 }
131135
132- private void updateAttachments (List <Long > attachmentIdsToDelete , List <MultipartFile > files , Task task ) {
133- List <Attachment > attachmentsToDelete = validateAndGetAttachments (attachmentIdsToDelete , task );
134- attachmentsToDelete .stream ()
135- .peek (Attachment ::softDelete )
136- .forEach (commandAttachmentPort ::save );
137-
138- if (files != null ) {
139- List <String > fileUrls = s3UploadPort .uploadFiles (FilePathConstants .TASK_FILE , files );
140- List <Attachment > attachments = AttachmentMapper .toTaskAttachments (task , files , fileUrls );
141- commandAttachmentPort .saveAll (attachments );
142- }
143- }
144-
145- private void updateAttachmentWithoutAttachmentsToDelete (List <MultipartFile > files , Task task ) {
136+ private void updateAttachments (List <MultipartFile > files , Task task ) {
146137 if (files != null ) {
147138 List <String > fileUrls = s3UploadPort .uploadFiles (FilePathConstants .TASK_FILE , files );
148139 List <Attachment > attachments = AttachmentMapper .toTaskAttachments (task , files , fileUrls );
0 commit comments