Skip to content

[Fix] getPublicCourseDetail #137

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
YuSuhwa-ve merged 2 commits into from
Dec 20, 2023
Merged

[Fix] getPublicCourseDetail #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98b1fa4
fix: 🐛 publicCourse에 있는 scrapCount 칼럼으로 해당 공개코스의 전체 스크랩수 가져옴
YuSuhwa-ve Dec 19, 2023
1862486
fix: 🐛 기존 api response 맞추기 위해 ScrapCount Long으로 변경
YuSuhwa-ve Dec 19, 2023
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
4 changes: 1 addition & 3 deletions src/main/java/org/runnect/server/publicCourse/entity/PublicCourse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ public class PublicCourse extends AuditingTimeEntity {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;



@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "course_id", nullable = false)
private Course course;
Expand All @@ -42,7 +40,7 @@ public class PublicCourse extends AuditingTimeEntity {
private List<Record> records = new ArrayList<>();

@Formula("(select count(*) from Scrap where Scrap.public_course_id=id and Scrap.scraptf=true)")
private Integer scrapCount;
private Long scrapCount;

@Transient
private Boolean isScrap=false; //현재 사용자가 스크랩한지 아닌지 여부
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/org/runnect/server/publicCourse/service/PublicCourseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,6 @@ public GetPublicCourseDetailResponseDto getPublicCourseDetail(final Long userId,
}
}

//4. 해당 공개코스가 얼마나 스크랩되었는지 가져오기
Long scrapCount = scrapRepository.countByPublicCourseAndScrapTFIsTrue(publicCourse);

//5. 삭제된 유저인 경우 처리 user=null일때
RunnectUser uploader = course.getRunnectUser();
Expand All @@ -279,13 +277,13 @@ public GetPublicCourseDetailResponseDto getPublicCourseDetail(final Long userId,
if (course.getDepartureName() == null) {
return GetPublicCourseDetailResponseDto.of(
uploader.getId(), uploader.getNickname(), uploader.getLevel(), uploader.getLatestStamp().toString(), uploader.equals(user),
publicCourse.getId(), course.getId(), publicCourse.getIsScrap(), scrapCount, course.getImage(), publicCourse.getTitle(), publicCourse.getDescription(),
publicCourse.getId(), course.getId(), publicCourse.getIsScrap(), publicCourse.getScrapCount(), course.getImage(), publicCourse.getTitle(), publicCourse.getDescription(),
CoordinatePathConverter.pathConvertCoor(course.getPath()), course.getDistance(), course.getDepartureRegion(), course.getDepartureCity(), course.getDepartureTown());
}

return GetPublicCourseDetailResponseDto.of(
uploader.getId(), uploader.getNickname(), uploader.getLevel(), uploader.getLatestStamp().toString(), uploader.equals(user),
publicCourse.getId(), course.getId(), publicCourse.getIsScrap(), scrapCount, course.getImage(), publicCourse.getTitle(), publicCourse.getDescription(),
publicCourse.getId(), course.getId(), publicCourse.getIsScrap(), publicCourse.getScrapCount(), course.getImage(), publicCourse.getTitle(), publicCourse.getDescription(),
CoordinatePathConverter.pathConvertCoor(course.getPath()), course.getDistance(), course.getDepartureRegion(), course.getDepartureCity(), course.getDepartureTown(), course.getDepartureName());


Expand Down