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

# Conflicts:
#	src/main/java/com/example/demo/app/presentation/controller/CourseController.java

src/main/java/com/example/demo/app/domain/service/CourseService.java

@@ -8,4 +8,6 @@ public interface CourseService {
 	
 	public List<CourseModel> findAll();
 	
+	public CourseModel findById(Long courseId);
+	
 }

src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java

@@ -21,4 +21,8 @@ public class CourseServiceImpl implements CourseService {
 		
 		return CourseEntity.createCourseModelList(courseRepository.findAll());
 	}
+	
+	public CourseModel findById(Long courseId) {
+		return CourseModel.convertFrom(courseRepository.findByCourseId(courseId));
+	}
 }

src/main/java/com/example/demo/app/infra/repository/CourseRepository.java

@@ -1,9 +1,14 @@
 package com.example.demo.app.infra.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import com.example.demo.app.infra.entity.CourseEntity;
 
 public interface CourseRepository extends JpaRepository<CourseEntity, Long> {
 	
+	@Query("SELECT c FROM CourseEntity c WHERE c.courseId = :courseId ")
+	public CourseEntity findByCourseId(Long courseId);
+	
+	
 }

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

@@ -7,25 +7,25 @@ import jakarta.servlet.http.HttpSession;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.example.demo.aop.aspect.SessionCheck;
 import com.example.demo.app.domain.model.LoginModel;
-import com.example.demo.app.domain.model.UserModel;
 import com.example.demo.app.domain.service.CourseInfoService;
 import com.example.demo.app.domain.service.CourseService;
 import com.example.demo.app.domain.service.UserService;
 import com.example.demo.app.presentation.form.CourseForm;
 import com.example.demo.app.presentation.form.CourseInfoForm;
+import com.example.demo.app.presentation.form.UserForm;
 
 import lombok.RequiredArgsConstructor;
 
 
 @Controller
-@RequestMapping("/course")
+//@RequestMapping("/course")
 @RequiredArgsConstructor
 public class CourseController {
 	
@@ -40,14 +40,17 @@ public class CourseController {
     
     
     @SessionCheck
-    @PostMapping("/select/register")
-    public String showSelectCourse(@ModelAttribute UserModel userModel, Model model) {
+    @GetMapping("/course/select/register")
+    public String showSelectCourse(@ModelAttribute UserForm userForm, Model model, HttpSession session) {
     	
     	try {
+    		System.out.println(userForm.getMailAddress());
     		
-    		model.addAttribute("mode", "select");
+    		session.setAttribute("userForm", userForm);
+    		model.addAttribute("mode", "regist");
     		model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll()));
     		model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll()));
+  
     		
     		return "select_course";
     		
@@ -65,7 +68,7 @@ public class CourseController {
     }
     
     @SessionCheck
-    @PostMapping("/select/change")
+    @GetMapping("/select/change")
     public String showChangeCourse(Model model) {
     	
     	try {

src/main/java/com/example/demo/app/presentation/controller/UserController.java

@@ -7,7 +7,9 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
+import com.example.demo.app.domain.service.CourseService;
 import com.example.demo.app.presentation.form.UserForm;
 
 import lombok.RequiredArgsConstructor;
@@ -17,15 +19,33 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class UserController {
 	
+	private final CourseService courseService;
+	
 	@GetMapping("/user/register")
 	public String showRegister(Model model, HttpSession session) {
+		UserForm userForm = new UserForm();
+		
+		model.addAttribute("userForm", userForm);
+		return "user_register";
+	}
+	
+	@PostMapping("/user/register/return")
+	public String showRegisterReturn(@RequestParam(required = false) Long courseId, Model model, HttpSession session) {
+		
 		UserForm userForm = (UserForm) session.getAttribute("userForm");
 		
 		if(userForm == null) {
 			userForm = new UserForm(); 
+			userForm.setCourseId(courseId);
 		}
 		
+		if(courseId != null) {
+			model.addAttribute("selectedCourseName", courseService.findById(courseId).getCourseName());
+		}
+		
+		model.addAttribute("courseId", courseId);
 		model.addAttribute("userForm", userForm);
+		
 		return "user_register";
 	}
 	

src/main/resources/templates/select_course.html

@@ -9,42 +9,34 @@
 <body>
 	
 	<h1>コース選択</h1>
-	<form th:action="@{/user/register}" th:object="${userForm}" method="post">
-	  <input type="hidden" th:field="*{userName}">
-	  <input type="hidden" th:field="*{mailAddress}">
-	  <input type="hidden" th:field="*{birthDate}">
-	  <input type="hidden" th:field="*{password}">
-	  <input type="hidden" th:field="*{secretQuestionId}">
-	  <input type="hidden" th:field="*{secretAnswer}">
-	  <input type="hidden" th:field="*{saving}">
-	  <input type="hidden" th:field="*{annualIncome}">
-	  <input type="hidden" th:field="*{monthlyBudget}">
-	  <input type="hidden" th:field="*{targetAmount}">
-	<button type="submit">確定</button>
-	<div class="accordion" id="accordionExample">
-	  <div class="accordion-item" th:each="course:${courseList}">
-	    <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">
-	      <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>
-	      </button>
-	    </h2>
-	    <div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
-	      <div class="accordion-body">
-	        <span th:text="${course.description}"></span>
-			<table border="1">
-				<tr>
-					<th>カテゴリ名</th><th>配分(%)</th>
-				</tr>
-				<tr th:each="courseInfo:${courseInfoList}" th:if="${course.courseId == courseInfo.courseId}">
-					<td th:text="${courseInfo.categoryName}"></td>
-					<td th:text="${courseInfo.allocationRatio}"></td>
-				</tr>
-			</table>
-	      </div>
-	    </div>
-	  </div>
-	</div>
+	
+	
+	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">  
+		<button type="submit">確定</button>
+		<div class="accordion" id="accordionExample">
+		  <div class="accordion-item" th:each="course:${courseList}">
+		    <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">
+		      <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>
+		      </button>
+		    </h2>
+		    <div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
+		      <div class="accordion-body">
+		        <span th:text="${course.description}"></span>
+				<table border="1">
+					<tr>
+						<th>カテゴリ名</th><th>配分(%)</th>
+					</tr>
+					<tr th:each="courseInfo:${courseInfoList}" th:if="${course.courseId == courseInfo.courseId}">
+						<td th:text="${courseInfo.categoryName}"></td>
+						<td th:text="${courseInfo.allocationRatio}"></td>
+					</tr>
+				</table>
+		      </div>
+		    </div>
+		  </div>
+		</div>
 	</form>
 	
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>