Skip to content

Commit bcff03d

Browse files
authored
Merge pull request #372 from Clokey-dev/fix/#369-unable-to-search-myself
[fix/#369] 본인을 제외하고 검색하도록 추가
2 parents aefaa84 + cc820c7 commit bcff03d

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

clokey-api/src/main/java/org/clokey/domain/search/controller/SearchController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ public BaseResponse<Void> unSyncAllHistories() {
9797
@Operation(
9898
operationId = "Search_searchUserByNickname",
9999
summary = "유저 검색",
100-
description = "검색탭에서 클로키ID와 닉네임을 통해 유저를 검색할 수 있는 API입니다.")
100+
description = "검색탭에서 클로키ID와 닉네임을 통해 유저를 검색할 수 있는 API입니다. (본인 제외)")
101101
public BaseResponse<SliceResponse<SearchedMemberResponse>> searchUserByNickname(
102-
@Parameter(description = "검색 키워드 (클로키ID or 닉네임)") @RequestParam String keyword,
102+
@Parameter(description = "검색 키워드 (닉네임)") @RequestParam String keyword,
103103
@Parameter(description = "페이지 번호") @RequestParam Long page,
104104
@Parameter(description = "페이지당 조회할 유저의 수") @RequestParam @PageSize Integer size) {
105105
SliceResponse<SearchedMemberResponse> response =

clokey-api/src/main/java/org/clokey/domain/search/service/SearchServiceImpl.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,11 @@ public void unSyncAllHistories() {
165165
@Transactional(readOnly = true)
166166
public SliceResponse<SearchedMemberResponse> searchUserByNickname(
167167
String keyword, Long page, Integer size) {
168-
Member currentMember = memberUtil.getCurrentMember();
168+
Long memberId = memberUtil.getCurrentMember().getId();
169169

170-
List<Long> excludedMemberIds =
171-
blockRepository.findBlockedMemberIdsByBlockerId(currentMember.getId());
170+
// 차단한 회원과 본인 제외
171+
List<Long> excludedMemberIds = blockRepository.findBlockedMemberIdsByBlockerId(memberId);
172+
excludedMemberIds.add(memberId);
172173

173174
return searchRepository.findUsersByKeyword(keyword, page, size, excludedMemberIds);
174175
}

0 commit comments

Comments
 (0)