Skip to content

Commit 6004e8b

Browse files
authored
Merge pull request #22 from enjoy-hack/jiwoo
feat: ---
2 parents d6783bc + 2b6790c commit 6004e8b

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

src/main/java/com/example/enjoy/dto/CourseDto.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,7 @@ public class CourseDto {
1414

1515
private String courseName; // 현재 과목명
1616
private String courseAlias; // 과거 과목명 (없으면 null)
17+
private String courseCode;
18+
private String academicYear;
19+
private String academicSemester;
1720
}

src/main/java/com/example/enjoy/service/TrackService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.example.enjoy.service;
22

3-
import ch.qos.logback.core.joran.sanity.Pair;
43
import com.example.enjoy.dto.CourseDto;
54
import com.example.enjoy.dto.CourseStatusDto;
65
import 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

Comments
 (0)