[feat #53] 추천 질문 조회 API (#55)

* [feat] : 추천 게시글 응답 dto 추가

* [feat] : 추천 게시물 조회 쿼리 작성

* [test] : 추천 게시물 조회 쿼리 테스트

* [feat] : 추천 게시물 조회 비즈니스 로직 추가

* [feat] : 추천 게시물 조회 controller 로직 작성

* [test] : 추천 게시물 조회 controller 로직 테스트

* [fix] : 직군 필터 쿼리 수정

* [test] : 직군 필터 쿼리 수정 -> 테스트 반영

* [style] : 코드 리포멧팅

* [feat] : 질문 게시물 검색 쿼리에 최신순 정렬 추가

* [test] : 질문 게시물 검색 쿼리에 최신순 정렬 추가 반영

* [test] : interactionFixture 통합

src/main/java/com/dnd/gongmuin/question_post/controller/QuestionPostController.java

@@ -16,6 +16,7 @@
 import com.dnd.gongmuin.question_post.dto.request.RegisterQuestionPostRequest;
 import com.dnd.gongmuin.question_post.dto.response.QuestionPostDetailResponse;
 import com.dnd.gongmuin.question_post.dto.response.QuestionPostSimpleResponse;
+import com.dnd.gongmuin.question_post.dto.response.RecQuestionPostResponse;
 import com.dnd.gongmuin.question_post.dto.response.RegisterQuestionPostResponse;
 import com.dnd.gongmuin.question_post.service.QuestionPostService;
 
@@ -64,4 +65,14 @@ public ResponseEntity<PageResponse<QuestionPostSimpleResponse>> searchQuestionPo
 			condition, pageable);
 		return ResponseEntity.ok(response);
 	}
+
+	@GetMapping("/api/question-posts/recommends")
+	public ResponseEntity<PageResponse<RecQuestionPostResponse>> getRecommendQuestionPosts(
+		@AuthenticationPrincipal Member member,
+		Pageable pageable
+	) {
+		PageResponse<RecQuestionPostResponse> response
+			= questionPostService.getRecommendQuestionPosts(member, pageable);
+		return ResponseEntity.ok(response);
+	}
 }

src/main/java/com/dnd/gongmuin/question_post/dto/response/RecQuestionPostResponse.java

@@ -0,0 +1,30 @@
+package com.dnd.gongmuin.question_post.dto.response;
+
+import com.dnd.gongmuin.question_post.domain.QuestionPost;
+import com.querydsl.core.annotations.QueryProjection;
+
+public record RecQuestionPostResponse(
+	Long questionPostId,
+	String title,
+	int reward,
+	boolean isChosen,
+	int savedCount,
+	int recommendCount
+) {
+
+	@QueryProjection
+	public RecQuestionPostResponse(
+		QuestionPost questionPost,
+		int savedCount,
+		int recommendCount
+	) {
+		this(
+			questionPost.getId(),
+			questionPost.getTitle(),
+			questionPost.getReward(),
+			questionPost.getIsChosen(),
+			savedCount,
+			recommendCount
+		);
+	}
+}

src/main/java/com/dnd/gongmuin/question_post/repository/QuestionPostQueryRepository.java

@@ -3,9 +3,18 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 
+import com.dnd.gongmuin.member.domain.JobGroup;
 import com.dnd.gongmuin.question_post.dto.request.QuestionPostSearchCondition;
 import com.dnd.gongmuin.question_post.dto.response.QuestionPostSimpleResponse;
+import com.dnd.gongmuin.question_post.dto.response.RecQuestionPostResponse;
 
 public interface QuestionPostQueryRepository {
-	Slice<QuestionPostSimpleResponse> searchQuestionPosts(QuestionPostSearchCondition condition, Pageable pageable);
+	Slice<QuestionPostSimpleResponse> searchQuestionPosts(
+		QuestionPostSearchCondition condition, Pageable pageable
+	);
+
+	Slice<RecQuestionPostResponse> getRecommendQuestionPosts(
+		JobGroup targetJobGroup,
+		Pageable pageable
+	);
 }

src/main/java/com/dnd/gongmuin/question_post/repository/QuestionPostQueryRepositoryImpl.java

@@ -15,7 +15,9 @@
 import com.dnd.gongmuin.question_post.domain.QQuestionPost;
 import com.dnd.gongmuin.question_post.dto.request.QuestionPostSearchCondition;
 import com.dnd.gongmuin.question_post.dto.response.QQuestionPostSimpleResponse;
+import com.dnd.gongmuin.question_post.dto.response.QRecQuestionPostResponse;
 import com.dnd.gongmuin.question_post.dto.response.QuestionPostSimpleResponse;
+import com.dnd.gongmuin.question_post.dto.response.RecQuestionPostResponse;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
@@ -54,6 +56,44 @@ public Slice<QuestionPostSimpleResponse> searchQuestionPosts(
 				jobGroupContains(condition.jobGroups()),
 				isChosenEq(condition.isChosen())
 			)
+			.orderBy(questionPost.createdAt.desc())
+			.limit(pageable.getPageSize() + 1L)
+			.offset(pageable.getOffset())
+			.fetch();
+		boolean hasNext = hasNext(pageable.getPageSize(), content);
+		return new SliceImpl<>(content, pageable, hasNext);
+	}
+
+	@Override
+	public Slice<RecQuestionPostResponse> getRecommendQuestionPosts(
+		JobGroup targetJobGroup,
+		Pageable pageable
+	) {
+		QQuestionPost questionPost = QQuestionPost.questionPost;
+		QInteractionCount saved = new QInteractionCount("saved");
+		QInteractionCount recommend = new QInteractionCount("recommend");
+
+		List<RecQuestionPostResponse> content = queryFactory
+			.select(new QRecQuestionPostResponse(
+				questionPost,
+				saved.count.coalesce(0),
+				recommend.count.coalesce(0)
+			))
+			.from(questionPost)
+			.leftJoin(saved)
+			.on(questionPost.id.eq(saved.questionPostId)
+				.and(saved.type.eq(InteractionType.SAVED)))
+			.leftJoin(recommend)
+			.on(questionPost.id.eq(recommend.questionPostId)
+				.and(recommend.type.eq(InteractionType.RECOMMEND)))
+			.where(
+				questionPost.jobGroup.eq(targetJobGroup)
+			)
+			.orderBy(
+				recommend.count.coalesce(0).desc(),
+				saved.count.coalesce(0).desc(),
+				questionPost.createdAt.desc()
+			)
 			.limit(pageable.getPageSize() + 1L)
 			.offset(pageable.getOffset())
 			.fetch();
@@ -83,11 +123,11 @@ private BooleanExpression keywordContains(String keyword) {
 		return keyword != null ? questionPost.title.contains(keyword) : null;
 	}
 
-	private boolean hasNext(int pageSize, List<QuestionPostSimpleResponse> questionPosts) {
-		if (questionPosts.size() <= pageSize) {
+	private <T> boolean hasNext(int pageSize, List<T> items) {
+		if (items.size() <= pageSize) {
 			return false;
 		}
-		questionPosts.remove(pageSize);
+		items.remove(pageSize);
 		return true;
 	}
 }

src/main/java/com/dnd/gongmuin/question_post/service/QuestionPostService.java

@@ -20,6 +20,7 @@
 import com.dnd.gongmuin.question_post.dto.request.RegisterQuestionPostRequest;
 import com.dnd.gongmuin.question_post.dto.response.QuestionPostDetailResponse;
 import com.dnd.gongmuin.question_post.dto.response.QuestionPostSimpleResponse;
+import com.dnd.gongmuin.question_post.dto.response.RecQuestionPostResponse;
 import com.dnd.gongmuin.question_post.dto.response.RegisterQuestionPostResponse;
 import com.dnd.gongmuin.question_post.exception.QuestionPostErrorCode;
 import com.dnd.gongmuin.question_post.repository.QuestionPostRepository;
@@ -64,8 +65,18 @@ public PageResponse<QuestionPostSimpleResponse> searchQuestionPost(
 		QuestionPostSearchCondition condition,
 		Pageable pageable
 	) {
-		Slice<QuestionPostSimpleResponse> responsePage = questionPostRepository
-			.searchQuestionPosts(condition, pageable);
+		Slice<QuestionPostSimpleResponse> responsePage =
+			questionPostRepository.searchQuestionPosts(condition, pageable);
+		return PageMapper.toPageResponse(responsePage);
+	}
+
+	@Transactional(readOnly = true)
+	public PageResponse<RecQuestionPostResponse> getRecommendQuestionPosts(
+		Member member,
+		Pageable pageable
+	) {
+		Slice<RecQuestionPostResponse> responsePage
+			= questionPostRepository.getRecommendQuestionPosts(member.getJobGroup(), pageable);
 		return PageMapper.toPageResponse(responsePage);
 	}
 

src/test/java/com/dnd/gongmuin/common/fixture/InteractionFixture.java

@@ -25,8 +25,8 @@ public static Interaction interaction(
 		ReflectionTestUtils.setField(interaction, "id", id);
 		return interaction;
 	}
-  
-  public static Interaction interaction(
+
+	public static Interaction interaction(
 		InteractionType type,
 		Long memberId,
 		Long questionPostId
@@ -37,17 +37,4 @@ public static Interaction interaction(
 			questionPostId
 		);
 	}
-
-  public static Interaction interaction2(
-		InteractionType type,
-		Long memberId,
-		Long questionPostId
-	) {
-		Interaction interaction = Interaction.of(
-			type,
-			memberId,
-			questionPostId
-		);
-		return interaction;
-	}
 }

src/test/java/com/dnd/gongmuin/common/fixture/MemberFixture.java

@@ -48,8 +48,12 @@ public static Member member3() {
 
 	public static Member member4() {
 		return Member.of(
+			"회원",
 			"소셜회원",
+			JobGroup.ADMINISTRATION,
+			JobCategory.GAS,
 			"KAKAO1234/[email protected]",
+			"[email protected]",
 			20000
 		);
 	}

src/test/java/com/dnd/gongmuin/member/controller/MemberControllerTest.java

@@ -182,13 +182,13 @@ void getBookmarksByMember() throws Exception {
 		QuestionPost questionPost3 = QuestionPostFixture.questionPost(loginMember, "세 번째 게시글입니다.");
 		questionPostRepository.saveAll(List.of(questionPost1, questionPost2, questionPost3));
 
-		Interaction interaction1 = InteractionFixture.interaction2(InteractionType.SAVED, loginMember.getId(),
+		Interaction interaction1 = InteractionFixture.interaction(InteractionType.SAVED, loginMember.getId(),
 			questionPost1.getId());
-		Interaction interaction3 = InteractionFixture.interaction2(InteractionType.RECOMMEND, loginMember.getId(),
+		Interaction interaction3 = InteractionFixture.interaction(InteractionType.RECOMMEND, loginMember.getId(),
 			questionPost2.getId());
-		Interaction interaction2 = InteractionFixture.interaction2(InteractionType.SAVED, loginMember.getId(),
+		Interaction interaction2 = InteractionFixture.interaction(InteractionType.SAVED, loginMember.getId(),
 			questionPost3.getId());
-		Interaction interaction4 = InteractionFixture.interaction2(InteractionType.RECOMMEND, loginMember.getId(),
+		Interaction interaction4 = InteractionFixture.interaction(InteractionType.RECOMMEND, loginMember.getId(),
 			questionPost3.getId());
 		interactionRepository.saveAll(List.of(interaction1, interaction2, interaction3, interaction4));
 

src/test/java/com/dnd/gongmuin/member/repository/MemberRepositoryTest.java

@@ -365,13 +365,13 @@ void getBookmarksByMember() {
 		QuestionPost questionPost3 = QuestionPostFixture.questionPost(member2, "세 번째 게시글입니다.");
 		questionPostRepository.saveAll(List.of(questionPost1, questionPost2, questionPost3));
 
-		Interaction interaction1 = InteractionFixture.interaction2(InteractionType.SAVED, member1.getId(),
+		Interaction interaction1 = InteractionFixture.interaction(InteractionType.SAVED, member1.getId(),
 			questionPost1.getId());
-		Interaction interaction2 = InteractionFixture.interaction2(InteractionType.SAVED, member1.getId(),
+		Interaction interaction2 = InteractionFixture.interaction(InteractionType.SAVED, member1.getId(),
 			questionPost2.getId());
-		Interaction interaction3 = InteractionFixture.interaction2(InteractionType.RECOMMEND, member1.getId(),
+		Interaction interaction3 = InteractionFixture.interaction(InteractionType.RECOMMEND, member1.getId(),
 			questionPost2.getId());
-		Interaction interaction4 = InteractionFixture.interaction2(InteractionType.RECOMMEND, member1.getId(),
+		Interaction interaction4 = InteractionFixture.interaction(InteractionType.RECOMMEND, member1.getId(),
 			questionPost3.getId());
 		interactionRepository.saveAll(List.of(interaction1, interaction2, interaction3, interaction4));
 

src/test/java/com/dnd/gongmuin/question_post/controller/QuestionPostControllerTest.java

@@ -14,9 +14,16 @@
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
 
+import com.dnd.gongmuin.common.fixture.InteractionCountFixture;
+import com.dnd.gongmuin.common.fixture.InteractionFixture;
 import com.dnd.gongmuin.common.fixture.QuestionPostFixture;
 import com.dnd.gongmuin.common.support.ApiTestSupport;
 import com.dnd.gongmuin.member.exception.MemberErrorCode;
+import com.dnd.gongmuin.post_interaction.domain.Interaction;
+import com.dnd.gongmuin.post_interaction.domain.InteractionCount;
+import com.dnd.gongmuin.post_interaction.domain.InteractionType;
+import com.dnd.gongmuin.post_interaction.repository.InteractionCountRepository;
+import com.dnd.gongmuin.post_interaction.repository.InteractionRepository;
 import com.dnd.gongmuin.question_post.domain.QuestionPost;
 import com.dnd.gongmuin.question_post.dto.request.RegisterQuestionPostRequest;
 import com.dnd.gongmuin.question_post.repository.QuestionPostRepository;
@@ -27,10 +34,18 @@ class QuestionPostControllerTest extends ApiTestSupport {
 	@Autowired
 	private QuestionPostRepository questionPostRepository;
 
+	@Autowired
+	private InteractionRepository interactionRepository;
+
+	@Autowired
+	private InteractionCountRepository interactionCountRepository;
+
 	@AfterEach
 	void teardown() {
 		memberRepository.deleteAll();
 		questionPostRepository.deleteAll();
+		interactionRepository.deleteAll();
+		interactionCountRepository.deleteAll();
 	}
 
 	@DisplayName("[질문글을 등록할 수 있다.]")
@@ -120,8 +135,8 @@ void searchQuestionPost() throws Exception {
 			.andExpect(status().isOk())
 			.andDo(MockMvcResultHandlers.print())
 			.andExpect(jsonPath("$.size").value(2))
-			.andExpect(jsonPath("$.content[0].questionPostId").value(questionPost1.getId()))
-			.andExpect(jsonPath("$.content[1].questionPostId").value(questionPost2.getId()));
+			.andExpect(jsonPath("$.content[0].questionPostId").value(questionPost2.getId())) //최신순 정렬
+			.andExpect(jsonPath("$.content[1].questionPostId").value(questionPost1.getId()));
 	}
 
 	@DisplayName("[질문글을 여러 직군들로 필터링할 수 있다.]")
@@ -174,4 +189,33 @@ void searchQuestionPostByIsChosen() throws Exception {
 			.andExpect(jsonPath("$.size").value(1))
 			.andExpect(jsonPath("$.content[0].questionPostId").value(questionPost2.getId()));
 	}
-}
+
+	@DisplayName("[직군에 맞는 추천 질문 게시물을 조회할 수 있다. 추천순>북마크순]")
+	@Test
+	void getRecommendQuestionPosts() throws Exception {
+		QuestionPost questionPost1 = questionPostRepository.save(QuestionPostFixture.questionPost(loginMember));
+		QuestionPost questionPost2 = questionPostRepository.save(QuestionPostFixture.questionPost(loginMember));
+		QuestionPost questionPost3 = questionPostRepository.save(QuestionPostFixture.questionPost(loginMember));
+		questionPostRepository.saveAll(List.of(questionPost1, questionPost2, questionPost3));
+
+		interactPost(questionPost3.getId(), InteractionType.RECOMMEND);
+		interactPost(questionPost1.getId(), InteractionType.SAVED);
+		mockMvc.perform(get("/api/question-posts/recommends")
+				.header(AUTHORIZATION, accessToken))
+			.andExpect(status().isOk())
+			.andDo(MockMvcResultHandlers.print())
+			.andExpect(jsonPath("$.size").value(3))
+			.andExpect(jsonPath("$.content[0].questionPostId").value(questionPost3.getId()))
+			.andExpect(jsonPath("$.content[1].questionPostId").value(questionPost1.getId()))
+			.andExpect(jsonPath("$.content[2].questionPostId").value(questionPost2.getId()));
+	}
+
+	private void interactPost(Long questionPostId, InteractionType type) {
+		Interaction interaction =
+			InteractionFixture.interaction(type, 2L, questionPostId);
+		interactionRepository.save(interaction);
+		InteractionCount interactionCount =
+			InteractionCountFixture.interactionCount(type, questionPostId);
+		interactionCountRepository.save(interactionCount);
+	}
+}