Skip to content

feat/#58 채팅방 목록 조회 api에 키워드 검색 추가 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gol2580 merged 1 commit into from
Feb 27, 2025
Merged

feat/#58 채팅방 목록 조회 api에 키워드 검색 추가 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/com/example/SucceSS/repository/ChatRoomRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,11 @@ public interface ChatRoomRepository extends JpaRepository<ChatRoom,Long> {
"WHERE c.memberId = :memberId")
Page<ChatRoomResponseDto> getPagesByMemberId(@Param("memberId") Long memberId, Pageable pageable);

@Query("SELECT new com.example.SucceSS.web.dto.ChatRoomResponseDto(c.chatRoomId, c.memberId, c.title, c.updatedAt) " +
"FROM ChatRoom c " +
"WHERE c.memberId = :memberId " +
"AND c.title LIKE CONCAT('%', :keyword, '%')")
Page<ChatRoomResponseDto> getPagesByMemberIdAndSort(@Param("memberId") Long memberId, Pageable pageable,@Param("keyword") String keyword);

Optional<ChatRoom> findByChatRoomId(Long chatRoomId);
}
7 changes: 4 additions & 3 deletions src/main/java/com/example/SucceSS/service/ChatService/ChatRoomService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ public Page<ChatResponseDto> getChatPages(Long chatRoomId, Pageable pageable) {
}

@Transactional(readOnly = true)
public Page<ChatRoomResponseDto> getChatRoomPages(Member member, Pageable pageable) {
return chatRoomRepository.getPagesByMemberId(member.getId()
, getChatRoomPageableWithSort(pageable));
public Page<ChatRoomResponseDto> getChatRoomPages(Member member, Pageable pageable, String keyword) {
Pageable sortedPageable = getChatRoomPageableWithSort(pageable);
return keyword == null ? chatRoomRepository.getPagesByMemberId(member.getId(),sortedPageable )
: chatRoomRepository.getPagesByMemberIdAndSort(member.getId(),sortedPageable, keyword);
}

private Pageable getChatRoomPageableWithSort(Pageable pageable) {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/example/SucceSS/web/controller/ChatController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,10 @@ public ResponseEntity<ApiResponse<Page<ChatResponseDto>>> getChatPages(@PathVari

@GetMapping(value = "/rooms")
@Operation(summary = "채팅방 목록 불러오기")
public ResponseEntity<ApiResponse<Page<ChatRoomResponseDto>>> getChatRoomPages(Pageable pageable) {
public ResponseEntity<ApiResponse<Page<ChatRoomResponseDto>>> getChatRoomPages(Pageable pageable
, @RequestParam(required = false, name = "keyword") String keyword) {
return ResponseEntity.ok(
ApiResponse.onSuccess(chatRoomService.getChatRoomPages(getCurrentUser.getCurrentUser(), pageable)));
ApiResponse.onSuccess(chatRoomService.getChatRoomPages(getCurrentUser.getCurrentUser(), pageable, keyword)));
}


Expand Down