|
|
@@ -112,7 +112,7 @@ public class CourseService {
|
|
|
public List<CourseVO> getAllCourses() {
|
|
|
List<Course> courses = courseRepository.findAll();
|
|
|
return courses.stream()
|
|
|
- .filter(course -> course.getState().equals(ObjectState.NORMAL))
|
|
|
+ .filter(course -> !course.getState().equals(ObjectState.DELETED))
|
|
|
.map(courseMapper::courseToCourseVO)
|
|
|
.collect(Collectors.toList());
|
|
|
}
|
|
|
@@ -124,6 +124,7 @@ public class CourseService {
|
|
|
|
|
|
public List<CourseVO> getStudentCourses(Long studentId) {
|
|
|
List<CourseSelection> courseSelections = courseSelectionRepository.findCourseSelectionsByUserId(studentId);
|
|
|
+ Optional<Course> course = courseRepository.findById(37L);
|
|
|
return courseSelections.stream()
|
|
|
.map(courseSelection -> courseMapper.courseToCourseVO(courseRepository.findById(courseSelection.getCourseId()).get()))
|
|
|
.collect(Collectors.toList());
|