Merge pull request #85 from Princess-in-silvertown/feat/52

Feat: 수신된 롤링페이퍼 그룹 필터링 기반 조회 기능
Princess-in-silvertown · Sep 30, 2024 · 6b294da · 6b294da
2 parents d6bdc41 + 2199404
commit 6b294da
Show file tree

Hide file tree

Showing 5 changed files with 210 additions and 6 deletions.
diff --git a/src/main/java/slvtwn/khu/toyouserver/application/RollingPaperService.java b/src/main/java/slvtwn/khu/toyouserver/application/RollingPaperService.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import slvtwn.khu.toyouserver.agent.modellabs.ModelLabsAgent;
@@ -62,6 +63,15 @@ public RollingPaperResponse findById(Long userId, Long rollingPaperId) {
 		return RollingPaperResponse.from(rollingPaper);
 	}
 
+	public List<RollingPaperResponse> findReceivedRollingPapers(Long userId, Long groupId,
+	                                                            Long targetId, Integer limit) {
+		List<Long> memberIds = getMemberIds(userId, groupId);
+		PageRequest pageRequest = PageRequest.ofSize(limit);
+		return rollingPaperRepository.findAllByMembersAfterCursor(memberIds, targetId, pageRequest).stream()
+				.map(RollingPaperResponse::from)
+				.toList();
+	}
+
 	private List<Sticker> parseStickers(RollingPaperRequest request, RollingPaper rollingPaper) {
 		return request.stickers().stream()
 				.map(each -> new Sticker(rollingPaper, each.imageUrl(), each.x(), each.y(),
@@ -74,4 +84,19 @@ private void assertUserIsRollingPaperOwner(User user, RollingPaper rollingPaper)
 			throw new ToyouException(ResponseType.UNAUTHORIZED_USER_ACCESS);
 		}
 	}
+
+	private List<Long> getMemberIds(Long userId, Long groupId) {
+		User user = userRepository.findById(userId)
+				.orElseThrow(() -> new ToyouException(ResponseType.USER_NOT_FOUND));
+		if (groupId == null) {
+			List<Member> members = memberRepository.findByUser(user);
+			return members.stream()
+					.map(Member::getId)
+					.toList();
+		} else {
+			Member member = memberRepository.findByUserIdAndGroupId(userId, groupId)
+					.orElseThrow(() -> new ToyouException(ResponseType.MEMBER_NOT_FOUND));
+			return List.of(member.getId());
+		}
+	}
 }
diff --git a/src/main/java/slvtwn/khu/toyouserver/common/response/ResponseType.java b/src/main/java/slvtwn/khu/toyouserver/common/response/ResponseType.java
@@ -31,6 +31,7 @@ public enum ResponseType {
 	NOT_FOUND(HttpStatus.NOT_FOUND, "TYU-404", "요청한 자원을 찾을 수 없습니다."),
 	GROUP_NOT_FOUND(HttpStatus.NOT_FOUND, "TYU-4041", "그룹을 찾을 수 없습니다."),
 	USER_NOT_FOUND(HttpStatus.NOT_FOUND, "TYU-4042", "사용자를 찾을 수 없습니다."),
+	MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "TYU-4043", "가입 기록이 존재하지 않습니다."),
 
 	// 500 Internal Server Error
 	INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "TYU-500", "서버 내부 오류");

diff --git a/src/main/java/slvtwn/khu/toyouserver/persistance/RollingPaperRepository.java b/src/main/java/slvtwn/khu/toyouserver/persistance/RollingPaperRepository.java
@@ -1,7 +1,16 @@
 package slvtwn.khu.toyouserver.persistance;
 
+import java.util.List;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import slvtwn.khu.toyouserver.domain.RollingPaper;
 
 public interface RollingPaperRepository extends JpaRepository<RollingPaper, Long> {
+
+	@Query("SELECT r FROM RollingPaper r WHERE r.member.id IN :memberIds AND r.id < :targetId ORDER BY r.id DESC")
+	List<RollingPaper> findAllByMembersAfterCursor(@Param("memberIds") List<Long> memberIds,
+	                                               @Param("targetId") Long targetId,
+	                                               Pageable pageable);
 }
diff --git a/src/main/java/slvtwn/khu/toyouserver/presentation/RollingPaperController.java b/src/main/java/slvtwn/khu/toyouserver/presentation/RollingPaperController.java
@@ -1,5 +1,6 @@
 package slvtwn.khu.toyouserver.presentation;
 
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -20,23 +21,32 @@ public class RollingPaperController {
 
 	private final RollingPaperService rollingPaperService;
 
-	@GetMapping("/rollingpapers")
+	@GetMapping("/rollingpapers/{rollingPaperId}")
 	public ToyouResponse<RollingPaperResponse> findById(@UserAuthentication Long userId,
-	                                                    @RequestParam Long rollingPaperId) {
+	                                                    @PathVariable Long rollingPaperId) {
 		return ToyouResponse.from(rollingPaperService.findById(userId, rollingPaperId));
 	}
 
+	@GetMapping("/rollingpapers")
+	public ToyouResponse<List<RollingPaperResponse>> findReceivedRollingPapers(@UserAuthentication Long userId,
+	                                                                           @RequestParam Long groupId,
+	                                                                           @RequestParam Long targetId,
+	                                                                           @RequestParam(defaultValue = "10") int limit) {
+		return ToyouResponse.from(rollingPaperService.findReceivedRollingPapers(userId, groupId, targetId, limit));
+	}
+
 	@PostMapping("/users/{userId}/rollingpapers")
 	public ToyouResponse<Void> sendRollingPaper(@UserAuthentication Long RequestUserId,
-												@PathVariable(name = "userId") Long recipientUserId,
-												@RequestBody RollingPaperRequest rollingPaperRequest) {
+	                                            @PathVariable(name = "userId") Long recipientUserId,
+	                                            @RequestBody RollingPaperRequest rollingPaperRequest) {
 		rollingPaperService.sendRollingPaper(recipientUserId, rollingPaperRequest);
 		return ToyouResponse.noContent();
 	}
 
 	@PostMapping("/rollingpapers/{rollingPaperId}/generate-cover")
 	public ToyouResponse<Void> generateCoverImage(@UserAuthentication Long userId,
-	                               @PathVariable Long rollingPaperId, @RequestBody CoverRequest request) {
+	                                              @PathVariable Long rollingPaperId,
+	                                              @RequestBody CoverRequest request) {
 		rollingPaperService.generateCoverImageAndUpdateRollingPaper(request, rollingPaperId);
 		return ToyouResponse.noContent();
 	}

diff --git a/src/test/java/slvtwn/khu/toyouserver/application/RollingPaperServiceTest.java b/src/test/java/slvtwn/khu/toyouserver/application/RollingPaperServiceTest.java
@@ -20,7 +20,6 @@
 import slvtwn.khu.toyouserver.domain.Group;
 import slvtwn.khu.toyouserver.domain.Member;
 import slvtwn.khu.toyouserver.domain.RollingPaper;
-import slvtwn.khu.toyouserver.domain.SocialAuthProvider;
 import slvtwn.khu.toyouserver.domain.User;
 import slvtwn.khu.toyouserver.dto.CoverRequest;
 import slvtwn.khu.toyouserver.dto.RollingPaperRequest;
@@ -111,4 +110,164 @@ class RollingPaperServiceTest {
 		assertThat(response).usingRecursiveComparison()
 				.isEqualTo(RollingPaperResponse.from(rollingPaper));
 	}
+
+	@Test
+	void 사용자는_자신이_수신한_롤링페이퍼를_조회할_수_있다() {
+		// given
+		Group group = new Group("name");
+		User user = new User("name", LocalDate.now(), "introduction", "profile_picture", null);
+		Member member = new Member(user, group);
+		RollingPaper rollingPaper = new RollingPaper(null, "title", "content", 1L, member);
+
+		entityManager.persist(user);
+		entityManager.persist(group);
+		entityManager.persist(member);
+		entityManager.persist(rollingPaper);
+
+		// when
+		List<RollingPaperResponse> response = rollingPaperService.findReceivedRollingPapers(user.getId(), group.getId(),
+				rollingPaper.getId() + 1, 10);
+
+		// then
+		assertThat(response).usingRecursiveComparison()
+				.isEqualTo(List.of(RollingPaperResponse.from(rollingPaper)));
+	}
+
+	@Test
+	void 수신한_롤링페이퍼_조회는_그룹_식별자가_null인_경우_유저가_수신한_모든_롤링페이퍼를_반환한다() {
+		// given
+		User user = new User("name", LocalDate.now(), "introduction", "profile_picture", null);
+		Group group1 = new Group("group1");
+		Group group2 = new Group("group2");
+		Member member1 = new Member(user, group1);
+		Member member2 = new Member(user, group2);
+		RollingPaper rollingPaper = new RollingPaper(null, "title", "rollingPaper", 1L, member1);
+		RollingPaper anotherRollingPaper = new RollingPaper(null, "title", "anotherRollingPaper", 1L, member2);
+
+		entityManager.persist(user);
+		entityManager.persist(group1);
+		entityManager.persist(group2);
+		entityManager.persist(member1);
+		entityManager.persist(member2);
+		entityManager.persist(rollingPaper);
+		entityManager.persist(anotherRollingPaper);
+
+		// when
+		List<RollingPaperResponse> responseWithoutGroupId = rollingPaperService.findReceivedRollingPapers(
+				user.getId(),
+				null,
+				anotherRollingPaper.getId() + 1, 10);
+
+		// then
+		assertThat(responseWithoutGroupId).usingRecursiveComparison()
+				.isEqualTo(List.of(
+						RollingPaperResponse.from(anotherRollingPaper),
+						RollingPaperResponse.from(rollingPaper)));
+
+	}
+
+	@Test
+	void 수신한_롤링페이퍼_조회는_그룹_식별자가_존재할_경우_해당_그룹의_롤링페이퍼만_반환한다() {
+		// given
+		User user = new User("name", LocalDate.now(), "introduction", "profile_picture", null);
+		Group group1 = new Group("group1");
+		Group group2 = new Group("group2");
+		Member member1 = new Member(user, group1);
+		Member member2 = new Member(user, group2);
+		RollingPaper rollingPaper = new RollingPaper(null, "title", "rollingPaper", 1L, member1);
+		RollingPaper anotherRollingPaper = new RollingPaper(null, "title", "anotherRollingPaper", 1L, member2);
+
+		entityManager.persist(user);
+		entityManager.persist(group1);
+		entityManager.persist(group2);
+		entityManager.persist(member1);
+		entityManager.persist(member2);
+		entityManager.persist(rollingPaper);
+		entityManager.persist(anotherRollingPaper);
+
+		// when
+		List<RollingPaperResponse> responseWithGroupId = rollingPaperService.findReceivedRollingPapers(
+				user.getId(),
+				group1.getId(),
+				rollingPaper.getId() + 1, 10);
+
+		// then
+		assertThat(responseWithGroupId).usingRecursiveComparison()
+				.isEqualTo(List.of(RollingPaperResponse.from(rollingPaper)));
+	}
+
+	@Test
+	void 수신한_롤링페이퍼_조회는_다른_그룹의_커서를_사용해도_해당_그룹의_편지만_조회된다() {
+		// given
+		User user = new User("name", LocalDate.now(), "introduction", "profile_picture", null);
+		Group group1 = new Group("group1");
+		Group group2 = new Group("group2");
+		Member member1 = new Member(user, group1);
+		Member member2 = new Member(user, group2);
+
+		RollingPaper rollingPaper1 = new RollingPaper(null, "title1", "rollingPaper1", 1L, member1);
+		RollingPaper rollingPaper2 = new RollingPaper(null, "title2", "rollingPaper2", 1L, member1);
+		RollingPaper rollingPaper3 = new RollingPaper(null, "title3", "rollingPaper3", 1L, member2);
+
+		entityManager.persist(user);
+		entityManager.persist(group1);
+		entityManager.persist(group2);
+		entityManager.persist(member1);
+		entityManager.persist(member2);
+		entityManager.persist(rollingPaper1);
+		entityManager.persist(rollingPaper2);
+		entityManager.persist(rollingPaper3);
+
+		long totalRollingPapersCount = rollingPaper3.getId() + 1;
+
+		// when
+		List<RollingPaperResponse> response = rollingPaperService.findReceivedRollingPapers(
+				user.getId(),
+				group1.getId(),
+				totalRollingPapersCount, 10);
+
+		// then
+		List<RollingPaperResponse> expectedResponse = List.of(
+				RollingPaperResponse.from(rollingPaper2),
+				RollingPaperResponse.from(rollingPaper1)
+		);
+
+		assertThat(response).usingRecursiveComparison()
+				.isEqualTo(expectedResponse);
+	}
+
+	@Test
+	void 수신한_롤링페이퍼_조회는_생성된_시간이_최신인_롤링페이퍼부터_조회된다() {
+		// given
+		User user = new User("name", LocalDate.now(), "introduction", "profile_picture", null);
+		Group group = new Group("group");
+		Member member = new Member(user, group);
+
+		RollingPaper rollingPaper1 = new RollingPaper(null, "title1", "rollingPaper1", 1L, member);
+		RollingPaper rollingPaper2 = new RollingPaper(null, "title2", "rollingPaper2", 1L, member);
+		RollingPaper rollingPaper3 = new RollingPaper(null, "title3", "rollingPaper3", 1L, member);
+
+		entityManager.persist(user);
+		entityManager.persist(group);
+		entityManager.persist(member);
+		entityManager.persist(rollingPaper1);
+		entityManager.persist(rollingPaper2);
+		entityManager.persist(rollingPaper3);
+
+		// when
+		List<RollingPaperResponse> response = rollingPaperService.findReceivedRollingPapers(
+				user.getId(),
+				group.getId(),
+				rollingPaper3.getId() + 1, 10);
+
+		// then
+		List<RollingPaperResponse> expectedResponse = List.of(
+				RollingPaperResponse.from(rollingPaper3),
+				RollingPaperResponse.from(rollingPaper2),
+				RollingPaperResponse.from(rollingPaper1)
+		);
+
+		assertThat(response).usingRecursiveComparison()
+				.isEqualTo(expectedResponse);
+	}
 }