[FIX] 配分まで入力してもらったあと、保存されるように修正しました。コース削除機能を追加しました。
This commit is contained in:
s-choi
@@ -3,6 +3,7 @@ package com.example.demo.app.domain.service;
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.domain.model.CourseModel;
|
||||
import com.example.demo.app.presentation.form.AllocationFormList;
|
||||
|
||||
public interface CourseService {
|
||||
|
||||
@@ -12,12 +13,14 @@ public interface CourseService {
|
||||
|
||||
public Long findByName(String courName);
|
||||
|
||||
public CourseModel save(CourseModel courseModel, Long userId);
|
||||
public CourseModel save(CourseModel courseModel, Long userId, AllocationFormList allocationFormList);
|
||||
|
||||
public List<CourseModel> findAllByUserId(Long userId);
|
||||
|
||||
public List<CourseModel> findAllByNull();
|
||||
|
||||
public String deleteCourse(Long courseId, Long userId);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -7,14 +7,19 @@ import jakarta.transaction.Transactional;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.app.domain.model.AllocationModel;
|
||||
import com.example.demo.app.domain.model.CourseModel;
|
||||
import com.example.demo.app.domain.service.CourseService;
|
||||
import com.example.demo.app.infra.entity.AllocationEntity;
|
||||
import com.example.demo.app.infra.entity.CourseEntity;
|
||||
import com.example.demo.app.infra.entity.CourseOwnerEntity;
|
||||
import com.example.demo.app.infra.entity.UserEntity;
|
||||
import com.example.demo.app.infra.repository.AllocationRepository;
|
||||
import com.example.demo.app.infra.repository.CategoryRepository;
|
||||
import com.example.demo.app.infra.repository.CourseOwnerRepository;
|
||||
import com.example.demo.app.infra.repository.CourseRepository;
|
||||
import com.example.demo.app.infra.repository.UserRepository;
|
||||
import com.example.demo.app.presentation.form.AllocationFormList;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -22,53 +27,121 @@ import lombok.RequiredArgsConstructor;
|
||||
@RequiredArgsConstructor
|
||||
public class CourseServiceImpl implements CourseService {
|
||||
|
||||
private final AllocationRepository allocationRepository;
|
||||
|
||||
private final CourseRepository courseRepository;
|
||||
private final UserRepository userRepository;
|
||||
private final CourseOwnerRepository courseOwnerRepository;
|
||||
|
||||
public List<CourseModel> findAll(){
|
||||
|
||||
private final CategoryRepository categoryRepository;
|
||||
|
||||
public List<CourseModel> findAll() {
|
||||
|
||||
return CourseEntity.createCourseModelList(courseRepository.findAll());
|
||||
}
|
||||
|
||||
public List<CourseModel> findAllByUserId(Long userId) {
|
||||
|
||||
|
||||
public List<CourseModel> findAllByUserId(Long userId) {
|
||||
|
||||
return CourseModel.convertFrom(courseRepository.findAllByUserId(userId));
|
||||
}
|
||||
|
||||
|
||||
public List<CourseModel> findAllByNull() {
|
||||
return CourseModel.convertFrom(courseRepository.findAllByNull());
|
||||
}
|
||||
|
||||
|
||||
public CourseModel findById(Long courseId) {
|
||||
return CourseModel.convertFrom(courseRepository.findByCourseId(courseId));
|
||||
}
|
||||
|
||||
|
||||
public Long findByName(String courseName) {
|
||||
return courseRepository.findByCourseName(courseName).getCourseId();
|
||||
}
|
||||
|
||||
|
||||
@Transactional
|
||||
public CourseModel save(CourseModel courseModel, Long userId) {
|
||||
|
||||
List<UserEntity> userEntityList = new ArrayList<>();
|
||||
userEntityList.add(userRepository.findById(userId).get());
|
||||
CourseEntity result = courseRepository.save( CourseModel.convertTo(courseModel));
|
||||
|
||||
public CourseModel save(CourseModel courseModel, Long userId, AllocationFormList allocationFormList) {
|
||||
|
||||
List<UserEntity> userEntityList = new ArrayList<>();
|
||||
userEntityList.add(userRepository.findById(userId).get());
|
||||
CourseEntity result = courseRepository.save(CourseModel.convertTo(courseModel));
|
||||
|
||||
List<AllocationModel> allocationModelList = new ArrayList<>();
|
||||
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId4(),
|
||||
result.getCourseId(),
|
||||
allocationFormList.getAllocationRatio4()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId5(),
|
||||
result.getCourseId(),
|
||||
allocationFormList.getAllocationRatio5()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId6(),
|
||||
result.getCourseId(),
|
||||
allocationFormList.getAllocationRatio6()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId7(),
|
||||
result.getCourseId(),
|
||||
allocationFormList.getAllocationRatio7()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId8(),
|
||||
result.getCourseId(),
|
||||
allocationFormList.getAllocationRatio8()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId9(),
|
||||
result.getCourseId(),
|
||||
allocationFormList.getAllocationRatio9()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId10(),
|
||||
result.getCourseId(),
|
||||
allocationFormList.getAllocationRatio10()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId11(),
|
||||
result.getCourseId(),
|
||||
allocationFormList.getAllocationRatio11()));
|
||||
|
||||
allocationModelList.stream().forEach(allocation -> {
|
||||
System.out.println(allocation.getCourseId());
|
||||
});
|
||||
|
||||
UserEntity user = userRepository.findById(userId).orElse(null);
|
||||
|
||||
|
||||
user.setCourseEntity(result);
|
||||
|
||||
|
||||
UserEntity userResult = userRepository.save(user);
|
||||
|
||||
|
||||
CourseOwnerEntity courseOwnerEntity = new CourseOwnerEntity();
|
||||
courseOwnerEntity.setUserEntity(userResult);
|
||||
courseOwnerEntity.setCourseEntity(result);
|
||||
|
||||
|
||||
courseOwnerRepository.save(courseOwnerEntity);
|
||||
|
||||
|
||||
List<AllocationEntity> allocationEntityList = new ArrayList<>();
|
||||
|
||||
allocationModelList.forEach(allocationModel -> {
|
||||
allocationEntityList.add(
|
||||
AllocationModel.convertTo(
|
||||
categoryRepository.findById(allocationModel.getCategoryId()).get(),
|
||||
courseRepository.findById(allocationModel.getCourseId()).get(),
|
||||
allocationModel.getAllocationRatio()));
|
||||
|
||||
});
|
||||
|
||||
List<AllocationModel> resultList = new ArrayList<>();
|
||||
for (AllocationEntity allocationEntity : allocationEntityList) {
|
||||
resultList.add(AllocationModel.convertFrom(allocationRepository.save(allocationEntity)));
|
||||
}
|
||||
|
||||
return CourseModel.convertFrom(result);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public String deleteCourse(Long courseId, Long userId) {
|
||||
|
||||
UserEntity userEntity = userRepository.findById(userId).orElse(null);
|
||||
System.out.println("***********************ここでエラー1");
|
||||
if (userEntity.getCourseEntity().getCourseId() == courseId) {
|
||||
return "selected";
|
||||
}
|
||||
System.out.println("***********************ここでエラー2");
|
||||
allocationRepository.deleteByCourseId(courseId);
|
||||
System.out.println("***********************ここでエラー3");
|
||||
courseOwnerRepository.deleteByCourseId(courseId);
|
||||
System.out.println("***********************ここでエラー4");
|
||||
courseRepository.deleteById(courseId);
|
||||
System.out.println("***********************ここでエラー5");
|
||||
return "ok";
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.example.demo.aop.aspect.SessionCheck;
|
||||
import com.example.demo.app.domain.model.AllocationModel;
|
||||
import com.example.demo.app.domain.model.CourseModel;
|
||||
import com.example.demo.app.domain.model.LoginModel;
|
||||
import com.example.demo.app.domain.service.AllocationService;
|
||||
@@ -111,48 +110,44 @@ public class CourseController {
|
||||
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
|
||||
|
||||
CourseForm form = CourseForm
|
||||
.convertFrom(courseService.save(CourseForm.convertTo(courseForm), loginUser.getUserId()));
|
||||
|
||||
session.setAttribute(PageReturnAttributeKeyword.COURSE_ID, form.getCourseId());
|
||||
model.addAttribute("courseForm", courseForm);
|
||||
|
||||
return TransitionTargetPageNameKeyword.COURSE_CREATE_RATIO_HTML;
|
||||
}
|
||||
|
||||
@SessionCheck
|
||||
@PostMapping(TransitionTargetPageNameKeyword.COURSE_CREATE)
|
||||
public String createCoursePost(@ModelAttribute AllocationFormList allocationFormList, HttpSession session) {
|
||||
public String createCoursePost(@ModelAttribute CourseForm courseForm,
|
||||
@ModelAttribute AllocationFormList allocationFormList, HttpSession session) {
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
|
||||
|
||||
List<AllocationModel> allocationModelList = new ArrayList<>();
|
||||
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId4(),
|
||||
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
|
||||
allocationFormList.getAllocationRatio4()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId5(),
|
||||
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
|
||||
allocationFormList.getAllocationRatio5()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId6(),
|
||||
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
|
||||
allocationFormList.getAllocationRatio6()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId7(),
|
||||
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
|
||||
allocationFormList.getAllocationRatio7()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId8(),
|
||||
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
|
||||
allocationFormList.getAllocationRatio8()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId9(),
|
||||
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
|
||||
allocationFormList.getAllocationRatio9()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId10(),
|
||||
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
|
||||
allocationFormList.getAllocationRatio10()));
|
||||
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId11(),
|
||||
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
|
||||
allocationFormList.getAllocationRatio11()));
|
||||
|
||||
allocationService.save(allocationModelList);
|
||||
courseService.save(CourseForm.convertTo(courseForm), loginUser.getUserId(), allocationFormList);
|
||||
|
||||
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
|
||||
}
|
||||
|
||||
@SessionCheck
|
||||
@PostMapping("/course/delete")
|
||||
public String createCoursePost(@RequestParam Long courseId, HttpSession session, Model model) {
|
||||
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
|
||||
|
||||
System.out.println("**********************cousrId: " + courseId);
|
||||
String condition = courseService.deleteCourse(courseId, loginUser.getUserId());
|
||||
|
||||
if (condition.equals("selected")) {
|
||||
|
||||
model.addAttribute("message", "適用中のコースは選べません");
|
||||
|
||||
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
|
||||
|
||||
} else if (condition.equals("ok")) {
|
||||
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
|
||||
}
|
||||
model.addAttribute("message", "エラーが発生しました");
|
||||
|
||||
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user