From 503ac3f3db541223bdbf2c6707811952f3c2763a Mon Sep 17 00:00:00 2001
From: s-choi <choi-suyeong@iij.ad.jp>
Date: Mon, 28 Sep 2026 10:45:13 +0900
Subject: [PATCH] =?UTF-8?q?[FIX]=20=E6=96=B0=E8=A6=8F=E4=BC=9A=E5=93=A1?=
 =?UTF-8?q?=E7=99=BB=E9=8C=B2=E7=94=BB=E9=9D=A2=E3=81=A7=E3=81=AE=E7=94=9F?=
 =?UTF-8?q?=E5=B9=B4=E6=9C=88=E6=97=A5=E3=81=AEmax=E5=80=A4=E3=82=92?=
 =?UTF-8?q?=E4=BB=8A=E6=97=A5=E3=81=AE=E6=97=A5=E4=BB=98=E3=81=B8=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82=E6=96=B0?=
 =?UTF-8?q?=E8=A6=8F=E4=BC=9A=E5=93=A1=E7=99=BB=E9=8C=B2=E7=94=BB=E9=9D=A2?=
 =?UTF-8?q?=E3=81=A7=E4=B8=80=E5=9B=9E=E3=82=B3=E3=83=BC=E3=82=B9=E3=82=92?=
 =?UTF-8?q?=E9=81=B8=E6=8A=9E=E3=81=97=E3=81=9F=E3=82=89=E3=80=81=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/presentation/controller/UserController.java   | 11 +++++++++++
 .../resources/templates/user_register_confirm.html    | 10 +++++-----
 .../resources/templates/user_register_return.html     |  5 +++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/example/demo/app/presentation/controller/UserController.java b/src/main/java/com/example/demo/app/presentation/controller/UserController.java
index ebfc930..84d721d 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/UserController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/UserController.java
@@ -71,6 +71,11 @@ public class UserController {
 			HttpSession session) {
 
 		model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, (String) session.getAttribute("selectedCourseName"));
+		
+		session.setAttribute("questionId", userForm.getSecretQuestionId());
+		
+		System.out.println("return questionId: ****************************:" + userForm.getSecretQuestionId());
+		
 		return TransitionTargetPageNameKeyword.USER_RESISTER_CONFIRM_HTML;
 		
 	}
@@ -83,6 +88,12 @@ public class UserController {
 
 		Long courseId = courseService.findByName((String) session.getAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME));
 		
+		Long questionId = (Long) session.getAttribute("questionId");
+		
+		System.out.println("confirm questionId: ****************************:" + questionId);
+		
+		userForm.setSecretQuestionId(questionId);
+		
 		userService.register(userForm, courseId);
 		
 		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.LOGIN;
diff --git a/src/main/resources/templates/user_register_confirm.html b/src/main/resources/templates/user_register_confirm.html
index 6d39145..fedad18 100644
--- a/src/main/resources/templates/user_register_confirm.html
+++ b/src/main/resources/templates/user_register_confirm.html
@@ -44,14 +44,14 @@
 
 			<div class="mb-3">
 				<label for="secretQuestionId" class="form-label">秘密の質問</label>
-				<select id="secretQuestionId" th:field="*{secretQuestionId}" required readonly>
-					<option value="">選択してください</option>
+				<select id="secretQuestionId" th:field="*{secretQuestionId}" required disabled>
+					<option value="" readonly>選択してください</option>
 					<option th:each="question : ${session.questionList}" th:value="${question.secretQuestionId}"
-						th:text="${question.questionText}">
+						th:text="${question.questionText}" readonly>
 					</option>
 				</select>
 			</div>
-
+			
 			<div class="mb-3">
 				<label for="secretAnswer" class="form-label">秘密の質問の回答</label>
 				<input type="text" id="secretAnswer" class="form-control" th:field="*{secretAnswer}" maxlength="100" readonly>
@@ -82,7 +82,7 @@
 				<div class="d-flex justify-content-between align-items-center">
 				<input type="hidden" class="form-control" th:field="*{courseId}">
 				<span th:text="${selectedCourseName}">未選択</span>
-				<button type="submit" class="btn btn-outline-primary btn-sm">コース選択</button>
+				<button type="submit" class="btn btn-outline-primary btn-sm" disabled>コース選択</button>
 				</div>
 			</div>
 
diff --git a/src/main/resources/templates/user_register_return.html b/src/main/resources/templates/user_register_return.html
index f60f359..93569ea 100644
--- a/src/main/resources/templates/user_register_return.html
+++ b/src/main/resources/templates/user_register_return.html
@@ -55,7 +55,7 @@
 							</option>
 						</select>
 					</div>
-
+					
 					<div class="mb-3">
 						<label for="secretAnswer" class="form-label">秘密の質問の回答</label>
 						<input type="text" id="secretAnswer" class="form-control" th:field="*{secretAnswer}"
@@ -89,7 +89,7 @@
 						<div class="d-flex justify-content-between align-items-center">
 							<input type="hidden" th:field="*{courseId}">
 							<span th:text="${selectedCourseName}">未選択</span>
-							<button type="submit" class="btn btn-outline-primary btn-sm">
+							<button class="btn btn-outline-primary btn-sm" disabled>
 								コース選択
 							</button>
 						</div>
@@ -137,6 +137,7 @@
 				birthDate.setAttribute("max", year + "-" + month + "-" + day);
 			}
 		}
+		
 
 	</script>
 </body>