Skip to content

Commit 4f218b8

Browse files
committed
CLAP-113 Refactor: attachment 조회 시 comment null 조건 추가
<footer> - 관련: #76
1 parent 25bc069 commit 4f218b8

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public List<Attachment> findAllByTaskIdAndCommentIsNull(final Long taskId) {
4545
.collect(Collectors.toList());
4646
}
4747

48-
public List<Attachment> findAllByTaskIdAndAttachmentIdIn(final Long taskId, final List<Long> attachmentIds) {
49-
List<AttachmentEntity> attachmentEntities = attachmentRepository.findAllByTask_TaskIdAndAttachmentIdIn(taskId, attachmentIds);
48+
public List<Attachment> findAllByTaskIdAndCommentIsNullAndAttachmentId(final Long taskId, final List<Long> attachmentIds) {
49+
List<AttachmentEntity> attachmentEntities = attachmentRepository.findAllByTask_TaskIdAndCommentIsNullAndAttachmentIdIn(taskId, attachmentIds);
5050
return attachmentEntities.stream()
5151
.map(attachmentPersistenceMapper::toDomain)
5252
.collect(Collectors.toList());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
public interface AttachmentRepository extends JpaRepository<AttachmentEntity, Long> {
1111
List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNull(Long taskId);
1212
void deleteAllByAttachmentIdIn(List<Long> attachmentIds);
13-
List<AttachmentEntity> findAllByTask_TaskIdAndAttachmentIdIn(Long task_taskId, List<Long> attachmentId);
13+
List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNullAndAttachmentIdIn(Long task_taskId, List<Long> attachmentId);
1414

1515
}

src/main/java/clap/server/application/Task/UpdateTaskService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartF
6767
}
6868

6969
private void validateAttachments(List<Long> attachmentIdsToDelete, Task task) {
70-
List<Attachment> attachmentsOfTask = loadAttachmentPort.findAllByTaskIdAndAttachmentIdIn(task.getTaskId(), attachmentIdsToDelete);
70+
List<Attachment> attachmentsOfTask = loadAttachmentPort.findAllByTaskIdAndCommentIsNullAndAttachmentId(task.getTaskId(), attachmentIdsToDelete);
7171
if(attachmentsOfTask.size() != attachmentIdsToDelete.size()) {
7272
throw new ApplicationException(TaskErrorCode.TASK_ATTACHMENT_NOT_FOUND);
7373
}

src/main/java/clap/server/application/port/outbound/task/LoadAttachmentPort.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77

88
public interface LoadAttachmentPort {
99
List<Attachment> findAllByTaskIdAndCommentIsNull(Long task);
10-
List<Attachment> findAllByTaskIdAndAttachmentIdIn(Long taskId, List<Long> attachmentIds);
10+
List<Attachment> findAllByTaskIdAndCommentIsNullAndAttachmentId(Long taskId, List<Long> attachmentIds);
1111
}

0 commit comments

Comments
 (0)