From 618f13f969ddcecb835527ef79ef19a33ac49e7c Mon Sep 17 00:00:00 2001 From: Kim-TaeUk Date: Thu, 12 Sep 2024 14:05:46 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[FIX]=20=EA=B4=80=EC=8B=AC=EA=B8=80=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=9D=91=EB=8B=B5=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=8D=BC=ED=8B=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 관심 소설이 없는 경우와 관심 소설은 있지만 연관된 피드가 없는 경우 분리를 위해 message 프로퍼티 추가 --- .../WSSServer/dto/feed/InterestFeedsGetResponse.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java b/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java index f85fedb2..189b5ffa 100644 --- a/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java +++ b/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java @@ -3,10 +3,15 @@ import java.util.List; public record InterestFeedsGetResponse( - List recommendFeeds + List recommendFeeds, + String message ) { public static InterestFeedsGetResponse of(List interestFeedGetResponses) { - return new InterestFeedsGetResponse(interestFeedGetResponses); + return new InterestFeedsGetResponse(interestFeedGetResponses, null); + } + + public static InterestFeedsGetResponse of(List interestFeedGetResponses, String message) { + return new InterestFeedsGetResponse(interestFeedGetResponses, message); } } From 7cb75844296dbcb81b0a4acc85a9bd2c5fb09f81 Mon Sep 17 00:00:00 2001 From: Kim-TaeUk Date: Thu, 12 Sep 2024 14:07:19 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[FIX]=20=EA=B4=80=EC=8B=AC=20=EC=86=8C?= =?UTF-8?q?=EC=84=A4=EC=9D=B4=20=EC=97=86=EB=8A=94=20=EA=B2=BD=EC=9A=B0?= =?UTF-8?q?=EC=9D=BC=20=EB=95=8C=20=EC=9D=91=EB=8B=B5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/websoso/WSSServer/service/FeedService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/websoso/WSSServer/service/FeedService.java b/src/main/java/org/websoso/WSSServer/service/FeedService.java index 896f4ea9..473882e7 100644 --- a/src/main/java/org/websoso/WSSServer/service/FeedService.java +++ b/src/main/java/org/websoso/WSSServer/service/FeedService.java @@ -9,6 +9,7 @@ import static org.websoso.WSSServer.exception.error.CustomUserError.PRIVATE_PROFILE_STATUS; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; @@ -269,6 +270,10 @@ public InterestFeedsGetResponse getInterestFeeds(User user) { .map(UserNovel::getNovel) .toList(); + if (interestNovels.isEmpty()) { + return InterestFeedsGetResponse.of(Collections.emptyList(), "NO_INTEREST_NOVELS"); + } + Map novelMap = interestNovels .stream() .collect(Collectors.toMap(Novel::getNovelId, novel -> novel)); From 464d0eba32647d4a5040599cf5532cd5603a04d2 Mon Sep 17 00:00:00 2001 From: Kim-TaeUk Date: Thu, 12 Sep 2024 14:07:24 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[FIX]=20=EC=97=B0=EA=B4=80=EB=90=9C=20?= =?UTF-8?q?=ED=94=BC=EB=93=9C=EA=B0=80=20=EC=97=86=EB=8A=94=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=EC=9D=BC=20=EB=95=8C=20=EC=9D=91=EB=8B=B5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/websoso/WSSServer/service/FeedService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/websoso/WSSServer/service/FeedService.java b/src/main/java/org/websoso/WSSServer/service/FeedService.java index 473882e7..00a94afb 100644 --- a/src/main/java/org/websoso/WSSServer/service/FeedService.java +++ b/src/main/java/org/websoso/WSSServer/service/FeedService.java @@ -280,6 +280,11 @@ public InterestFeedsGetResponse getInterestFeeds(User user) { List interestNovelIds = new ArrayList<>(novelMap.keySet()); List interestFeeds = feedRepository.findTop10ByNovelIdInOrderByFeedIdDesc(interestNovelIds); + + if (interestFeeds.isEmpty()) { + return InterestFeedsGetResponse.of(Collections.emptyList(), "NO_ASSOCIATED_FEEDS"); + } + Set avatarIds = interestFeeds.stream() .map(feed -> feed.getUser().getAvatarId()) .collect(Collectors.toSet()); From 3128d524f650cd416149c34fd4b3bb6443ba36d5 Mon Sep 17 00:00:00 2001 From: Kim-TaeUk Date: Thu, 12 Sep 2024 14:07:45 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[FIX]=20=EC=A0=95=EC=83=81=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20message=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=ED=8D=BC=ED=8B=B0=EB=8A=94=20=EC=A0=9C=EC=99=B8?= =?UTF-8?q?=ED=95=98=EA=B3=A0=20=EC=9D=91=EB=8B=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java b/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java index 189b5ffa..1852031a 100644 --- a/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java +++ b/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java @@ -1,9 +1,13 @@ package org.websoso.WSSServer.dto.feed; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; import java.util.List; public record InterestFeedsGetResponse( List recommendFeeds, + + @JsonInclude(Include.NON_NULL) String message ) { From b7691a4dfea450cc41de4f597889117d9c621c75 Mon Sep 17 00:00:00 2001 From: Kim-TaeUk Date: Thu, 12 Sep 2024 14:08:38 +0900 Subject: [PATCH 5/8] [REFACTOR] Include.NON_NULL static import --- .../websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java b/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java index 1852031a..42d8e335 100644 --- a/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java +++ b/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java @@ -1,13 +1,14 @@ package org.websoso.WSSServer.dto.feed; +import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL; + import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import java.util.List; public record InterestFeedsGetResponse( List recommendFeeds, - @JsonInclude(Include.NON_NULL) + @JsonInclude(NON_NULL) String message ) { From ffe7ca573f02a6be2e99c8297305d0375339e085 Mon Sep 17 00:00:00 2001 From: Kim-TaeUk Date: Thu, 12 Sep 2024 15:27:28 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[FIX]=20=EC=A0=95=EC=83=81=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=EC=9D=BC=20=EB=95=8C=EB=8F=84=20message=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=ED=8D=BC=ED=8B=B0=20=EB=82=B4=EB=A0=A4=EC=A3=BC?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 클라이언트 요구사항 반영 --- src/main/java/org/websoso/WSSServer/service/FeedService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/websoso/WSSServer/service/FeedService.java b/src/main/java/org/websoso/WSSServer/service/FeedService.java index 00a94afb..b5329739 100644 --- a/src/main/java/org/websoso/WSSServer/service/FeedService.java +++ b/src/main/java/org/websoso/WSSServer/service/FeedService.java @@ -299,7 +299,7 @@ public InterestFeedsGetResponse getInterestFeeds(User user) { return InterestFeedGetResponse.of(novel, feed.getUser(), feed, avatar); }) .toList(); - return InterestFeedsGetResponse.of(interestFeedGetResponses); + return InterestFeedsGetResponse.of(interestFeedGetResponses, ""); } public NovelGetResponseFeedTab getFeedsByNovel(User user, Long novelId, Long lastFeedId, int size) { From e5799b6b6b4f017e1ac24fc723dedfe58e4b66f7 Mon Sep 17 00:00:00 2001 From: Kim-TaeUk Date: Thu, 12 Sep 2024 15:27:54 +0900 Subject: [PATCH 7/8] =?UTF-8?q?[REMOVE]=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20@JsonInclude=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java b/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java index 42d8e335..4b290390 100644 --- a/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java +++ b/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java @@ -1,14 +1,10 @@ package org.websoso.WSSServer.dto.feed; -import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL; - -import com.fasterxml.jackson.annotation.JsonInclude; import java.util.List; public record InterestFeedsGetResponse( List recommendFeeds, - @JsonInclude(NON_NULL) String message ) { From 6e02b0898dc3c80f985e3d5b076a86dbeb119f64 Mon Sep 17 00:00:00 2001 From: Kim-TaeUk Date: Thu, 12 Sep 2024 15:28:17 +0900 Subject: [PATCH 8/8] =?UTF-8?q?[REMOVE]=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20of=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java b/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java index 4b290390..d1c85d7b 100644 --- a/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java +++ b/src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedsGetResponse.java @@ -8,10 +8,6 @@ public record InterestFeedsGetResponse( String message ) { - public static InterestFeedsGetResponse of(List interestFeedGetResponses) { - return new InterestFeedsGetResponse(interestFeedGetResponses, null); - } - public static InterestFeedsGetResponse of(List interestFeedGetResponses, String message) { return new InterestFeedsGetResponse(interestFeedGetResponses, message); }