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

@@ -47,7 +47,7 @@ public class GlobalExceptionHandler {
 
 		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
 		
-		System.out.println("session invalidated method not supported exception");
+		System.out.println("session invalidated");
     	session.invalidate();
 
 		return "error";
@@ -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);
-		session.invalidate();
+
+		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,13 +11,4 @@ public class ErrorController {
 	    public String showError() {
 	        return TransitionTargetPageNameKeyword.ERROR_HTML;
 	    }
-	    
-	    @GetMapping(".well-known/appspecific/com.chrome.devtools")
-	    public void nothing1() {
-	    	
-	    }
-	    @GetMapping("/.well-known/appspecific/com.chrome.devtools.json")
-	    public void nothing2() {
-	    	
-	    }
 }

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/controller/TransactionController.java

@@ -353,29 +353,29 @@ public class TransactionController {
 			@RequestParam(required = false, defaultValue = "0") String months) {
 
 		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
-		System.out.println("******************************************::1");
+
 		LocalDate today = LocalDate.now();
-		System.out.println("******************************************::2");
+
 		int year = (years.equals("0")) ? today.getYear() : Integer.parseInt(years);
-		System.out.println("******************************************::3");
+
 		int month = (months.equals("0")) ? today.getMonthValue() : Integer.parseInt(months);
-		System.out.println("******************************************::4");
+
 		YearMonth yearMonth = YearMonth.of(year, month);
-		System.out.println("******************************************::5");
+
 		int lastDay = yearMonth.lengthOfMonth();
-		System.out.println("******************************************::6");
+
 		int firstDayOfWeek = yearMonth.atDay(1).getDayOfWeek().getValue() % 7;
-		System.out.println("******************************************::7");
+
 		YearMonth previousYearMonth = yearMonth.minusMonths(1);
-		System.out.println("******************************************::8");
+
 		int previousYear = previousYearMonth.getYear();
 		int previousMonth = previousYearMonth.getMonthValue();
-		System.out.println("******************************************::9");
+
 		YearMonth nextYearMonth = yearMonth.plusMonths(1);
-		System.out.println("******************************************::10");
+
 		int nextYear = nextYearMonth.getYear();
 		int nextMonth = nextYearMonth.getMonthValue();
-		System.out.println("******************************************::11");
+
 		model.addAttribute(PageReturnAttributeKeyword.YEAR, year);
 		model.addAttribute(PageReturnAttributeKeyword.MONTH, month);
 		model.addAttribute(PageReturnAttributeKeyword.DAY, today.getDayOfMonth());
@@ -388,34 +388,34 @@ public class TransactionController {
 
 		model.addAttribute(PageReturnAttributeKeyword.NEXT_YEAR, nextYear);
 		model.addAttribute(PageReturnAttributeKeyword.NEXT_MONTH, nextMonth);
-		System.out.println("******************************************::12");
+
 		LocalDate startDate = yearMonth.atDay(1);
 		LocalDate endDate = yearMonth.atEndOfMonth();
-		System.out.println("******************************************::13");
+
 		List<Income> incomeList = transactionService.findTotalIncomeList(startDate, endDate, loginUser.getUserId());
-		System.out.println("******************************************::14");
+
 		List<Expense> expenseList = transactionService.findTotalExpenseList(startDate, endDate, loginUser.getUserId());
-		System.out.println("******************************************::15");
+
 		model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
 		model.addAttribute(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList);
-		System.out.println("******************************************::16");
+
 		int totalIncome = transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId());
 
 		int totalExpense = transactionService.findTotalExpense(startDate, endDate, loginUser.getUserId());
-		System.out.println("******************************************::17");
+
 		model.addAttribute(PageReturnAttributeKeyword.TOTAL_INCOME, totalIncome);
 		model.addAttribute(PageReturnAttributeKeyword.TOTAL_EXPENSE, totalExpense);
-		System.out.println("******************************************::18");
+
 		List<GoalForm> goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId()));
-		System.out.println("******************************************::19");
+
 		UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
-		System.out.println("******************************************::20");
+
 		List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0)
 				.collect(Collectors.toList());
-		System.out.println("******************************************::21");
+
 		if (!resultList.isEmpty()) {
 			GoalForm result = resultList.getFirst();
-			System.out.println("******************************************::22");
+
 			model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, result.getAchievementRate());
 
 			model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, result.getCurrentAmount());

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/menu.html

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

src/main/resources/templates/select_course.html

@@ -8,8 +8,9 @@
 	<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>
 
 	<th:block th:if="${mode == 'change'}">

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>