11package com .example .enjoy .service ;
22
3- import ch .qos .logback .core .joran .sanity .Pair ;
43import com .example .enjoy .dto .CourseDto ;
54import com .example .enjoy .dto .CourseStatusDto ;
65import com .example .enjoy .dto .TrackDetailDto ;
@@ -29,7 +28,8 @@ public class TrackService {
2928
3029 private final TrackRepository trackRepository ;
3130 private final StudentCourseRepository studentCourseRepository ;
32-
31+ private final UserRepository userRepository ;
32+ private final FavoriteCourseRepository favoriteCourseRepository ;
3333
3434 //진척률 계산
3535 public List <TrackProgressDto > calculateTrackProgress (String studentId ) {
@@ -44,7 +44,8 @@ public List<TrackProgressDto> calculateTrackProgress(String studentId) {
4444 List <CourseDto > remaining = new ArrayList <>();
4545
4646 for (TrackCourse course : courses ) {
47- CourseDto dto = new CourseDto (course .getCourseName (), course .getCourseAlias ());
47+ CourseDto dto = new CourseDto (course .getCourseName (), course .getCourseAlias (),
48+ course .getCourseCode (), course .getAcademicYear (), course .getAcademicSemester ());
4849 if (isCourseCompleted (course , completedCourseNames )) {
4950 completed .add (dto );
5051 } else {
@@ -84,7 +85,6 @@ public TrackDetailDto getTrackDetails(String studentId, String trackName) {
8485 // 4. [수정] DTO 객체 생성 및 실제 필드에 맞게 데이터 세팅
8586 CourseStatusDto dto = new CourseStatusDto ();
8687 dto .setTitle (trackCourse .getCourseName ());
87- // (TrackCourse 엔티티에 getCourseCode, getYear, getSemester가 있다고 가정합니다)
8888 dto .setCode (trackCourse .getCourseCode ());
8989 dto .setYear (trackCourse .getAcademicYear ());
9090 dto .setSemester (trackCourse .getAcademicSemester ());
0 commit comments