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

# Conflicts:
#	src/main/resources/templates/transaction_detail.html

src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java

@@ -55,11 +55,15 @@ public class GlobalExceptionHandler {
 
 	@ExceptionHandler(Exception.class)
 	public String AllException(Model model, Exception e, HttpSession session) {
+		model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
 
 		e.printStackTrace();
 
-		System.out.println("session invalidated exception");
+		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
+
+		System.out.println("session invalidated");
     	session.invalidate();
+		
 		return "error";
 	}
 }

src/main/java/com/example/demo/app/domain/model/GoalModel.java

@@ -57,7 +57,7 @@ public class GoalModel {
 				goalModel.getTargetAmount(),
 				goalModel.getDeadline(),
 				0,
-				userEntity);
+				userEntity, 0);
 	}
 	
 	public static GoalModel convertFrom(GoalForm goalForm) {

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

@@ -53,13 +53,13 @@ public class UserServiceImpl implements UserService {
 
 		userEntity.setQuestionEntity(questionEntity);
 		
+		
+		
 		userEntity.setCourseEntity(courseEntity);
 
 		userEntity.setDeleteFlag(0);
 
-		goalEntity.setUserEntity(userRepository.save(userEntity));
+		userRepository.save(userEntity);
-		
-		goalRepository.save(goalEntity);
 	}
 
 	@Override

src/main/java/com/example/demo/app/infra/entity/CategoryEntity.java

@@ -29,7 +29,7 @@ public class CategoryEntity {
 	@Column(name = "category_id")
 	private Long categoryId;
 
-	@Column(name = "category_name", nullable = false, length = 50)
+	@Column(name = "category_name", nullable = false)
 	private String categoryName;
 
 	@Column(name = "transaction_type", nullable = false)

src/main/java/com/example/demo/app/infra/entity/CourseEntity.java

@@ -27,7 +27,7 @@ public class CourseEntity {
 	 @Column(name = "course_id")
 	 private Long courseId;
 	 
-	 @Column(name = "course_name", nullable = false, length = 50)
+	 @Column(name = "course_name", nullable = false)
 	 private String courseName;
 	
 	 

src/main/java/com/example/demo/app/infra/entity/FixedCostEntity.java

@@ -34,7 +34,7 @@ public class FixedCostEntity {
 	@JoinColumn(name = "category_id")
 	private CategoryEntity categoryEntity;
 	
-	@Column(name = "fixed_cost_name", nullable = false, length = 50)
+	@Column(name = "fixed_cost_name", nullable = false)
 	private String fixedCostName;
 
 	@Column(name = "amount", nullable = false)

src/main/java/com/example/demo/app/infra/entity/GoalEntity.java

@@ -29,10 +29,10 @@ public class GoalEntity {
 	private Long goalId;
 
 	@Column(name = "goal_title", nullable = true)
-	private String goalTitle = "名前を設定してください";
+	private String goalTitle;
 	
 	@Column(name = "goal_subtitle", nullable = true)
-	private String goalSubtitle = "説明を書いてください";
+	private String goalSubtitle;
 	
 	@Column(name = "target_amount", nullable = true)
 	private Integer targetAmount;
@@ -47,4 +47,6 @@ public class GoalEntity {
 	@JoinColumn(name = "user_id")
 	private UserEntity userEntity;
 	
+	private Integer deleteFlag;
+
 }

src/main/java/com/example/demo/app/infra/entity/TestController6.java

@@ -1,5 +0,0 @@
-package com.example.demo.app.infra.entity;
-
-public class TestController6 {
-
-}

src/main/java/com/example/demo/app/infra/entity/UserEntity.java

@@ -30,7 +30,7 @@ public class UserEntity {
 	@Column(name = "user_id")
 	private Long userId;
 
-	@Column(name = "user_name", nullable = false, length = 100)
+	@Column(name = "user_name", nullable = false)
 	private String userName;
 
 	@Column(name = "mail_address", nullable = false)
@@ -39,7 +39,7 @@ public class UserEntity {
 	@Column(name = "password", nullable = false)
 	private String password;
 
-	@Column(name = "secret_answer", nullable = false, length = 100)
+	@Column(name = "secret_answer", nullable = false)
 	private String secretQuestionAnswer;
 	
 	@Column(name = "birth_date", nullable = false)

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

@@ -11,5 +11,4 @@ public class ErrorController {
 	    public String showError() {
 	        return TransitionTargetPageNameKeyword.ERROR_HTML;
 	    }
-	    
 }

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

@@ -57,7 +57,8 @@ public class ProfileController {
 	                    profileModel.getBirthDate(),
 	                    profileModel.getSaving(),
 	                    profileModel.getAnnualIncome(),
-	                    profileModel.getMonthlyBudget());
+	                    profileModel.getMonthlyBudget(),
+	                    profileModel.getBirthDate());
 
 	    model.addAttribute(PageReturnAttributeKeyword.PROFILE_EDIT_FORM, profileEditForm);
 	    return TransitionTargetPageNameKeyword.PROFILE_EDIT_HTML;

src/main/java/com/example/demo/app/presentation/form/ProfileEditForm.java

@@ -16,4 +16,5 @@ public class ProfileEditForm {
 	private Integer saving;
 	private Integer annualIncome;
 	private Integer monthlyBudget;
+	private LocalDate birthDate;
 }

src/main/resources/templates/category_list.html

@@ -9,13 +9,13 @@
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
 </head>
 
-<body style="padding-top:80px; padding-bottom:80px;">
+<body class="pb-5 pt-5">
 
 	<div th:replace="~{header :: header}"></div>
 	<div class="main-container">
 
 		<div>
-			<ul class="list-unstyled p-0 m-0">
+			<ul>
 				<li class="card shadow-sm mb-3" th:each="categoryForm : ${categoryFormList}">
 					<div class="card-body">
 						<div class="d-flex justify-content-between">
@@ -49,30 +49,20 @@
 
 						</div>
 
+						<hr>
+						<hr>
 					</div>
 				</li>
 			</ul>
 		</div>
 
-		<div class="d-grid mt-4">
+
 
 		<form th:action="@{/category/create}" method="get">
-
+			<input type="hidden" name="today" id="today" th:value="${today}">
-				<input type="hidden"
+			<button type="submit">新規登録</button>
-			           name="today"
-					   id="today"
-			           th:value="${today}">
-
-			    <button class="btn btn-success w-100" type="submit">
-					新規登録
-				</button>
-
 		</form>
 
-		</div>
-		
-	</div>
-
 		<div th:replace="~{footer :: footer}"></div>
 </body>
 

src/main/resources/templates/fixed_cost.html

@@ -10,7 +10,7 @@
 	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
-<body style="padding-top:80px; padding-bottom:80px;">
+<body class="pb-5 pt-5">
 
 	<div th:replace="~{header :: header}"></div>
 	<div class="main-container">
@@ -19,7 +19,7 @@
 		<h2 class="page-title" th:text="${today}"></h2>
 
 		<div>
-			<ul class="list-unstyled p-0 m-0">
+			<ul>
 				<li th:each="fixedCostForm : ${fixedCostFormList}" class="card shadow-sm mb-3">
 
 					<div class="card-body">
@@ -52,29 +52,21 @@
 
 						</div>
 
+						<hr>
+						<hr>
 					</div>
 				</li>
+		</div>
 		</ul>
 	</div>
-		<div class="d-grid mt-4">
 
-			<form th:action="@{/category/create}" method="get">
 
-				<input type="hidden"
-					   name="today"
-					   id="today"
-					   th:value="${today}">
-
-				<button class="btn btn-success w-100" type="submit">
-			    	新規登録
-				</button>
 
+	<form th:action="@{/fixed-cost/create}" method="get">
+		<input type="hidden" name="today" id="today" th:value="${today}">
+		<button type="submit">新規登録</button>
 	</form>
 
-		</div>
-		
-	</div>
-
 	<div th:replace="~{footer :: footer}"></div>
 </body>
 

src/main/resources/templates/goal_create.html

@@ -52,12 +52,9 @@
 
 				</form>
 
-			</div>
-		</div>
-	</div>
-	
 				<div th:replace="~{footer :: footer}"></div>
 
+
 </body>
 
 </html>

src/main/resources/templates/goal_record.html

@@ -8,7 +8,7 @@
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
 </head>
 
-<body style="padding-top:80px; padding-bottom:80px;">
+<body class="pb-5 pt-5">
 
 	<div th:replace="~{header :: header}"></div>
 
@@ -74,16 +74,16 @@
 				</ul>
 
 			</div>
-		</div>
-		
 			<div class="d-grid mt-4">
 				<form th:action="@{/goal}" method="get">
+
 					<button class="btn btn-success w-100" type="submit">
 						戻る
 					</button>
+
 				</form>
 			</div>
-		
+		</div>
 	</div>
 
 	<div th:replace="~{footer :: footer}"></div>

src/main/resources/templates/menu.html

@@ -138,6 +138,8 @@
 
 	    </div>
 
+
+
 	</div>
 	
 	<div class="card shadow-sm">

src/main/resources/templates/select_course.html

@@ -5,24 +5,21 @@
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<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}">
 	<title>コース選択</title>
 </head>
 
-<body style="padding-bottom: 120px; padding-top: 60px;">
+<body style="padding-bottom: 120px">
 	<div th:replace="~{header :: header}"></div>
+
 	<h1 class="page-title">コース選択</h1>
 
-	<div class="d-grid mt-4">
 	<th:block th:if="${mode == 'change'}">
 		<form th:action="@{/course/create}" method="get">
-			    <button class="btn btn-success w-100" type="submit">
+			<button type="submit">新規登録</button>
-					新規登録
-				</button>
 		</form>
-	    </th:block>
-	</div>
 
+
+	</th:block>
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
 		<button type="submit" class="btn btn-primary w-100">確定</button>
 

src/main/resources/templates/user_register_return.html

@@ -80,7 +80,7 @@
 					</div>
 
 					<div class="mb-3">
-						<label for="goalId" class="form-label">目標貯金額</label>
+						<label for="goalId" class="form-label">目標</label>
 						<input type="number" id="goalId" class="form-control" th:field="*{goalId}" min="0" required>
 					</div>