|
|
@@ -1,71 +1,55 @@
|
|
|
package cn.seecoder.seecoderportalserver.service;
|
|
|
|
|
|
-import cn.seecoder.seecoderportalcommon.vo.ObjectState;
|
|
|
-import cn.seecoder.seecoderportalcommon.vo.CourseVO;
|
|
|
-import cn.seecoder.seecoderportalcommon.vo.UserRole;
|
|
|
+import cn.seecoder.seecoderportalcommon.vo.*;
|
|
|
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.mapper.CourseMapper;
|
|
|
import cn.seecoder.seecoderportalserver.repository.CourseRepository;
|
|
|
import cn.seecoder.seecoderportalserver.repository.CourseSelectionRepository;
|
|
|
-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 org.slf4j.Logger;
|
|
|
-import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
-import java.util.Optional;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
|
@Transactional(rollbackFor = RuntimeException.class)
|
|
|
public class CourseService {
|
|
|
- private static final Logger log = LoggerFactory.getLogger(CourseService.class);
|
|
|
-
|
|
|
private final CourseRepository courseRepository;
|
|
|
private final CourseMapper courseMapper;
|
|
|
- private final UserRepository userRepository;
|
|
|
private final CourseSelectionRepository courseSelectionRepository;
|
|
|
private final CourseSelectionMapper courseSelectionMapper;
|
|
|
- private final CourseSelectionService courseSelectionService;
|
|
|
+ private final UserService userService;
|
|
|
private final CoderService coderService;
|
|
|
private final HelperService helperService;
|
|
|
private final EvalService evalService;
|
|
|
|
|
|
- public CourseService(CourseRepository courseRepository, CourseMapper courseMapper, UserRepository userRepository, CourseSelectionRepository courseSelectionRepository, CourseSelectionMapper courseSelectionMapper, CourseSelectionService courseSelectionService, CoderService coderService, HelperService helperService, EvalService evalService) {
|
|
|
+ public CourseService(CourseRepository courseRepository, CourseMapper courseMapper, CourseSelectionRepository courseSelectionRepository, CourseSelectionMapper courseSelectionMapper, CoderService coderService, HelperService helperService, EvalService evalService, UserService userService) {
|
|
|
this.courseRepository = courseRepository;
|
|
|
this.courseMapper = courseMapper;
|
|
|
- this.userRepository = userRepository;
|
|
|
this.courseSelectionRepository = courseSelectionRepository;
|
|
|
this.courseSelectionMapper = courseSelectionMapper;
|
|
|
- this.courseSelectionService = courseSelectionService;
|
|
|
+ this.userService = userService;
|
|
|
this.coderService = coderService;
|
|
|
this.helperService = helperService;
|
|
|
this.evalService = evalService;
|
|
|
}
|
|
|
|
|
|
- public CourseVO getCourse(Long courseId) {
|
|
|
- Optional<Course> course = courseRepository.findById(courseId);
|
|
|
- return course.map(courseMapper::courseToCourseVO).orElse(null);
|
|
|
- }
|
|
|
-
|
|
|
public CourseVO createCourse(CourseVO courseVO) {
|
|
|
- Integer coderId;
|
|
|
+// Integer coderId;
|
|
|
|
|
|
// 确认授课教师
|
|
|
- Optional<User> teacher = userRepository.findById(courseVO.getTeacher().getId());
|
|
|
- if (!teacher.isPresent()) {
|
|
|
- throw new CustomErrorException("课程教师不存在");
|
|
|
- }
|
|
|
- if (!teacher.get().getRole().equals(UserRole.TEACHER) && !teacher.get().getRole().equals(UserRole.ADMIN)) {
|
|
|
- throw new CustomErrorException("仅限管理员和教师创建课程");
|
|
|
+ UserVO teacher = userService.findUserById(courseVO.getTeacher().getId());
|
|
|
+ List<UserRole> teacherRoles = new ArrayList<>();
|
|
|
+ teacherRoles.add(UserRole.TEACHER);
|
|
|
+ if (!teacherRoles.contains(teacher.getRole())) {
|
|
|
+ throw new CustomErrorException("当前用户无权创建课程");
|
|
|
}
|
|
|
|
|
|
// todo: 创建Coder课程
|
|
|
@@ -84,34 +68,27 @@ public class CourseService {
|
|
|
}
|
|
|
|
|
|
public CourseVO updateCourse(CourseVO courseVO) {
|
|
|
- Optional<Course> optionalCourse = courseRepository.findById(courseVO.getId());
|
|
|
- if(!optionalCourse.isPresent()){
|
|
|
- throw new CustomErrorException("原课程不存在");
|
|
|
- }
|
|
|
- if(!courseVO.getTeacher().getId().equals(optionalCourse.get().getTeacherId())){
|
|
|
- throw new CustomErrorException("当前用户无权修改课程信息");
|
|
|
+ CourseVO originalCourse = this.getCourseById(courseVO.getId());
|
|
|
+ if (!courseVO.getTeacher().getId().equals(originalCourse.getTeacher().getId())) {
|
|
|
+ throw new CustomErrorException("当前用户无权修改课程");
|
|
|
}
|
|
|
Course course = courseMapper.courseVOToCourse(courseVO);
|
|
|
- course.setCreatedTime(optionalCourse.get().getCreatedTime());
|
|
|
- course.setState(optionalCourse.get().getState());
|
|
|
+ course.setCreatedTime(originalCourse.getCreatedTime());
|
|
|
+ course.setState(originalCourse.getState());
|
|
|
Course result = courseRepository.save(course);
|
|
|
return courseMapper.courseToCourseVO(result);
|
|
|
}
|
|
|
|
|
|
// 伪删除
|
|
|
public String deleteCourse(Long courseId, Long userId) {
|
|
|
- Optional<Course> optionalCourse = courseRepository.findById(courseId);
|
|
|
- if (!optionalCourse.isPresent()) {
|
|
|
- throw new CustomErrorException("原课程不存在");
|
|
|
- }
|
|
|
- Course course = optionalCourse.get();
|
|
|
- if (!userId.equals(course.getTeacherId())){
|
|
|
+ CourseVO course = this.getCourseById(courseId);
|
|
|
+ if (!userId.equals(course.getTeacher().getId())) {
|
|
|
throw new CustomErrorException("当前用户无权删除课程");
|
|
|
}
|
|
|
List<CourseSelection> courseSelectionList = courseSelectionRepository.findCourseSelectionsByCourseId(courseId);
|
|
|
- courseSelectionList.forEach(courseSelection -> courseSelectionService.cancelCourseSelection(courseSelectionMapper.toCourseSelectionVO(courseSelection)));
|
|
|
+ courseSelectionList.forEach(courseSelection -> this.cancelCourseSelection(courseSelectionMapper.toCourseSelectionVO(courseSelection)));
|
|
|
course.setState(ObjectState.DELETED);
|
|
|
- courseRepository.save(course);
|
|
|
+ courseRepository.save(courseMapper.courseVOToCourse(course));
|
|
|
return "课程删除成功";
|
|
|
}
|
|
|
|
|
|
@@ -134,23 +111,58 @@ public class CourseService {
|
|
|
public List<CourseVO> getStudentCourses(Long studentId) {
|
|
|
List<CourseSelection> courseSelections = courseSelectionRepository.findCourseSelectionsByUserId(studentId);
|
|
|
return courseSelections.stream()
|
|
|
- .map(courseSelection -> courseMapper.courseToCourseVO(courseRepository.findById(courseSelection.getCourseId()).get()))
|
|
|
- .filter(courseVO -> !courseVO.getState().equals(ObjectState.DELETED))
|
|
|
+ .map(courseSelection -> this.getCourseById(courseSelection.getCourseId()))
|
|
|
+ .filter(course -> !course.getState().equals(ObjectState.DELETED))
|
|
|
.collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
- public List<CourseVO> getExampleCourses(){
|
|
|
+ public List<CourseVO> getExampleCourses() {
|
|
|
List<Course> courses = courseRepository.findCoursesByState(ObjectState.EXAMPLE);
|
|
|
- return courses.stream().map(courseMapper::courseToCourseVO).collect(Collectors.toList());
|
|
|
+ return courses.stream()
|
|
|
+ .map(courseMapper::courseToCourseVO)
|
|
|
+ .collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
- public CourseVO getCourseByCoderId(Integer coderId){
|
|
|
- Optional<Course> optionalCourse = courseRepository.findCourseByCoderId(coderId);
|
|
|
- return optionalCourse.map(courseMapper::courseToCourseVO).orElse(null);
|
|
|
+ public CourseVO getCourseByCoderId(Integer coderId) {
|
|
|
+ Course course = courseRepository.findCourseByCoderId(coderId).orElseThrow(CustomErrorException::courseNotFound);
|
|
|
+ return courseMapper.courseToCourseVO(course);
|
|
|
+ }
|
|
|
+
|
|
|
+ public Boolean checkCourseNameUnique(Long id, String name) {
|
|
|
+ Course course = courseRepository.findCourseByName(name).orElse(null);
|
|
|
+ return course == null || course.getId().equals(id);
|
|
|
+ }
|
|
|
+
|
|
|
+ public CourseVO getCourseById(Long id) {
|
|
|
+ Course course = courseRepository.findById(id).orElseThrow(CustomErrorException::courseNotFound);
|
|
|
+ return courseMapper.courseToCourseVO(course);
|
|
|
+ }
|
|
|
+
|
|
|
+ public String confirmCourseSelection(CourseSelectionVO courseSelectionVO) {
|
|
|
+ userService.findUserById(courseSelectionVO.getUserId());
|
|
|
+ this.getCourseById(courseSelectionVO.getCourseId());
|
|
|
+ CourseSelection courseSelection = courseSelectionMapper.toCourseSelection(courseSelectionVO);
|
|
|
+ courseSelection.setState(true);
|
|
|
+ courseSelectionRepository.save(courseSelection);
|
|
|
+ return "选课成功";
|
|
|
+ }
|
|
|
+
|
|
|
+ public String cancelCourseSelection(CourseSelectionVO courseSelectionVO) {
|
|
|
+ CourseSelection record = courseSelectionRepository.findById(courseSelectionMapper.toCourseSelectionKey(courseSelectionVO)).orElseThrow(CustomErrorException::courseSelectionNotFound);
|
|
|
+ if (record.getState()) {
|
|
|
+ record.setState(false);
|
|
|
+ courseSelectionRepository.save(record);
|
|
|
+ return "选课记录已删除";
|
|
|
+ } else {
|
|
|
+ throw CustomErrorException.courseSelectionNotFound();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- public Boolean checkCourseNameUnique(Long id, String name){
|
|
|
- Optional<Course> optionalCourse = courseRepository.findCourseByName(name);
|
|
|
- return !(optionalCourse.isPresent() && !optionalCourse.get().getId().equals(id));
|
|
|
+ public Boolean checkSelection(Long userId, Long courseId) {
|
|
|
+ CourseSelectionKey key = new CourseSelectionKey();
|
|
|
+ key.setUserId(userId);
|
|
|
+ key.setCourseId(courseId);
|
|
|
+ CourseSelection record = courseSelectionRepository.findById(key).orElse(null);
|
|
|
+ return record != null && record.getState();
|
|
|
}
|
|
|
}
|