Merge branch 'main' of https://github.com/Coastee/COASTER-Server

Author: 5jisoo

src/main/java/com/coastee/server/chatroom/domain/repository/ChatRoomQuerydslRepository.java

@@ -3,7 +3,6 @@
 import com.coastee.server.chatroom.domain.ChatRoom;
 import com.coastee.server.chatroom.domain.ChatRoomType;
 import com.coastee.server.global.util.QuerydslUtil;
-import com.coastee.server.hashtag.domain.HashTag;
 import com.coastee.server.server.domain.Server;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.JPQLQuery;
@@ -30,10 +29,10 @@ public Page<ChatRoom> findByServerAndTypeAndKeywordAndTagList(
             final Server server,
             final ChatRoomType chatRoomType,
             final String keyword,
-            final List<HashTag> tagList,
+            final List<String> tagNameList,
             final Pageable pageable
     ) {
-        List<ChatRoom> chatRoomList = findByServerAndTypeAndKeywordAndTagList(server, chatRoomType, keyword, tagList)
+        List<ChatRoom> chatRoomList = findByServerAndTypeAndKeywordAndTagList(server, chatRoomType, keyword, tagNameList)
                 .orderBy(QuerydslUtil.getSort(pageable, chatRoom))
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
@@ -42,7 +41,7 @@ public Page<ChatRoom> findByServerAndTypeAndKeywordAndTagList(
         JPAQuery<Long> countQuery = query
                 .select(chatRoom.count())
                 .from(chatRoom)
-                .where(chatRoom.in(findByServerAndTypeAndKeywordAndTagList(server, chatRoomType, keyword, tagList)));
+                .where(chatRoom.in(findByServerAndTypeAndKeywordAndTagList(server, chatRoomType, keyword, tagNameList)));
 
         return PageableExecutionUtils.getPage(chatRoomList, pageable, countQuery::fetchOne);
     }
@@ -51,39 +50,70 @@ private JPQLQuery<ChatRoom> findByServerAndTypeAndKeywordAndTagList(
             final Server server,
             final ChatRoomType chatRoomType,
             final String keyword,
-            final List<HashTag> tagList
+            final List<String> tagNameList
     ) {
         return query
                 .selectFrom(chatRoom)
+                .join(chatRoom.user)
                 .where(
                         chatRoom.server.eq(server)
                                 .and(chatRoom.chatRoomType.eq(chatRoomType))
-                                .and(likeKeyword(keyword))
-                                .and(eqTagList(tagList))
+                                .and(containsKeyword(keyword))
+                                .and(eqTagList(tagNameList))
                 );
     }
 
     private BooleanExpression containsKeyword(final String keyword) {
         if (keyword == null || keyword.isBlank()) {
             return null;
         }
-        return chatRoom.title.like(keyword);
+        return chatRoom.title.contains(keyword)
+                .or(chatRoom.content.contains(keyword))
+                .or(chatRoom.user.nickname.contains(keyword))
+                .or(containsTagList(List.of(keyword)))
+                ;
     }
 
-    private BooleanExpression eqTagList(final List<HashTag> tagList) {
-        if (tagList == null || tagList.isEmpty()) {
+    private BooleanExpression eqTagList(
+            final List<String> tagNameList
+    ) {
+        if (tagNameList == null || tagNameList.isEmpty()) {
+            return null;
+        }
+
+        BooleanExpression condition = tagNameList.stream()
+                .map(hashTag.content::eq)
+                .reduce(BooleanExpression::or)
+                .orElse(null);
+
+        return chatRoom.in(
+                query
+                        .select(chatRoomTag.chatRoom).from(chatRoomTag)
+                        .join(hashTag).on(condition.and(hashTag.eq(chatRoomTag.hashTag)))
+                        .where(chatRoom.eq(chatRoomTag.chatRoom))
+                        .groupBy(chatRoomTag.chatRoom)
+                        .having(chatRoomTag.chatRoom.count().eq(Long.valueOf(tagNameList.size())))
+        );
+    }
+
+    private BooleanExpression containsTagList(
+            final List<String> tagNameList
+    ) {
+        if (tagNameList == null || tagNameList.isEmpty()) {
             return null;
         }
+
+        BooleanExpression condition = tagNameList.stream()
+                .map(hashTag.content::contains)
+                .reduce(BooleanExpression::or)
+                .orElse(null);
+
         return chatRoom.in(
                 query
                         .select(chatRoomTag.chatRoom).from(chatRoomTag)
-                        .join(hashTag).on(
-                                hashTag.eq(chatRoomTag.hashTag)
-                                        .and(hashTag.in(tagList))
-                        )
+                        .join(hashTag).on(condition.and(hashTag.eq(chatRoomTag.hashTag)))
                         .where(chatRoom.eq(chatRoomTag.chatRoom))
                         .groupBy(chatRoomTag.chatRoom)
-                        .having(chatRoomTag.chatRoom.count().eq(Long.valueOf(tagList.size())))
         );
     }
 }

src/main/java/com/coastee/server/chatroom/facade/ChatRoomFacade.java

@@ -12,7 +12,6 @@
 import com.coastee.server.chatroom.dto.request.ChatRoomCreateRequest;
 import com.coastee.server.chatroom.service.ChatRoomEntryService;
 import com.coastee.server.chatroom.service.ChatRoomService;
-import com.coastee.server.hashtag.domain.HashTag;
 import com.coastee.server.hashtag.service.HashTagService;
 import com.coastee.server.image.domain.DirName;
 import com.coastee.server.image.service.BlobStorageService;
@@ -28,8 +27,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -170,15 +167,11 @@ private ChatRoomElements findAllByServer(
             final List<String> tagNameList,
             final Pageable pageable
     ) {
-        List<HashTag> hashTagList = new ArrayList<>();
-        if (tagNameList != null && !tagNameList.isEmpty())
-            hashTagList = hashTagService.findAllByContentIn(new HashSet<>(tagNameList));
-
         Page<ChatRoom> chatRoomPage = chatRoomService.findByServerAndTypeAndKeywordAndTagList(
                 server,
                 type,
                 keyword,
-                hashTagList,
+                tagNameList,
                 pageable
         );
         Map<Long, Boolean> hasEnteredMap = chatRoomEntryService.findHasEnteredByChatRoomList(

src/main/java/com/coastee/server/chatroom/service/ChatRoomService.java

@@ -107,14 +107,14 @@ public Page<ChatRoom> findByServerAndTypeAndKeywordAndTagList(
             final Server server,
             final ChatRoomType type,
             final String keyword,
-            final List<HashTag> tagList,
+            final List<String> tagNameList,
             final Pageable pageable
     ) {
         return chatRoomQueryDSLRepository.findByServerAndTypeAndKeywordAndTagList(
                 server,
                 type,
                 keyword,
-                tagList,
+                tagNameList,
                 pageable
         );
     }

src/main/java/com/coastee/server/server/facade/ServerFacade.java

@@ -84,26 +84,22 @@ public ServerHomeResponse getHomeWithConditions(
                 PageRequest.of(0, 10)
         );
 
-        List<HashTag> searchTagList = new ArrayList<>();
-        if (tagNameList != null && !tagNameList.isEmpty())
-            searchTagList = hashTagService.findAllByContentIn(new HashSet<>(tagNameList));
         Page<ChatRoom> groupPage = chatRoomService.findByServerAndTypeAndKeywordAndTagList(
                 server,
                 ChatRoomType.GROUP,
                 keyword,
-                searchTagList,
+                tagNameList,
                 PageRequest.of(0, 3, Sort.by(DESC, "createdDate"))
         );
         Page<ChatRoom> meetingPage = chatRoomService.findByServerAndTypeAndKeywordAndTagList(
                 server,
                 ChatRoomType.MEETING,
                 keyword,
-                searchTagList,
+                tagNameList,
                 PageRequest.of(0, 3, Sort.by(DESC, "remainCount"))
         );
         if (isSearch(keyword, tagNameList))
             return new ServerHomeResponse(hashTagList, groupPage, meetingPage);
-
         Page<Notice> noticePage = noticeService.findAllByServer(
                 server,
                 PageRequest.of(0, 10, Sort.by(DESC, "createdDate"))

src/test/java/com/coastee/server/server/controller/ServerHomeControllerTest.java

@@ -113,15 +113,15 @@ void getHome() throws Exception {
                 .header(ACCESS_TOKEN_HEADER, ACCESS_TOKEN)
                 .contentType(MediaType.APPLICATION_JSON_VALUE)
                 .param("keyword", "검색하는키워드")
-                .param("tagList", "#검색", "#해시태그")
+                .param("tags", "#검색", "#해시태그")
                 .filter(
                         document("get-server-home",
                                 pathParameters(
                                         parameterWithName("serverId").description("서버 아이디")
                                 ),
                                 queryParameters(
                                         parameterWithName("keyword").description("검색 키워드"),
-                                        parameterWithName("tagList").description("검색 해시태그")
+                                        parameterWithName("tags").description("검색 해시태그")
                                 ),
                                 requestHeaders(
                                         headerWithName(ACCESS_TOKEN_HEADER).description("액세스 토큰")