2026_09_5H_Spring_KIZAKI/Monegement
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito

Browse Source
This commit is contained in:
[IIJ] Naoki Kawahito
2026-09-24 10:53:24 +09:00
parent 149f9b220c f10f9f83de
commit 8fa363ad56
3 changed files with 28 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/main/java/com/example/demo/app/presentation/controller/CourseController.java
View File

@@ -1,8 +1,5 @@
package com.example.demo.app.presentation.controller; package com.example.demo.app.presentation.controller;
import java.util.logging.Level;
import java.util.logging.Logger;
import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.HttpSession;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@@ -25,74 +22,53 @@ import lombok.RequiredArgsConstructor;
@Controller @Controller
//@RequestMapping("/course")
@RequiredArgsConstructor @RequiredArgsConstructor
public class CourseController { 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 CourseService courseService;
private final CourseInfoService courseInfoService; private final CourseInfoService courseInfoService;
private final UserService userService; private final UserService userService;
@PostMapping("/course/select/register") @PostMapping("/user/register/course")
public String showSelectCourse(@ModelAttribute UserForm userForm, Model model, HttpSession session) { public String showSelectCourse(@ModelAttribute UserForm userForm, Model model, HttpSession session) {
try {
session.setAttribute("userForm", userForm); session.setAttribute("userForm", userForm);
model.addAttribute("mode", "regist"); model.addAttribute("mode", "regist");
model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll())); model.addAttribute("currentCourseId", 4);
model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll())); 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 @SessionCheck
@GetMapping("/select/change") @GetMapping("/course")
public String showChangeCourse(Model model) { public String showChangeCourse(Model model, HttpSession session) {
try {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
model.addAttribute("mode", "change"); Long userId = loginUser.getUserId();
model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll()));
model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll())); Long currentCourseId = userService.findByUserId(userId).getCourseId();
model.addAttribute("mode", "change");
return "select_course"; model.addAttribute("currentCourseId", currentCourseId);
model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll()));
} catch (Exception e) { model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll()));
// ログイン情報の破棄
httpSession.invalidate();
e.printStackTrace(); return "select_course";
// エラーログ出力
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
// エラー画面遷移
return null;
}
} }
@SessionCheck @SessionCheck
@PostMapping("/change") @PostMapping("/change")
public String changeCourse(@RequestParam Long courseId) { public String changeCourse(@RequestParam Long courseId, HttpSession httpSession) {
LoginModel loginUser = (LoginModel) httpSession.getAttribute("loginUser"); LoginModel loginUser = (LoginModel) httpSession.getAttribute("loginUser");

3
src/main/resources/templates/select_course.html
View File

@@ -7,6 +7,7 @@
<title>コース選択</title> <title>コース選択</title>
</head> </head>
<body> <body>
<div th:replace="~{header :: header}"></div>
<h1>コース選択</h1> <h1>コース選択</h1>
@@ -17,7 +18,7 @@
<div class="accordion" id="accordionExample"> <div class="accordion" id="accordionExample">
<div class="accordion-item" th:each="course:${courseList}"> <div class="accordion-item" th:each="course:${courseList}">
<h2 class="accordion-header d-flex align-items-center"> <h2 class="accordion-header d-flex align-items-center">
<input type="radio" name="courseId" th:value="${course.courseId}" class="form-check-input ms-3 me-2"> <input type="radio" name="courseId" th:value="${course.courseId}" th:checked="${course.courseId==currentCourseId}" class="form-check-input ms-3 me-2">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" th:data-bs-target="'#collapse' + ${course.courseId}" aria-expanded="false" aria-controls="'collapse' + ${course.courseId}"> <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" th:data-bs-target="'#collapse' + ${course.courseId}" aria-expanded="false" aria-controls="'collapse' + ${course.courseId}">
<span th:text="${course.courseName}"></span> <span th:text="${course.courseName}"></span>
</button> </button>

2
src/main/resources/templates/user_register.html
View File

@@ -13,7 +13,7 @@
<main> <main>
<h1>新規会員登録</h1> <h1>新規会員登録</h1>
<form th:action="@{/course/select/register}" th:object="${userForm}" method="post"> <form th:action="@{/user/register/course}" th:object="${userForm}" method="post">
<div> <div>
<label for="userName">氏名</label> <label for="userName">氏名</label>
<input type="text" <input type="text"