Merge pull request #85 from jisung-in/feature/83-popluar-talkroom-fin…

…d-api [Feature] 인기 있는 토론방 조회 API 및 최근 의견이 달린 토론방 API 구현
jisung-in · Apr 29, 2024 · 1ec5d52 · 1ec5d52
2 parents 71509b0 + 8bc3b08
commit 1ec5d52
Show file tree

Hide file tree

Showing 8 changed files with 146 additions and 9 deletions.
diff --git a/src/docs/asciidoc/api/comment/comment.adoc b/src/docs/asciidoc/api/comment/comment.adoc
@@ -10,6 +10,18 @@ include::{snippets}/comment/create/request-fields.adoc[]
 include::{snippets}/comment/create/http-response.adoc[]
 include::{snippets}/comment/create/response-fields.adoc[]
 
+=== 의견 조회
+
+==== HTTP Request
+
+include::{snippets}/comment/find/http-request.adoc[]
+include::{snippets}/comment/find/path-parameters.adoc[]
+
+==== HTTP Response
+
+include::{snippets}/comment/find/http-response.adoc[]
+include::{snippets}/comment/find/response-fields.adoc[]
+
 === 의견 수정
 
 ==== HTTP Request

diff --git a/src/main/java/com/jisungin/api/SearchRequest.java b/src/main/java/com/jisungin/api/SearchRequest.java
@@ -4,10 +4,8 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 @Getter
-@Setter
 @NoArgsConstructor
 public class SearchRequest {
 
@@ -23,15 +21,15 @@ public class SearchRequest {
     private SearchRequest(Integer page, Integer size, String order, String query) {
         this.page = page != null ? page : 1;
         this.size = size != null ? size : 10;
-        this.order = order;
+        this.order = order != null ? order : "recent";
         this.query = query;
     }
 
     public SearchServiceRequest toService() {
         return SearchServiceRequest.builder()
                 .page(page)
                 .size(size)
-                .order(order != null ? order : "recent")
+                .order(order)
                 .query(query)
                 .build();
     }

diff --git a/src/main/java/com/jisungin/domain/talkroom/repository/OrderType.java b/src/main/java/com/jisungin/domain/talkroom/repository/OrderType.java
@@ -7,7 +7,8 @@ public enum OrderType {
 
     RECENT("최신순"),
     RECOMMEND("좋아요순"),
-    COMMENT("토크 많은순");
+    COMMENT("토크 많은순"),
+    RECENT_COMMENT("최근 등록된 의견순");
 
     private final String text;
 
@@ -20,6 +21,7 @@ public static OrderType convertToOrderType(String order) {
             case "recent" -> RECENT;
             case "recommend" -> RECOMMEND;
             case "comment" -> COMMENT;
+            case "recent-comment" -> RECENT_COMMENT;
             default -> RECENT;
         };
     }

diff --git a/src/main/java/com/jisungin/domain/talkroom/repository/TalkRoomRepositoryImpl.java b/src/main/java/com/jisungin/domain/talkroom/repository/TalkRoomRepositoryImpl.java
@@ -1,8 +1,10 @@
 package com.jisungin.domain.talkroom.repository;
 
 import static com.jisungin.domain.book.QBook.book;
+import static com.jisungin.domain.comment.QComment.comment;
 import static com.jisungin.domain.talkroom.QTalkRoom.talkRoom;
 import static com.jisungin.domain.talkroom.repository.OrderType.RECENT;
+import static com.jisungin.domain.talkroom.repository.OrderType.RECENT_COMMENT;
 import static com.jisungin.domain.talkroom.repository.OrderType.RECOMMEND;
 import static com.jisungin.domain.talkroomlike.QTalkRoomLike.talkRoomLike;
 import static com.jisungin.domain.user.QUser.user;
@@ -11,6 +13,7 @@
 import com.jisungin.application.talkroom.response.TalkRoomQueryResponse;
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -77,7 +80,7 @@ public TalkRoomQueryResponse findOneTalkRoom(Long talkRoomId) {
 
     // 토크룸 페이징 조회 쿼리
     private List<TalkRoomQueryResponse> findTalkRoomBySearch(long offset, int size, String order, String query) {
-        return queryFactory.select(new QTalkRoomQueryResponse(
+        JPAQuery<TalkRoomQueryResponse> jpaQuery = queryFactory.select(new QTalkRoomQueryResponse(
                         talkRoom.id.as("talkRoomId"),
                         user.profileImage,
                         user.name.as("userName"),
@@ -92,12 +95,25 @@ private List<TalkRoomQueryResponse> findTalkRoomBySearch(long offset, int size,
                 .join(talkRoom.user, user)
                 .join(talkRoom.book, book)
                 .leftJoin(talkRoomLike).on(talkRoom.eq(talkRoomLike.talkRoom))
-                .groupBy(talkRoom.id)
+                .from(talkRoom);
+
+        addJoinByOrder(jpaQuery, OrderType.convertToOrderType(order));
+
+        List<TalkRoomQueryResponse> response = jpaQuery.groupBy(talkRoom.id)
                 .where(searchQuery(query))
                 .offset(offset)
                 .limit(size)
                 .orderBy(condition(OrderType.convertToOrderType(order)))
                 .fetch();
+
+        return response;
+    }
+
+    private void addJoinByOrder(JPAQuery<?> jpaQuery, OrderType orderType) {
+        if (RECENT_COMMENT.equals(orderType)) {
+            jpaQuery
+                    .leftJoin(comment).on(talkRoom.eq(comment.talkRoom));
+        }
     }
 
     private BooleanExpression searchQuery(String search) {
@@ -130,6 +146,8 @@ private OrderSpecifier<?> condition(OrderType orderType) {
             return talkRoom.createDateTime.desc();
         } else if (RECOMMEND.equals(orderType)) {
             return talkRoomLike.count().desc();
+        } else if (RECENT_COMMENT.equals(orderType)) {
+            return comment.createDateTime.max().desc();
         }
         return OrderByNull.DEFAULT;
     }

diff --git a/src/test/java/com/jisungin/application/talkroom/TalkRoomServiceTest.java b/src/test/java/com/jisungin/application/talkroom/TalkRoomServiceTest.java
@@ -32,6 +32,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.IntStream;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -914,6 +915,23 @@ void createTalkRoomWithImage() throws Exception {
 
     }
 
+    @Test
+    @DisplayName("최근 의견이 달린 토론방을 조회 할때 의견이 없다면 빈 값을 보낸다.")
+    void fetchRecentCommentedDiscussionsWithCommentEmpty() throws Exception {
+        // given
+        SearchServiceRequest request = SearchServiceRequest.builder()
+                .size(3)
+                .page(1)
+                .order("recent_comment")
+                .build();
+
+        // when
+        TalkRoomPageResponse response = talkRoomService.findAllTalkRoom(request, null);
+
+        // then
+        Assertions.assertThat(response.getResponse().getQueryResponse()).isEmpty();
+    }
+
     private static List<User> listUsers() {
         return IntStream.range(0, 10)
                 .mapToObj(i -> User.builder()

diff --git a/src/test/java/com/jisungin/docs/comment/CommentControllerDocsTest.java b/src/test/java/com/jisungin/docs/comment/CommentControllerDocsTest.java
@@ -133,7 +133,7 @@ void getComments() throws Exception {
                 )
                 .andDo(print())
                 .andExpect(status().isOk())
-                .andDo(document("comment/create",
+                .andDo(document("comment/find",
                         preprocessRequest(prettyPrint()),
                         preprocessResponse(prettyPrint()),
                         pathParameters(

diff --git a/src/test/java/com/jisungin/docs/talkroom/TalkRoomControllerDocsTest.java b/src/test/java/com/jisungin/docs/talkroom/TalkRoomControllerDocsTest.java
@@ -185,7 +185,8 @@ void findAllTalkRooms() throws Exception {
                                 parameterWithName("size")
                                         .description("페이지 사이즈"),
                                 parameterWithName("order")
-                                        .description("정렬 기준(기본값 최신순) -> RECENT(최신순), RECOMMEND(좋아요순)"),
+                                        .description(
+                                                "정렬 기준 : recent(최신순), recommend(좋아요순), recent-comment(최근 등록된 의견순)"),
                                 parameterWithName("search")
                                         .description("검색").optional()
                         ),

diff --git a/src/test/java/com/jisungin/domain/talkroom/repository/TalkRoomRepositoryTest.java b/src/test/java/com/jisungin/domain/talkroom/repository/TalkRoomRepositoryTest.java
@@ -521,6 +521,94 @@ public void getTalkRoomsRelatedBookTotalSize() {
         assertThat(anotherTotalCount).isEqualTo(10L);
     }
 
+    @Test
+    @DisplayName("최근 의견이 달린 토론방을 가져온다.")
+    void fetchRecentCommentedDiscussions() throws Exception {
+        // given
+        User user = createUser();
+        userRepository.save(user);
+
+        Book book = createBook();
+        bookRepository.save(book);
+
+        List<TalkRoom> talkRooms = IntStream.range(1, 11)
+                .mapToObj(i -> TalkRoom.builder()
+                        .user(user)
+                        .book(book)
+                        .title("토론방" + i)
+                        .content("내용" + i)
+                        .build())
+                .toList();
+        talkRoomRepository.saveAll(talkRooms);
+
+        List<Comment> comments = IntStream.range(3, 6)
+                .mapToObj(i -> Comment.builder()
+                        .user(user)
+                        .talkRoom(talkRooms.get(i))
+                        .content("의견")
+                        .build())
+                .toList();
+        commentRepository.saveAll(comments);
+
+        SearchServiceRequest request = SearchServiceRequest.builder()
+                .size(3)
+                .page(1)
+                .order("recent-comment")
+                .build();
+
+        // when
+        List<TalkRoomQueryResponse> response = talkRoomRepository.findAllTalkRoom(request.getOffset(),
+                request.getSize(), request.getOrder(), request.getQuery());
+
+        // then
+        assertThat("토론방6").isEqualTo(response.get(0).getTitle());
+        assertThat("토론방5").isEqualTo(response.get(1).getTitle());
+        assertThat("토론방4").isEqualTo(response.get(2).getTitle());
+    }
+
+    @Test
+    @DisplayName("최근 의견이 달린 토론방을 가져온다.")
+    void fetchRecentCommentedDiscussions2() throws Exception {
+        // given
+        User user = createUser();
+        userRepository.save(user);
+
+        Book book = createBook();
+        bookRepository.save(book);
+
+        List<TalkRoom> talkRooms = IntStream.range(1, 11)
+                .mapToObj(i -> TalkRoom.builder()
+                        .user(user)
+                        .book(book)
+                        .title("토론방" + i)
+                        .content("내용" + i)
+                        .build())
+                .toList();
+        talkRoomRepository.saveAll(talkRooms);
+
+        Comment comment1 = createComment(talkRooms.get(3), user);
+        Comment comment2 = createComment(talkRooms.get(4), user);
+        Comment comment3 = createComment(talkRooms.get(5), user);
+        Comment comment4 = createComment(talkRooms.get(5), user);
+
+        commentRepository.saveAll(List.of(comment1, comment2, comment3, comment4));
+
+        SearchServiceRequest request = SearchServiceRequest.builder()
+                .size(3)
+                .page(1)
+                .order("recent-comment")
+                .build();
+
+        // when
+        List<TalkRoomQueryResponse> response = talkRoomRepository.findAllTalkRoom(request.getOffset(),
+                request.getSize(), request.getOrder(), request.getQuery());
+
+        // then
+        assertThat("토론방6").isEqualTo(response.get(0).getTitle());
+        assertThat("토론방5").isEqualTo(response.get(1).getTitle());
+        assertThat("토론방4").isEqualTo(response.get(2).getTitle());
+    }
+
     private static Comment createComment(TalkRoom talkRoom, User user) {
         return Comment.builder()
                 .talkRoom(talkRoom)