Skip to content

[fix] 코스 상세 정보 response에 북마크 여부 추가 #174

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
hyoinkang merged 1 commit into from
Feb 8, 2025
Merged

[fix] 코스 상세 정보 response에 북마크 여부 추가 #174

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
2 changes: 2 additions & 0 deletions src/main/java/umc/catchy/domain/course/converter/CourseConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public static CourseInfoResponse.getCourseInfoDTO toCourseInfoDTO(
Course course,
Integer reviewCount,
String recommendTime,
Boolean isBookMarked,
List<CourseInfoResponse.getPlaceInfoOfCourseDTO> placeInfoOfCourseDTOS
){
return CourseInfoResponse.getCourseInfoDTO.builder()
Expand All @@ -31,6 +32,7 @@ public static CourseInfoResponse.getCourseInfoDTO toCourseInfoDTO(
.reviewCount(reviewCount)
.recommendTime(recommendTime)
.participantsNumber(course.getParticipantsNumber())
.isBookMarked(isBookMarked)
.placeInfos(placeInfoOfCourseDTOS)
.build();
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/umc/catchy/domain/course/dto/response/CourseInfoResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static class getCourseInfoDTO{
Integer reviewCount;
String recommendTime;
Long participantsNumber;
Boolean isBookMarked;
List<getPlaceInfoOfCourseDTO> placeInfos;
}

Expand Down
13 changes: 10 additions & 3 deletions src/main/java/umc/catchy/domain/course/service/CourseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,13 @@ private String getRecommendTimeToString(Course course) {
return startTime.format(formatter) + " ~ " + endTime.format(formatter);
}

//북마크 여부 가져오기
private Boolean getBookmarks(Course course, Member member){
return memberCourseRepository.findByCourseAndMember(course, member)
.map(MemberCourse::isBookmark)
.orElse(false);
}

//코스의 상세 정보 받아오기
public CourseInfoResponse.getCourseInfoDTO getCourseDetails(Long courseId) {
Course course = getCourse(courseId);
Expand All @@ -144,7 +151,7 @@ public CourseInfoResponse.getCourseInfoDTO getCourseDetails(Long courseId) {
.orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));

List<CourseInfoResponse.getPlaceInfoOfCourseDTO> placeListOfCourse = getPlaceListOfCourse(course, member);
return CourseConverter.toCourseInfoDTO(course, calculateNumberOfReviews(course), getRecommendTimeToString(course), placeListOfCourse);
return CourseConverter.toCourseInfoDTO(course, calculateNumberOfReviews(course), getRecommendTimeToString(course), getBookmarks(course, member), placeListOfCourse);
}

// 현재 사용자의 코스를 불러옴
Expand Down Expand Up @@ -242,7 +249,7 @@ public CourseInfoResponse.getCourseInfoDTO updateCourse(Long courseId, CourseUpd
}

List<CourseInfoResponse.getPlaceInfoOfCourseDTO> placeListOfCourse = getPlaceListOfCourse(course, member);
return CourseConverter.toCourseInfoDTO(course, calculateNumberOfReviews(course), getRecommendTimeToString(course), placeListOfCourse);
return CourseConverter.toCourseInfoDTO(course, calculateNumberOfReviews(course), getRecommendTimeToString(course), getBookmarks(course, member), placeListOfCourse);
}

public void deleteCourse(Long courseId) {
Expand Down Expand Up @@ -323,7 +330,7 @@ public CourseInfoResponse.getCourseInfoDTO createCourseByDIY(CourseCreateRequest
memberCourseRepository.save(memberCourse);

List<CourseInfoResponse.getPlaceInfoOfCourseDTO> placeListOfCourse = getPlaceListOfCourse(course, member);
return CourseConverter.toCourseInfoDTO(course, calculateNumberOfReviews(course), getRecommendTimeToString(course), placeListOfCourse);
return CourseConverter.toCourseInfoDTO(course, calculateNumberOfReviews(course), getRecommendTimeToString(course), false, placeListOfCourse);
}

public List<Place> getRecommendedPlaces(List<String> regionList, List<Long> preferredCategoryIds, Long memberId, int maxPlaces) {
Expand Down