From df88298e0bf55fee8952bb3bd4548fff4b88015f Mon Sep 17 00:00:00 2001 From: Curry4182 Date: Thu, 7 Mar 2024 14:48:47 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20default=20=ED=8F=B4=EB=8D=94=EB=A5=BC?= =?UTF-8?q?=20=EA=B0=80=EC=9E=A5=20=EB=92=A4=EC=97=90=20=EC=98=A4=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MemberItemFolderFavoriteInfoReader.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/lime-domain/src/main/java/com/programmers/lime/domains/item/implementation/MemberItemFolderFavoriteInfoReader.java b/lime-domain/src/main/java/com/programmers/lime/domains/item/implementation/MemberItemFolderFavoriteInfoReader.java index c9419000d..960d280ea 100644 --- a/lime-domain/src/main/java/com/programmers/lime/domains/item/implementation/MemberItemFolderFavoriteInfoReader.java +++ b/lime-domain/src/main/java/com/programmers/lime/domains/item/implementation/MemberItemFolderFavoriteInfoReader.java @@ -25,6 +25,8 @@ public class MemberItemFolderFavoriteInfoReader implements IFavoriteReader { private static final int DEFAULT_IMAGE_SIZE = 3; private final MemberItemReader memberItemReader; + private static final String DEFAULT_FOLDER_NAME = "default"; + /* * * folder id 가 null 이면 root folder 를 의미한다. @@ -33,17 +35,32 @@ public class MemberItemFolderFavoriteInfoReader implements IFavoriteReader { * */ @Override public List readFavorites(final Long folderId, final Long memberId) { - if (folderId != null) { return Collections.emptyList(); } List memberItemFolders = memberItemFolderReader.readMemberItemFoldersByMemberId(memberId); + moveDefaultFolderToEnd(memberItemFolders); + return memberItemFolders.stream() .map(this::mapToMemberItemObjectInfo) .toList(); } + private void moveDefaultFolderToEnd(final List memberItemFolders) { + List defaultFolders = new ArrayList<>(); + + memberItemFolders.removeIf(folder -> { + boolean isDefault = DEFAULT_FOLDER_NAME.equals(folder.getName()); + if (isDefault) { + defaultFolders.add(folder); + } + return isDefault; + }); + + memberItemFolders.addAll(defaultFolders); + } + @Override public FavoriteType getFavoriteType() { return FavoriteType.FOLDER;