Skip to content

Commit

Permalink
[RENAME] #131 - 원상복구 커밋
Browse files Browse the repository at this point in the history
- 빌드 에러로 인한 원상복구
  • Loading branch information
aelimited committed Jun 12, 2024
1 parent 8469c18 commit fe036b3
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 55 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,4 @@ public BaseResponse<Page<ClubSearchResponse>> findManagingApplication(
return BaseResponse.response(responses);
}

@GetMapping("/application/search")
public BaseResponse<Page<ClubSearchApplicationResponse>> findSearchApplicationList(
@AuthenticationPrincipal MemberDetails member,
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "10") int size
) {
Page<ClubSearchApplicationResponse> response = clubMemberService.findSearchClubApplicationList(member, PageRequest.of(page, size));
return BaseResponse.response(response);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@
@Repository
public interface ClubRepository extends JpaRepository<Club, Long>, ClubCustomRepository {
Page<Club> findByMemberId(Long memberId, Pageable pageable);

List<Club> findByMemberId(Long memberId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -149,48 +149,4 @@ public Page<ClubSearchResponse> findManagingApplication(MemberDetails memberDeta
});
}

public Page<ClubSearchApplicationResponse> findSearchClubApplicationList(MemberDetails member, Pageable pageable) {
Long memberId = member.getId();

List<Club> hostedClubs = clubRepository.findByMemberId(memberId);
List<Long> hostedClubIds = hostedClubs.stream().map(Club::getId).collect(Collectors.toList());


List<ClubMember> clubMembers = clubMemberRepository.findByMemberId(memberId);

List<Long> memberLikes = likeRepository.findAllByMemberId(memberId).stream()
.map(ClubLike::getClubId)
.collect(Collectors.toList());

List<ClubSearchApplicationResponse> 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<ClubSearchApplicationResponse> page = new PageImpl<>(responses.subList(start, end), pageable, responses.size());

return page;
}

}

0 comments on commit fe036b3

Please sign in to comment.