Merge pull request #93 from uju-in/LIME-168-BE-feed-cursor-feat

[LIME-168] 피드 목록 조회 기능 수정
uju-in · May 1, 2024 · 7548480 · 7548480
2 parents 1a5201c + 05d4f35
commit 7548480
Show file tree

Hide file tree

Showing 11 changed files with 138 additions and 112 deletions.
diff --git a/lime-api/src/main/java/com/programmers/lime/domains/feed/api/FeedController.java b/lime-api/src/main/java/com/programmers/lime/domains/feed/api/FeedController.java
@@ -1,5 +1,6 @@
 package com.programmers.lime.domains.feed.api;
 
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -9,12 +10,11 @@
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.programmers.lime.common.cursor.CursorSummary;
-import com.programmers.lime.common.model.Hobby;
 import com.programmers.lime.domains.feed.api.request.FeedCreateRequest;
+import com.programmers.lime.domains.feed.api.request.FeedCursorGetRequest;
 import com.programmers.lime.domains.feed.api.request.FeedUpdateRequest;
 import com.programmers.lime.domains.feed.api.response.FeedCreateResponse;
 import com.programmers.lime.domains.feed.api.response.FeedGetByCursorResponse;
@@ -82,23 +82,15 @@ public ResponseEntity<Void> cancelLikedFeed(@PathVariable final Long feedId) {
 		return ResponseEntity.ok().build();
 	}
 
-	@Operation(summary = "피드 목록 조회", description = "hobbyName, nickname, sortCondition, CursorRequest을 이용하여 피드 목록 조회 합니다.")
+	@Operation(summary = "피드 목록 조회", description = "hobbyName, nickname, sortCondition, 커서 id, 페이지 사이지를 이용하여 피드 목록 조회 합니다.")
 	@GetMapping
 	public ResponseEntity<FeedGetByCursorResponse> getFeedByCursor(
-		@RequestParam(required = false) final String hobbyName,
-		@RequestParam(required = false) final String nickname,
-		@RequestParam(required = false) final boolean onlyNicknameLikeFeeds,
-		@RequestParam(required = false) final String sortCondition,
-		@ModelAttribute @Valid final CursorRequest request
+		@ParameterObject @ModelAttribute @Valid final FeedCursorGetRequest feedCursorGetRequest,
+		@ParameterObject @ModelAttribute @Valid final CursorRequest cursorRequest
 	) {
-		Hobby hobby = Hobby.from(hobbyName);
-
 		CursorSummary<FeedCursorSummaryLike> cursorSummary = feedService.getFeedByCursor(
-			hobby,
-			nickname,
-			onlyNicknameLikeFeeds,
-			sortCondition,
-			request.toParameters()
+			feedCursorGetRequest.toServiceRequest(),
+			cursorRequest.toParameters()
 		);
 		FeedGetByCursorResponse response = FeedGetByCursorResponse.from(cursorSummary);
 

diff --git a/...api/src/main/java/com/programmers/lime/domains/feed/api/request/FeedCursorGetRequest.java b/...api/src/main/java/com/programmers/lime/domains/feed/api/request/FeedCursorGetRequest.java
@@ -0,0 +1,33 @@
+package com.programmers.lime.domains.feed.api.request;
+
+import com.programmers.lime.common.model.Hobby;
+import com.programmers.lime.domains.feed.application.dto.request.FeedGetCursorServiceRequest;
+import com.programmers.lime.domains.feed.model.FeedSortCondition;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+
+public record FeedCursorGetRequest(
+
+	@Schema(description = "취미 이름", example = "농구")
+	String hobbyName,
+
+	@Schema(description = "닉네임", example = "test0")
+	String nickname,
+
+	@Schema(description = "정렬 조건", example = "POPULARITY")
+	String sortCondition
+
+) {
+	public FeedGetCursorServiceRequest toServiceRequest() {
+
+		FeedSortCondition feedSortCondition = FeedSortCondition.from(this.sortCondition);
+		Hobby hobby = Hobby.from(hobbyName);
+
+		return FeedGetCursorServiceRequest.builder()
+			.nickname(nickname)
+			.sortCondition(feedSortCondition)
+			.hobby(hobby)
+			.build();
+	}
+}
diff --git a/lime-api/src/main/java/com/programmers/lime/domains/feed/application/FeedService.java b/lime-api/src/main/java/com/programmers/lime/domains/feed/application/FeedService.java
@@ -7,6 +7,8 @@
 import com.programmers.lime.common.cursor.CursorPageParameters;
 import com.programmers.lime.common.cursor.CursorSummary;
 import com.programmers.lime.common.model.Hobby;
+import com.programmers.lime.domains.feed.api.request.FeedCursorGetRequest;
+import com.programmers.lime.domains.feed.application.dto.request.FeedGetCursorServiceRequest;
 import com.programmers.lime.domains.feed.application.dto.response.FeedGetRankingServiceResponse;
 import com.programmers.lime.domains.feed.application.dto.response.FeedGetServiceResponse;
 import com.programmers.lime.domains.feed.implementation.FeedAppender;
@@ -60,25 +62,16 @@ public void modifyFeed(
 	}
 
 	public CursorSummary<FeedCursorSummaryLike> getFeedByCursor(
-		final Hobby hobby,
-		final String nickName,
-		final boolean onlyNicknameLikeFeeds,
-		final String sortCondition,
+		final FeedGetCursorServiceRequest request,
 		final CursorPageParameters parameters
 	) {
-		FeedSortCondition feedSortCondition = FeedSortCondition.from(sortCondition);
 		Long loginMemberId = memberUtils.getCurrentMemberId();
 
-		if (onlyNicknameLikeFeeds && nickName == null) {
-			throw new BusinessException(ErrorCode.FEED_BAD_LIKE_ONLY_REQUEST);
-		}
-
 		return feedCursorReader.getFeedByCursor(
-			hobby,
-			nickName,
-			onlyNicknameLikeFeeds,
+			request.hobby(),
+			request.nickname(),
 			loginMemberId,
-			feedSortCondition,
+			request.sortCondition(),
 			parameters
 		);
 	}

diff --git a/...om/programmers/lime/domains/feed/application/dto/request/FeedGetCursorServiceRequest.java b/...om/programmers/lime/domains/feed/application/dto/request/FeedGetCursorServiceRequest.java
@@ -1,13 +1,14 @@
 package com.programmers.lime.domains.feed.application.dto.request;
 
 import com.programmers.lime.common.model.Hobby;
+import com.programmers.lime.domains.feed.model.FeedSortCondition;
 
 import lombok.Builder;
 
 @Builder
 public record FeedGetCursorServiceRequest(
-	Long myPageMemberId,
-	Long loginMemberId,
+	String nickname,
+	FeedSortCondition sortCondition,
 	Hobby hobby
 ) {
 }
diff --git a/...main/src/main/java/com/programmers/lime/domains/feed/implementation/FeedCursorReader.java b/...main/src/main/java/com/programmers/lime/domains/feed/implementation/FeedCursorReader.java
@@ -1,6 +1,8 @@
 package com.programmers.lime.domains.feed.implementation;
 
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Component;
 
@@ -10,6 +12,7 @@
 import com.programmers.lime.common.model.Hobby;
 import com.programmers.lime.domains.feed.model.FeedCursorSummary;
 import com.programmers.lime.domains.feed.model.FeedCursorSummaryLike;
+import com.programmers.lime.domains.feed.model.FeedLikeInfo;
 import com.programmers.lime.domains.feed.model.FeedSortCondition;
 import com.programmers.lime.domains.feed.repository.FeedLikeRepository;
 import com.programmers.lime.domains.feed.repository.FeedRepository;
@@ -26,13 +29,10 @@ public class FeedCursorReader {
 
 	private final FeedRepository feedRepository;
 	private final MemberReader memberReader;
-	private final FeedLikeRepository feedLikeRepository;
-	private final FeedReader feedReader;
 
 	public CursorSummary<FeedCursorSummaryLike> getFeedByCursor(
 		final Hobby hobby,
 		final String nickname,
-		final boolean onlyNicknameLikeFeeds,
 		final Long loginMemberId,
 		final FeedSortCondition sortCondition,
 		final CursorPageParameters parameters
@@ -42,25 +42,39 @@ public CursorSummary<FeedCursorSummaryLike> getFeedByCursor(
 
 		List<FeedCursorSummary> feedCursorSummaries = feedRepository.findAllByCursor(
 			nicknameMemberId,
-			onlyNicknameLikeFeeds,
 			hobby,
 			sortCondition,
 			parameters.cursorId(),
 			pageSize
 		);
 
-		List<FeedCursorSummaryLike> feedCursorSummaryLikes = feedCursorSummaries.stream().map(
-			feedCursorSummary -> {
-				boolean isLike = feedLikeRepository.existsByMemberIdAndFeed(
-					loginMemberId,
-					feedReader.read(feedCursorSummary.feedId())
-				);
+		List<FeedCursorSummaryLike> feedCursorSummaryLikes = getFeedCursorSummaryLikes(
+			loginMemberId,
+			feedCursorSummaries
+		);
+
+		return CursorUtils.getCursorSummaries(feedCursorSummaryLikes);
+	}
+
+	private List<FeedCursorSummaryLike> getFeedCursorSummaryLikes(
+		final Long loginMemberId,
+		final List<FeedCursorSummary> feedCursorSummaries
+	) {
+		List<Long> feedIds = feedCursorSummaries.stream()
+			.map(FeedCursorSummary::feedId)
+			.toList();
+
+		Set<Long> feedLikeInfoSet = feedRepository.getFeedLikeInfos(feedIds, loginMemberId)
+			.stream()
+			.map(FeedLikeInfo::feedId)
+			.collect(Collectors.toSet());
 
+		return feedCursorSummaries.stream().map(
+			feedCursorSummary -> {
+				boolean isLike = feedLikeInfoSet.contains(feedCursorSummary.feedId());
 				return feedCursorSummary.of(isLike);
 			}
 		).toList();
-
-		return CursorUtils.getCursorSummaries(feedCursorSummaryLikes);
 	}
 
 	private int getPageSizeByParameter(final CursorPageParameters parameters) {

diff --git a/lime-domain/src/main/java/com/programmers/lime/domains/feed/model/FeedLikeInfo.java b/lime-domain/src/main/java/com/programmers/lime/domains/feed/model/FeedLikeInfo.java
@@ -0,0 +1,8 @@
+package com.programmers.lime.domains.feed.model;
+
+public record FeedLikeInfo(
+	Long feedId,
+	Long memberId
+
+) {
+}
diff --git a/...n/src/main/java/com/programmers/lime/domains/feed/repository/FeedRepositoryForCursor.java b/...n/src/main/java/com/programmers/lime/domains/feed/repository/FeedRepositoryForCursor.java
@@ -4,15 +4,20 @@
 
 import com.programmers.lime.common.model.Hobby;
 import com.programmers.lime.domains.feed.model.FeedCursorSummary;
+import com.programmers.lime.domains.feed.model.FeedLikeInfo;
 import com.programmers.lime.domains.feed.model.FeedSortCondition;
 
 public interface FeedRepositoryForCursor {
 	List<FeedCursorSummary> findAllByCursor(
 		final Long nicknameMemberId,
-		final boolean onlyNicknameLikeFeeds,
 		final Hobby hobby,
 		final FeedSortCondition feedSortCondition,
 		final String cursorId,
 		final int pageSize
 	);
+
+	List<FeedLikeInfo> getFeedLikeInfos(
+		final List<Long> feedIds,
+		final Long loginMemberId
+	);
 }