Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@ public Long edit(Long memberId, EditMentorRequest request) {
}

public CursorResponse<MentorCardResponse> getMentorBy(CursorRequest request, Pageable pageable, Long memberId) {
Member member = memberRepository.findById(memberId)
if(request.isBookmarked()) {
Member member = memberRepository.findById(memberId)
.orElseThrow(() -> new CustomRuntimeException(MemberErrorCode.MEMBER_NOT_FOUND));

if (member.getMemberType().equals(MemberType.ROLE_MENTEE)) {
throw new CustomRuntimeException(MemberErrorCode.MEMBER_TYPE_DIFFERENT);
if (member.isNotMentee()) {
throw new CustomRuntimeException(MemberErrorCode.MEMBER_TYPE_DIFFERENT);
}
}

final Slice<MentorCardResponse> response = mentorRepository.findMentorBy(request, pageable, memberId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ private List<Tuple> fetchMentor(

private List<MentorCardResponse> fetchContent(
final Pageable pageable,
final Long cursor,
final Long cursor,
final Boolean bookmared,
final Long memberId
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Pageable;
Expand Down Expand Up @@ -54,11 +55,11 @@ public ResponseEntity<ApiResponseWrapper<CursorResponse<MentorCardResponse>>> ge
HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse
) {
Long memberId = null;

if (request.isBookmarked()){
memberId = SessionToMemberId.getSessionMemberId(httpServletRequest,httpServletResponse);
}
Long memberId = Optional.ofNullable(request)
.filter(CursorRequest::isBookmarked)
.map(req -> SessionToMemberId.getSessionMemberId(httpServletRequest, httpServletResponse))
.orElse(null);

log.info(request.toString());
log.info(pageable.toString());
Expand Down