Skip to content

Commit e6a0a38

Browse files
authored
Merge pull request #137 from Runnect/fix/#136-getPublicCourseDetail
[Fix] getPublicCourseDetail
2 parents 549c69d + 1862486 commit e6a0a38

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

โ€Žsrc/main/java/org/runnect/server/publicCourse/entity/PublicCourse.javaโ€Ž

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ public class PublicCourse extends AuditingTimeEntity {
2525
@GeneratedValue(strategy = GenerationType.IDENTITY)
2626
private Long id;
2727

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

4442
@Formula("(select count(*) from Scrap where Scrap.public_course_id=id and Scrap.scraptf=true)")
45-
private Integer scrapCount;
43+
private Long scrapCount;
4644

4745
@Transient
4846
private Boolean isScrap=false; //ํ˜„์žฌ ์‚ฌ์šฉ์ž๊ฐ€ ์Šคํฌ๋žฉํ•œ์ง€ ์•„๋‹Œ์ง€ ์—ฌ๋ถ€

โ€Žsrc/main/java/org/runnect/server/publicCourse/service/PublicCourseService.javaโ€Ž

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,6 @@ public GetPublicCourseDetailResponseDto getPublicCourseDetail(final Long userId,
267267
}
268268
}
269269

270-
//4. ํ•ด๋‹น ๊ณต๊ฐœ์ฝ”์Šค๊ฐ€ ์–ผ๋งˆ๋‚˜ ์Šคํฌ๋žฉ๋˜์—ˆ๋Š”์ง€ ๊ฐ€์ ธ์˜ค๊ธฐ
271-
Long scrapCount = scrapRepository.countByPublicCourseAndScrapTFIsTrue(publicCourse);
272270

273271
//5. ์‚ญ์ œ๋œ ์œ ์ €์ธ ๊ฒฝ์šฐ ์ฒ˜๋ฆฌ user=null์ผ๋•Œ
274272
RunnectUser uploader = course.getRunnectUser();
@@ -279,13 +277,13 @@ public GetPublicCourseDetailResponseDto getPublicCourseDetail(final Long userId,
279277
if (course.getDepartureName() == null) {
280278
return GetPublicCourseDetailResponseDto.of(
281279
uploader.getId(), uploader.getNickname(), uploader.getLevel(), uploader.getLatestStamp().toString(), uploader.equals(user),
282-
publicCourse.getId(), course.getId(), publicCourse.getIsScrap(), scrapCount, course.getImage(), publicCourse.getTitle(), publicCourse.getDescription(),
280+
publicCourse.getId(), course.getId(), publicCourse.getIsScrap(), publicCourse.getScrapCount(), course.getImage(), publicCourse.getTitle(), publicCourse.getDescription(),
283281
CoordinatePathConverter.pathConvertCoor(course.getPath()), course.getDistance(), course.getDepartureRegion(), course.getDepartureCity(), course.getDepartureTown());
284282
}
285283

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

291289

0 commit comments

Comments
ย (0)