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

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);
 
 }

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

@@ -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);
@@ -108,4 +123,21 @@ public class GoalServiceImpl implements GoalService {
 		});
 	}
 
+	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;
+		
+	}
+	
 }

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(PageReturnAttributeKeyword.CATEGORY_ID, categoryId);
-		model.addAttribute("categoryForm", categoryForm);
+		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;
 	}
 	
 	

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;
 	}
 
 }

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(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList);
-		model.addAttribute("incomeList", incomeList);
+		model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
-		model.addAttribute("today", today);
+		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;
 	}
 	
 	

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,55 @@ public class GoalController {
 	}
 
 	@SessionCheck
-	@GetMapping("/create")
+	@GetMapping(TransitionTargetPageNameKeyword.CREATE)
-	public String createGoalGet(@ModelAttribute GoalForm goalForm, HttpSession session) {
+	public String createGoalGet(@ModelAttribute GoalForm goalForm, HttpSession session, Model model) {
 
-		return "goal_create";
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
-	}
-
-	@SessionCheck
-	@PostMapping("/create")
-	public String createGoalPost(@ModelAttribute GoalForm goalForm, HttpSession session) {
-
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
 
 		Long userId = loginUser.getUserId();
 		
-		goalService.createGoal(GoalModel.convertFrom(goalForm), userId);
+		int currentAmount = goalService.getCurrentAmount(userId);
 		
-		return "redirect:/goal";
+		model.addAttribute("currentAmount", currentAmount);
+		
+		return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
 	}
 
 	@SessionCheck
-	@PostMapping("/delete") // フラグ考慮してないため、今度修正必要
+	@PostMapping(TransitionTargetPageNameKeyword.CREATE)
+	public String createGoalPost(@ModelAttribute GoalForm goalForm, HttpSession session, Model model) {
+
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
+
+		Long userId = loginUser.getUserId();
+
+		if (goalService.createGoal(GoalModel.convertFrom(goalForm), userId) == null) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE, "現在所持金より高い金額を設定してください。");
+			return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
+		}
+
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
+	}
+
+	@SessionCheck
+	@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 +331,10 @@ public class GoalController {
 		});
 
 		model.addAttribute(
-				"goalCompleteFormList",
+				PageReturnAttributeKeyword.GOAL_COMPLETE_FORM_LIST,
 				goalCompleteFormList);
 
-		return "goal_record";
+		return TransitionTargetPageNameKeyword.GOAL_RECORD_HTML;
 	}
 
 }

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) {
+		if (session.getAttribute(SessionKeyword.LOGIN_USER) != null) {
-			return "redirect:/menu";
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.MENU;
 		}
 
 		return TransitionTargetPageNameKeyword.LOGIN_HTML;

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();
 		}
@@ -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);
@@ -253,7 +271,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 +313,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 +425,17 @@ public class TransactionController {
 			model.addAttribute(PageReturnAttributeKeyword.DEADLINE, result.getDeadline());
 
 		} else {
-			model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, "目標を設定してください");
+			final String MESSAGE = "目標を設定してください";
 
-			model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, "目標を設定してください");
+			model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, MESSAGE);
 
-			model.addAttribute(PageReturnAttributeKeyword.TARGET_AMOUNT, "目標を設定してください");
+			model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, MESSAGE);
+
+			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;

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;
@@ -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;

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";
 	
 }

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";
+	
 	
 }

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>
@@ -44,7 +48,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>
 

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">
 

src/main/resources/templates/password_reset.html

@@ -60,6 +60,10 @@
 
                     </div>
 					
+					<span th:if="${message != null}">
+						<h4 th:text="${message}" style="color: red;"></h4>
+					</span>
+
                     <div class="d-grid">
 
                         <button type="submit"

src/main/resources/templates/transaction_create.html

@@ -23,34 +23,23 @@
 
 			<div class="card-body">
 
-	            <form th:action="@{/transaction/create}"
+				<form th:action="@{/transaction/create}" th:object="${transactionForm}" method="post">
-	                  th:object="${transactionForm}"
-	                  method="post">
 
 					<div class="mb-3">
-				      <label for="transactionDate"
+						<label for="transactionDate" class="form-label">
-					         class="form-label">
 							日付
 						</label>
-				      <input type="date" 
+						<input type="date" id="transactionDate" class="form-select" name="transactionDate"
-					         id="transactionDate" 
+							th:value="*{transactionDate}" required>
-							 class="form-select"
-							 name="transactionDate" 
-							 th:value="*{transactionDate}"
-							 required>
 					</div>
 
 					<div class="mb-3">
 
-	                    <label for="transactionType"
+						<label for="transactionType" class="form-label">
-	                           class="form-label">
 							収入・支出
 						</label>
 
-	                    <select id="transactionType"
+						<select id="transactionType" class="form-select" th:field="*{transactionType}" required>
-	                            class="form-select"
-	                            th:field="*{transactionType}"  
-								required>
 
 							<option value="">
 								選択してください
@@ -70,23 +59,22 @@
 
 					<div class="mb-3">
 
-	                    <label for="categoryId"
+						<label for="categoryId" class="form-label">
-	                           class="form-label">
 							カテゴリ
 						</label>
 
-	                    <select id="categoryId"
+						<select id="categoryId" class="form-select" th:field="*{categoryId}" required>
-	                            class="form-select"
-	                            th:field="*{categoryId}"  
-								required>
 
 							<option value="">
 								選択してください
 							</option>
 
-	                        <option th:each="category : ${categoryFormList}"
+							<option class="expenseListClass" th:each="category : ${expenseList}"
-	                                th:value="${category.categoryId}"
+								th:value="${category.categoryId}" th:text="${category.categoryName}">
-	                                th:text="${category.categoryName}">
+							</option>
+
+							<option class="incomeListClass" th:each="category : ${incomeList}"
+								th:value="${category.categoryId}" th:text="${category.categoryName}">
 							</option>
 
 						</select>
@@ -95,30 +83,20 @@
 
 					<div class="mb-3">
 
-	                    <label for="amount"
+						<label for="amount" class="form-label">
-	                           class="form-label">
 							金額
 						</label>
 
-	                    <input type="number"
+						<input type="number" id="amount" class="form-control" th:field="*{amount}" min="1"
-	                           id="amount"
+							max="100000000" placeholder="金額を入力してください" required>
-	                           class="form-control"
-	                           th:field="*{amount}"
-	                           min="0"
-							   max="100000000"
-	                           placeholder="金額を入力してください"  
-							   required>
 
 					</div>
 
-	                <input type="hidden"
+					<input type="hidden" name="today" th:value="${today}">
-	                       name="today"
-	                       th:value="${today}">
 
 					<div class="d-grid">
 
-	                    <button type="submit"
+						<button type="submit" class="btn btn-primary">
-	                            class="btn btn-primary">
 
 							登録
 
@@ -136,6 +114,50 @@
 
 	<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>
 

src/main/resources/templates/user_register.html

@@ -3,16 +3,13 @@
 
 <head>
 	<meta charset="UTF-8">
-    <meta name="viewport"
+	<meta name="viewport" content="width=device-width, initial-scale=1">
-          content="width=device-width, initial-scale=1">
 
 	<title>新規会員登録</title>
 
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css"
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
-          rel="stylesheet">
 
-    <link rel="stylesheet"
+	<link rel="stylesheet" th:href="@{/css/style.css}">
-          th:href="@{/css/style.css}">
 </head>
 
 <body style="padding-top:80px; padding-bottom:80px;">
@@ -30,83 +27,55 @@
 
 			<div class="card-body">
 
-                <form th:action="@{/user/register/course}"
+				<form th:action="@{/user/register/course}" th:object="${userForm}" method="post">
-                      th:object="${userForm}"
-                      method="post">
 
 					<div class="mb-3">
-                        <label for="userName"
+						<label for="userName" class="form-label">
-                               class="form-label">
 							氏名
 						</label>
 
-                        <input type="text"
+						<input type="text" id="userName" class="form-control" th:field="*{userName}" maxlength="100"
-                               id="userName"
-                               class="form-control"
-                               th:field="*{userName}"
-                               maxlength="100"
 							required>
 					</div>
 
 					<div class="mb-3">
-                        <label for="mailAddress"
+						<label for="mailAddress" class="form-label">
-                               class="form-label">
 							メールアドレス
 						</label>
 
-                        <input type="email"
+						<input type="email" id="mailAddress" class="form-control" th:field="*{mailAddress}"
-                               id="mailAddress"
+							maxlength="255" required>
-                               class="form-control"
-                               th:field="*{mailAddress}"
-                               maxlength="255"
-                               required>
 					</div>
 
 					<div class="mb-3">
-                        <label for="birthDate"
+						<label for="birthDate" class="form-label">
-                               class="form-label">
 							生年月日
 						</label>
 
-                        <input type="date"
+						<input type="date" id="birthDate" class="form-control" th:field="*{birthDate}" required>
-                               id="birthDate"
-                               class="form-control"
-                               th:field="*{birthDate}"
-                               required>
 					</div>
 
 					<div class="mb-3">
-                        <label for="password"
+						<label for="password" class="form-label">
-                               class="form-label">
 							パスワード
 						</label>
 
-                        <input type="password"
+						<input type="password" id="password" class="form-control" th:field="*{password}" minlength="8"
-                               id="password"
+							maxlength="24" required>
-                               class="form-control"
-                               th:field="*{password}"
-                               minlength="8"
-                               maxlength="24"
-                               required>
 					</div>
 
 					<div class="mb-3">
-                        <label for="secretQuestionId"
+						<label for="secretQuestionId" class="form-label">
-                               class="form-label">
 							秘密の質問
 						</label>
 
-                        <select id="secretQuestionId"
+						<select id="secretQuestionId" class="form-select" th:field="*{secretQuestionId}" required>
-                                class="form-select"
-                                th:field="*{secretQuestionId}"
-                                required>
 
 							<option value="">
 								選択してください
 							</option>
 
-                            <option th:each="question : ${session.questionList}"
+							<option th:each="question : ${session.questionList}" th:value="${question.secretQuestionId}"
-                                    th:value="${question.secretQuestionId}"
 								th:text="${question.questionText}">
 							</option>
 
@@ -114,91 +83,59 @@
 					</div>
 
 					<div class="mb-3">
-                        <label for="secretAnswer"
+						<label for="secretAnswer" class="form-label">
-                               class="form-label">
 							秘密の質問の回答
 						</label>
 
-                        <input type="text"
+						<input type="text" id="secretAnswer" class="form-control" th:field="*{secretAnswer}"
-                               id="secretAnswer"
+							maxlength="100" required>
-                               class="form-control"
-                               th:field="*{secretAnswer}"
-                               maxlength="100"
-                               required>
 					</div>
 
 					<div class="mb-3">
-                        <label for="saving"
+						<label for="saving" class="form-label">
-                               class="form-label">
 							貯蓄金
 						</label>
 
-                        <input type="number"
+						<input type="number" id="saving" class="form-control" th:field="*{saving}" min="0"
-                               id="saving"
+							max="1000000000" required>
-                               class="form-control"
-                               th:field="*{saving}"
-                               min="0"
-							   max="1000000000"
-                               required>
 					</div>
 
 					<div class="mb-3">
-                        <label for="annualIncome"
+						<label for="annualIncome" class="form-label">
-                               class="form-label">
 							年収
 						</label>
 
-                        <input type="number"
+						<input type="number" id="annualIncome" class="form-control" th:field="*{annualIncome}" min="0"
-                               id="annualIncome"
+							max="100000000" required>
-                               class="form-control"
-                               th:field="*{annualIncome}"
-                               min="0"
-							   max="100000000"
-                               required>
 					</div>
 
 					<div class="mb-3">
-                        <label for="monthlyBudget"
+						<label for="monthlyBudget" class="form-label">
-                               class="form-label">
 							月別使用可能金額
 						</label>
 
-                        <input type="number"
+						<input type="number" id="monthlyBudget" class="form-control" th:field="*{monthlyBudget}" min="0"
-                               id="monthlyBudget"
+							max="10000000" required>
-                               class="form-control"
-                               th:field="*{monthlyBudget}"
-                               min="0"
-							   max="10000000"
-                               required>
 					</div>
 
 					<div class="mb-3">
-                        <label for="goalId"
+						<label for="goalId" class="form-label">
-                               class="form-label">
 							目標貯金額
 						</label>
 
-                        <input type="number"
+						<input type="number" id="goalId" class="form-control" th:field="*{goalId}" min="0"
-                               id="goalId"
+							max="1000000000" required>
-                               class="form-control"
-                               th:field="*{goalId}"
-                               min="0"
-							   max="1000000000"
-                               required>
 					</div>
 
-                    <input type="hidden"
+					<input type="hidden" th:field="*{courseId}">
-                           th:field="*{courseId}">
 
 					<div class="d-grid gap-2 mt-4">
 
-                        <button type="submit"
+						<button type="submit" class="btn btn-outline-primary">
-                                class="btn btn-outline-primary">
 							コース選択
 						</button>
 
-                        <button type="submit"
+						<button type="submit" class="btn btn-primary">
-                                class="btn btn-primary">
 							作成
 						</button>
 
@@ -212,11 +149,9 @@
 
 		<div class="d-grid mt-3">
 
-            <form th:action="@{/login}"
+			<form th:action="@{/login}" method="get">
-                  method="get">
 
-                <button type="submit"
+				<button type="submit" class="btn btn-outline-secondary">
-                        class="btn btn-outline-secondary">
 					戻る
 				</button>
 
@@ -226,6 +161,34 @@
 
 	</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>

src/main/resources/templates/user_register_confirm.html

@@ -44,10 +44,10 @@
 
 			<div class="mb-3">
 				<label for="secretQuestionId" class="form-label">秘密の質問</label>
-				<select id="secretQuestionId" th:field="*{secretQuestionId}" required readonly>
+				<select id="secretQuestionId" th:field="*{secretQuestionId}" required disabled>
-					<option value="">選択してください</option>
+					<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>
@@ -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>
 

src/main/resources/templates/user_register_return.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <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>
@@ -7,6 +8,7 @@
 	<link rel="stylesheet" th:href="@{/css/style.css}">
 
 </head>
+
 <body>
 	<div th:replace="~{header :: header}">
 	</div>
@@ -22,22 +24,14 @@
 				<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"
+						<input type="text" id="userName" class="form-control" th:field="*{userName}" maxlength="100"
-				    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"
+						<input type="email" id="mailAddress" class="form-control" th:field="*{mailAddress}"
-				   id="mailAddress"
+							maxlength="255" required>
-				   class="form-control"
-				   th:field="*{mailAddress}"
-				   maxlength="255"
-				   required>
 					</div>
 
 					<div class="mb-3">
@@ -48,24 +42,15 @@
 
 					<div class="mb-3">
 						<label for="password" class="form-label">パスワード</label>
-				<input type="password"
+						<input type="password" id="password" name="password" class="form-control" th:value="*{password}"
-				id="password"
+							minlength="8" maxlength="24" required>
-				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"
+						<select id="secretQuestionId" th:field="*{secretQuestionId}" required>
-				        th:field="*{secretQuestionId}"
-				        required>
 							<option value="">選択してください</option>
-				    <option th:each="question : ${session.questionList}"
+							<option th:each="question : ${session.questionList}" th:value="${question.secretQuestionId}"
-				            th:value="${question.secretQuestionId}"
 								th:text="${question.questionText}">
 							</option>
 						</select>
@@ -73,52 +58,30 @@
 					
 					<div class="mb-3">
 						<label for="secretAnswer" class="form-label">秘密の質問の回答</label>
-				<input type="text"
+						<input type="text" id="secretAnswer" class="form-control" th:field="*{secretAnswer}"
-				id="secretAnswer"
+							maxlength="100" required>
-				class="form-control"
-				th:field="*{secretAnswer}"
-				maxlength="100"
-				required>
 					</div>
 
 					<div class="mb-3">
 						<label for="saving" class="form-label">貯蓄金</label>
-				<input type="number"
+						<input type="number" id="saving" class="form-control" th:field="*{saving}" min="0" required>
-				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"
+						<input type="number" id="annualIncome" class="form-control" th:field="*{annualIncome}" min="0"
-				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"
+						<input type="number" id="monthlyBudget" class="form-control" th:field="*{monthlyBudget}" min="0"
-				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"
+						<input type="number" id="goalId" class="form-control" th:field="*{goalId}" min="0" required>
-				id="goalId"
-				class="form-control"
-				th:field="*{goalId}"
-				min="0"
-				required>
 					</div>
 
 					<div class="mb-4">
@@ -126,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>
@@ -149,5 +112,34 @@
 		</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>