From 428cb0fd640bac4b1571967255498a773fb80db1 Mon Sep 17 00:00:00 2001 From: kkazuya Date: Thu, 24 Sep 2026 10:50:39 +0900 Subject: [PATCH] =?UTF-8?q?[EDIT]=20=E3=82=B3=E3=83=BC=E3=82=B9=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E3=81=AE=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88?= =?UTF-8?q?=E3=82=92=E3=83=90=E3=83=A9=E3=83=B3=E3=82=B9=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E3=81=AB=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E7=B7=A8?= =?UTF-8?q?=E9=9B=86=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82=E3=83=AD?= =?UTF-8?q?=E3=82=B0=E3=82=A4=E3=83=B3=E6=B8=88=E3=81=BF=E3=81=AE=E3=83=A6?= =?UTF-8?q?=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=8C=E3=82=B3=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CourseController.java | 74 +++++++------------ 1 file changed, 25 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/example/demo/app/presentation/controller/CourseController.java b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java index 5a5e2cd..b4e34f8 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/CourseController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java @@ -1,8 +1,5 @@ package com.example.demo.app.presentation.controller; -import java.util.logging.Level; -import java.util.logging.Logger; - import jakarta.servlet.http.HttpSession; import org.springframework.stereotype.Controller; @@ -25,74 +22,53 @@ import lombok.RequiredArgsConstructor; @Controller -//@RequestMapping("/course") @RequiredArgsConstructor public class CourseController { - - private final static Logger LOGGER = Logger.getLogger(CourseController.class.getName()); - // エラーメッセージ用の定数フィールド - private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; - private final HttpSession httpSession; private final CourseService courseService; private final CourseInfoService courseInfoService; private final UserService userService; - @PostMapping("/course/select/register") + @PostMapping("/user/register/course") public String showSelectCourse(@ModelAttribute UserForm userForm, Model model, HttpSession session) { - try { + - session.setAttribute("userForm", userForm); - model.addAttribute("mode", "regist"); - model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll())); - model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll())); + session.setAttribute("userForm", userForm); + model.addAttribute("mode", "regist"); + model.addAttribute("currentCourseId", 4); + model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll())); + model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll())); + return "select_course"; - return "select_course"; - - } catch (Exception e) { - // ログイン情報の破棄 - httpSession.invalidate(); - - e.printStackTrace(); - - // エラーログ出力 - LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); - // エラー画面遷移 - return null; - } + } @SessionCheck - @GetMapping("/select/change") - public String showChangeCourse(Model model) { + @GetMapping("/course") + public String showChangeCourse(Model model, HttpSession session) { - try { - - model.addAttribute("mode", "change"); - model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll())); - model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll())); - - return "select_course"; - - } catch (Exception e) { - // ログイン情報の破棄 - httpSession.invalidate(); + + LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); + Long userId = loginUser.getUserId(); + + Long currentCourseId = userService.findByUserId(userId).getCourseId(); + model.addAttribute("mode", "change"); + model.addAttribute("currentCourseId", currentCourseId); + model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll())); + model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll())); + - e.printStackTrace(); - - // エラーログ出力 - LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); - // エラー画面遷移 - return null; - } + return "select_course"; + + } @SessionCheck @PostMapping("/change") - public String changeCourse(@RequestParam Long courseId) { + public String changeCourse(@RequestParam Long courseId, HttpSession httpSession) { LoginModel loginUser = (LoginModel) httpSession.getAttribute("loginUser");