Skip to content

Commit 59e2669

Browse files
최승원최승원
authored andcommitted
fix: 휴지통 폴더 조회 응답 수정
1 parent 422eb04 commit 59e2669

File tree

4 files changed

+22
-0
lines changed

4 files changed

+22
-0
lines changed
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

src/main/java/com/gdg/linking/domain/item/ItemServiceImpl.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,27 @@ public List<?> getMyItems(Long userId, String filter, String keyword) {
374374

375375
// 폴더 변환
376376
for (Folder folder : trashFolders) {
377+
378+
// 바로 아래 자식 폴더 개수 (상태가 ORPHAN인 직속 폴더만)
379+
long directChildFolderCount = folder.getChildFolders().stream()
380+
.filter(child -> child.getStatus() == Item.ItemStatus.ORPHAN)
381+
.count();
382+
383+
// 바로 아래 자식 아이템 개수 (상태가 ORPHAN인 직속 아이템만)
384+
long directChildItemCount = folder.getItems().stream()
385+
.filter(item -> item.getStatus() == Item.ItemStatus.ORPHAN)
386+
.count();
387+
388+
// 두 개수를 합산
389+
int directTotalCount = (int) (directChildFolderCount + directChildItemCount);
390+
377391
trashList.add(TrashResponse.builder()
378392
.type("FOLDER")
379393
.id(folder.getFId())
380394
.title(folder.getFolderName())
395+
.createdAt(folder.getCreatedAt())
381396
.deletedAt(folder.getDeletedAt())
397+
.totalCount(directTotalCount)
382398
.build());
383399
}
384400

src/main/java/com/gdg/linking/domain/item/dto/response/TrashResponse.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ public class TrashResponse {
3232
@Schema(description = "생성일")
3333
private LocalDateTime createdAt;
3434

35+
@Schema(description = "속한 링크(아이템) 수", example = "15")
36+
private int itemCount;
37+
38+
@Schema(description = "하위 항목 개수", example = "15")
39+
private int totalCount;
40+
3541
@Schema(description = "자식갯수")
3642
private int childCount;
3743

0 commit comments

Comments
 (0)