diff --git a/src/main/java/com/core/linkup/club/club/controller/ClubMemberController.java b/src/main/java/com/core/linkup/club/club/controller/ClubMemberController.java index 2651f42..06dae81 100644 --- a/src/main/java/com/core/linkup/club/club/controller/ClubMemberController.java +++ b/src/main/java/com/core/linkup/club/club/controller/ClubMemberController.java @@ -88,13 +88,4 @@ public BaseResponse> findManagingApplication( return BaseResponse.response(responses); } - @GetMapping("/application/search") - public BaseResponse> findSearchApplicationList( - @AuthenticationPrincipal MemberDetails member, - @RequestParam(defaultValue = "0") int page, - @RequestParam(defaultValue = "10") int size - ) { - Page response = clubMemberService.findSearchClubApplicationList(member, PageRequest.of(page, size)); - return BaseResponse.response(response); - } } \ No newline at end of file diff --git a/src/main/java/com/core/linkup/club/club/repository/ClubRepository.java b/src/main/java/com/core/linkup/club/club/repository/ClubRepository.java index 18f5737..ca8666d 100644 --- a/src/main/java/com/core/linkup/club/club/repository/ClubRepository.java +++ b/src/main/java/com/core/linkup/club/club/repository/ClubRepository.java @@ -11,6 +11,4 @@ @Repository public interface ClubRepository extends JpaRepository, ClubCustomRepository { Page findByMemberId(Long memberId, Pageable pageable); - - List findByMemberId(Long memberId); } diff --git a/src/main/java/com/core/linkup/club/club/service/ClubMemberService.java b/src/main/java/com/core/linkup/club/club/service/ClubMemberService.java index d3252fc..1556d62 100644 --- a/src/main/java/com/core/linkup/club/club/service/ClubMemberService.java +++ b/src/main/java/com/core/linkup/club/club/service/ClubMemberService.java @@ -149,48 +149,4 @@ public Page findManagingApplication(MemberDetails memberDeta }); } - public Page findSearchClubApplicationList(MemberDetails member, Pageable pageable) { - Long memberId = member.getId(); - - List hostedClubs = clubRepository.findByMemberId(memberId); - List hostedClubIds = hostedClubs.stream().map(Club::getId).collect(Collectors.toList()); - - - List clubMembers = clubMemberRepository.findByMemberId(memberId); - - List memberLikes = likeRepository.findAllByMemberId(memberId).stream() - .map(ClubLike::getClubId) - .collect(Collectors.toList()); - - List responses = new ArrayList<>(); - - - responses.addAll(clubMembers.stream() - .map(clubMember -> { - Club club = validateClub(clubMember.getClubId()); - boolean isLiked = memberLikes.contains(club.getId()); - Member memberInfo = memberRepository.findById(clubMember.getMemberId()) - .orElseThrow(() -> new BaseException(BaseResponseStatus.INVALID_CLUB_MEMBER)); - return clubConverter.toClubSearchApplicationResponse(clubMember, memberInfo, club, isLiked); - }) - .collect(Collectors.toList())); - - responses.addAll(hostedClubs.stream() - .map(club -> { - ClubMember clubMember = new ClubMember(); // 새로운 ClubMember 객체 생성 또는 적절한 방법으로 변환 - clubMember.setClubId(club.getId()); - clubMember.setMemberId(club.getMemberId()); - boolean isLiked = memberLikes.contains(club.getId()); - return clubConverter.toClubSearchApplicationResponse(clubMember, member.getMember(), club, isLiked); - }) - .collect(Collectors.toList())); - - - int start = (int) pageable.getOffset(); - int end = Math.min((start + pageable.getPageSize()), responses.size()); - Page page = new PageImpl<>(responses.subList(start, end), pageable, responses.size()); - - return page; - } - }