From efe93e010d65fd3909089b1718b5668ad8bb51c0 Mon Sep 17 00:00:00 2001
From: s-choi <choi-suyeong@iij.ad.jp>
Date: Mon, 28 Sep 2026 10:02:23 +0900
Subject: [PATCH 01/11] =?UTF-8?q?[STYLE]=20=E4=BD=99=E8=A8=88=E3=81=AA?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97=E3=81=BE?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/goal_view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/goal_view.html b/src/main/resources/templates/goal_view.html
index 26ecdd4..5249f82 100644
--- a/src/main/resources/templates/goal_view.html
+++ b/src/main/resources/templates/goal_view.html
@@ -112,7 +112,7 @@
 
 		<ul>
 
-			<li th:each="goalForm : ${goalFormList}" class="transaction-item">
+			<li th:each="goalForm : ${goalFormList}">
 
 				<div class="d-flex justify-content-between">
 

From d5b18ae3ad66d216164c67b9d868bad417542dc6 Mon Sep 17 00:00:00 2001
From: s-choi <choi-suyeong@iij.ad.jp>
Date: Mon, 28 Sep 2026 10:03:06 +0900
Subject: [PATCH 02/11] =?UTF-8?q?[FIX]=20=E4=BC=9A=E5=93=A1=E7=99=BB?=
 =?UTF-8?q?=E9=8C=B2=E3=81=AE=E7=94=9F=E5=B9=B4=E6=9C=88=E6=97=A5=E3=80=81?=
 =?UTF-8?q?=E4=BB=8A=E6=97=A5=E4=BB=A5=E9=99=8D=E3=81=AE=E6=97=A5=E4=BB=98?=
 =?UTF-8?q?=E3=81=AF=E9=81=B8=E3=81=B9=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?=
 =?UTF-8?q?=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

---
 .../resources/templates/user_register.html    | 311 ++++++++----------
 .../templates/user_register_return.html       | 265 +++++++--------
 2 files changed, 265 insertions(+), 311 deletions(-)

diff --git a/src/main/resources/templates/user_register.html b/src/main/resources/templates/user_register.html
index b8067b4..cdc4f99 100644
--- a/src/main/resources/templates/user_register.html
+++ b/src/main/resources/templates/user_register.html
@@ -2,229 +2,192 @@
 <html lang="ja" xmlns:th="http://www.thymeleaf.org">
 
 <head>
-    <meta charset="UTF-8">
-    <meta name="viewport"
-          content="width=device-width, initial-scale=1">
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>新規会員登録</title>
+	<title>新規会員登録</title>
 
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css"
-          rel="stylesheet">
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
 
-    <link rel="stylesheet"
-          th:href="@{/css/style.css}">
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
 <body style="padding-top:80px; padding-bottom:80px;">
 
-    <div th:replace="~{header :: header}">
-    </div>
+	<div th:replace="~{header :: header}">
+	</div>
 
-    <div class="main-container">
+	<div class="main-container">
 
-        <h1 class="page-title">
-            新規会員登録
-        </h1>
+		<h1 class="page-title">
+			新規会員登録
+		</h1>
 
-        <div class="card shadow-sm">
+		<div class="card shadow-sm">
 
-            <div class="card-body">
+			<div class="card-body">
 
-                <form th:action="@{/user/register/course}"
-                      th:object="${userForm}"
-                      method="post">
+				<form th:action="@{/user/register/course}" th:object="${userForm}" method="post">
 
-                    <div class="mb-3">
-                        <label for="userName"
-                               class="form-label">
-                            氏名
-                        </label>
+					<div class="mb-3">
+						<label for="userName" class="form-label">
+							氏名
+						</label>
 
-                        <input type="text"
-                               id="userName"
-                               class="form-control"
-                               th:field="*{userName}"
-                               maxlength="100"
-                               required>
-                    </div>
+						<input type="text" id="userName" class="form-control" th:field="*{userName}" maxlength="100"
+							required>
+					</div>
 
-                    <div class="mb-3">
-                        <label for="mailAddress"
-                               class="form-label">
-                            メールアドレス
-                        </label>
+					<div class="mb-3">
+						<label for="mailAddress" class="form-label">
+							メールアドレス
+						</label>
 
-                        <input type="email"
-                               id="mailAddress"
-                               class="form-control"
-                               th:field="*{mailAddress}"
-                               maxlength="255"
-                               required>
-                    </div>
+						<input type="email" id="mailAddress" class="form-control" th:field="*{mailAddress}"
+							maxlength="255" required>
+					</div>
 
-                    <div class="mb-3">
-                        <label for="birthDate"
-                               class="form-label">
-                            生年月日
-                        </label>
+					<div class="mb-3">
+						<label for="birthDate" class="form-label">
+							生年月日
+						</label>
 
-                        <input type="date"
-                               id="birthDate"
-                               class="form-control"
-                               th:field="*{birthDate}"
-                               required>
-                    </div>
+						<input type="date" id="birthDate" class="form-control" th:field="*{birthDate}" required>
+					</div>
 
-                    <div class="mb-3">
-                        <label for="password"
-                               class="form-label">
-                            パスワード
-                        </label>
+					<div class="mb-3">
+						<label for="password" class="form-label">
+							パスワード
+						</label>
 
-                        <input type="password"
-                               id="password"
-                               class="form-control"
-                               th:field="*{password}"
-                               minlength="8"
-                               maxlength="24"
-                               required>
-                    </div>
+						<input type="password" id="password" class="form-control" th:field="*{password}" minlength="8"
+							maxlength="24" required>
+					</div>
 
-                    <div class="mb-3">
-                        <label for="secretQuestionId"
-                               class="form-label">
-                            秘密の質問
-                        </label>
+					<div class="mb-3">
+						<label for="secretQuestionId" class="form-label">
+							秘密の質問
+						</label>
 
-                        <select id="secretQuestionId"
-                                class="form-select"
-                                th:field="*{secretQuestionId}"
-                                required>
+						<select id="secretQuestionId" class="form-select" th:field="*{secretQuestionId}" required>
 
-                            <option value="">
-                                選択してください
-                            </option>
+							<option value="">
+								選択してください
+							</option>
 
-                            <option th:each="question : ${session.questionList}"
-                                    th:value="${question.secretQuestionId}"
-                                    th:text="${question.questionText}">
-                            </option>
+							<option th:each="question : ${session.questionList}" th:value="${question.secretQuestionId}"
+								th:text="${question.questionText}">
+							</option>
 
-                        </select>
-                    </div>
+						</select>
+					</div>
 
-                    <div class="mb-3">
-                        <label for="secretAnswer"
-                               class="form-label">
-                            秘密の質問の回答
-                        </label>
+					<div class="mb-3">
+						<label for="secretAnswer" class="form-label">
+							秘密の質問の回答
+						</label>
 
-                        <input type="text"
-                               id="secretAnswer"
-                               class="form-control"
-                               th:field="*{secretAnswer}"
-                               maxlength="100"
-                               required>
-                    </div>
+						<input type="text" id="secretAnswer" class="form-control" th:field="*{secretAnswer}"
+							maxlength="100" required>
+					</div>
 
-                    <div class="mb-3">
-                        <label for="saving"
-                               class="form-label">
-                            貯蓄金
-                        </label>
+					<div class="mb-3">
+						<label for="saving" class="form-label">
+							貯蓄金
+						</label>
 
-                        <input type="number"
-                               id="saving"
-                               class="form-control"
-                               th:field="*{saving}"
-                               min="0"
-							   max="1000000000"
-                               required>
-                    </div>
+						<input type="number" id="saving" class="form-control" th:field="*{saving}" min="0"
+							max="1000000000" required>
+					</div>
 
-                    <div class="mb-3">
-                        <label for="annualIncome"
-                               class="form-label">
-                            年収
-                        </label>
+					<div class="mb-3">
+						<label for="annualIncome" class="form-label">
+							年収
+						</label>
 
-                        <input type="number"
-                               id="annualIncome"
-                               class="form-control"
-                               th:field="*{annualIncome}"
-                               min="0"
-							   max="100000000"
-                               required>
-                    </div>
+						<input type="number" id="annualIncome" class="form-control" th:field="*{annualIncome}" min="0"
+							max="100000000" required>
+					</div>
 
-                    <div class="mb-3">
-                        <label for="monthlyBudget"
-                               class="form-label">
-                            月別使用可能金額
-                        </label>
+					<div class="mb-3">
+						<label for="monthlyBudget" class="form-label">
+							月別使用可能金額
+						</label>
 
-                        <input type="number"
-                               id="monthlyBudget"
-                               class="form-control"
-                               th:field="*{monthlyBudget}"
-                               min="0"
-							   max="10000000"
-                               required>
-                    </div>
+						<input type="number" id="monthlyBudget" class="form-control" th:field="*{monthlyBudget}" min="0"
+							max="10000000" required>
+					</div>
 
-                    <div class="mb-3">
-                        <label for="goalId"
-                               class="form-label">
-                            目標貯金額
-                        </label>
+					<div class="mb-3">
+						<label for="goalId" class="form-label">
+							目標貯金額
+						</label>
 
-                        <input type="number"
-                               id="goalId"
-                               class="form-control"
-                               th:field="*{goalId}"
-                               min="0"
-							   max="1000000000"
-                               required>
-                    </div>
+						<input type="number" id="goalId" class="form-control" th:field="*{goalId}" min="0"
+							max="1000000000" required>
+					</div>
 
-                    <input type="hidden"
-                           th:field="*{courseId}">
+					<input type="hidden" th:field="*{courseId}">
 
-                    <div class="d-grid gap-2 mt-4">
+					<div class="d-grid gap-2 mt-4">
 
-                        <button type="submit"
-                                class="btn btn-outline-primary">
-                            コース選択
-                        </button>
+						<button type="submit" class="btn btn-outline-primary">
+							コース選択
+						</button>
 
-                        <button type="submit"
-                                class="btn btn-primary">
-                            作成
-                        </button>
+						<button type="submit" class="btn btn-primary">
+							作成
+						</button>
 
-                    </div>
+					</div>
 
-                </form>
+				</form>
 
-            </div>
+			</div>
 
-        </div>
+		</div>
 
-        <div class="d-grid mt-3">
+		<div class="d-grid mt-3">
 
-            <form th:action="@{/login}"
-                  method="get">
+			<form th:action="@{/login}" method="get">
 
-                <button type="submit"
-                        class="btn btn-outline-secondary">
-                    戻る
-                </button>
+				<button type="submit" class="btn btn-outline-secondary">
+					戻る
+				</button>
 
-            </form>
+			</form>
 
-        </div>
+		</div>
 
-    </div>
+	</div>
+
+
+	<script>
+
+		const date = new Date();
+
+		const year = date.getFullYear();
+		const month = date.getMonth() + 1;
+		const day = date.getDate();
+
+		const birthDate = document.getElementById("birthDate");
+
+		if (month < 10) {
+			if (day < 10) {
+				birthDate.setAttribute("max", year + "-0" + month + "-0" + day);
+			} else {
+				birthDate.setAttribute("max", year + "-0" + month + "-" + day);
+			}
+
+		} else {
+			if (day < 10) {
+				birthDate.setAttribute("max", year + "-" + month + "-0" + day);
+			} else {
+				birthDate.setAttribute("max", year + "-" + month + "-" + day);
+			}
+		}
+
+	</script>
 
 </body>
 
diff --git a/src/main/resources/templates/user_register_return.html b/src/main/resources/templates/user_register_return.html
index 272432d..f60f359 100644
--- a/src/main/resources/templates/user_register_return.html
+++ b/src/main/resources/templates/user_register_return.html
@@ -1,153 +1,144 @@
 <!DOCTYPE html>
-<html lang="ja"xmlns:th="http://www.thymeleaf.org">
+<html lang="ja" xmlns:th="http://www.thymeleaf.org">
+
 <head>
-<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
-<title>新規会員登録</title>
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
-<link rel="stylesheet" th:href="@{/css/style.css}">
+	<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
+	<title>新規会員登録</title>
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 
 </head>
+
 <body>
 	<div th:replace="~{header :: header}">
-		</div>
-	
+	</div>
+
 	<div class="main-container">
-		
+
 		<h1 class="page-title">新規会員登録</h1>
-		
+
 		<div class="card shadow-sm">
 
-		    <div class="card-body">
-		
-		       <form th:action="@{/user/register/confirm}" th:object="${userForm}" method="get">
-			     <div class="mb-3">
-				    <label for="userName" class="form-label">氏名</label>
-				    <input type="text"
-				    id="userName"
-					class="form-control"
-				    th:field="*{userName}"
-				    maxlength="100"
-				    required>
-			     </div>
-			
-			     <div class="mb-3">
-				   <label for="mailAddress" class="form-label">メールアドレス</label>
-				   <input type="email"
-				   id="mailAddress"
-				   class="form-control"
-				   th:field="*{mailAddress}"
-				   maxlength="255"
-				   required>
-			     </div>
-			
-			<div class="mb-3">
-				<label for="birthDate" class="form-label">生年月日</label>
-				<input type="date" id="birthDate" name="birthDate" class="form-control" th:value="*{birthDate}"
-				required>
+			<div class="card-body">
+
+				<form th:action="@{/user/register/confirm}" th:object="${userForm}" method="get">
+					<div class="mb-3">
+						<label for="userName" class="form-label">氏名</label>
+						<input type="text" id="userName" class="form-control" th:field="*{userName}" maxlength="100"
+							required>
+					</div>
+
+					<div class="mb-3">
+						<label for="mailAddress" class="form-label">メールアドレス</label>
+						<input type="email" id="mailAddress" class="form-control" th:field="*{mailAddress}"
+							maxlength="255" required>
+					</div>
+
+					<div class="mb-3">
+						<label for="birthDate" class="form-label">生年月日</label>
+						<input type="date" id="birthDate" name="birthDate" class="form-control" th:value="*{birthDate}"
+							required>
+					</div>
+
+					<div class="mb-3">
+						<label for="password" class="form-label">パスワード</label>
+						<input type="password" id="password" name="password" class="form-control" th:value="*{password}"
+							minlength="8" maxlength="24" required>
+					</div>
+
+					<div class="mb-3">
+						<label for="secretQuestionId" class="form-label">秘密の質問</label>
+						<select id="secretQuestionId" th:field="*{secretQuestionId}" required>
+							<option value="">選択してください</option>
+							<option th:each="question : ${session.questionList}" th:value="${question.secretQuestionId}"
+								th:text="${question.questionText}">
+							</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" required>
+					</div>
+
+					<div class="mb-3">
+						<label for="saving" class="form-label">貯蓄金</label>
+						<input type="number" id="saving" class="form-control" th:field="*{saving}" min="0" required>
+					</div>
+
+					<div class="mb-3">
+						<label for="annualIncome" class="form-label">年収</label>
+						<input type="number" id="annualIncome" class="form-control" th:field="*{annualIncome}" min="0"
+							required>
+					</div>
+
+					<div class="mb-3">
+						<label for="monthlyBudget" class="form-label">月別使用可能金額</label>
+						<input type="number" id="monthlyBudget" class="form-control" th:field="*{monthlyBudget}" min="0"
+							required>
+					</div>
+
+					<div class="mb-3">
+						<label for="goalId" class="form-label">目標</label>
+						<input type="number" id="goalId" class="form-control" th:field="*{goalId}" min="0" required>
+					</div>
+
+					<div class="mb-4">
+						<label class="form-label">コース</label>
+						<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>
+						</div>
+					</div>
+
+					<div class="d-grid">
+						<button type="submit" class="btn btn-primary">作成</button>
+					</div>
+				</form>
+
 			</div>
-			
-			<div class="mb-3">
-				<label for="password" class="form-label">パスワード</label>
-				<input type="password"
-				id="password"
-				name="password"
-				class="form-control"
-				th:value="*{password}"
-				minlength="8"
-				maxlength="24"
-				required>
-			</div>
-			
-			<div class="mb-3">
-				<label for="secretQuestionId" class="form-label">秘密の質問</label>
-				<select id="secretQuestionId"
-				        th:field="*{secretQuestionId}"
-				        required>
-				    <option value="">選択してください</option>
-				    <option th:each="question : ${session.questionList}"
-				            th:value="${question.secretQuestionId}"
-				            th:text="${question.questionText}">
-				    </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"
-				required>
-			</div>
-			
-			<div class="mb-3">
-				<label for="saving" class="form-label">貯蓄金</label>
-				<input type="number"
-				id="saving"
-				class="form-control"
-				th:field="*{saving}"
-				min="0"
-				required>
-			</div>
-			
-			<div class="mb-3">
-				<label for="annualIncome" class="form-label">年収</label>
-				<input type="number"
-				id="annualIncome"
-				class="form-control"
-				th:field="*{annualIncome}"
-				 min="0"
-				 required>
-			 </div>
-			 
-			 <div class="mb-3">
-				<label for="monthlyBudget" class="form-label">月別使用可能金額</label>
-				<input type="number"
-				id="monthlyBudget"
-				class="form-control"
-				th:field="*{monthlyBudget}"
-				min="0"
-				required>
-			 </div>
-			 
-			 <div class="mb-3">
-				<label for="goalId" class="form-label">目標</label>
-				<input type="number"
-				id="goalId"
-				class="form-control"
-				th:field="*{goalId}"
-				min="0"
-				required>
-			</div>
-			
-			<div class="mb-4">
-				<label class="form-label">コース</label>
-				<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>
-				</div>
-			</div>
-			
-			<div class="d-grid">
-				<button type="submit" class="btn btn-primary">作成</button>
-			</div>
-		</form>
-		
-		    </div>
-			
+
 		</div>
-		
+
 		<div class="d-grid mt-3">
-		<form th:action="@{/login}" method="get">
-			<button type="submit" class="btn btn-outline-secondary">戻る</button>
-		</form>
-		
-	</div>
-	
+			<form th:action="@{/login}" method="get">
+				<button type="submit" class="btn btn-outline-secondary">戻る</button>
+			</form>
+
+		</div>
+
 	</div>
+
+	<script>
+
+		const date = new Date();
+
+		const year = date.getFullYear();
+		const month = date.getMonth() + 1;
+		const day = date.getDate();
+
+		const birthDate = document.getElementById("birthDate");
+
+		if (month < 10) {
+			if (day < 10) {
+				birthDate.setAttribute("max", year + "-0" + month + "-0" + day);
+			} else {
+				birthDate.setAttribute("max", year + "-0" + month + "-" + day);
+			}
+
+		} else {
+			if (day < 10) {
+				birthDate.setAttribute("max", year + "-" + month + "-0" + day);
+			} else {
+				birthDate.setAttribute("max", year + "-" + month + "-" + day);
+			}
+		}
+
+	</script>
 </body>
+
 </html>
\ No newline at end of file

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 03/11] =?UTF-8?q?[FIX]=20=E6=96=B0=E8=A6=8F=E4=BC=9A?=
 =?UTF-8?q?=E5=93=A1=E7=99=BB=E9=8C=B2=E7=94=BB=E9=9D=A2=E3=81=A7=E3=81=AE?=
 =?UTF-8?q?=E7=94=9F=E5=B9=B4=E6=9C=88=E6=97=A5=E3=81=AEmax=E5=80=A4?=
 =?UTF-8?q?=E3=82=92=E4=BB=8A=E6=97=A5=E3=81=AE=E6=97=A5=E4=BB=98=E3=81=B8?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
 =?UTF-8?q?=E6=96=B0=E8=A6=8F=E4=BC=9A=E5=93=A1=E7=99=BB=E9=8C=B2=E7=94=BB?=
 =?UTF-8?q?=E9=9D=A2=E3=81=A7=E4=B8=80=E5=9B=9E=E3=82=B3=E3=83=BC=E3=82=B9?=
 =?UTF-8?q?=E3=82=92=E9=81=B8=E6=8A=9E=E3=81=97=E3=81=9F=E3=82=89=E3=80=81?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=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>

From cfbf56cf4e818c10680d948bca6b72eb95564893 Mon Sep 17 00:00:00 2001
From: kkazuya <kkazuya@iij.ad.jp>
Date: Mon, 28 Sep 2026 10:51:02 +0900
Subject: [PATCH 04/11] =?UTF-8?q?[EDIT]=20HTML=E3=83=95=E3=82=A1=E3=82=A4?=
 =?UTF-8?q?=E3=83=AB=E5=90=8D=E3=81=AE=E3=83=8F=E3=82=A4=E3=83=95=E3=83=B3?=
 =?UTF-8?q?=E3=82=92=E3=82=A2=E3=83=B3=E3=83=80=E3=83=BC=E3=82=B9=E3=82=B3?=
 =?UTF-8?q?=E3=82=A2=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/{category-create.html => category_create.html}      | 0
 .../templates/{category-list.html => category_list.html}          | 0
 .../templates/{category-update.html => category_update.html}      | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename src/main/resources/templates/{category-create.html => category_create.html} (100%)
 rename src/main/resources/templates/{category-list.html => category_list.html} (100%)
 rename src/main/resources/templates/{category-update.html => category_update.html} (100%)

diff --git a/src/main/resources/templates/category-create.html b/src/main/resources/templates/category_create.html
similarity index 100%
rename from src/main/resources/templates/category-create.html
rename to src/main/resources/templates/category_create.html
diff --git a/src/main/resources/templates/category-list.html b/src/main/resources/templates/category_list.html
similarity index 100%
rename from src/main/resources/templates/category-list.html
rename to src/main/resources/templates/category_list.html
diff --git a/src/main/resources/templates/category-update.html b/src/main/resources/templates/category_update.html
similarity index 100%
rename from src/main/resources/templates/category-update.html
rename to src/main/resources/templates/category_update.html

From 42c4d7c273664ee089e75915ec41fbbb9bae1813 Mon Sep 17 00:00:00 2001
From: kkazuya <kkazuya@iij.ad.jp>
Date: Mon, 28 Sep 2026 10:51:34 +0900
Subject: [PATCH 05/11] =?UTF-8?q?[EDIT]=20=E4=BA=8C=E6=AC=A1=E6=A9=9F?=
 =?UTF-8?q?=E8=83=BD=E3=81=BE=E3=81=A7=E5=90=AB=E3=82=81=E3=81=9F=E5=AE=9A?=
 =?UTF-8?q?=E6=95=B0=E3=82=AF=E3=83=A9=E3=82=B9=E3=82=92=E4=BD=9C=E6=88=90?=
 =?UTF-8?q?=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

---
 .../PageReturnAttributeKeyword.java           | 11 +++++++-
 .../TransitionTargetPageNameKeyword.java      | 27 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java b/src/main/java/com/example/demo/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java
index c5b6eea..3b0a32a 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java
@@ -9,7 +9,7 @@ public class PageReturnAttributeKeyword {
 	public static final String QUESTION_LIST = "questionList";
 	public static final String USER_FORM = "userForm";
 	public static final String SELECTED_COURSE_NAME = "selectedCourseName";
-	public static final String COURESE_ID = "courseId";
+	public static final String COURSE_ID = "courseId";
 	
 	public static final String PASSWOR_RESET_FORM = "passwordResetForm";
 	public static final String PASSWOR_RESET_USER_ID = "passwordResetUserId";
@@ -52,5 +52,14 @@ public class PageReturnAttributeKeyword {
 	public static final String ANALYSIS_FORM = "analysisForm";
 	
 	public static final String GOAL_FORM = "goalForm";
+	public static final String GOAL_FORM_LIST = "goalFormList";
+	public static final String ACHIEVEMENT_LIST = "achievementList";
+	public static final String GRAPH_GOAL = "graphGoal";
+	public static final String GOAL_COMPLETE_FORM_LIST = "goalCompleteFormList";
+	
+	public static final String CATEGORY_ID = "categoryId";
+	public static final String CATEGORY_FORM = "categoryForm";
+	
+	public static final String FIXED_COST_FORM_LIST = "fixedCostFormList";
 	
 }
diff --git a/src/main/java/com/example/demo/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java b/src/main/java/com/example/demo/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java
index 3249dee..98f7bde 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java
@@ -21,6 +21,8 @@ public class TransitionTargetPageNameKeyword {
 	public static final String PROFILE_EDIT_HTML = "profile_edit";
 	
 	public static final String SELECT_COURSE_HTML = "select_course";
+	public static final String COURSE_CREATE_HTML = "course_create";
+	public static final String COURSE_CREATE_RATIO_HTML = "course_create_ratio";
 	
 	public static final String TRANSACTION_LIST_HTML = "transaction_list";
 	public static final String TRANSACTION_DETAIL_HTML = "transaction_detail";
@@ -31,6 +33,15 @@ public class TransitionTargetPageNameKeyword {
 	
 	public static final String GOAL_VIEW_HTML = "goal_view";
 	public static final String GOAL_EDIT_HTML = "goal_edit";
+	public static final String GOAL_CREATE_HTML = "goal_create";
+	public static final String GOAL_RECORD_HTML = "goal_record";
+	
+	public static final String CATEGORY_LIST_HTML = "category_list";
+	public static final String CATEGORY_CREATE_HTML = "category_create";
+	public static final String CATEGORY_UPDATE_HTML = "category_update";
+	
+	public static final String FIXED_COST_HTML = "fixed_cost";
+	public static final String FIXED_COST_CREATE_HTML = "fixed_cost_create";
 	
 	// Countroller
 	public static final String ERROR = "/error";
@@ -58,6 +69,9 @@ public class TransitionTargetPageNameKeyword {
 	public static final String SHOW_SELECT_COURSE = "/user/register/course";
 	public static final String COURSE = "/course";
 	public static final String CHANGE = "/change";
+	public static final String COURSE_CREATE = "/course/create";
+	public static final String COURSE_CREATE_RATIO = "/course/create/ratio";
+	
 	
 	public static final String INTERROGATION = "?";
 	public static final String EQUAL = "=";
@@ -73,5 +87,18 @@ public class TransitionTargetPageNameKeyword {
 	public static final String GOAL = "/goal";
 	public static final String EDIT = "/edit";
 	public static final String UPDATE = "/update";
+	public static final String CREATE = "/create";
+	public static final String DELETE = "/delete";
+	public static final String RECORD = "/record";
+	
+	public static final String CATEGORY_LIST = "/category/list";
+	public static final String CATEGORY_CREATE = "/category/create";	
+	public static final String CATEGORY_UPDATE = "/category/update";	
+	public static final String CATEGORY_DELETE = "/category/delete";	
+	
+	public static final String FIXED_COST_LIST = "/fixed-cost/list";
+	public static final String FIXED_COST_CREATE = "/fixed-cost/create";
+	public static final String FIXED_COST_DELETE = "/fixed-cost/delete";
+	
 	
 }

From b83f360781312c9b5c302a14cdfc776002830000 Mon Sep 17 00:00:00 2001
From: kkazuya <kkazuya@iij.ad.jp>
Date: Mon, 28 Sep 2026 10:52:42 +0900
Subject: [PATCH 06/11] =?UTF-8?q?[EDIT]=20=E4=BA=8C=E6=AC=A1=E6=A9=9F?=
 =?UTF-8?q?=E8=83=BD=E3=81=AE=E5=AE=9A=E6=95=B0=E9=83=A8=E5=88=86=E3=82=92?=
 =?UTF-8?q?=E3=80=81=E5=AE=9A=E6=95=B0=E3=82=AF=E3=83=A9=E3=82=B9=E3=82=92?=
 =?UTF-8?q?=E5=8F=82=E7=85=A7=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=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/CategoryController.java        | 39 ++++++++++---------
 .../controller/CourseController.java          | 38 +++++++++---------
 .../controller/FixedCostController.java       | 39 ++++++++++---------
 .../controller/GoalController.java            | 36 ++++++++---------
 .../controller/LoginController.java           |  4 +-
 .../controller/TransactionController.java     | 16 ++++----
 6 files changed, 90 insertions(+), 82 deletions(-)

diff --git a/src/main/java/com/example/demo/app/presentation/controller/CategoryController.java b/src/main/java/com/example/demo/app/presentation/controller/CategoryController.java
index 5576a9e..ba55b94 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/CategoryController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/CategoryController.java
@@ -12,6 +12,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 import com.example.demo.app.domain.model.LoginModel;
 import com.example.demo.app.domain.service.CategoryService;
+import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
+import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.demo.app.presentation.form.CategoryForm;
 
 import lombok.RequiredArgsConstructor;
@@ -23,64 +26,64 @@ public class CategoryController {
 	private final CategoryService categoryService;
 	
 	
-	@GetMapping("/category/list")
+	@GetMapping(TransitionTargetPageNameKeyword.CATEGORY_LIST)
 	public String categoryListGet(Model model, HttpSession session) {
 		
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 		
 		List<CategoryForm> categoryFormList = CategoryForm.convertFrom(categoryService.findAllByuserId(loginUser.getUserId()));
 		
-		model.addAttribute("categoryFormList", categoryFormList);
+		model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList);
 		
-		return "category-list";
+		return TransitionTargetPageNameKeyword.CATEGORY_LIST_HTML;
 	}
 	
-	@GetMapping("/category/create")
+	@GetMapping(TransitionTargetPageNameKeyword.CATEGORY_CREATE)
 	public String categoryCreateGet(@ModelAttribute CategoryForm categoryForm) {
 		
-		return "category-create";
+		return TransitionTargetPageNameKeyword.CATEGORY_CREATE_HTML;
 	}
 	
-	@PostMapping("/category/create")
+	@PostMapping(TransitionTargetPageNameKeyword.CATEGORY_CREATE)
 	public String categoryCreatePost(@ModelAttribute CategoryForm categoryForm, HttpSession session) {
 		
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 		
 		
 		categoryService.save(CategoryForm.convertTo(categoryForm), loginUser.getUserId());
 		
-		return "redirect:/category/list";
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.CATEGORY_LIST;
 	}
 	
-	@GetMapping("/category/update")
+	@GetMapping(TransitionTargetPageNameKeyword.CATEGORY_UPDATE)
 	public String categoryUpdateGet(Model model, Long categoryId) {
 		
 		CategoryForm categoryForm = CategoryForm.convertFrom(categoryService.findOne(categoryId));
 		
-		model.addAttribute("categoryId", categoryId);
-		model.addAttribute("categoryForm", categoryForm);
+		model.addAttribute(PageReturnAttributeKeyword.CATEGORY_ID, categoryId);
+		model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM, categoryForm);
 		
-		return "category-update";
+		return TransitionTargetPageNameKeyword.CATEGORY_UPDATE_HTML;
 	}
 	
-	@PostMapping("/category/update")
+	@PostMapping(TransitionTargetPageNameKeyword.CATEGORY_UPDATE)
 	public String categoryUpdatePost(@ModelAttribute CategoryForm categoryForm, HttpSession session, Long categoryId) {
 		
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 		
 		categoryForm.setCategoryId(categoryId);
 		
 		categoryService.save(CategoryForm.convertTo(categoryForm), loginUser.getUserId());
 		
-		return "redirect:/category/list";
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.CATEGORY_LIST;
 	}
 	
-	@PostMapping("/category/delete")
+	@PostMapping(TransitionTargetPageNameKeyword.CATEGORY_DELETE)
 	public String categoryDeletePost(Long categoryId) {
 		
 		categoryService.delete(categoryId);
 		
-		return "redirect:/category/list";
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.CATEGORY_LIST;
 	}
 	
 	
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 8d98405..cd2f770 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
@@ -88,60 +88,60 @@ public class CourseController {
 	}
 
 	@SessionCheck
-	@GetMapping("/course/create")
+	@GetMapping(TransitionTargetPageNameKeyword.COURSE_CREATE)
 	public String createCourseGet(@ModelAttribute CourseForm courseForm, HttpSession session) {
 
-		return "course_create";
+		return TransitionTargetPageNameKeyword.COURSE_CREATE_HTML;
 	}
 
 	@SessionCheck
-	@PostMapping("/course/create/ratio")
+	@PostMapping(TransitionTargetPageNameKeyword.COURSE_CREATE_RATIO)
 	public String createCourse(@ModelAttribute CourseForm courseForm,
 			@ModelAttribute AllocationFormList allocationFormList,
 			HttpSession session, Model model) {
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 		CourseForm form = CourseForm
 				.convertFrom(courseService.save(CourseForm.convertTo(courseForm), loginUser.getUserId()));
 
-		session.setAttribute("courseId", form.getCourseId());
+		session.setAttribute(PageReturnAttributeKeyword.COURSE_ID, form.getCourseId());
 
-		return "course_create_ratio";
+		return TransitionTargetPageNameKeyword.COURSE_CREATE_RATIO_HTML;
 	}
 
 	@SessionCheck
-	@PostMapping("/course/create")
+	@PostMapping(TransitionTargetPageNameKeyword.COURSE_CREATE)
 	public String createCoursePost(@ModelAttribute AllocationFormList allocationFormList, HttpSession session) {
 
 		List<AllocationModel> allocationModelList = new ArrayList<>();
 
 		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId1(),
-				(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio1()));
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio1()));
 		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId2(),
-				(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio2()));
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio2()));
 		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId3(),
-				(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio3()));
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio3()));
 		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId4(),
-				(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio4()));
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio4()));
 		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId5(),
-				(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio5()));
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio5()));
 		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId6(),
-				(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio6()));
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio6()));
 		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId7(),
-				(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio7()));
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio7()));
 		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId8(),
-				(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio8()));
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio8()));
 		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId9(),
-				(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio9()));
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio9()));
 		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId10(),
-				(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio10()));
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio10()));
 		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId11(),
-				(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio11()));
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio11()));
 
 		allocationService.save(allocationModelList);
 
-		return "redirect:/course";
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/app/presentation/controller/FixedCostController.java b/src/main/java/com/example/demo/app/presentation/controller/FixedCostController.java
index 5a0809b..7e76238 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/FixedCostController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/FixedCostController.java
@@ -16,6 +16,9 @@ import com.example.demo.aop.aspect.SessionCheck;
 import com.example.demo.app.domain.model.LoginModel;
 import com.example.demo.app.domain.service.CategoryService;
 import com.example.demo.app.domain.service.FixedCostService;
+import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
+import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.demo.app.presentation.form.CategoryForm;
 import com.example.demo.app.presentation.form.FixedCostForm;
 
@@ -29,30 +32,30 @@ public class FixedCostController {
 	private final CategoryService categoryService;
 
 	@SessionCheck
-	@GetMapping("/fixed-cost/list")
+	@GetMapping(TransitionTargetPageNameKeyword.FIXED_COST_LIST)
 	public String getFixedCostList(
 			HttpSession session, Model model, LocalDate today) {
 		
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 		
 		if (today == null) {
-			today = (LocalDate) session.getAttribute("today");
+			today = (LocalDate) session.getAttribute(PageReturnAttributeKeyword.TODAY);
 		}
 		
 		List<FixedCostForm> fixedCostFormList = FixedCostForm.convertFrom(fixedCostService.findAllByUserId(loginUser.getUserId()));
 		
 		fixedCostFormList.forEach(fixedCostForm -> fixedCostForm.setCategoryName(categoryService.findOne(fixedCostForm.getCategoryId()).getCategoryName()));
 		
-		model.addAttribute("fixedCostFormList", fixedCostFormList);
+		model.addAttribute(PageReturnAttributeKeyword.FIXED_COST_FORM_LIST, fixedCostFormList);
 		
-		model.addAttribute("today", today);
+		model.addAttribute(PageReturnAttributeKeyword.TODAY, today);
 		
-		return "fixed_cost";
+		return TransitionTargetPageNameKeyword.FIXED_COST_HTML;
 	}
 	
 	
 	@SessionCheck
-	@GetMapping("/fixed-cost/create")
+	@GetMapping(TransitionTargetPageNameKeyword.FIXED_COST_CREATE)
 	public String getFixedCostCreate(
 			HttpSession session, @ModelAttribute FixedCostForm fixedCostForm, Model model, LocalDate today) {
 		
@@ -72,42 +75,42 @@ public class FixedCostController {
 			
 		}
 		
-		model.addAttribute("expenseList", expenseList);
-		model.addAttribute("incomeList", incomeList);
-		model.addAttribute("today", today);
+		model.addAttribute(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList);
+		model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
+		model.addAttribute(PageReturnAttributeKeyword.TODAY, today);
 		
 		
-		return "fixed_cost_create";
+		return TransitionTargetPageNameKeyword.FIXED_COST_CREATE_HTML;
 	}
 	
 	
 	
 	@SessionCheck
-	@PostMapping("/fixed-cost/create")
+	@PostMapping(TransitionTargetPageNameKeyword.FIXED_COST_CREATE)
 	public String postFixedCostCreate(
 			HttpSession session, @ModelAttribute FixedCostForm fixedCostForm, Model model, LocalDate today) {
 		
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 		
 		fixedCostForm.setUserId(loginUser.getUserId());
 		
 		fixedCostService.save(FixedCostForm.convertTo(fixedCostForm));
 		
-		session.setAttribute("today", today);
+		session.setAttribute(PageReturnAttributeKeyword.TODAY, today);
 		
-		return "redirect:/fixed-cost/list";
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.FIXED_COST_LIST;
 	}
 	
 	
 	@SessionCheck
-	@PostMapping("/fixed-cost/delete")
+	@PostMapping(TransitionTargetPageNameKeyword.FIXED_COST_DELETE)
 	public String postFixedCostDelete(Long fixedCostId, LocalDate today, HttpSession session) {
 		
 		fixedCostService.delete(fixedCostId);
 		
-		session.setAttribute("today", today);
+		session.setAttribute(PageReturnAttributeKeyword.TODAY, today);
 		
-		return "redirect:/fixed-cost/list";
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.FIXED_COST_LIST;
 	}
 	
 	
diff --git a/src/main/java/com/example/demo/app/presentation/controller/GoalController.java b/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
index 4985491..585b1e8 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
@@ -53,7 +53,7 @@ public class GoalController {
 			HttpSession session,
 			Long goalId) {
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 		Long userId = loginUser.getUserId();
 
@@ -68,15 +68,15 @@ public class GoalController {
 				.collect(Collectors.toList());
 
 		model.addAttribute(
-				"goalFormList",
+				PageReturnAttributeKeyword.GOAL_FORM_LIST,
 				goalFormList);
 
 		model.addAttribute(
-				"achievementList",
+				PageReturnAttributeKeyword.ACHIEVEMENT_LIST,
 				new ArrayList<MonthlyAchievementForm>());
 
 		if (goalFormList.isEmpty()) {
-			return "goal_view";
+			return TransitionTargetPageNameKeyword.GOAL_VIEW_HTML;
 		}
 
 		GoalForm graphGoal;
@@ -95,7 +95,7 @@ public class GoalController {
 		}
 
 		model.addAttribute(
-				"graphGoal",
+				PageReturnAttributeKeyword.GRAPH_GOAL,
 				graphGoal);
 
 		int currentAmount = graphGoal.getCurrentAmount();
@@ -223,7 +223,7 @@ public class GoalController {
 		}
 
 		model.addAttribute(
-				"achievementList",
+				PageReturnAttributeKeyword.ACHIEVEMENT_LIST,
 				achievementList);
 
 		return TransitionTargetPageNameKeyword.GOAL_VIEW_HTML;
@@ -266,44 +266,44 @@ public class GoalController {
 	}
 
 	@SessionCheck
-	@GetMapping("/create")
+	@GetMapping(TransitionTargetPageNameKeyword.CREATE)
 	public String createGoalGet(@ModelAttribute GoalForm goalForm, HttpSession session) {
 
-		return "goal_create";
+		return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
 	}
 
 	@SessionCheck
-	@PostMapping("/create")
+	@PostMapping(TransitionTargetPageNameKeyword.CREATE)
 	public String createGoalPost(@ModelAttribute GoalForm goalForm, HttpSession session) {
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 		Long userId = loginUser.getUserId();
 
 		goalService.createGoal(GoalModel.convertFrom(goalForm), userId);
 
-		return "redirect:/goal";
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
 	}
 
 	@SessionCheck
-	@PostMapping("/delete") // フラグ考慮してないため、今度修正必要
+	@PostMapping(TransitionTargetPageNameKeyword.DELETE) // フラグ考慮してないため、今度修正必要
 	public String deleteGoal(Long goalId, Long record) {
 
 		goalService.delete(goalId);
 
 		if (record == null) {
-			return "redirect:/goal";
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
 		} else {
-			return "redirect:/goal/record";
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL + TransitionTargetPageNameKeyword.RECORD;
 		}
 
 	}
 
 	@SessionCheck
-	@GetMapping("/record")
+	@GetMapping(TransitionTargetPageNameKeyword.RECORD)
 	public String getRecord(HttpSession session, Model model) {
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 		Long userId = loginUser.getUserId();
 		goalService.updateGoalComplete(userId);
@@ -320,10 +320,10 @@ public class GoalController {
 		});
 
 		model.addAttribute(
-				"goalCompleteFormList",
+				PageReturnAttributeKeyword.GOAL_COMPLETE_FORM_LIST,
 				goalCompleteFormList);
 
-		return "goal_record";
+		return TransitionTargetPageNameKeyword.GOAL_RECORD_HTML;
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/app/presentation/controller/LoginController.java b/src/main/java/com/example/demo/app/presentation/controller/LoginController.java
index 099f47d..47d26a3 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/LoginController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/LoginController.java
@@ -26,8 +26,8 @@ public class LoginController {
 	@GetMapping(TransitionTargetPageNameKeyword.LOGIN)
 	public String showLogin(@ModelAttribute LoginForm loginForm, HttpSession session) {
 
-		if (session.getAttribute("loginUser") != null) {
-			return "redirect:/menu";
+		if (session.getAttribute(SessionKeyword.LOGIN_USER) != null) {
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.MENU;
 		}
 
 		return TransitionTargetPageNameKeyword.LOGIN_HTML;
diff --git a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
index eb2cc95..ce0319e 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
@@ -192,7 +192,7 @@ public class TransactionController {
 			Long fixedCostId,
 			Model model, HttpSession session) {
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 		if (today == null) {
 			today = LocalDate.now();
 		}
@@ -253,7 +253,7 @@ public class TransactionController {
 	public String updateOneGet(@RequestParam Long transactionId, @RequestParam(defaultValue = "") LocalDate today,
 			Model model, HttpSession session) {
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 		if (today == null) {
 			today = LocalDate.now();
 		}
@@ -295,7 +295,7 @@ public class TransactionController {
 			@RequestParam LocalDate today, Model model,
 			HttpSession session) {
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 		transactionForm.setUserId(loginUser.getUserId());
 		transactionForm.setTransactionId(transactionId);
@@ -407,15 +407,17 @@ public class TransactionController {
 			model.addAttribute(PageReturnAttributeKeyword.DEADLINE, result.getDeadline());
 
 		} else {
-			model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, "目標を設定してください");
+			final String MESSAGE = "目標を設定してください";
+			
+			model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, MESSAGE);
 
-			model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, "目標を設定してください");
+			model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, MESSAGE);
 
-			model.addAttribute(PageReturnAttributeKeyword.TARGET_AMOUNT, "目標を設定してください");
+			model.addAttribute(PageReturnAttributeKeyword.TARGET_AMOUNT, MESSAGE);
 
 			model.addAttribute(PageReturnAttributeKeyword.SAVING, userForm.getSaving());
 
-			model.addAttribute(PageReturnAttributeKeyword.DEADLINE, "目標を設定してください");
+			model.addAttribute(PageReturnAttributeKeyword.DEADLINE, MESSAGE);
 		}
 
 		return TransitionTargetPageNameKeyword.MENU_HTML;

From 546206317d237c81ef2a92d799723a90c432442b Mon Sep 17 00:00:00 2001
From: s-choi <choi-suyeong@iij.ad.jp>
Date: Mon, 28 Sep 2026 10:53:07 +0900
Subject: [PATCH 07/11] =?UTF-8?q?[FIX]=20=E3=82=A8=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=8C=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=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

---
 src/main/resources/templates/password_reset.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/resources/templates/password_reset.html b/src/main/resources/templates/password_reset.html
index 453a9db..4206bc9 100644
--- a/src/main/resources/templates/password_reset.html
+++ b/src/main/resources/templates/password_reset.html
@@ -59,6 +59,10 @@
                                required>
 
                     </div>
+					
+					<span th:if="${message != null}">
+						<h4 th:text="${message}" style="color: red;"></h4>
+					</span>
 
                     <div class="d-grid">
 

From 0f800da9a39e6eee952e7a5fffa3b1511481a860 Mon Sep 17 00:00:00 2001
From: kkazuya <kkazuya@iij.ad.jp>
Date: Mon, 28 Sep 2026 10:53:41 +0900
Subject: [PATCH 08/11] =?UTF-8?q?[FIX]=20=E8=AA=A4=E5=AD=97=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=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

---
 .../demo/app/presentation/controller/UserController.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 84d721d..2c3eb8e 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
@@ -59,7 +59,7 @@ public class UserController {
 		}
 
 		session.setAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
-		model.addAttribute(PageReturnAttributeKeyword.COURESE_ID, courseId);
+		model.addAttribute(PageReturnAttributeKeyword.COURSE_ID, courseId);
 		model.addAttribute(PageReturnAttributeKeyword.USER_FORM, userForm);
 
 		return TransitionTargetPageNameKeyword.USER_RESISTER_RETURN_HTML;

From b76be8f38ac7d21681dc91661498ddca863b64cd Mon Sep 17 00:00:00 2001
From: s-choi <choi-suyeong@iij.ad.jp>
Date: Mon, 28 Sep 2026 11:11:28 +0900
Subject: [PATCH 09/11] =?UTF-8?q?[FIX]=20=E5=8F=8E=E6=94=AF=E7=99=BB?=
 =?UTF-8?q?=E9=8C=B2=E3=81=AE=E9=9A=9B=E3=80=81=E5=8F=8E=E6=94=AF=E9=A0=85?=
 =?UTF-8?q?=E7=9B=AE=E3=82=92=E5=88=86=E3=81=91=E3=81=BE=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E3=80=82=E9=87=91=E9=A1=8D=E3=81=AE=E6=9C=80=E5=B0=91=E9=A1=8D?=
 =?UTF-8?q?=E3=81=AF1=E5=86=86=E3=81=AB=E8=A8=AD=E5=AE=9A=E3=81=97?=
 =?UTF-8?q?=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/TransactionController.java     |  20 +-
 .../templates/transaction_create.html         | 186 ++++++++++--------
 2 files changed, 123 insertions(+), 83 deletions(-)

diff --git a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
index ce0319e..009acc8 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
@@ -218,6 +218,24 @@ public class TransactionController {
 			}
 		}
 
+
+		List<CategoryForm> expenseList = new ArrayList<CategoryForm>();
+
+		List<CategoryForm> incomeList = new ArrayList<CategoryForm>();
+
+		for (CategoryForm categoryForm : categoryFormList) {
+
+			if (categoryForm.getTransactionType() == 0) {
+				expenseList.add(categoryForm);
+			} else {
+				incomeList.add(categoryForm);
+			}
+
+		}
+
+		model.addAttribute(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList);
+		model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
+
 		model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm);
 
 		model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList);
@@ -408,7 +426,7 @@ public class TransactionController {
 
 		} else {
 			final String MESSAGE = "目標を設定してください";
-			
+
 			model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, MESSAGE);
 
 			model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, MESSAGE);
diff --git a/src/main/resources/templates/transaction_create.html b/src/main/resources/templates/transaction_create.html
index 8ad421c..115ae4f 100644
--- a/src/main/resources/templates/transaction_create.html
+++ b/src/main/resources/templates/transaction_create.html
@@ -15,127 +15,149 @@
 
 	<div class="main-container">
 
-	    <h1 class="page-title">
-	        取引登録
-	    </h1>
+		<h1 class="page-title">
+			取引登録
+		</h1>
 
-	    <div class="card shadow-sm">
+		<div class="card shadow-sm">
 
-	        <div class="card-body">
+			<div class="card-body">
 
-	            <form th:action="@{/transaction/create}"
-	                  th:object="${transactionForm}"
-	                  method="post">
+				<form th:action="@{/transaction/create}" th:object="${transactionForm}" method="post">
 
 					<div class="mb-3">
-				      <label for="transactionDate"
-					         class="form-label">
-							 日付
-					  </label>
-				      <input type="date" 
-					         id="transactionDate" 
-							 class="form-select"
-							 name="transactionDate" 
-							 th:value="*{transactionDate}"
-							 required>
+						<label for="transactionDate" class="form-label">
+							日付
+						</label>
+						<input type="date" id="transactionDate" class="form-select" name="transactionDate"
+							th:value="*{transactionDate}" required>
 					</div>
 
-	                <div class="mb-3">
+					<div class="mb-3">
 
-	                    <label for="transactionType"
-	                           class="form-label">
-	                        収入・支出
-	                    </label>
+						<label for="transactionType" class="form-label">
+							収入・支出
+						</label>
 
-	                    <select id="transactionType"
-	                            class="form-select"
-	                            th:field="*{transactionType}"  
-								required>
+						<select id="transactionType" class="form-select" th:field="*{transactionType}" required>
 
-	                        <option value="">
-	                            選択してください
-	                        </option>
+							<option value="">
+								選択してください
+							</option>
 
-	                        <option value="1">
-	                            支出
-	                        </option>
+							<option value="1">
+								支出
+							</option>
 
-	                        <option value="2">
-	                            収入
-	                        </option>
+							<option value="2">
+								収入
+							</option>
 
-	                    </select>
+						</select>
 
-	                </div>
+					</div>
 
-	                <div class="mb-3">
+					<div class="mb-3">
 
-	                    <label for="categoryId"
-	                           class="form-label">
-	                        カテゴリ
-	                    </label>
+						<label for="categoryId" class="form-label">
+							カテゴリ
+						</label>
 
-	                    <select id="categoryId"
-	                            class="form-select"
-	                            th:field="*{categoryId}"  
-								required>
+						<select id="categoryId" class="form-select" th:field="*{categoryId}" required>
 
-	                        <option value="">
-	                            選択してください
-	                        </option>
+							<option value="">
+								選択してください
+							</option>
 
-	                        <option th:each="category : ${categoryFormList}"
-	                                th:value="${category.categoryId}"
-	                                th:text="${category.categoryName}">
-	                        </option>
+							<option class="expenseListClass" th:each="category : ${expenseList}"
+								th:value="${category.categoryId}" th:text="${category.categoryName}">
+							</option>
 
-	                    </select>
+							<option class="incomeListClass" th:each="category : ${incomeList}"
+								th:value="${category.categoryId}" th:text="${category.categoryName}">
+							</option>
 
-	                </div>
+						</select>
 
-	                <div class="mb-3">
+					</div>
 
-	                    <label for="amount"
-	                           class="form-label">
-	                        金額
-	                    </label>
+					<div class="mb-3">
 
-	                    <input type="number"
-	                           id="amount"
-	                           class="form-control"
-	                           th:field="*{amount}"
-	                           min="0"
-							   max="100000000"
-	                           placeholder="金額を入力してください"  
-							   required>
+						<label for="amount" class="form-label">
+							金額
+						</label>
 
-	                </div>
+						<input type="number" id="amount" class="form-control" th:field="*{amount}" min="1"
+							max="100000000" placeholder="金額を入力してください" required>
 
-	                <input type="hidden"
-	                       name="today"
-	                       th:value="${today}">
+					</div>
 
-	                <div class="d-grid">
+					<input type="hidden" name="today" th:value="${today}">
 
-	                    <button type="submit"
-	                            class="btn btn-primary">
+					<div class="d-grid">
 
-	                        登録
+						<button type="submit" class="btn btn-primary">
 
-	                    </button>
+							登録
 
-	                </div>
+						</button>
 
-	            </form>
+					</div>
 
-	        </div>
+				</form>
 
-	    </div>
+			</div>
+
+		</div>
 
 	</div>
 
 	<div th:replace="~{footer :: footer}"></div>
 
+	<script>
+		const transactionType = document.getElementById("transactionType");
+		const categoryId = document.getElementById("categoryId");
+
+		const expenseList = document.getElementsByClassName("expenseListClass");
+		const incomeList = document.getElementsByClassName("incomeListClass");
+
+		transactionType.addEventListener("change", function () {
+
+			if (this.value === "1") {
+
+				for (let i = 0; i < expenseList.length; i++) {
+					expenseList[i].style.display = "";
+				}
+
+				for (let i = 0; i < incomeList.length; i++) {
+					incomeList[i].style.display = "none";
+				}
+
+			} else if (this.value === "2") {
+
+				for (let i = 0; i < expenseList.length; i++) {
+					expenseList[i].style.display = "none";
+				}
+
+				for (let i = 0; i < incomeList.length; i++) {
+					incomeList[i].style.display = "";
+				}
+
+			} else {
+
+				for (let i = 0; i < expenseList.length; i++) {
+					expenseList[i].style.display = "none";
+				}
+
+				for (let i = 0; i < incomeList.length; i++) {
+					incomeList[i].style.display = "none";
+				}
+			}
+
+			categoryId.value = "";
+		});
+	</script>
+
 
 </body>
 

From e5af64b53bbaaddd5467129836d44d54f6bb3bf4 Mon Sep 17 00:00:00 2001
From: s-choi <choi-suyeong@iij.ad.jp>
Date: Mon, 28 Sep 2026 11:15:22 +0900
Subject: [PATCH 10/11] =?UTF-8?q?[FIX]=20=E7=9B=AE=E6=A8=99=E7=99=BB?=
 =?UTF-8?q?=E9=8C=B2=E3=81=AE=E7=94=BB=E9=9D=A2=E3=81=A7=E3=83=9C=E3=82=BF?=
 =?UTF-8?q?=E3=83=B3=E3=81=AE=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=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

---
 src/main/resources/templates/goal_create.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/goal_create.html b/src/main/resources/templates/goal_create.html
index a97384f..6a23ef3 100644
--- a/src/main/resources/templates/goal_create.html
+++ b/src/main/resources/templates/goal_create.html
@@ -44,7 +44,7 @@
 						<input type="date" th:field="*{deadline}"
 							th:min="${#temporals.format(#temporals.createNow(), 'yyyy-MM-dd')}" required>
 					</div>
-					<button type="submit" class="btn btn-sm btn-primary w-100">更新する</button>
+					<button type="submit" class="btn btn-sm btn-primary w-100">登録</button>
 
 				</form>
 

From 34172aecc9a01c227b487a8801dd3fe5a9aa7097 Mon Sep 17 00:00:00 2001
From: s-choi <choi-suyeong@iij.ad.jp>
Date: Mon, 28 Sep 2026 11:45:23 +0900
Subject: [PATCH 11/11] =?UTF-8?q?[FIX]=20=E7=9B=AE=E6=A8=99=E9=87=91?=
 =?UTF-8?q?=E9=A1=8D=E3=81=8C=E7=8F=BE=E5=9C=A8=E6=89=80=E6=8C=81=E9=87=91?=
 =?UTF-8?q?=E3=82=88=E3=82=8A=E4=BD=8E=E3=81=8B=E3=81=A3=E3=81=9F=E5=A0=B4?=
 =?UTF-8?q?=E5=90=88=E3=80=81=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=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

---
 .../demo/app/domain/service/GoalService.java  |  2 +
 .../domain/service/impl/GoalServiceImpl.java  | 40 +++++++++++++++++--
 .../controller/GoalController.java            | 17 ++++++--
 src/main/resources/templates/goal_create.html |  4 ++
 4 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/example/demo/app/domain/service/GoalService.java b/src/main/java/com/example/demo/app/domain/service/GoalService.java
index 05e9e89..ce3bf35 100644
--- a/src/main/java/com/example/demo/app/domain/service/GoalService.java
+++ b/src/main/java/com/example/demo/app/domain/service/GoalService.java
@@ -18,6 +18,8 @@ public interface GoalService {
 	
 	public void updateGoalComplete(Long userId);
 
+	public int getCurrentAmount(Long userId);
+	
 //	void deleteGoal(Long goalId);
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/app/domain/service/impl/GoalServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/GoalServiceImpl.java
index 5e30fed..3f60f9e 100644
--- a/src/main/java/com/example/demo/app/domain/service/impl/GoalServiceImpl.java
+++ b/src/main/java/com/example/demo/app/domain/service/impl/GoalServiceImpl.java
@@ -47,7 +47,7 @@ public class GoalServiceImpl implements GoalService {
 
 		// 現在の資産 = 貯蓄金 + 収支合計
 		int currentAmount = userEntity.getSaving() + transactionTotal;
-		
+
 		// 達成率(%) = 現在の資産 ÷ 目標金額 × 100
 
 		List<GoalModel> goalModelList = new ArrayList<GoalModel>();
@@ -59,13 +59,28 @@ public class GoalServiceImpl implements GoalService {
 								: (int) ((currentAmount * 100.0) / goalEntity.getTargetAmount()),
 						currentAmount)));
 
-
 		return goalModelList;
 	}
 
 	@Override
 	public GoalModel createGoal(GoalModel goalModel, Long userId) {
 
+		UserEntity userEntity = userRepository.findById(userId).orElseThrow();
+
+		int transactionTotal = userEntity.getTransactionEntityList().stream()
+				.mapToInt(t -> {
+					int sign = t.getCategoryEntity().getTransactionType() == 1 ? 1 : -1;
+					return sign * t.getAmount();
+				})
+				.sum();
+
+		// 現在の資産 = 貯蓄金 + 収支合計
+		int currentAmount = userEntity.getSaving() + transactionTotal;
+		
+		if (currentAmount >= goalModel.getTargetAmount()) {
+			return null;
+		}
+
 		GoalEntity goalEntity = GoalModel.convertTo(goalModel, userRepository.findById(userId).get());
 
 		GoalEntity savedGoalEntity = goalRepository.save(goalEntity);
@@ -82,7 +97,7 @@ public class GoalServiceImpl implements GoalService {
 
 		return GoalModel.convertFrom(updatedGoalEntity, 0, 0);
 	}
-	
+
 	public void delete(Long goalId) {
 		goalRepository.deleteById(goalId);
 	}
@@ -100,12 +115,29 @@ public class GoalServiceImpl implements GoalService {
 				.sum();
 
 		int currentAmount = userEntity.getSaving() + transactionTotal;
-		
+
 		goalEntityList.stream().forEach(goalEntity -> {
 			if (goalEntity.getTargetAmount() <= currentAmount) {
 				goalRepository.updateCompleteByGoalId(goalEntity.getGoalId());
 			}
 		});
 	}
+
+	public int getCurrentAmount(Long userId) {
+	
+		UserEntity userEntity = userRepository.findById(userId).orElseThrow();
+
+		int transactionTotal = userEntity.getTransactionEntityList().stream()
+				.mapToInt(t -> {
+					int sign = t.getCategoryEntity().getTransactionType() == 1 ? 1 : -1;
+					return sign * t.getAmount();
+				})
+				.sum();
+
+		int currentAmount = userEntity.getSaving() + transactionTotal;
+		
+		return currentAmount;
+		
+	}
 	
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/app/presentation/controller/GoalController.java b/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
index 585b1e8..cb7ee49 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
@@ -267,20 +267,31 @@ public class GoalController {
 
 	@SessionCheck
 	@GetMapping(TransitionTargetPageNameKeyword.CREATE)
-	public String createGoalGet(@ModelAttribute GoalForm goalForm, HttpSession session) {
+	public String createGoalGet(@ModelAttribute GoalForm goalForm, HttpSession session, Model model) {
 
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
+
+		Long userId = loginUser.getUserId();
+		
+		int currentAmount = goalService.getCurrentAmount(userId);
+		
+		model.addAttribute("currentAmount", currentAmount);
+		
 		return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
 	}
 
 	@SessionCheck
 	@PostMapping(TransitionTargetPageNameKeyword.CREATE)
-	public String createGoalPost(@ModelAttribute GoalForm goalForm, HttpSession session) {
+	public String createGoalPost(@ModelAttribute GoalForm goalForm, HttpSession session, Model model) {
 
 		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 		Long userId = loginUser.getUserId();
 
-		goalService.createGoal(GoalModel.convertFrom(goalForm), userId);
+		if (goalService.createGoal(GoalModel.convertFrom(goalForm), userId) == null) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE, "現在所持金より高い金額を設定してください。");
+			return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
+		}
 
 		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
 	}
diff --git a/src/main/resources/templates/goal_create.html b/src/main/resources/templates/goal_create.html
index 6a23ef3..2057470 100644
--- a/src/main/resources/templates/goal_create.html
+++ b/src/main/resources/templates/goal_create.html
@@ -37,6 +37,10 @@
 					<div>
 						<label>目標金額</label>
 						<input type="number" th:field="*{targetAmount}" required min="1">
+						<span th:text="|所持金：${currentAmount}円|"></span>
+						<span th:if="${message != null}">
+							<span th:text="${message}" style="color: red;"></span>
+						</span>
 					</div>
 
 					<div>