|
|
@@ -6,9 +6,8 @@ import cn.seecoder.seecoderportalcommon.vo.UserRole;
|
|
|
import cn.seecoder.seecoderportalserver.domain.Course;
|
|
|
import cn.seecoder.seecoderportalserver.domain.CourseSelection;
|
|
|
import cn.seecoder.seecoderportalserver.domain.User;
|
|
|
+import cn.seecoder.seecoderportalserver.mapper.CourseSelectionMapper;
|
|
|
import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
|
|
|
-import cn.seecoder.seecoderportalserver.web.rest.errors.ExceptionType;
|
|
|
-import cn.seecoder.seecoderportalserver.web.rest.errors.PortalException;
|
|
|
import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
|
|
|
import cn.seecoder.seecoderportalserver.repository.CourseRepository;
|
|
|
import cn.seecoder.seecoderportalserver.repository.CourseSelectionRepository;
|
|
|
@@ -16,7 +15,6 @@ import cn.seecoder.seecoderportalserver.repository.UserRepository;
|
|
|
import cn.seecoder.seecoderportalserver.service.Impl.CoderService;
|
|
|
import cn.seecoder.seecoderportalserver.service.Impl.EvalService;
|
|
|
import cn.seecoder.seecoderportalserver.service.Impl.HelperService;
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -35,15 +33,19 @@ public class CourseService {
|
|
|
private final CourseMapper courseMapper;
|
|
|
private final UserRepository userRepository;
|
|
|
private final CourseSelectionRepository courseSelectionRepository;
|
|
|
+ private final CourseSelectionMapper courseSelectionMapper;
|
|
|
+ private final CourseSelectionService courseSelectionService;
|
|
|
private final CoderService coderService;
|
|
|
private final HelperService helperService;
|
|
|
private final EvalService evalService;
|
|
|
|
|
|
- public CourseService(CourseRepository courseRepository, CourseMapper courseMapper, UserRepository userRepository, CourseSelectionRepository courseSelectionRepository, CoderService coderService, HelperService helperService, EvalService evalService) {
|
|
|
+ public CourseService(CourseRepository courseRepository, CourseMapper courseMapper, UserRepository userRepository, CourseSelectionRepository courseSelectionRepository, CourseSelectionMapper courseSelectionMapper, CourseSelectionService courseSelectionService, CoderService coderService, HelperService helperService, EvalService evalService) {
|
|
|
this.courseRepository = courseRepository;
|
|
|
this.courseMapper = courseMapper;
|
|
|
this.userRepository = userRepository;
|
|
|
this.courseSelectionRepository = courseSelectionRepository;
|
|
|
+ this.courseSelectionMapper = courseSelectionMapper;
|
|
|
+ this.courseSelectionService = courseSelectionService;
|
|
|
this.coderService = coderService;
|
|
|
this.helperService = helperService;
|
|
|
this.evalService = evalService;
|
|
|
@@ -106,6 +108,8 @@ public class CourseService {
|
|
|
if (!userId.equals(course.getTeacherId())){
|
|
|
throw new CustomErrorException("当前用户无权删除课程");
|
|
|
}
|
|
|
+ List<CourseSelection> courseSelectionList = courseSelectionRepository.findCourseSelectionsByCourseId(courseId);
|
|
|
+ courseSelectionList.forEach(courseSelection -> courseSelectionService.cancelCourseSelection(courseSelectionMapper.toCourseSelectionVO(courseSelection)));
|
|
|
course.setState(ObjectState.DELETED);
|
|
|
courseRepository.save(course);
|
|
|
return "课程删除成功";
|
|
|
@@ -129,7 +133,6 @@ 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()))
|
|
|
.filter(courseVO -> !courseVO.getState().equals(ObjectState.DELETED))
|