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

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

pom.xml

@@ -83,6 +83,11 @@
 			<artifactId>spring-boot-starter-webmvc-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+    		<groupId>org.mindrot</groupId>
+  			<artifactId>jbcrypt</artifactId>
+    		<version>0.4</version>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/example/demo/aop/aspect/SessionCheckAspect.java

@@ -10,6 +10,7 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.demo.exception.NoSessionException;
 
 
@@ -32,7 +33,7 @@ public class SessionCheckAspect {
 	public void checkSession() {
 		HttpSession session = request.getSession(false);
 
-		if (session == null || session.getAttribute("loginUser") == null) {
+		if (session == null || session.getAttribute(SessionKeyword.LOGIN_USER) == null) {
 			throw new NoSessionException("不正なログインです");
 		}
 

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

@@ -4,12 +4,16 @@ package com.example.demo.aop.handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import jakarta.servlet.http.HttpSession;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.Model;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
+import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.demo.exception.NoSessionException;
 
 @ControllerAdvice
@@ -28,34 +32,36 @@ public class GlobalExceptionHandler {
 		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
 
 		model.addAttribute(
-                "errorMessage",
+                PageReturnAttributeKeyword.ERROR_MESSAGE,
                 "システムエラーが発生しました。"
                 + "初めからやり直してください。");
 
-        return "redirect:/login";
+        return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.LOGIN;
 		
 	}
 
 	@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
-	public String handleBadRequestException(Model model, Exception e) {
+	public String handleBadRequestException(Model model, Exception e, HttpSession session) {
-		model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
+		model.addAttribute(PageReturnAttributeKeyword.ERROR, SEVERE_ERROR_MESSAGE_BAD_REQUEST);
-		model.addAttribute("status", HttpStatus.BAD_REQUEST.value());
+		model.addAttribute(PageReturnAttributeKeyword.STATUS, HttpStatus.BAD_REQUEST.value());
 
 		e.printStackTrace();
 
 		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
 		
-		return "error";
+		System.out.println("session invalidated");
+    	session.invalidate();
+
+		return TransitionTargetPageNameKeyword.ERROR_HTML;
 	}
 	
 	@ExceptionHandler(Exception.class)
-	public String AllException(Model model, Exception e) {
+	public String AllException(Model model, Exception e, HttpSession session) {
-		model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
 
 		e.printStackTrace();
 
-		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
+		System.out.println("session invalidated exception");
-
+		session.invalidate();
-		return "error";
+		return TransitionTargetPageNameKeyword.ERROR_HTML;
 	}
 }

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

@@ -1,5 +1,12 @@
 package com.example.demo.app.domain.model;
 
+import java.util.List;
+
+import com.example.demo.app.infra.entity.AllocationEntity;
+import com.example.demo.app.infra.entity.CategoryEntity;
+import com.example.demo.app.infra.entity.CourseEntity;
+import com.example.demo.app.presentation.form.AllocationForm;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -11,4 +18,25 @@ public class AllocationModel {
 	private Long courseId;
 	private Integer allocationRatio;
 	
+	public static AllocationModel convertFrom(AllocationEntity allocationEntity) {
+		return new AllocationModel(allocationEntity.getCategoryEntity().getCategoryId(), allocationEntity.getCourseEntity().getCourseId(), allocationEntity.getAllocationRatio());
+	}
+	
+	public static List<AllocationModel> convertFrom(List<AllocationEntity> allocationEntityList){
+		return allocationEntityList.stream().map(AllocationModel::convertFrom).toList();
+	}
+	
+	public static AllocationModel convertFrom1(AllocationForm allocationForm) {
+		return new AllocationModel(allocationForm.getCategoryId(), allocationForm.getCourseId(), allocationForm.getAllocationRatio());
+	}
+	
+	public static List<AllocationModel> convertFrom1(List<AllocationForm> allocationFormList){
+		return allocationFormList.stream().map(AllocationModel::convertFrom1).toList();
+	}
+	
+	public static AllocationEntity convertTo(CategoryEntity categoryEntity, CourseEntity courseEntity, Integer allocationRatio) {
+		return new AllocationEntity(categoryEntity, courseEntity, allocationRatio);
+	}
+	
+	
 }

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

@@ -3,6 +3,7 @@ package com.example.demo.app.domain.model;
 import java.util.List;
 
 import com.example.demo.app.infra.entity.CategoryEntity;
+import com.example.demo.app.infra.entity.UserEntity;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -27,4 +28,15 @@ public class CategoryModel {
 		return categoryEntityList.stream().map(CategoryModel::convertFrom).toList();
 	}
 	
+	public static CategoryEntity convertTo(CategoryModel categoryModel, UserEntity userEntity) {
+		return new CategoryEntity(
+				categoryModel.getCategoryId(),
+				categoryModel.getCategoryName(),
+				categoryModel.getTransactionType(),
+				userEntity,
+				0,
+				null,
+				null);
+	}
+	
 }

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

@@ -25,4 +25,11 @@ public class CourseModel {
 	public static List<CourseModel> convertFrom(List<CourseEntity> courseEntityList) {
 		return courseEntityList.stream().map(CourseModel::convertFrom).toList();
 	}
+	
+	public static CourseEntity convertTo(CourseModel courseModel) {
+		return new CourseEntity(
+				courseModel.getCourseId(),
+				courseModel.getCourseName(),
+				courseModel.getDescription());
+	}
 }

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

@@ -0,0 +1,49 @@
+package com.example.demo.app.domain.model;
+
+import java.util.List;
+
+import com.example.demo.app.infra.entity.CategoryEntity;
+import com.example.demo.app.infra.entity.FixedCostEntity;
+import com.example.demo.app.infra.entity.UserEntity;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class FixedCostModel {
+
+	private Long fixedCostId;
+
+	private Long userId;
+
+	private Long categoryId;
+	
+	private String fixedCostName;
+
+	private Integer amount;
+	
+	
+	public static FixedCostModel convertFrom(FixedCostEntity fixedCostEntity) {
+		return new FixedCostModel(
+				fixedCostEntity.getFixedCostId(),
+				fixedCostEntity.getUserEntity().getUserId(),
+				fixedCostEntity.getCategoryEntity().getCategoryId(),
+				fixedCostEntity.getFixedCostName(),
+				fixedCostEntity.getAmount());
+	}
+
+	public static List<FixedCostModel> convertFrom(List<FixedCostEntity> fixedCostEntityList) {
+		return fixedCostEntityList.stream().map(FixedCostModel::convertFrom).toList();
+	}
+	
+	public static FixedCostEntity convertTo(FixedCostModel fixedCostModel, UserEntity userEntity, CategoryEntity categoryEntity) {
+		return new FixedCostEntity(
+				fixedCostModel.getFixedCostId(),
+				userEntity,
+				categoryEntity,
+				fixedCostModel.getFixedCostName(),
+				fixedCostModel.getAmount());
+	}
+	
+}

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

@@ -1,8 +1,11 @@
 package com.example.demo.app.domain.model;
 
 import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.example.demo.app.infra.entity.GoalEntity;
+import com.example.demo.app.infra.entity.UserEntity;
 import com.example.demo.app.presentation.form.GoalForm;
 
 import lombok.AllArgsConstructor;
@@ -28,7 +31,11 @@ public class GoalModel {
 	
 	private Integer currentAmount; // 現在の資産
 	
-	public static GoalModel convertFrom(GoalEntity goalEntity) {
+	private Long userId;
+	
+	private List<Integer> savingList;
+
+	public static GoalModel convertFrom(GoalEntity goalEntity, int achievementRate, int currentAmount) {
 		return new GoalModel(
 				goalEntity.getGoalId(),
 				goalEntity.getGoalTitle(),
@@ -36,18 +43,21 @@ public class GoalModel {
 				goalEntity.getTargetAmount(),
 				goalEntity.getDeadline(),
 				goalEntity.getGoalComplete(),
-				null,null);
+				achievementRate,
+				currentAmount,
+				goalEntity.getUserEntity().getUserId(),
+				new ArrayList<>());
 	}
 
-	public static GoalEntity convertTo(GoalModel goalModel) {
+	public static GoalEntity convertTo(GoalModel goalModel, UserEntity userEntity) {
 		return new GoalEntity(
 				goalModel.getGoalId(),
 				goalModel.getGoalTitle(),
 				goalModel.getGoalSubtitle(),
 				goalModel.getTargetAmount(),
 				goalModel.getDeadline(),
-				goalModel.getGoalComplete(),
+				0,
-				null);
+				userEntity);
 	}
 	
 	public static GoalModel convertFrom(GoalForm goalForm) {
@@ -58,7 +68,9 @@ public class GoalModel {
 				goalForm.getTargetAmount(),
 				goalForm.getDeadline(),
 				goalForm.getGoalComplete()
-				,null,null);
+				,null,null,
+				goalForm.getUserId(),
+				new ArrayList<>());
 	}
 
 }

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

@@ -20,7 +20,6 @@ public class UserModel {
     private Integer saving;
     private Integer annualIncome;
     private Integer monthlyBudget;
-    private Long goalId;
     private Long courseId;
     private Integer deleteFlag;
     
@@ -36,7 +35,6 @@ public class UserModel {
 				userEntity.getSaving(),
 				userEntity.getAnnualIncome(),
 				userEntity.getMonthlyBudget(),
-				userEntity.getGoalEntity().getGoalId(),
 				userEntity.getCourseEntity().getCourseId(),
 				userEntity.getDeleteFlag()
 				);

src/main/java/com/example/demo/app/domain/service/CategoryService.java

@@ -13,4 +13,12 @@ public interface CategoryService {
 	public CategoryModel findOneByCategoryName(String categoryName);
 	
 	public CategoryModel findByTransactionId(Long transactionId);
+	
+	public List<CategoryModel> findAllByuserId(Long userId);
+	
+	public void delete(Long categoryId);
+	
+	public CategoryModel save(CategoryModel categoryModel, Long userId);
+	
+	public List<CategoryModel> findAllExceptCustom();
 }

src/main/java/com/example/demo/app/domain/service/CourseService.java

@@ -3,6 +3,7 @@ package com.example.demo.app.domain.service;
 import java.util.List;
 
 import com.example.demo.app.domain.model.CourseModel;
+import com.example.demo.app.presentation.form.AllocationFormList;
 
 public interface CourseService {
 	
@@ -11,4 +12,15 @@ public interface CourseService {
 	public CourseModel findById(Long courseId);
 	
 	public Long findByName(String courName);
+	
+	public CourseModel save(CourseModel courseModel, Long userId, AllocationFormList allocationFormList);
+
+	public List<CourseModel> findAllByUserId(Long userId);
+	
+	public List<CourseModel> findAllByNull();
+
+	public String deleteCourse(Long courseId, Long userId);
+	
 }
+
+

src/main/java/com/example/demo/app/domain/service/FixedCostService.java

@@ -0,0 +1,16 @@
+package com.example.demo.app.domain.service;
+
+import java.util.List;
+
+import com.example.demo.app.domain.model.FixedCostModel;
+
+public interface FixedCostService {
+
+	public List<FixedCostModel> findAllByUserId(Long userId);
+	
+	public FixedCostModel save(FixedCostModel fixedCostModel);
+	
+	public void delete(Long fixedCostId);
+	
+	public FixedCostModel findById(Long fixedCostId);
+}

src/main/java/com/example/demo/app/domain/service/GoalService.java

@@ -1,16 +1,24 @@
 package com.example.demo.app.domain.service;
 
+import java.util.List;
+
 import com.example.demo.app.domain.model.GoalModel;
 
 public interface GoalService {
 
 	GoalModel getGoalById(Long goalId);
 	
-	GoalModel getGoalByUserId(Long userId); 
+	public List<GoalModel> getGoalByUserId(Long userId); 
 
-	GoalModel createGoal(GoalModel goalModel);
+	public GoalModel createGoal(GoalModel goalModel, Long userId);
 
-	GoalModel updateGoal(GoalModel goalModel);
+	GoalModel updateGoal(GoalModel goalModel, Long userId);
+	
+	public void delete(Long goalId);
+	
+	public void updateGoalComplete(Long userId);
+
+	public int getCurrentAmount(Long userId);
 	
 //	void deleteGoal(Long goalId);
 

src/main/java/com/example/demo/app/domain/service/UserService.java

@@ -5,7 +5,7 @@ import com.example.demo.app.presentation.form.UserForm;
 
 public interface UserService {
     
-	void register(UserForm userForm, Long courseId);
+	public void register(UserForm userForm, Long courseId);
     
     public void updateCourse(Long userId, Long courseId);
 

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

@@ -8,6 +8,8 @@ import com.example.demo.app.domain.model.AllocationModel;
 import com.example.demo.app.domain.service.AllocationService;
 import com.example.demo.app.infra.entity.AllocationEntity;
 import com.example.demo.app.infra.repository.AllocationRepository;
+import com.example.demo.app.infra.repository.CategoryRepository;
+import com.example.demo.app.infra.repository.CourseRepository;
 
 import lombok.RequiredArgsConstructor;
 
@@ -15,10 +17,13 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class AllocationServiceImpl implements AllocationService {
 
-	AllocationRepository allocationRepository;
+	private final AllocationRepository allocationRepository;
+	private final CategoryRepository categoryRepository;
+	private final CourseRepository courseRepository;
 
-	public List<AllocationModel> findAll(){
+	public List<AllocationModel> findAll() {
 		return AllocationEntity.createAllocationModelList(allocationRepository.findAll());
 	}
 
+
 }

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

@@ -9,6 +9,7 @@ import com.example.demo.app.domain.model.CategoryModel;
 import com.example.demo.app.domain.service.CategoryService;
 import com.example.demo.app.infra.entity.CategoryEntity;
 import com.example.demo.app.infra.repository.CategoryRepository;
+import com.example.demo.app.infra.repository.UserRepository;
 
 import lombok.RequiredArgsConstructor;
 
@@ -17,6 +18,7 @@ import lombok.RequiredArgsConstructor;
 public class CategoryServiceImpl implements CategoryService {
 
 	private final CategoryRepository categoryRepository;
+	private final UserRepository userRepository;
 
 	public List<CategoryModel> findAll() {
 
@@ -52,5 +54,29 @@ public class CategoryServiceImpl implements CategoryService {
 		return CategoryModel.convertFrom(categoryRepository.findByTransactionId(transactionId));
 	}
 
+	public List<CategoryModel> findAllByuserId(Long userId) {
+
+		return CategoryModel.convertFrom(categoryRepository.findByUserId(userId));
+
+	}
+
+	public void delete(Long categoryId) {
+
+		categoryRepository.deleteById(categoryId);
+
+	}
+
+	public CategoryModel save(CategoryModel categoryModel, Long userId) {
+
+		return CategoryModel.convertFrom(
+				categoryRepository.save(CategoryModel.convertTo(categoryModel, userRepository.findById(userId).get())));
+
+	}
+
+	public List<CategoryModel> findAllExceptCustom() {
+
+		return CategoryModel.convertFrom(categoryRepository.findAllExceptCustom());
+
+	}
 
 }

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

@@ -1,13 +1,25 @@
 package com.example.demo.app.domain.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import jakarta.transaction.Transactional;
+
 import org.springframework.stereotype.Service;
 
+import com.example.demo.app.domain.model.AllocationModel;
 import com.example.demo.app.domain.model.CourseModel;
 import com.example.demo.app.domain.service.CourseService;
+import com.example.demo.app.infra.entity.AllocationEntity;
 import com.example.demo.app.infra.entity.CourseEntity;
+import com.example.demo.app.infra.entity.CourseOwnerEntity;
+import com.example.demo.app.infra.entity.UserEntity;
+import com.example.demo.app.infra.repository.AllocationRepository;
+import com.example.demo.app.infra.repository.CategoryRepository;
+import com.example.demo.app.infra.repository.CourseOwnerRepository;
 import com.example.demo.app.infra.repository.CourseRepository;
+import com.example.demo.app.infra.repository.UserRepository;
+import com.example.demo.app.presentation.form.AllocationFormList;
 
 import lombok.RequiredArgsConstructor;
 
@@ -15,13 +27,27 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class CourseServiceImpl implements CourseService {
 
-	private final CourseRepository courseRepository;
+	private final AllocationRepository allocationRepository;
 
-	public List<CourseModel> findAll(){
+	private final CourseRepository courseRepository;
+	private final UserRepository userRepository;
+	private final CourseOwnerRepository courseOwnerRepository;
+	private final CategoryRepository categoryRepository;
+
+	public List<CourseModel> findAll() {
 
 		return CourseEntity.createCourseModelList(courseRepository.findAll());
 	}
 
+	public List<CourseModel> findAllByUserId(Long userId) {
+
+		return CourseModel.convertFrom(courseRepository.findAllByUserId(userId));
+	}
+
+	public List<CourseModel> findAllByNull() {
+		return CourseModel.convertFrom(courseRepository.findAllByNull());
+	}
+
 	public CourseModel findById(Long courseId) {
 		return CourseModel.convertFrom(courseRepository.findByCourseId(courseId));
 	}
@@ -29,4 +55,95 @@ public class CourseServiceImpl implements CourseService {
 	public Long findByName(String courseName) {
 		return courseRepository.findByCourseName(courseName).getCourseId();
 	}
+
+	@Transactional
+	public CourseModel save(CourseModel courseModel, Long userId, AllocationFormList allocationFormList) {
+
+		List<UserEntity> userEntityList = new ArrayList<>();
+		userEntityList.add(userRepository.findById(userId).get());
+		CourseEntity result = courseRepository.save(CourseModel.convertTo(courseModel));
+
+		List<AllocationModel> allocationModelList = new ArrayList<>();
+
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId4(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio4()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId5(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio5()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId6(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio6()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId7(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio7()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId8(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio8()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId9(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio9()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId10(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio10()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId11(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio11()));
+
+		allocationModelList.stream().forEach(allocation -> {
+			System.out.println(allocation.getCourseId());
+		});
+
+		UserEntity user = userRepository.findById(userId).orElse(null);
+
+		user.setCourseEntity(result);
+
+		UserEntity userResult = userRepository.save(user);
+
+		CourseOwnerEntity courseOwnerEntity = new CourseOwnerEntity();
+		courseOwnerEntity.setUserEntity(userResult);
+		courseOwnerEntity.setCourseEntity(result);
+
+		courseOwnerRepository.save(courseOwnerEntity);
+
+		List<AllocationEntity> allocationEntityList = new ArrayList<>();
+
+		allocationModelList.forEach(allocationModel -> {
+			allocationEntityList.add(
+					AllocationModel.convertTo(
+							categoryRepository.findById(allocationModel.getCategoryId()).get(),
+							courseRepository.findById(allocationModel.getCourseId()).get(),
+							allocationModel.getAllocationRatio()));
+
+		});
+
+		List<AllocationModel> resultList = new ArrayList<>();
+		for (AllocationEntity allocationEntity : allocationEntityList) {
+			resultList.add(AllocationModel.convertFrom(allocationRepository.save(allocationEntity)));
+		}
+
+		return CourseModel.convertFrom(result);
+
+	}
+
+	@Transactional
+	public String deleteCourse(Long courseId, Long userId) {
+
+		UserEntity userEntity = userRepository.findById(userId).orElse(null);
+		System.out.println("***********************ここでエラー1");
+		if (userEntity.getCourseEntity().getCourseId() == courseId) {
+			return "selected";
+		} else if (courseId <= 6) {
+			return "original";
+		}
+		System.out.println("***********************ここでエラー2");
+		allocationRepository.deleteByCourseId(courseId);
+		System.out.println("***********************ここでエラー3");
+		courseOwnerRepository.deleteByCourseId(courseId);
+		System.out.println("***********************ここでエラー4");
+		courseRepository.deleteById(courseId);
+		System.out.println("***********************ここでエラー5");
+		return "ok";
+
+	}
 }

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

@@ -0,0 +1,48 @@
+package com.example.demo.app.domain.service.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.example.demo.app.domain.model.FixedCostModel;
+import com.example.demo.app.domain.service.FixedCostService;
+import com.example.demo.app.infra.repository.CategoryRepository;
+import com.example.demo.app.infra.repository.FixedCostRepository;
+import com.example.demo.app.infra.repository.UserRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class FixedCostServiceImpl implements FixedCostService{
+
+
+	private final FixedCostRepository fixedCostRepository;
+	private final UserRepository userRepository;
+	private final CategoryRepository categoryRepository;
+	
+	
+	public List<FixedCostModel> findAllByUserId(Long userId) {
+		
+		return  FixedCostModel.convertFrom(fixedCostRepository.findByUserId(userId));
+		
+	}
+	
+	public FixedCostModel save(FixedCostModel fixedCostModel) {
+		
+		return  FixedCostModel.convertFrom(fixedCostRepository.save( FixedCostModel.convertTo(fixedCostModel, userRepository.findById(fixedCostModel.getUserId()).get(), categoryRepository.findById(fixedCostModel.getCategoryId()).get())));
+		
+	}
+	
+	public void delete(Long fixedCostId) {
+		
+		fixedCostRepository.deleteById(fixedCostId);
+		
+	}
+	
+	public FixedCostModel findById(Long fixedCostId) {
+		return  FixedCostModel.convertFrom(fixedCostRepository.findById(fixedCostId).get());
+	}
+	
+	
+}

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

@@ -1,5 +1,10 @@
 package com.example.demo.app.domain.service.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import jakarta.transaction.Transactional;
+
 import org.springframework.stereotype.Service;
 
 import com.example.demo.app.domain.model.GoalModel;
@@ -7,6 +12,7 @@ import com.example.demo.app.domain.service.GoalService;
 import com.example.demo.app.infra.entity.GoalEntity;
 import com.example.demo.app.infra.entity.UserEntity;
 import com.example.demo.app.infra.repository.GoalRepository;
+import com.example.demo.app.infra.repository.TransactionRepository;
 import com.example.demo.app.infra.repository.UserRepository;
 
 import lombok.RequiredArgsConstructor;
@@ -17,18 +23,19 @@ public class GoalServiceImpl implements GoalService {
 
 	private final GoalRepository goalRepository;
 	private final UserRepository userRepository;
+	private final TransactionRepository transactionRepository;
 
 	@Override
 	public GoalModel getGoalById(Long goalId) {
 		GoalEntity goalEntity = goalRepository.findById(goalId).orElse(null);
-		return GoalModel.convertFrom(goalEntity);
+		return GoalModel.convertFrom(goalEntity, 0, 0);
 	}
 
 	@Override
-	public GoalModel getGoalByUserId(Long userId) {
+	public List<GoalModel> getGoalByUserId(Long userId) {
 
 		UserEntity userEntity = userRepository.findById(userId).orElseThrow();
-		GoalEntity goalEntity = userEntity.getGoalEntity();
+		List<GoalEntity> goalEntityList = goalRepository.findAllByUserId(userId);
 
 		// 収支の合計を計算(収入はプラス、支出はマイナス)
 		int transactionTotal = userEntity.getTransactionEntityList().stream()
@@ -42,42 +49,95 @@ public class GoalServiceImpl implements GoalService {
 		int currentAmount = userEntity.getSaving() + transactionTotal;
 
 		// 達成率(%) = 現在の資産 ÷ 目標金額 × 100
-		int achievementRate = 
+
+		List<GoalModel> goalModelList = new ArrayList<GoalModel>();
+
+		goalEntityList.stream()
+				.forEach(goalEntity -> goalModelList.add(GoalModel.convertFrom(goalEntity,
 						(goalEntity.getTargetAmount() == null)
-				? 0	: 
+								? 0
-				(int) ((currentAmount * 100.0) / goalEntity.getTargetAmount());
+								: (int) ((currentAmount * 100.0) / goalEntity.getTargetAmount()),
+						currentAmount)));
 
-		GoalModel goalModel = GoalModel.convertFrom(goalEntity);
+		return goalModelList;
-
-		return new GoalModel(
-				goalModel.getGoalId(),
-				goalModel.getGoalTitle(),
-				goalModel.getGoalSubtitle(),
-				goalModel.getTargetAmount(),
-				goalModel.getDeadline(),
-				goalModel.getGoalComplete(),
-				achievementRate,
-				currentAmount);   
 	}
 
 	@Override
-	public GoalModel createGoal(GoalModel goalModel) {
+	public GoalModel createGoal(GoalModel goalModel, Long userId) {
 
-		GoalEntity goalEntity = GoalModel.convertTo(goalModel);
+		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);
 
-		return GoalModel.convertFrom(savedGoalEntity);
+		return GoalModel.convertFrom(savedGoalEntity, 0, 0);
 	}
 
 	@Override
-	public GoalModel updateGoal(GoalModel goalModel) {
+	public GoalModel updateGoal(GoalModel goalModel, Long userId) {
 
-		GoalEntity goalEntity = GoalModel.convertTo(goalModel);
+		GoalEntity goalEntity = GoalModel.convertTo(goalModel, userRepository.findById(userId).get());
 
 		GoalEntity updatedGoalEntity = goalRepository.save(goalEntity);
 
-		return GoalModel.convertFrom(updatedGoalEntity);
+		return GoalModel.convertFrom(updatedGoalEntity, 0, 0);
+	}
+
+	public void delete(Long goalId) {
+		goalRepository.deleteById(goalId);
+	}
+
+	@Transactional
+	public void updateGoalComplete(Long userId) {
+		UserEntity userEntity = userRepository.findById(userId).orElseThrow();
+		List<GoalEntity> goalEntityList = goalRepository.findAllByUserId(userId);
+
+		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;
+
+		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;
+		
 	}
 	
 }

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

@@ -1,5 +1,6 @@
 package com.example.demo.app.domain.service.impl;
 
+import org.mindrot.jbcrypt.BCrypt;
 import org.springframework.stereotype.Service;
 
 import com.example.demo.app.domain.model.LoginModel;
@@ -18,14 +19,38 @@ public class LoginServiceImpl implements LoginService {
 	@Override
 	public LoginModel login(String mailAddress, String password) {
 
-        UserEntity userEntity = userRepository.findByMailAddressAndPassword(
+		UserEntity userEntity = userRepository
-                mailAddress,
+				.findByMailAddress(mailAddress)
-                password).orElse(null);
+				.orElse(null);
 
 		if (userEntity == null) {
 			return null;
+		} else if (userEntity.getDeleteFlag() == 1) {
+			return null;
+		}
+
+		boolean isValidPassword = false;
+		if (userEntity.getPassword().length() <= 24) {
+			if (userEntity.getPassword().equals(password)) {
+				
+				userEntity.setPassword(BCrypt.hashpw(password, BCrypt.gensalt()));
+				userRepository.save(userEntity);
+				isValidPassword = true;
+				
+			} else {
+				return null;
+			}
+
+		} else {
+			
+			isValidPassword = BCrypt.checkpw(password, userEntity.getPassword());			
+		}
+
+		if (!isValidPassword) {
+			return null;
 		}
 
 		return new LoginModel(userEntity.getUserId());
 	}
+
 }

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

@@ -1,5 +1,6 @@
 package com.example.demo.app.domain.service.impl;
 
+import org.mindrot.jbcrypt.BCrypt;
 import org.springframework.stereotype.Service;
 
 import com.example.demo.app.domain.service.PasswordResetService;
@@ -25,15 +26,16 @@ public class PasswordResetServiceImpl implements PasswordResetService {
 			return false;
 		}
 
-        UserEntity userEntity =
+		UserEntity userEntity = userRepository.findById(userId).orElse(null);
-                userRepository.findById(userId).orElse(null);
 
 		if (userEntity == null) {
 			return false;
 		}
 
+		String passwordHashed = BCrypt.hashpw(passwordResetForm.getPassword(), BCrypt.gensalt());
+
 		userEntity.setPassword(
-                passwordResetForm.getPassword());
+				passwordHashed);
 
 		userRepository.save(userEntity);
 

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

@@ -58,6 +58,7 @@ public class ProfileServiceImpl implements ProfileService{
 	    userEntity.setSaving(profileEditForm.getSaving());
 	    userEntity.setAnnualIncome(profileEditForm.getAnnualIncome());
 	    userEntity.setMonthlyBudget(profileEditForm.getMonthlyBudget());
+	    userEntity.setBirthDate(profileEditForm.getBirthDate());
 	    userRepository.save(userEntity);
 	}
 }

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

@@ -1,5 +1,6 @@
 package com.example.demo.app.domain.service.impl;
 
+import org.mindrot.jbcrypt.BCrypt;
 import org.springframework.stereotype.Service;
 
 import com.example.demo.app.domain.model.UserModel;
@@ -31,7 +32,10 @@ public class UserServiceImpl implements UserService {
 
 		userEntity.setUserName(userForm.getUserName());
 		userEntity.setMailAddress(userForm.getMailAddress());
-		userEntity.setPassword(userForm.getPassword());
+
+		String passwordHashed = BCrypt.hashpw(userForm.getPassword(), BCrypt.gensalt());
+
+		userEntity.setPassword(passwordHashed);
 		userEntity.setSecretQuestionAnswer(userForm.getSecretAnswer());
 		userEntity.setBirthDate(userForm.getBirthDate());
 		userEntity.setSaving(userForm.getSaving());
@@ -48,13 +52,14 @@ public class UserServiceImpl implements UserService {
 		CourseEntity courseEntity = courseRepository.findById(courseId).orElse(null);
 
 		userEntity.setQuestionEntity(questionEntity);
-		userEntity.setGoalEntity(goalRepository.save(
+		
-				goalEntity));
 		userEntity.setCourseEntity(courseEntity);
 
 		userEntity.setDeleteFlag(0);
 
-		userRepository.save(userEntity);
+		goalEntity.setUserEntity(userRepository.save(userEntity));
+		
+		goalRepository.save(goalEntity);
 	}
 
 	@Override

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

@@ -4,9 +4,12 @@ import java.util.List;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
@@ -26,12 +29,19 @@ public class CategoryEntity {
 	@Column(name = "category_id")
 	private Long categoryId;
 
-	@Column(name = "category_name", nullable = false)
+	@Column(name = "category_name", nullable = false, length = 50)
 	private String categoryName;
 
 	@Column(name = "transaction_type", nullable = false)
 	private Integer transactionType;
 	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "user_id")
+	private UserEntity userEntity;
+	
+	@Column(name = "delete_flag")
+	private Integer deleteFlag;
+	
 	@OneToMany(mappedBy = "categoryEntity")
 	private List<TransactionEntity> transactionEntity;
 	

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

@@ -7,7 +7,6 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
 import com.example.demo.app.domain.model.CourseModel;
@@ -28,16 +27,13 @@ public class CourseEntity {
 	 @Column(name = "course_id")
 	 private Long courseId;
 	 
-	 @Column(name = "course_name", nullable = false)
+	 @Column(name = "course_name", nullable = false, length = 50)
 	 private String courseName;
 	
 	 
 	 @Column(name = "description", nullable = false)
 	 private String description;
 	 
-	 @OneToMany(mappedBy = "courseEntity")
-	 private List<UserEntity> userEntity;
-	 
 	 public static List<CourseModel> createCourseModelList(List<CourseEntity> courseEntityList) {
 
 	        return courseEntityList

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

@@ -0,0 +1,37 @@
+package com.example.demo.app.infra.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Table(name = "course_owner_t")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CourseOwnerEntity {
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long courseOwnerId;
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "user_id")
+	private UserEntity userEntity;
+	
+	@OneToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "course_id")
+	private CourseEntity courseEntity;
+	
+	
+}

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

@@ -0,0 +1,42 @@
+package com.example.demo.app.infra.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Table(name = "fixed_cost_t")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FixedCostEntity {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "fixed_cost_id")
+	private Long fixedCostId;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "user_id")
+	private UserEntity userEntity;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "category_id")
+	private CategoryEntity categoryEntity;
+	
+	@Column(name = "fixed_cost_name", nullable = false, length = 50)
+	private String fixedCostName;
+
+	@Column(name = "amount", nullable = false)
+	private Integer amount;
+}

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

@@ -4,10 +4,12 @@ import java.time.LocalDate;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.OneToOne;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 
 import lombok.AllArgsConstructor;
@@ -27,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;
@@ -41,7 +43,8 @@ public class GoalEntity {
 	@Column(name = "goal_complete", nullable = false)
 	private Integer goalComplete = 0;
 	
-	@OneToOne(mappedBy = "goalEntity")
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "user_id")
 	private UserEntity userEntity;
 
 }

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

@@ -12,7 +12,6 @@ import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 
 import lombok.AllArgsConstructor;
@@ -31,7 +30,7 @@ public class UserEntity {
 	@Column(name = "user_id")
 	private Long userId;
 
-	@Column(name = "user_name", nullable = false)
+	@Column(name = "user_name", nullable = false, length = 100)
 	private String userName;
 
 	@Column(name = "mail_address", nullable = false)
@@ -40,7 +39,7 @@ public class UserEntity {
 	@Column(name = "password", nullable = false)
 	private String password;
 
-	@Column(name = "secret_answer", nullable = false)
+	@Column(name = "secret_answer", nullable = false, length = 100)
 	private String secretQuestionAnswer;
 	
 	@Column(name = "birth_date", nullable = false)
@@ -65,9 +64,8 @@ public class UserEntity {
 	@JoinColumn(name = "secret_question_id")
 	private QuestionEntity questionEntity;
 	
-	@OneToOne(fetch = FetchType.LAZY)
+	@OneToMany(mappedBy = "userEntity")
-	@JoinColumn(name = "goal_id")
+	private List<GoalEntity> goalEntityList;
-	private GoalEntity goalEntity;
 	
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "course_id")

src/main/java/com/example/demo/app/infra/repository/AllocationRepository.java

@@ -3,6 +3,7 @@ package com.example.demo.app.infra.repository;
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import com.example.demo.app.domain.model.CourseInfoModel;
@@ -29,4 +30,8 @@ public interface AllocationRepository extends JpaRepository<AllocationEntity, Al
 			+ " a.categoryEntity.categoryId ASC ")
 	List<CourseInfoModel> findAllJoinedAllocation();
 	
+	@Modifying
+	@Query("delete from AllocationEntity a where a.courseEntity.courseId = :courseId")
+	void deleteByCourseId(Long courseId);
+
 }

src/main/java/com/example/demo/app/infra/repository/CategoryRepository.java

@@ -1,5 +1,7 @@
 package com.example.demo.app.infra.repository;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -15,4 +17,10 @@ public interface CategoryRepository extends JpaRepository<CategoryEntity, Long>
 	@Query("select c from CategoryEntity c inner join TransactionEntity t on c.categoryId = t.categoryEntity.categoryId where t.transactionId = :transactionId")
 	public CategoryEntity findByTransactionId(Long transactionId);
 	
+	@Query("select c from CategoryEntity c where c.userEntity.userId = :userId")
+	public List<CategoryEntity> findByUserId(Long userId);
+	
+	@Query("select c from CategoryEntity c where c.userEntity.userId is null")
+	public List<CategoryEntity> findAllExceptCustom();
+	
 }

src/main/java/com/example/demo/app/infra/repository/CourseOwnerRepository.java

@@ -0,0 +1,15 @@
+package com.example.demo.app.infra.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import com.example.demo.app.infra.entity.CourseOwnerEntity;
+
+public interface CourseOwnerRepository extends JpaRepository<CourseOwnerEntity, Long>{
+
+	@Modifying
+	@Query("delete from CourseOwnerEntity c where c.courseEntity.courseId = :courseId")
+	public void deleteByCourseId(Long courseId);
+	
+}

src/main/java/com/example/demo/app/infra/repository/CourseRepository.java

@@ -1,5 +1,7 @@
 package com.example.demo.app.infra.repository;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
@@ -13,5 +15,10 @@ public interface CourseRepository extends JpaRepository<CourseEntity, Long> {
 	@Query("SELECT c FROM CourseEntity c WHERE c.courseName = :courseName ")
 	public CourseEntity findByCourseName(String courseName);
 
+	@Query("select c from CourseEntity c inner join CourseOwnerEntity o on c.courseId = o.courseEntity.courseId inner join UserEntity u on o.userEntity.userId = u.userId where u.userId = :userId")
+	public List<CourseEntity> findAllByUserId(Long userId);
+
+	@Query("select c from CourseEntity c where c.courseId between 1 and 6")
+	public List<CourseEntity> findAllByNull();
 
 }

src/main/java/com/example/demo/app/infra/repository/FixedCostRepository.java

@@ -0,0 +1,15 @@
+package com.example.demo.app.infra.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import com.example.demo.app.infra.entity.FixedCostEntity;
+
+public interface FixedCostRepository extends JpaRepository<FixedCostEntity, Long> {
+
+	@Query("select f from FixedCostEntity f where f.userEntity.userId = :userId")
+	public List<FixedCostEntity> findByUserId(Long userId);
+
+}

src/main/java/com/example/demo/app/infra/repository/GoalRepository.java

@@ -1,6 +1,10 @@
 package com.example.demo.app.infra.repository;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import com.example.demo.app.infra.entity.GoalEntity;
@@ -8,4 +12,11 @@ import com.example.demo.app.infra.entity.GoalEntity;
 @Repository
 public interface GoalRepository extends JpaRepository<GoalEntity, Long> {
 	
+	@Query("select g from GoalEntity g where g.userEntity.userId = :userId")
+	public List<GoalEntity> findAllByUserId(Long userId);
+	
+	@Modifying(clearAutomatically = true, flushAutomatically = true)
+	@Query("update GoalEntity g set g.goalComplete = 1 where g.goalId = :goalId")
+	public int updateCompleteByGoalId(Long goalId);
+	
 }

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

@@ -13,6 +13,9 @@ import com.example.demo.aop.aspect.SessionCheck;
 import com.example.demo.app.domain.model.AnalysisModel;
 import com.example.demo.app.domain.model.LoginModel;
 import com.example.demo.app.domain.service.AnalysisService;
+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.AnalysisForm;
 
 import lombok.RequiredArgsConstructor;
@@ -25,7 +28,7 @@ public class AnalysisController {
 	private final AnalysisService analysisService;
 	
 	@SessionCheck
-	@GetMapping("/analysis")
+	@GetMapping(TransitionTargetPageNameKeyword.ANALYSIS)
 	public String showAnalysis(
 			@RequestParam(required = false) Integer year,
 			@RequestParam(required = false) Integer month,
@@ -33,7 +36,7 @@ public class AnalysisController {
 			HttpSession session) {
 		
 		//ログインユーザーの取得（セッション）
-        LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+        LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
         
         //初期年月表示
         LocalDate nowDate = LocalDate.now();
@@ -58,15 +61,15 @@ public class AnalysisController {
         AnalysisForm analysisForm = AnalysisForm.convertFrom(analysisModel);
         
 		//model格納
-        model.addAttribute("analysisForm", analysisForm);
+        model.addAttribute(PageReturnAttributeKeyword.ANALYSIS_FORM, analysisForm);
-        model.addAttribute("year", year);
+        model.addAttribute(PageReturnAttributeKeyword.YEAR, year);
-        model.addAttribute("month", month);
+        model.addAttribute(PageReturnAttributeKeyword.MONTH, month);
-        model.addAttribute("previousYear", previousDate.getYear());
+        model.addAttribute(PageReturnAttributeKeyword.PREVIOUS_YEAR, previousDate.getYear());
-        model.addAttribute("previousMonth", previousDate.getMonthValue());
+        model.addAttribute(PageReturnAttributeKeyword.PREVIOUS_MONTH, previousDate.getMonthValue());
-        model.addAttribute("nextYear", nextDate.getYear());
+        model.addAttribute(PageReturnAttributeKeyword.NEXT_YEAR, nextDate.getYear());
-        model.addAttribute("nextMonth", nextDate.getMonthValue());
+        model.addAttribute(PageReturnAttributeKeyword.NEXT_MONTH, nextDate.getMonthValue());
 		
-		return "analysis";
+		return TransitionTargetPageNameKeyword.ANALYSIS_HTML;
 	}
 	
 }

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

@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import com.example.demo.app.domain.model.AuthenticationModel;
 import com.example.demo.app.domain.service.AuthenticationService;
 import com.example.demo.app.infra.repository.QuestionRepository;
+import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.demo.app.presentation.form.AuthenticationForm;
 import com.example.demo.app.presentation.form.PasswordResetForm;
 
@@ -22,16 +24,16 @@ public class AuthenticationController {
     private final AuthenticationService authenticationService;
     private final QuestionRepository questionRepository;
 
-    @GetMapping("/authentication")
+    @GetMapping(TransitionTargetPageNameKeyword.AUTHENTICATION)
     public String showAuthentication(Model model) {
 
-        model.addAttribute("authenticationForm", new AuthenticationForm());
+        model.addAttribute(PageReturnAttributeKeyword.AUTHENTICATION_FORM, new AuthenticationForm());
-        model.addAttribute("questionList", questionRepository.findAll());
+        model.addAttribute(PageReturnAttributeKeyword.QUESTION_LIST, questionRepository.findAll());
 
-        return "authentication";
+        return TransitionTargetPageNameKeyword.AUTHENTICATION_HTML;
     }
     
-    @PostMapping("/authentication")
+    @PostMapping(TransitionTargetPageNameKeyword.AUTHENTICATION)
     public String authenticate(
             AuthenticationForm authenticationForm,
             Model model,
@@ -41,21 +43,21 @@ public class AuthenticationController {
     	        authenticationService.authenticate(authenticationForm);
 
     	if (authenticationModel == null) {
-    	    model.addAttribute("errorMessage", "認証情報が正しくありません。");
+    	    model.addAttribute(PageReturnAttributeKeyword.ERROR_MESSAGE, "認証情報が正しくありません。");
-    	    model.addAttribute("questionList", questionRepository.findAll());
+    	    model.addAttribute(PageReturnAttributeKeyword.QUESTION_LIST, questionRepository.findAll());
 
-    	    return "authentication";
+    	    return TransitionTargetPageNameKeyword.AUTHENTICATION_HTML;
     	}
 
     	session.setAttribute(
-    	        "passwordResetUserId",
+    			PageReturnAttributeKeyword.PASSWOR_RESET_USER_ID,
     	        authenticationModel.getUserId());
 
     	model.addAttribute(
-    	        "passwordResetForm",
+    			PageReturnAttributeKeyword.PASSWOR_RESET_FORM,
     	        new PasswordResetForm());
     	
-    	return "password_reset";
+    	return TransitionTargetPageNameKeyword.PASSWORD_RESET_HTML;
 
     }
 }

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

@@ -0,0 +1,90 @@
+package com.example.demo.app.presentation.controller;
+
+import java.util.List;
+
+import jakarta.servlet.http.HttpSession;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+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;
+
+@Controller
+@RequiredArgsConstructor
+public class CategoryController {
+
+	private final CategoryService categoryService;
+	
+	
+	@GetMapping(TransitionTargetPageNameKeyword.CATEGORY_LIST)
+	public String categoryListGet(Model model, HttpSession session) {
+		
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
+		
+		List<CategoryForm> categoryFormList = CategoryForm.convertFrom(categoryService.findAllByuserId(loginUser.getUserId()));
+		
+		model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList);
+		
+		return TransitionTargetPageNameKeyword.CATEGORY_LIST_HTML;
+	}
+	
+	@GetMapping(TransitionTargetPageNameKeyword.CATEGORY_CREATE)
+	public String categoryCreateGet(@ModelAttribute CategoryForm categoryForm) {
+		
+		return TransitionTargetPageNameKeyword.CATEGORY_CREATE_HTML;
+	}
+	
+	@PostMapping(TransitionTargetPageNameKeyword.CATEGORY_CREATE)
+	public String categoryCreatePost(@ModelAttribute CategoryForm categoryForm, HttpSession session) {
+		
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
+		
+		
+		categoryService.save(CategoryForm.convertTo(categoryForm), loginUser.getUserId());
+		
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.CATEGORY_LIST;
+	}
+	
+	@GetMapping(TransitionTargetPageNameKeyword.CATEGORY_UPDATE)
+	public String categoryUpdateGet(Model model, Long categoryId) {
+		
+		CategoryForm categoryForm = CategoryForm.convertFrom(categoryService.findOne(categoryId));
+		
+		model.addAttribute(PageReturnAttributeKeyword.CATEGORY_ID, categoryId);
+		model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM, categoryForm);
+		
+		return TransitionTargetPageNameKeyword.CATEGORY_UPDATE_HTML;
+	}
+	
+	@PostMapping(TransitionTargetPageNameKeyword.CATEGORY_UPDATE)
+	public String categoryUpdatePost(@ModelAttribute CategoryForm categoryForm, HttpSession session, Long categoryId) {
+		
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
+		
+		categoryForm.setCategoryId(categoryId);
+		
+		categoryService.save(CategoryForm.convertTo(categoryForm), loginUser.getUserId());
+		
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.CATEGORY_LIST;
+	}
+	
+	@PostMapping(TransitionTargetPageNameKeyword.CATEGORY_DELETE)
+	public String categoryDeletePost(Long categoryId) {
+		
+		categoryService.delete(categoryId);
+		
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.CATEGORY_LIST;
+	}
+	
+	
+}

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

@@ -1,5 +1,8 @@
 package com.example.demo.app.presentation.controller;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jakarta.servlet.http.HttpSession;
 
 import org.springframework.stereotype.Controller;
@@ -10,17 +13,22 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.example.demo.aop.aspect.SessionCheck;
+import com.example.demo.app.domain.model.CourseModel;
 import com.example.demo.app.domain.model.LoginModel;
+import com.example.demo.app.domain.service.AllocationService;
 import com.example.demo.app.domain.service.CourseInfoService;
 import com.example.demo.app.domain.service.CourseService;
 import com.example.demo.app.domain.service.UserService;
+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.AllocationFormList;
 import com.example.demo.app.presentation.form.CourseForm;
 import com.example.demo.app.presentation.form.CourseInfoForm;
 import com.example.demo.app.presentation.form.UserForm;
 
 import lombok.RequiredArgsConstructor;
 
-
 @Controller
 @RequiredArgsConstructor
 public class CourseController {
@@ -28,54 +36,122 @@ public class CourseController {
 	private final CourseService courseService;
 	private final CourseInfoService courseInfoService;
 	private final UserService userService;
+	private final AllocationService allocationService;
 
-    
+	@PostMapping(TransitionTargetPageNameKeyword.SHOW_SELECT_COURSE)
-    @PostMapping("/user/register/course")
 	public String showSelectCourse(@ModelAttribute UserForm userForm, Model model, HttpSession session) {
 
+		final String MODE = "regist";
+		final String DEFAULT = "バランスコース";
 
+		session.setAttribute(PageReturnAttributeKeyword.USER_FORM, userForm);
+		model.addAttribute(PageReturnAttributeKeyword.MODE, MODE);
+		model.addAttribute(PageReturnAttributeKeyword.CURRENT_COURSE_ID, courseService.findByName(DEFAULT));
 
-		session.setAttribute("userForm", userForm);
+		model.addAttribute(PageReturnAttributeKeyword.COURSE_LIST,
-		model.addAttribute("mode", "regist");
+				CourseForm.convertFrom(courseService.findAllByNull()));
-		model.addAttribute("currentCourseId", courseService.findByName("バランスコース"));
+		model.addAttribute(PageReturnAttributeKeyword.COURSE_INFO_LIST,
-		model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll()));
+				CourseInfoForm.convertFrom(courseInfoService.findAll()));
-		model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll()));
-  
-    	return "select_course";
 
+		return TransitionTargetPageNameKeyword.SELECT_COURSE_HTML;
 
 	}
 
 	@SessionCheck
-    @GetMapping("/course")
+	@GetMapping(TransitionTargetPageNameKeyword.COURSE)
 	public String showChangeCourse(Model model, HttpSession session) {
 
+		final String MODE = "change";
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 		Long userId = loginUser.getUserId();
 
 		Long currentCourseId = userService.findByUserId(userId).getCourseId();
-		model.addAttribute("mode", "change");
-		model.addAttribute("currentCourseId", currentCourseId);
-		model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll()));
-		model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll()));
 
+		List<CourseModel> courseModelList = new ArrayList<>(courseService.findAllByNull());
 
-		return "select_course";
+		List<CourseModel> tempList = courseService.findAllByUserId(userId);
 
+		tempList.forEach(courseModelList::add);
+
+		model.addAttribute(PageReturnAttributeKeyword.MODE, MODE);
+		model.addAttribute(PageReturnAttributeKeyword.CURRENT_COURSE_ID, currentCourseId);
+		model.addAttribute(PageReturnAttributeKeyword.COURSE_LIST, CourseForm.convertFrom(courseModelList));
+		model.addAttribute(PageReturnAttributeKeyword.COURSE_INFO_LIST,
+				CourseInfoForm.convertFrom(courseInfoService.findAll()));
+
+		return TransitionTargetPageNameKeyword.SELECT_COURSE_HTML;
 
 	}
 
 	@SessionCheck
-    @PostMapping("/change")
+	@PostMapping(TransitionTargetPageNameKeyword.CHANGE)
 	public String changeCourse(@RequestParam Long courseId, HttpSession httpSession) {
 
-    	LoginModel loginUser = (LoginModel) httpSession.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) httpSession.getAttribute(SessionKeyword.LOGIN_USER);
 
 		userService.updateCourse(loginUser.getUserId(), courseId);
 
-    	return "redirect:/menu";
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.MENU;
 	}
 
+	@SessionCheck
+	@GetMapping(TransitionTargetPageNameKeyword.COURSE_CREATE)
+	public String createCourseGet(@ModelAttribute CourseForm courseForm, HttpSession session) {
+
+		return TransitionTargetPageNameKeyword.COURSE_CREATE_HTML;
+	}
+
+	@SessionCheck
+	@PostMapping(TransitionTargetPageNameKeyword.COURSE_CREATE_RATIO)
+	public String createCourse(@ModelAttribute CourseForm courseForm,
+			@ModelAttribute AllocationFormList allocationFormList,
+			HttpSession session, Model model) {
+
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
+
+		model.addAttribute("courseForm", courseForm);
+
+		return TransitionTargetPageNameKeyword.COURSE_CREATE_RATIO_HTML;
+	}
+
+	@SessionCheck
+	@PostMapping(TransitionTargetPageNameKeyword.COURSE_CREATE)
+	public String createCoursePost(@ModelAttribute CourseForm courseForm,
+			@ModelAttribute AllocationFormList allocationFormList, HttpSession session) {
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
+
+		courseService.save(CourseForm.convertTo(courseForm), loginUser.getUserId(), allocationFormList);
+
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
+	}
+
+	@SessionCheck
+	@PostMapping("/course/delete")
+	public String createCoursePost(@RequestParam Long courseId, HttpSession session, Model model) {
+
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
+
+		System.out.println("**********************cousrId: " + courseId);
+		String condition = courseService.deleteCourse(courseId, loginUser.getUserId());
+
+		if (condition.equals("selected")) {
+
+			model.addAttribute("message", "適用中のコースは選べません");
+
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
+
+		} else if (condition.equals("original")) {
+			model.addAttribute("message", "既存のデータは削除できません");
+
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
+		} else if (condition.equals("ok")) {
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
+		} 
+		model.addAttribute("message", "エラーが発生しました");
+
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
+
+	}
 
 }

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

@@ -3,10 +3,13 @@ package com.example.demo.app.presentation.controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 
+import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+
 @Controller
 public class ErrorController {
-	    @GetMapping("/error")
+	    @GetMapping(TransitionTargetPageNameKeyword.ERROR)
 	    public String showError() {
-	        return "error";
+	        return TransitionTargetPageNameKeyword.ERROR_HTML;
 	    }
+	    
 }

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

@@ -0,0 +1,123 @@
+package com.example.demo.app.presentation.controller;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+import jakarta.servlet.http.HttpSession;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+
+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;
+
+import lombok.RequiredArgsConstructor;
+
+@Controller
+@RequiredArgsConstructor
+public class FixedCostController {
+
+	private final FixedCostService fixedCostService;
+	private final CategoryService categoryService;
+
+	@SessionCheck
+	@GetMapping(TransitionTargetPageNameKeyword.FIXED_COST_LIST)
+	public String getFixedCostList(
+			HttpSession session, Model model, LocalDate today) {
+		
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
+		
+		if (today == null) {
+			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(PageReturnAttributeKeyword.FIXED_COST_FORM_LIST, fixedCostFormList);
+		
+		model.addAttribute(PageReturnAttributeKeyword.TODAY, today);
+		
+		return TransitionTargetPageNameKeyword.FIXED_COST_HTML;
+	}
+	
+	
+	@SessionCheck
+	@GetMapping(TransitionTargetPageNameKeyword.FIXED_COST_CREATE)
+	public String getFixedCostCreate(
+			HttpSession session, @ModelAttribute FixedCostForm fixedCostForm, Model model, LocalDate today) {
+		
+		List<CategoryForm> categoryFormList = CategoryForm.convertFrom(categoryService.findAll());
+		
+		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.TODAY, today);
+		
+		
+		return TransitionTargetPageNameKeyword.FIXED_COST_CREATE_HTML;
+	}
+	
+	
+	
+	@SessionCheck
+	@PostMapping(TransitionTargetPageNameKeyword.FIXED_COST_CREATE)
+	public String postFixedCostCreate(
+			HttpSession session, @ModelAttribute FixedCostForm fixedCostForm, Model model, LocalDate today) {
+		
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
+		
+		fixedCostForm.setUserId(loginUser.getUserId());
+		
+		fixedCostService.save(FixedCostForm.convertTo(fixedCostForm));
+		
+		session.setAttribute(PageReturnAttributeKeyword.TODAY, today);
+		
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.FIXED_COST_LIST;
+	}
+	
+	
+	@SessionCheck
+	@PostMapping(TransitionTargetPageNameKeyword.FIXED_COST_DELETE)
+	public String postFixedCostDelete(Long fixedCostId, LocalDate today, HttpSession session) {
+		
+		fixedCostService.delete(fixedCostId);
+		
+		session.setAttribute(PageReturnAttributeKeyword.TODAY, today);
+		
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.FIXED_COST_LIST;
+	}
+	
+	
+	
+	
+	
+	
+	
+
+}

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

@@ -1,5 +1,14 @@
 package com.example.demo.app.presentation.controller;
 
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import jakarta.servlet.http.HttpSession;
 
 import org.springframework.stereotype.Controller;
@@ -12,66 +21,331 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.example.demo.aop.aspect.SessionCheck;
 import com.example.demo.app.domain.model.GoalModel;
 import com.example.demo.app.domain.model.LoginModel;
+import com.example.demo.app.domain.service.CategoryService;
 import com.example.demo.app.domain.service.GoalService;
+import com.example.demo.app.domain.service.TransactionService;
+import com.example.demo.app.domain.service.UserService;
+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.GoalForm;
+import com.example.demo.app.presentation.form.MonthlyAchievementForm;
+import com.example.demo.app.presentation.form.MonthlySavingForm;
+import com.example.demo.app.presentation.form.TransactionForm;
 
 import lombok.RequiredArgsConstructor;
 
 @Controller
 @RequiredArgsConstructor
-@RequestMapping("/goal")
+@RequestMapping(TransitionTargetPageNameKeyword.GOAL)
 public class GoalController {
 
 	private final GoalService goalService;
+	private final TransactionService transactionService;
+	private final UserService userService;
+	private final CategoryService categoryService;
 
 	@SessionCheck
 	@GetMapping("")
-	public String getGoal(Model model, HttpSession session) {
+	public String getGoal(
+			Model model,
+			HttpSession session,
+			Long goalId) {
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 		Long userId = loginUser.getUserId();
 
-		GoalModel goalModel = goalService.getGoalByUserId(userId);
+		LocalDate today = LocalDate.now();
-		GoalForm goalForm = GoalForm.convertFrom(goalModel);
 
-		model.addAttribute("goalForm", goalForm);
+		goalService.updateGoalComplete(userId);
-		return "goal_view";
+
+		List<GoalModel> goalModelList = goalService.getGoalByUserId(userId);
+
+		List<GoalForm> goalFormList1 = GoalForm.convertFrom(goalModelList);
+
+		List<GoalForm> goalFormList = goalFormList1.stream()
+				.filter(goalForm -> goalForm.getGoalComplete() == 0
+						&& !goalForm.getDeadline().isBefore(today))
+				.collect(Collectors.toList());
+
+		model.addAttribute(
+				PageReturnAttributeKeyword.GOAL_FORM_LIST,
+				goalFormList);
+
+		model.addAttribute(
+				PageReturnAttributeKeyword.ACHIEVEMENT_LIST,
+				new ArrayList<MonthlyAchievementForm>());
+
+		if (goalFormList.isEmpty()) {
+			return TransitionTargetPageNameKeyword.GOAL_VIEW_HTML;
+		}
+
+		GoalForm graphGoal;
+
+		if (goalId == null) {
+
+			graphGoal = goalFormList.getFirst();
+
+		} else {
+
+			graphGoal = goalFormList.stream()
+					.filter(goal -> goal.getGoalId().equals(goalId))
+					.findFirst()
+					.orElse(
+							goalFormList.getFirst());
+		}
+
+		model.addAttribute(
+				PageReturnAttributeKeyword.GRAPH_GOAL,
+				graphGoal);
+
+		int currentAmount = graphGoal.getCurrentAmount();
+
+		int targetAmount = graphGoal.getTargetAmount();
+
+		LocalDate startDate = LocalDate.of(
+				LocalDate.now().getYear(),
+				1,
+				1);
+
+		Map<LocalDate, List<TransactionForm>> transactionFormMap = new HashMap<>();
+
+		transactionService
+				.findAllByDate(
+						startDate,
+						today,
+						userId)
+				.forEach((date, list) -> {
+
+					List<TransactionForm> transactionFormList = list.stream()
+							.map(transaction -> {
+
+								CategoryForm categoryForm = CategoryForm.convertFrom(
+										categoryService.findOne(
+												transaction.getCategoryId()));
+
+								return TransactionForm.convertFrom(
+										transaction,
+										categoryForm.getCategoryName(),
+										transactionService.findTotalExpense(
+												startDate,
+												today,
+												loginUser.getUserId()),
+										transactionService.findTotalIncome(
+												startDate,
+												today,
+												loginUser.getUserId()),
+										categoryForm.getTransactionType());
+							})
+							.collect(Collectors.toList());
+
+					transactionFormMap.put(
+							date,
+							transactionFormList);
+				});
+
+		List<MonthlySavingForm> monthlySavingList = new ArrayList<>();
+
+		YearMonth startMonth = YearMonth.from(startDate);
+
+		YearMonth currentMonth = YearMonth.now();
+
+		YearMonth month = currentMonth;
+
+		while (!month.isBefore(startMonth)) {
+
+			int income = 0;
+			int expense = 0;
+
+			for (Map.Entry<LocalDate, List<TransactionForm>> entry : transactionFormMap.entrySet()) {
+
+				YearMonth transactionMonth = YearMonth.from(entry.getKey());
+
+				if (!transactionMonth.equals(month)) {
+					continue;
+				}
+
+				for (TransactionForm transaction : entry.getValue()) {
+
+					if (transaction.getAmount() == null) {
+						continue;
+					}
+
+					if (transaction.getTransactionType() == 1) {
+
+						income += transaction.getAmount();
+
+					} else if (transaction.getTransactionType() == 0) {
+
+						expense += transaction.getAmount();
+					}
+				}
+			}
+
+			monthlySavingList.add(
+					new MonthlySavingForm(
+							month,
+							income,
+							expense,
+							currentAmount));
+
+			currentAmount = currentAmount
+					- income
+					+ expense;
+
+			month = month.minusMonths(1);
+		}
+
+		Collections.reverse(
+				monthlySavingList);
+
+		List<MonthlyAchievementForm> achievementList = new ArrayList<>();
+
+		for (MonthlySavingForm monthlySaving : monthlySavingList) {
+
+			int savingAmount = monthlySaving.getSaving();
+
+			int achievementRate = 0;
+
+			if (targetAmount > 0) {
+
+				achievementRate = (int) ((double) savingAmount
+						/ targetAmount
+						* 100);
+			}
+
+			achievementList.add(
+					new MonthlyAchievementForm(
+							monthlySaving.getMonth(),
+							savingAmount,
+							achievementRate));
+		}
+
+		model.addAttribute(
+				PageReturnAttributeKeyword.ACHIEVEMENT_LIST,
+				achievementList);
+
+		return TransitionTargetPageNameKeyword.GOAL_VIEW_HTML;
 	}
 
 	@SessionCheck
-	@GetMapping("/edit")
+	@GetMapping(TransitionTargetPageNameKeyword.EDIT)
-	public String editGoal(Model model, HttpSession session) {
+	public String editGoal(Model model, HttpSession session, Long goalId) {
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
 		Long userId = loginUser.getUserId();
 
-		GoalModel goalModel = goalService.getGoalByUserId(userId);
+		GoalForm goalForm = GoalForm.convertFrom(goalService.getGoalById(goalId));
-		GoalForm goalForm = GoalForm.convertFrom(goalModel);
+
+		model.addAttribute(PageReturnAttributeKeyword.GOAL_FORM, goalForm);
+		return TransitionTargetPageNameKeyword.GOAL_EDIT_HTML;
 
-		model.addAttribute("goalForm", goalForm);
-		return "goal_edit";
 	}
 
 	@SessionCheck
-	@PostMapping("/update")
+	@PostMapping(TransitionTargetPageNameKeyword.UPDATE)
 	public String updateGoal(@ModelAttribute GoalForm goalForm, HttpSession session) {
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 		Long userId = loginUser.getUserId();
 
-		// 本人の目標かどうかを確認してから更新する
+		//		// 本人の目標かどうかを確認してから更新する
-		GoalModel currentGoal = goalService.getGoalByUserId(userId);
+		//		GoalModel currentGoal = goalService.getGoalByUserId(userId);
-
+		//
-		if (!currentGoal.getGoalId().equals(goalForm.getGoalId())) {
+		//		if (!currentGoal.getGoalId().equals(goalForm.getGoalId())) {
-			return "redirect:/goal"; // 他人のデータを更新しようとしたら弾く
+		//			return "redirect:/goal"; // 他人のデータを更新しようとしたら弾く
-		}
+		//		}
 
 		GoalModel goalModel = GoalModel.convertFrom(goalForm);
-		goalService.updateGoal(goalModel);
+		goalService.updateGoal(goalModel, userId);
 
-		return "redirect:/goal";
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
+	}
+
+	@SessionCheck
+	@GetMapping(TransitionTargetPageNameKeyword.CREATE)
+	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);
+
+		System.out.println("************************currentAmount : " + currentAmount);
+		
+		session.setAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
+
+		return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
+	}
+
+	@SessionCheck
+	@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 TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
+		} else {
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL
+					+ TransitionTargetPageNameKeyword.RECORD;
+		}
+
+	}
+
+	@SessionCheck
+	@GetMapping(TransitionTargetPageNameKeyword.RECORD)
+	public String getRecord(HttpSession session, Model model) {
+
+		LocalDate today = LocalDate.now();
+
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
+
+		Long userId = loginUser.getUserId();
+		goalService.updateGoalComplete(userId);
+		List<GoalModel> goalModelList = goalService.getGoalByUserId(userId);
+
+		List<GoalForm> goalFormList = GoalForm.convertFrom(goalModelList);
+
+		List<GoalForm> goalCompleteFormList = new ArrayList<>();
+
+		goalFormList.stream().forEach(goalForm -> {
+			if (goalForm.getGoalComplete() == 1 || goalForm.getDeadline().isBefore(today)) {
+
+				goalForm.setStatus(
+						goalForm.getGoalComplete() == 1
+								? "達成"
+								: "未達成");
+
+				goalCompleteFormList.add(goalForm);
+			}
+		});
+
+		model.addAttribute(
+				PageReturnAttributeKeyword.GOAL_COMPLETE_FORM_LIST,
+				goalCompleteFormList);
+
+		return TransitionTargetPageNameKeyword.GOAL_RECORD_HTML;
 	}
 
 }

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

@@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 import com.example.demo.app.domain.model.LoginModel;
 import com.example.demo.app.domain.service.LoginService;
+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.LoginForm;
 
 import lombok.RequiredArgsConstructor;
@@ -20,13 +23,18 @@ public class LoginController {
 
 	private final LoginService loginService;
 
-    @GetMapping("/login")
+	@GetMapping(TransitionTargetPageNameKeyword.LOGIN)
-    public String showLogin(@ModelAttribute LoginForm loginForm) {
+	public String showLogin(@ModelAttribute LoginForm loginForm, HttpSession session) {
 
-        return "login";
+		if (session.getAttribute(SessionKeyword.LOGIN_USER) != null) {
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.MENU;
 		}
 
-    @PostMapping("/login")
+		return TransitionTargetPageNameKeyword.LOGIN_HTML;
+
+	}
+
+	@PostMapping(TransitionTargetPageNameKeyword.LOGIN)
 	public String login(
 			@ModelAttribute LoginForm loginForm,
 			Model model,
@@ -38,15 +46,15 @@ public class LoginController {
 
 		if (loginModel == null) {
 			model.addAttribute(
-                    "errorMessage",
+					PageReturnAttributeKeyword.ERROR_MESSAGE,
-                    "Email address or password is incorrect.");
+					"IDまたはパスワードが間違っています.");
 
-            return "login";
+			return TransitionTargetPageNameKeyword.LOGIN_HTML;
 		}
 
-        session.setAttribute("loginUser", loginModel);
+		session.setAttribute(SessionKeyword.LOGIN_USER, loginModel);
 
-        return "redirect:/menu";
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.MENU;
 	}
 
 }

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

@@ -9,6 +9,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 import com.example.demo.app.domain.model.LoginModel;
 import com.example.demo.app.domain.service.PasswordResetService;
+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.PasswordResetForm;
 
 import lombok.RequiredArgsConstructor;
@@ -18,24 +21,22 @@ import lombok.RequiredArgsConstructor;
 public class PasswordResetController {
 	private final PasswordResetService passwordResetService;
 
-	@GetMapping("/password/reset")
+	@GetMapping(TransitionTargetPageNameKeyword.PASSWORD_RESET)
 	public String showPasswordReset(Model model) {
-		model.addAttribute("passwordResetForm", new PasswordResetForm());
+		model.addAttribute(PageReturnAttributeKeyword.PASSWOR_RESET_FORM, new PasswordResetForm());
-		return "password_reset";
+		return TransitionTargetPageNameKeyword.PASSWORD_RESET_HTML;
 	}
 
-	@PostMapping("/password/reset")
+	@PostMapping(TransitionTargetPageNameKeyword.PASSWORD_RESET)
 	public String resetPassword(
 			PasswordResetForm passwordResetForm,
 			Model model,
-	        HttpSession session){
+			HttpSession session) {
 
-	    Long userId =
+		Long userId = (Long) session.getAttribute(PageReturnAttributeKeyword.PASSWOR_RESET_USER_ID);
-	    	    (Long) session.getAttribute("passwordResetUserId");
 
 		if (userId == null) {
-	    	    LoginModel loginUser =
+			LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
-	    	            (LoginModel) session.getAttribute("loginUser");
 
 			if (loginUser != null) {
 				userId = loginUser.getUserId();
@@ -43,28 +44,27 @@ public class PasswordResetController {
 		}
 
 		if (userId == null) {
-	    	    return "redirect:/login";
+			return TransitionTargetPageNameKeyword.REDIRECT +
+					TransitionTargetPageNameKeyword.LOGIN;
 		}
 
-	    boolean isReset =
+		boolean isReset = passwordResetService.resetPassword(userId, passwordResetForm);
-	            passwordResetService.resetPassword(userId, passwordResetForm);
 
-	    System.out.println("isReset=" + isReset);
+		if (!isReset) {
-
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE, "パスワードが一致しません。");
-	    if(!isReset) {
+			return TransitionTargetPageNameKeyword.PASSWORD_RESET_HTML;
-	        model.addAttribute("message", "パスワードが一致しません。");
-	        return "password_reset";
 		}
 
-	    session.removeAttribute("passwordResetUserId");
+		session.removeAttribute(PageReturnAttributeKeyword.PASSWOR_RESET_USER_ID);
 
-	    LoginModel loginUser =
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
-	            (LoginModel) session.getAttribute("loginUser");
 
 		if (loginUser != null) {
-	        return "redirect:/menu";
+			return TransitionTargetPageNameKeyword.REDIRECT +
+					TransitionTargetPageNameKeyword.PROFILE;
 		}
 
-	    return "redirect:/login";
+		return TransitionTargetPageNameKeyword.REDIRECT +
+				TransitionTargetPageNameKeyword.LOGIN;
 	}
 }

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

@@ -12,6 +12,9 @@ import com.example.demo.aop.aspect.SessionCheck;
 import com.example.demo.app.domain.model.LoginModel;
 import com.example.demo.app.domain.model.ProfileModel;
 import com.example.demo.app.domain.service.ProfileService;
+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.ProfileEditForm;
 import com.example.demo.app.presentation.form.ProfileForm;
 
@@ -23,26 +26,26 @@ public class ProfileController {
 	private final ProfileService profileService;
 	
 	@SessionCheck
-	@GetMapping("/profile")
+	@GetMapping(TransitionTargetPageNameKeyword.PROFILE)
 	public String profile(Model model, HttpSession session) {
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 		
 		ProfileModel profileModel = profileService.findOne(loginUser.getUserId());
 		
 		ProfileForm profileForm = ProfileForm.convertForm(profileModel);
 		
-		model.addAttribute("profileForm", profileForm);
+		model.addAttribute(PageReturnAttributeKeyword.PROFILE_FORM, profileForm);
-		return "profile";
+		return TransitionTargetPageNameKeyword.PROFILE_HTML;
 	}
 	
 	@SessionCheck
-	@GetMapping("/profile/edit")
+	@GetMapping(TransitionTargetPageNameKeyword.PROFILE_EDIT)
 	public String showEditProfile(
 	        Model model,
 	        HttpSession session) {
 
 	    LoginModel loginUser =
-	            (LoginModel) session.getAttribute("loginUser");
+	            (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 	    ProfileModel profileModel =
 	            profileService.findOne(loginUser.getUserId());
@@ -51,46 +54,47 @@ public class ProfileController {
 	            new ProfileEditForm(
 	                    profileModel.getUserName(),
 	                    profileModel.getMailAddress(),
+	                    profileModel.getBirthDate(),
 	                    profileModel.getSaving(),
 	                    profileModel.getAnnualIncome(),
 	                    profileModel.getMonthlyBudget());
 
-	    model.addAttribute("profileEditForm", profileEditForm);
+	    model.addAttribute(PageReturnAttributeKeyword.PROFILE_EDIT_FORM, profileEditForm);
-	    return "profile_edit";
+	    return TransitionTargetPageNameKeyword.PROFILE_EDIT_HTML;
 	}
 	
-	@PostMapping("/profile/edit")
+	@PostMapping(TransitionTargetPageNameKeyword.PROFILE_EDIT)
 	public String updateProfile(
 			@ModelAttribute ProfileEditForm profileEditForm,
 	        HttpSession session) {
 
 	    LoginModel loginUser =
-	            (LoginModel) session.getAttribute("loginUser");
+	            (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 	    profileService.update(
 	            loginUser.getUserId(),
 	            profileEditForm);
 
-	    return "redirect:/profile";
+	    return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.PROFILE;
 	}
 	
-	@PostMapping("/withdraw")
+	@PostMapping(TransitionTargetPageNameKeyword.WITHDRAW)
 	public String withdraw(HttpSession session) {
 
 	    LoginModel loginUser =
-	            (LoginModel) session.getAttribute("loginUser");
+	            (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 	    profileService.withdraw(loginUser.getUserId());
 
 	    session.invalidate();
 
-	    return "redirect:/login";
+	    return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.LOGIN;
 	}
 	
 	
-	@PostMapping("/logout")
+	@PostMapping(TransitionTargetPageNameKeyword.LOGOUT)
 	public String logout(HttpSession session) {
 	    session.invalidate();
-	    return "redirect:/login";
+	    return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.LOGIN;
 	}
 }

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

@@ -3,6 +3,7 @@ package com.example.demo.app.presentation.controller;
 import java.time.LocalDate;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -20,11 +21,16 @@ import org.springframework.web.bind.annotation.RequestParam;
 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.domain.service.GoalService;
 import com.example.demo.app.domain.service.TransactionService;
 import com.example.demo.app.domain.service.UserService;
+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.Expense;
+import com.example.demo.app.presentation.form.FixedCostForm;
 import com.example.demo.app.presentation.form.GoalForm;
 import com.example.demo.app.presentation.form.Income;
 import com.example.demo.app.presentation.form.TransactionForm;
@@ -40,17 +46,18 @@ public class TransactionController {
 	private final CategoryService categoryService;
 	private final GoalService goalService;
 	private final UserService userService;
+	private final FixedCostService fixedCostService;
 
 	// 一覧画面
 	@SessionCheck
-	@GetMapping("/transaction/list")
+	@GetMapping(TransitionTargetPageNameKeyword.TRANSACTION_LIST)
 	public String transactionList(
 			@RequestParam(required = false, defaultValue = "0") String years,
 			@RequestParam(required = false, defaultValue = "0") String months,
 			Model model,
 			HttpSession session) {
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 		LocalDate today = LocalDate.now();
 
@@ -111,28 +118,28 @@ public class TransactionController {
 					transactionFormMap.put(date, transactionFormList);
 				});
 
-		model.addAttribute("year", year);
+		model.addAttribute(PageReturnAttributeKeyword.YEAR, year);
-		model.addAttribute("month", month);
+		model.addAttribute(PageReturnAttributeKeyword.MONTH, month);
 
-		model.addAttribute("previousYear", previousYear);
+		model.addAttribute(PageReturnAttributeKeyword.PREVIOUS_YEAR, previousYear);
-		model.addAttribute("previousMonth", previousMonth);
+		model.addAttribute(PageReturnAttributeKeyword.PREVIOUS_MONTH, previousMonth);
 
-		model.addAttribute("nextYear", nextYear);
+		model.addAttribute(PageReturnAttributeKeyword.NEXT_YEAR, nextYear);
-		model.addAttribute("nextMonth", nextMonth);
+		model.addAttribute(PageReturnAttributeKeyword.NEXT_MONTH, nextMonth);
 
-		model.addAttribute("transactionFormMap", transactionFormMap);
+		model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM_MAP, transactionFormMap);
 
-		return "transaction_list";
+		return TransitionTargetPageNameKeyword.TRANSACTION_LIST_HTML;
 	}
 
 	// 詳細画面
 	@SessionCheck
-	@GetMapping("/transaction/detail")
+	@GetMapping(TransitionTargetPageNameKeyword.TRANSACTION_DETAIL)
 	public String findOne(@RequestParam(required = false) LocalDate todayDates, Model model, HttpSession session) {
 
 		LocalDate todayDate = (todayDates == null) ? LocalDate.now() : todayDates;
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 		List<TransactionForm> transactionFormList = transactionService
 				.findByUserIdAndDate(todayDate, loginUser.getUserId()).stream()
@@ -173,63 +180,115 @@ public class TransactionController {
 					return transactionForm;
 				}).collect(Collectors.toList());
 
-		model.addAttribute("today", todayDate);
+		model.addAttribute(PageReturnAttributeKeyword.TODAY, todayDate);
-		model.addAttribute("transactionFormList", transactionFormList);
+		model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM_LIST, transactionFormList);
 
-		return "transaction_detail";
+		return TransitionTargetPageNameKeyword.TRANSACTION_DETAIL_HTML;
 	}
 
 	@SessionCheck
-	@GetMapping("/transaction/create")
+	@GetMapping(TransitionTargetPageNameKeyword.TRANSACTION_CREATE)
 	public String createOneGet(@RequestParam(defaultValue = "") LocalDate today,
-			Model model) {
+			Long fixedCostId,
+			Model model, HttpSession session) {
 
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 		if (today == null) {
 			today = LocalDate.now();
 		}
-
-		List<CategoryForm> categoryFormList = CategoryForm.convertFrom(categoryService.findAll());
-
 		TransactionForm transactionForm = new TransactionForm();
 		transactionForm.setTransactionDate(today);
+		if (fixedCostId != null) {
+			FixedCostForm fixedCostForm = FixedCostForm.convertFrom(fixedCostService.findById(fixedCostId));
+			transactionForm.setCategoryId(fixedCostForm.getCategoryId());
+			transactionForm.setAmount(fixedCostForm.getAmount());
+			transactionForm.setTransactionType(CategoryForm
+					.convertFrom(categoryService.findOne(fixedCostForm.getCategoryId())).getTransactionType());
+		}
 
-		System.out.println(transactionForm.getCategoryName() + " " + transactionForm.getAmount());
+		List<CategoryForm> categoryFormList = new ArrayList<>(
+				CategoryForm.convertFrom(categoryService.findAllExceptCustom()));
 
-		model.addAttribute("transactionForm", transactionForm);
+		List<CategoryForm> categoryFormCustomList = CategoryForm
+				.convertFrom(categoryService.findAllByuserId(loginUser.getUserId()));
 
-		model.addAttribute("categoryFormList", categoryFormList);
+		if (!categoryFormCustomList.isEmpty()) {
+			for (CategoryForm form : categoryFormCustomList) {
+				categoryFormList.add(form);
+			}
+		}
 
-		model.addAttribute("today", today.format(DateTimeFormatter.ISO_LOCAL_DATE));
 
-		return "transaction_create";
+		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);
+		
+		session.setAttribute(SessionKeyword.T_TYPE, String.valueOf(transactionForm.getTransactionType()));
+		
+		model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList);
+
+		model.addAttribute(PageReturnAttributeKeyword.TODAY, today.format(DateTimeFormatter.ISO_LOCAL_DATE));
+
+		return TransitionTargetPageNameKeyword.TRANSACTION_CREATE_HTML;
 	}
 
 	@SessionCheck
-	@PostMapping("/transaction/create")
+	@PostMapping(TransitionTargetPageNameKeyword.TRANSACTION_CREATE)
 	public String createOnePost(@ModelAttribute TransactionForm transactionForm, @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());
 		if (transactionService.createTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
-			return "error";
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 
-		return "redirect:/transaction/detail?todayDates=" + transactionForm.getTransactionDate();
+		return TransitionTargetPageNameKeyword.REDIRECT +
+				TransitionTargetPageNameKeyword.TRANSACTION_DETAIL +
+				TransitionTargetPageNameKeyword.INTERROGATION +
+				TransitionTargetPageNameKeyword.TODAY_DATES +
+				TransitionTargetPageNameKeyword.EQUAL +
+				transactionForm.getTransactionDate();
 
 	}
 
 	@SessionCheck
-	@GetMapping("/transaction/update")
+	@GetMapping(TransitionTargetPageNameKeyword.TRANSACTION_UPDATE)
 	public String updateOneGet(@RequestParam Long transactionId, @RequestParam(defaultValue = "") LocalDate today,
-			Model model) {
+			Model model, HttpSession session) {
 
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 		if (today == null) {
 			today = LocalDate.now();
 		}
 
-		List<CategoryForm> categoryFormList = CategoryForm.convertFrom(categoryService.findAll());
+		List<CategoryForm> categoryFormList = new ArrayList<>(
+				CategoryForm.convertFrom(categoryService.findAllExceptCustom()));
+
+		List<CategoryForm> categoryFormCustomList = CategoryForm
+				.convertFrom(categoryService.findAllByuserId(loginUser.getUserId()));
+
+		if (!categoryFormCustomList.isEmpty()) {
+			for (CategoryForm form : categoryFormCustomList) {
+				categoryFormList.add(form);
+			}
+		}
 
 		TransactionForm transactionForm = TransactionForm.convertFrom(
 				transactionService.findByTransactionId(transactionId),
@@ -238,54 +297,81 @@ public class TransactionController {
 				transactionService.findMoneyRecord(transactionId),
 				CategoryForm.convertFrom(categoryService.findByTransactionId(transactionId)).getTransactionType());
 
-		System.out.println("category: " + transactionForm.getCategoryId() + "金額：   " + transactionForm.getAmount());
+		List<CategoryForm> expenseList = new ArrayList<CategoryForm>();
 
-		model.addAttribute("transactionId", transactionId);
+		List<CategoryForm> incomeList = new ArrayList<CategoryForm>();
 
-		model.addAttribute("transactionForm", transactionForm);
+		for (CategoryForm categoryForm : categoryFormList) {
 
-		model.addAttribute("categoryFormList", categoryFormList);
+			if (categoryForm.getTransactionType() == 0) {
+				expenseList.add(categoryForm);
+			} else {
+				incomeList.add(categoryForm);
+			}
 
-		model.addAttribute("today", today);
+		}
 
-		return "transaction_update";
+		model.addAttribute(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList);
+		model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
+		
+		model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_ID, transactionId);
+
+		model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm);
+
+		model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList);
+
+		model.addAttribute(PageReturnAttributeKeyword.TODAY, today);
+		
+		session.setAttribute(SessionKeyword.T_TYPE, transactionForm.getTransactionType());
+
+		return TransitionTargetPageNameKeyword.TRANSACTION_UPDATE_HTML;
 
 	}
 
 	@SessionCheck
-	@PostMapping("/transaction/update")
+	@PostMapping(TransitionTargetPageNameKeyword.TRANSACTION_UPDATE)
 	public String updateOnePost(@RequestParam Long transactionId, @ModelAttribute TransactionForm transactionForm,
 			@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);
 
 		if (transactionService.updateTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
-			return "error";
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 
-		return "redirect:/transaction/detail?todayDates=" + transactionForm.getTransactionDate();
+		return TransitionTargetPageNameKeyword.REDIRECT +
+				TransitionTargetPageNameKeyword.TRANSACTION_DETAIL +
+				TransitionTargetPageNameKeyword.INTERROGATION +
+				TransitionTargetPageNameKeyword.TODAY_DATES +
+				TransitionTargetPageNameKeyword.EQUAL +
+				transactionForm.getTransactionDate();
 
 	}
 
 	@SessionCheck
-	@PostMapping("/transaction/delete")
+	@PostMapping(TransitionTargetPageNameKeyword.TRANSACTION_DELETE)
 	public String deleteOne(@RequestParam Long transactionId, @RequestParam LocalDate today) {
 
 		transactionService.deleteTransaction(transactionId);
-		return "redirect:/transaction/detail?todayDates=" + today;
+		return TransitionTargetPageNameKeyword.REDIRECT +
+				TransitionTargetPageNameKeyword.TRANSACTION_DETAIL +
+				TransitionTargetPageNameKeyword.INTERROGATION +
+				TransitionTargetPageNameKeyword.TODAY_DATES +
+				TransitionTargetPageNameKeyword.EQUAL +
+				today;
 	}
 
 	@SessionCheck
-	@GetMapping("/menu")
+	@GetMapping(TransitionTargetPageNameKeyword.MENU)
 	public String menu(HttpSession session, Model model,
 			@RequestParam(required = false, defaultValue = "0") String years,
 			@RequestParam(required = false, defaultValue = "0") String months) {
 
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 		LocalDate today = LocalDate.now();
 
@@ -309,18 +395,18 @@ public class TransactionController {
 		int nextYear = nextYearMonth.getYear();
 		int nextMonth = nextYearMonth.getMonthValue();
 
-		model.addAttribute("year", year);
+		model.addAttribute(PageReturnAttributeKeyword.YEAR, year);
-		model.addAttribute("month", month);
+		model.addAttribute(PageReturnAttributeKeyword.MONTH, month);
-		model.addAttribute("day", today.getDayOfMonth());
+		model.addAttribute(PageReturnAttributeKeyword.DAY, today.getDayOfMonth());
 
-		model.addAttribute("lastDay", lastDay);
+		model.addAttribute(PageReturnAttributeKeyword.LAST_DAY, lastDay);
-		model.addAttribute("firstDayOfWeek", firstDayOfWeek);
+		model.addAttribute(PageReturnAttributeKeyword.FIRST_DAY_OF_WEEK, firstDayOfWeek);
 
-		model.addAttribute("previousYear", previousYear);
+		model.addAttribute(PageReturnAttributeKeyword.PREVIOUS_YEAR, previousYear);
-		model.addAttribute("previousMonth", previousMonth);
+		model.addAttribute(PageReturnAttributeKeyword.PREVIOUS_MONTH, previousMonth);
 
-		model.addAttribute("nextYear", nextYear);
+		model.addAttribute(PageReturnAttributeKeyword.NEXT_YEAR, nextYear);
-		model.addAttribute("nextMonth", nextMonth);
+		model.addAttribute(PageReturnAttributeKeyword.NEXT_MONTH, nextMonth);
 
 		LocalDate startDate = yearMonth.atDay(1);
 		LocalDate endDate = yearMonth.atEndOfMonth();
@@ -329,31 +415,51 @@ public class TransactionController {
 
 		List<Expense> expenseList = transactionService.findTotalExpenseList(startDate, endDate, loginUser.getUserId());
 
-		model.addAttribute("incomeList", incomeList);
+		model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
-		model.addAttribute("expenseList", expenseList);
+		model.addAttribute(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList);
 
 		int totalIncome = transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId());
 
 		int totalExpense = transactionService.findTotalExpense(startDate, endDate, loginUser.getUserId());
 
-		model.addAttribute("totalIncome", totalIncome);
+		model.addAttribute(PageReturnAttributeKeyword.TOTAL_INCOME, totalIncome);
-		model.addAttribute("totalExpense", totalExpense);
+		model.addAttribute(PageReturnAttributeKeyword.TOTAL_EXPENSE, totalExpense);
 
-		GoalForm goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId()));
+		List<GoalForm> goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId()));
 
 		UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
 
-		model.addAttribute("achievementRate", goalForm.getAchievementRate());
+		List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0 && goal.getDeadline().isAfter(today) )
+				.collect(Collectors.toList());
 
-	    model.addAttribute("currentAmount", goalForm.getCurrentAmount());
+		if (!resultList.isEmpty()) {
+			GoalForm result = resultList.getFirst();
 
-		model.addAttribute("targetAmount", goalForm.getTargetAmount());
+			model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, result.getAchievementRate());
 
-		model.addAttribute("saving", userForm.getSaving());
+			model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, result.getCurrentAmount());
 
-		model.addAttribute("deadline", goalForm.getDeadline());
+			model.addAttribute(PageReturnAttributeKeyword.TARGET_AMOUNT, result.getTargetAmount());
 
-		return "menu";
+			model.addAttribute(PageReturnAttributeKeyword.SAVING, userForm.getSaving());
+
+			model.addAttribute(PageReturnAttributeKeyword.DEADLINE, result.getDeadline());
+
+		} else {
+			final String MESSAGE = "目標を設定してください";
+
+			model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, MESSAGE);
+
+			model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, MESSAGE);
+
+			model.addAttribute(PageReturnAttributeKeyword.TARGET_AMOUNT, MESSAGE);
+
+			model.addAttribute(PageReturnAttributeKeyword.SAVING, userForm.getSaving());
+
+			model.addAttribute(PageReturnAttributeKeyword.DEADLINE, MESSAGE);
+		}
+
+		return TransitionTargetPageNameKeyword.MENU_HTML;
 	}
 
 }

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

@@ -15,6 +15,9 @@ import com.example.demo.app.domain.service.CourseService;
 import com.example.demo.app.domain.service.QuestionService;
 import com.example.demo.app.domain.service.UserService;
 import com.example.demo.app.infra.entity.QuestionEntity;
+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.UserForm;
 
 import lombok.RequiredArgsConstructor;
@@ -30,24 +33,22 @@ public class UserController {
 	private final QuestionService questionService;
 
 
-	@GetMapping("/user/register")
+	@GetMapping(TransitionTargetPageNameKeyword.USER_RESISTER)
 	public String showRegister(Model model, HttpSession session) {
 		UserForm userForm = new UserForm();
 
 		List<QuestionEntity> questionList = questionService.findAll();
 
-		session.setAttribute("questionList", questionList);
+		session.setAttribute(PageReturnAttributeKeyword.QUESTION_LIST, questionList);
 
-		model.addAttribute("userForm", userForm);
+		model.addAttribute(PageReturnAttributeKeyword.USER_FORM, userForm);
-		return "user_register";
+		return TransitionTargetPageNameKeyword.USER_RESISTER_HTML;
 	}
 
-	@PostMapping("/user/register/return")
+	@PostMapping(TransitionTargetPageNameKeyword.USER_RESISTER_RETURN)
 	public String showRegisterReturn(@RequestParam(required = false) Long courseId, Model model, HttpSession session) {
 
-		UserForm userForm = (UserForm) session.getAttribute("userForm");
+		UserForm userForm = (UserForm) session.getAttribute(PageReturnAttributeKeyword.USER_FORM);
-		System.out.println(
-				"######################################################################3" + userForm.getBirthDate());
 		
 		if (userForm.getUserName().equals("")) {
 			userForm = new UserForm();
@@ -55,39 +56,44 @@ public class UserController {
 		}
 
 		if (courseId != null) {
-			model.addAttribute("selectedCourseName", courseService.findById(courseId).getCourseName());
+			model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
 		}
 
-		session.setAttribute("selectedCourseName", courseService.findById(courseId).getCourseName());
+		session.setAttribute(SessionKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
-		model.addAttribute("courseId", courseId);
+		model.addAttribute(PageReturnAttributeKeyword.COURSE_ID, courseId);
-		System.out.println(
+		model.addAttribute(PageReturnAttributeKeyword.USER_FORM, userForm);
-				"######################################################################3" + userForm.getBirthDate());
-		model.addAttribute("userForm", userForm);
 
-		return "user_register_return";
+		return TransitionTargetPageNameKeyword.USER_RESISTER_RETURN_HTML;
 	}
 
-	@GetMapping("/user/register/confirm")
+	@GetMapping(TransitionTargetPageNameKeyword.USER_RESISTER_CONFIRM)
 	public String confirmRegisterGet(@ModelAttribute UserForm userForm,
 			String selectedCourseName, Model model,
 			HttpSession session) {
 
-		model.addAttribute("selectedCourseName", (String) session.getAttribute("selectedCourseName"));
+		model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, (String) session.getAttribute(SessionKeyword.SELECTED_COURSE_NAME));
-		return "user_register_confirm";
+		
+		session.setAttribute(SessionKeyword.QUESTION_ID, userForm.getSecretQuestionId());
+		
+		return TransitionTargetPageNameKeyword.USER_RESISTER_CONFIRM_HTML;
 		
 	}
 
-	@PostMapping("/user/register/complete")
+	@PostMapping(TransitionTargetPageNameKeyword.USER_RESISTER_COMPLETE)
 	public String confirmRegister(
 			@ModelAttribute UserForm userForm,
 			Model model, 
 			HttpSession session) {
 
-		Long courseId = courseService.findByName((String) session.getAttribute("selectedCourseName"));
+		Long courseId = courseService.findByName((String) session.getAttribute(SessionKeyword.SELECTED_COURSE_NAME));
+		
+		Long questionId = (Long) session.getAttribute(SessionKeyword.QUESTION_ID);
+		
+		userForm.setSecretQuestionId(questionId);
 		
 		userService.register(userForm, courseId);
 		
-		return "redirect:/login";
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.LOGIN;
 	}
 
 

src/main/java/com/example/demo/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java

@@ -4,17 +4,18 @@ public class PageReturnAttributeKeyword {
 
 	public static final String ERROR_MESSAGE = "errorMessage";
 	public static final String MESSAGE = "message";
-	
+	public static final String ERROR = "error";
+	public static final String STATUS = "status";
 	
 	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";
 	
-	public static final String AUTENTICATION_FORM = "authenticationForm";
+	public static final String AUTHENTICATION_FORM = "authenticationForm";
 	
 	public static final String PROFILE_FORM = "profileForm";
 	public static final String PROFILE_EDIT_FORM = "profileEditForm";
@@ -52,5 +53,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/SessionKeyword.java

@@ -3,4 +3,10 @@ package com.example.demo.app.presentation.controller.pageproperty;
 public class SessionKeyword {
 	// SESSION情報として格納したいログイン者の情報
     public static final String LOGIN_USER = "loginUser";
+    
+    public static final String SELECTED_COURSE_NAME = "selectedCourseName";
+
+    public static final String QUESTION_ID = "questionId";
+    
+    public static final String T_TYPE = "tType";
 }

src/main/java/com/example/demo/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java

@@ -5,13 +5,13 @@ public class TransitionTargetPageNameKeyword {
 	// HTML
 	public static final String ERROR_HTML = "error";
 	
-	public static final String USER_RESISTER_HTML = "user_resiter";
+	public static final String USER_RESISTER_HTML = "user_register";
-	public static final String USER_RESISTER_RETURN_HTML = "user_resiter_return";
+	public static final String USER_RESISTER_RETURN_HTML = "user_register_return";
-	public static final String USER_RESISTER_CONFIRM_HTML = "user_resiter_confirm";
+	public static final String USER_RESISTER_CONFIRM_HTML = "user_register_confirm";
 
 	public static final String LOGIN_HTML = "login";
 	
-	public static final String PASSWORD_RESET_HTML = "passsword_reset";
+	public static final String PASSWORD_RESET_HTML = "password_reset";
 	
 	public static final String AUTHENTICATION_HTML = "authentication";
 	
@@ -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";
@@ -47,7 +58,7 @@ public class TransitionTargetPageNameKeyword {
 	
 	public static final String AUTHENTICATION = "/authentication";
 	
-	public static final String PASSWORD_RESET = "/passsword/reset";
+	public static final String PASSWORD_RESET = "/password/reset";
 	
 	public static final String MENU = "/menu";
 	
@@ -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 = "=";
@@ -65,12 +79,26 @@ public class TransitionTargetPageNameKeyword {
 	public static final String TRANSACTION_DETAIL = "/transaction/detail";
 	public static final String TRANSACTION_CREATE = "/transaction/create";
 	public static final String TRANSACTION_UPDATE = "/transaction/update";
+	public static final String TRANSACTION_DELETE = "/transaction/delete";
 	public static final String TODAY_DATES = "todayDates";
 	
 	public static final String ANALYSIS = "/analysis";
 	
 	public static final String GOAL = "/goal";
-	public static final String GOAL_EDIT = "/goal/edit";
+	public static final String EDIT = "/edit";
-	public static final String GOAL_UPDATE = "/goal/update";
+	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/java/com/example/demo/app/presentation/form/AllocationFormList.java

@@ -0,0 +1,45 @@
+package com.example.demo.app.presentation.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AllocationFormList {
+
+	private Long categoryId1 = 1L;
+	private Integer allocationRatio1;
+	
+	private Long categoryId2 = 2L;
+	private Integer allocationRatio2;
+	
+	private Long categoryId3 = 3L;
+	private Integer allocationRatio3;
+	
+	private Long categoryId4 = 4L;
+	private Integer allocationRatio4;
+	
+	private Long categoryId5 = 5L;
+	private Integer allocationRatio5;
+	
+	private Long categoryId6 = 6L;
+	private Integer allocationRatio6;
+	
+	private Long categoryId7 = 7L;
+	private Integer allocationRatio7;
+	
+	private Long categoryId8 = 8L;
+	private Integer allocationRatio8;
+	
+	private Long categoryId9 = 9L;
+	private Integer allocationRatio9;
+	
+	private Long categoryId10 = 10L;
+	private Integer allocationRatio10;
+	
+	private Long categoryId11 = 11L;
+	private Integer allocationRatio11;
+	
+}

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

@@ -25,4 +25,11 @@ public class CategoryForm {
 		return categoryModelList.stream().map(CategoryForm::convertFrom).toList();
 	}
 	
+	public static CategoryModel convertTo(CategoryForm categoryForm) {
+		return new CategoryModel(
+				categoryForm.getCategoryId(),
+				categoryForm.getCategoryName(),
+				categoryForm.getTransactionType());
+	}
+	
 }

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

@@ -30,4 +30,12 @@ public class CourseForm {
 		return courseModelList.stream().map(CourseForm::convertFrom).toList();
 	}
 	
+	public static CourseModel convertTo(CourseForm courseForm) {
+		return new CourseModel(
+				courseForm.getCourseId(), 
+				courseForm.getCourseName(), 
+				courseForm.getDescription()
+				);
+	}
+	
 }

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

@@ -0,0 +1,55 @@
+package com.example.demo.app.presentation.form;
+
+import java.util.List;
+
+import com.example.demo.app.domain.model.FixedCostModel;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class FixedCostForm {
+
+	private Long fixedCostId;
+
+	private Long userId;
+
+	private Long categoryId;
+	
+	private String fixedCostName;
+
+	private Integer amount;
+	
+	private String categoryName;
+	
+	
+	public static FixedCostForm convertFrom(FixedCostModel fixedCostModel) {
+		return new FixedCostForm(
+				fixedCostModel.getFixedCostId(),
+				fixedCostModel.getUserId(),
+				fixedCostModel.getCategoryId(),
+				fixedCostModel.getFixedCostName(),
+				fixedCostModel.getAmount(),
+				"");
+	}
+
+
+	public static List<FixedCostForm> convertFrom(List<FixedCostModel> fixedCostModelList) {
+		return fixedCostModelList.stream().map(fixedCostModel -> FixedCostForm.convertFrom(fixedCostModel)).toList();
+	}
+
+	public static FixedCostModel convertTo(FixedCostForm fixedCostForm) {
+		return new FixedCostModel(
+				fixedCostForm.getFixedCostId(),
+				fixedCostForm.getUserId(),
+				fixedCostForm.getCategoryId(),
+				fixedCostForm.getFixedCostName(),
+				fixedCostForm.getAmount());
+	}
+	
+	
+	
+}

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

@@ -1,6 +1,7 @@
 package com.example.demo.app.presentation.form;
 
 import java.time.LocalDate;
+import java.util.List;
 
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -28,10 +29,14 @@ public class GoalForm {
 
 	private Integer goalComplete;
 	
+	private String status;
+	
 	private Integer achievementRate; // 達成率
 	
 	private Integer currentAmount; // 現在の資産
 	
+	private Long userId;
+
 	public static GoalForm convertFrom(GoalModel goalModel) {
 		return new GoalForm(
 				goalModel.getGoalId(),
@@ -40,12 +45,14 @@ public class GoalForm {
 				goalModel.getTargetAmount(),
 				goalModel.getDeadline(),
 				goalModel.getGoalComplete(),
+				null,
 				goalModel.getAchievementRate(),
-				goalModel.getCurrentAmount());
+				goalModel.getCurrentAmount(),
+				goalModel.getUserId());
 	}
 
-//	public static List<GoalForm> convertFrom(List<GoalModel> goalModelList) {
+	public static List<GoalForm> convertFrom(List<GoalModel> goalModelList) {
-//		return goalModelList.stream().map(GoalForm::convertFrom).toList();
+		return goalModelList.stream().map(GoalForm::convertFrom).toList();
-//	}
+	}
 
 }

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

@@ -0,0 +1,17 @@
+package com.example.demo.app.presentation.form;
+
+import java.time.YearMonth;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class MonthlyAchievementForm {
+
+	private YearMonth month;
+
+	private Integer saving;
+
+	private Integer achievementRate;
+}

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

@@ -0,0 +1,19 @@
+package com.example.demo.app.presentation.form;
+
+import java.time.YearMonth;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class MonthlySavingForm {
+	
+	private YearMonth month;
+
+	private Integer income;
+
+	private Integer expense;
+
+	private Integer saving;
+}

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

@@ -1,5 +1,7 @@
 package com.example.demo.app.presentation.form;
 
+import java.time.LocalDate;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,6 +12,7 @@ import lombok.NoArgsConstructor;
 public class ProfileEditForm {
 	private String userName;
 	private String mailAddress;
+	private LocalDate birthDate;
 	private Integer saving;
 	private Integer annualIncome;
 	private Integer monthlyBudget;

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

@@ -36,7 +36,7 @@ public class UserForm {
 				userModel.getSaving(),
 				userModel.getAnnualIncome(),
 				userModel.getMonthlyBudget(),
-				userModel.getGoalId(),
+				0L,
 				userModel.getCourseId()
 				);
 	}

src/main/resources/static/css/style.css

@@ -46,6 +46,10 @@ body {
     border-top: 1px solid #d0d7de;
 }
 
+.a-footer {
+	text-decoration: none;
+}
+
 /* =======================
    カード
 ======================= */
@@ -178,6 +182,10 @@ td:hover {
     text-align: right;
 }
 
+.a-calender {
+	text-decoration: none;
+}
+
 /* =======================
    金額表示
 ======================= */
@@ -206,6 +214,10 @@ td:hover {
     vertical-align: middle;
 }
 
+.goal {
+	min-width: 300px;
+}
+
 /* =======================
    ボタン
 ======================= */

src/main/resources/templates/analysis.html

@@ -35,7 +35,7 @@
 	<table class="table text-center">
         <thead>
 	        <tr>
-                <th scope="col">カテゴリ別</th>
+                <th scope="col"></th>
 			    <th scope="col">支出</th>
 			    <th scope="col">前月比</th>
 			</tr>
@@ -47,7 +47,7 @@
 					0
 				  </td>
 			      <td th:text="${analysisForm.totalDifferenceAmount >= 0}
-					      ? '＋' + ${analysisForm.totalDifferenceAmount}
+					      ? '+' + ${analysisForm.totalDifferenceAmount}
 						  : ${analysisForm.totalDifferenceAmount}"
 				      th:class="${analysisForm.totalDifferenceAmount >= 0}
 					      ? 'text-danger'
@@ -73,16 +73,14 @@
 			
 	      <th scope="row"
 		      th:text="${category.categoryName}">
-			  食費
 		  </th>
 		  
 	      <td th:text="'￥' + ${category.currentMonthAmount}">
-			0
 		  </td>
 		  
 	      <td>
 			<span th:text="${category.monthDifferenceAmount >= 0}
-			          ? '＋' + ${category.monthDifferenceAmount}
+			          ? '+' + ${category.monthDifferenceAmount}
 				      : ${category.monthDifferenceAmount}"
 			      th:class="${category.monthDifferenceAmount >= 0}
 				      ? 'text-danger'
@@ -90,7 +88,7 @@
 			</span>
 			<br>
 			<span th:text="${category.courseDifferenceAmount >= 0}
-				      ? '＋' + ${category.courseDifferenceAmount}
+				      ? '+' + ${category.courseDifferenceAmount}
 					  : ${category.courseDifferenceAmount}"
 			      th:class="${category.courseDifferenceAmount >= 0}
 				      ? 'text-danger'

src/main/resources/templates/category_create.html

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
+	<title>カテゴリ登録</title>
+	<link rel="stylesheet" th:href="@{/css/menu.css}">
+
+	<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;">
+
+	<div th:replace="~{header :: header}"></div>
+
+	<div class="main-container">
+		<h1 class="page-title">カテゴリ登録</h1>
+
+		<div class="card shadow-sm">
+			<div class="card-body">
+
+				<form th:action="@{/category/create}" th:object="${categoryForm}" method="post">
+
+
+					<div class="mb-3">
+						<label class="form-label" for="categoryName">カテゴリ名</label>
+
+						<input class="form-control" type="text" id="categoryName" th:field="*{categoryName}" required>
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="transactionType">収入・支出</label>
+
+						<select class="form-select" id="transactionType" th:field="*{transactionType}" required>
+
+							<option value="">選択してください</option>
+							<option value="0">支出</option>
+							<option value="1">収入</option>
+
+						</select>
+					</div>
+
+					<br>
+					<div class="d-grid">
+						<button type="submit" class="btn btn-primary">登録</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+
+	<div th:replace="~{footer :: footer}"></div>
+
+
+</body>
+
+</html>

src/main/resources/templates/category_list.html

@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html 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 rel="stylesheet" th:href="@{/css/transaction_detail.css}">
+	<link rel="stylesheet" th:href="@{/css/style.css}">
+	<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;">
+
+	<div th:replace="~{header :: header}"></div>
+	<div class="main-container">
+
+		<div>
+			<ul class="list-unstyled p-0 m-0">
+				<li class="card shadow-sm mb-3" th:each="categoryForm : ${categoryFormList}">
+					<div class="card-body">
+						<div class="d-flex justify-content-between">
+							<p>
+								カテゴリ名：
+								<span class="fw-bold" th:text="${categoryForm.categoryName}"></span>
+								<br>
+								収支区分：
+								<span class="fw-bold" th:if="${categoryForm.transactionType == 0}"
+									th:text="|支出|"></span>
+								<span class="fw-bold" th:if="${categoryForm.transactionType == 1}"
+									th:text="|収入|"></span>
+							</p>
+						</div>
+
+						<div class="d-flex justify-content-end gap-2 mt-3">
+
+							<form th:action="@{/category/update}" method="get">
+								<input type="hidden" name="today" th:value="${today}">
+								<input type="hidden" name="categoryId" th:value="${categoryForm.categoryId}">
+								<button type="submit" class="btn btn-sm btn-primary">編集</button>
+							</form>
+
+							<form th:action="@{/category/delete}" method="post">
+								<input type="hidden" name="today" th:value="${today}">
+								<input type="hidden" name="categoryId" th:value="${categoryForm.categoryId}">
+								<button type="submit" class="btn btn-sm btn-danger">削除</button>
+							</form>
+
+
+
+						</div>
+
+					</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}">
+
+			    <button class="btn btn-success w-100" type="submit">
+					新規登録
+				</button>
+
+			</form>
+
+		</div>
+		
+	</div>
+
+		<div th:replace="~{footer :: footer}"></div>
+</body>
+
+</html>

src/main/resources/templates/category_update.html

@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
+	<title>カテゴリ登録</title>
+	<link rel="stylesheet" th:href="@{/css/menu.css}">
+
+	<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;">
+
+	<div th:replace="~{header :: header}"></div>
+
+	<div class="main-container">
+		<h1 class="page-title">カテゴリ編集</h1>
+
+		<div class="card shadow-sm">
+			<div class="card-body">
+
+				<form th:action="@{/category/update}" th:object="${categoryForm}" method="post">
+
+
+					<div class="mb-3">
+						<label class="form-label" for="categoryName">カテゴリ名</label>
+
+						<input class="form-control" type="text" id="categoryName" th:field="*{categoryName}" required>
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="transactionType">収入・支出</label>
+
+						<select class="form-select" id="transactionType" th:field="*{transactionType}" required>
+
+							<option value="">選択してください</option>
+							<option value="0">支出</option>
+							<option value="1">収入</option>
+
+						</select>
+					</div>
+
+					<br>
+
+					<input type="hidden" name="categoryId" th:value="${categoryId}">
+
+					<div class="d-grid">
+						<button type="submit" class="btn btn-primary">更新</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+
+	<div th:replace="~{footer :: footer}"></div>
+
+
+</body>
+
+</html>

src/main/resources/templates/course_create.html

@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
+	<title>コース登録</title>
+	<link rel="stylesheet" th:href="@{/css/menu.css}">
+
+	<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;">
+
+	<div th:replace="~{header :: header}"></div>
+	<div class="main-container">
+		<h1 class="page-title">コース登録</h1>
+
+		<div class="card shadow-sm">
+			<div class="card-body">
+				<form th:action="@{/course/create/ratio}" th:object="${courseForm}" method="post">
+
+
+					<div class="mb-3">
+						<label class="form-label" for="courseName">コース名</label>
+
+						<input class="form-control" type="text" id="courseName" th:field="*{courseName}" required>
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="description">説明</label>
+
+						<textarea class="form-control" id="description" th:field="*{description}"
+							placeholder="説明を入力してください">
+			</textarea>
+					</div>
+
+					<br>
+
+					<div class="d-grid">
+						<button type="submit" class="btn btn-primary">登録</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+
+	<div th:replace="~{footer :: footer}"></div>
+
+
+</body>
+
+</html>

src/main/resources/templates/course_create_ratio.html

@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
+	<title>コース登録</title>
+	<link rel="stylesheet" th:href="@{/css/menu.css}">
+
+	<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:120px;">
+
+	<div th:replace="~{header :: header}"></div>
+
+	<div class="main-container">
+
+		<h1 class="page-title">コース登録</h1>
+
+		<div class="card shadow-sm">
+			<div class="card-body">
+				<form th:action="@{/course/create}" th:object="${allocationFormList}" method="post">
+
+
+					<div class="mb-3">
+						<label class="form-label" for="allocationRatio4">固定費</label>
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio4" th:field="*{allocationRatio4}" required>
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="allocationRatio5">食費</label>
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio5" th:field="*{allocationRatio5}" required>
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="allocationRatio6">交通費</label>
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio6" th:field="*{allocationRatio6}" required>
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="allocationRatio7">日用品費</label>
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio7" th:field="*{allocationRatio7}" required>
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="allocationRatio8">被服/美容費</label>
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio8" th:field="*{allocationRatio8}" required>
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="allocationRatio9">医療費</label>
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio9" th:field="*{allocationRatio9}" required>
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="allocationRatio10">趣味/娯楽費</label>
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio10" th:field="*{allocationRatio10}" required>
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="allocationRatio11">その他</label>
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio11" th:field="*{allocationRatio11}" required>
+					</div>
+
+					<div class="mb-3">
+						<label class="form-label" for="allocationRatioTotal">合計(%)</label>
+						<input class="form-control" type="number" value="0" id="allocationRatioTotal" readonly>
+					</div>
+
+					<br>
+					<div class="d-grid">
+						<button type="submit" class="btn btn-primary" id="submit" disabled="true">登録</button>
+
+					</div>
+
+					<span th:object="${courseForm}">
+
+						<input type="hidden" id="courseName" th:field="*{courseName}" required>
+						<br>
+
+						<input type="hidden" id="description" th:field="*{description}">
+					</span>
+			</div>
+		</div>
+	</div>
+	</div>
+
+	<div th:replace="~{footer :: footer}"></div>
+
+	<script>
+
+		function inputChange() {
+			let total = 0;
+
+			for (let i = 4; i <= 11; i++) {
+				total += Number(document.getElementById(`allocationRatio${i}`).value || 0);
+				if (total == 100) {
+					document.getElementById('submit').disabled = false;
+				} else {
+					document.getElementById('submit').disabled = true;
+				}
+			}
+
+
+			document.getElementById("allocationRatioTotal").value = total;
+
+		}
+
+	</script>
+
+</body>
+
+</html>

src/main/resources/templates/error.html

@@ -10,12 +10,6 @@
 	    <div th:replace="~{header :: header}">
 	    </div>
 
-	</head>
-	<body>
-
-	    <div th:replace="~{header :: header}">
-	    </div>
-
 	    <div class="container text-center mt-5">
 
 	        <h2 class="text-danger">

src/main/resources/templates/fixed_cost.html

@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html 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 rel="stylesheet" th:href="@{/css/transaction_detail.css}">
+
+	<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 style="padding-top:80px; padding-bottom:80px;">
+
+	<div th:replace="~{header :: header}"></div>
+	<div class="main-container">
+
+
+		<h2 class="page-title" th:text="${today}"></h2>
+
+		<div>
+			<ul class="list-unstyled p-0 m-0">
+				<li th:each="fixedCostForm : ${fixedCostFormList}" class="card shadow-sm mb-3">
+
+					<div class="card-body">
+						<div class="d-flex justify-content-between">
+							<p>
+								カテゴリ名：
+								<span class="fw-bold" th:text="${fixedCostForm.categoryName}"></span>
+								<br>
+								固定費名：
+								<span class="fw-bold" th:text="${fixedCostForm.fixedCostName}"></span>
+								<br>
+								金額：
+								<span class="fw-bold" th:text="${fixedCostForm.amount}"></span>
+							</p>
+						</div>
+
+						<div class="d-flex justify-content-end gap-2 mt-3">
+
+							<form th:action="@{/transaction/create}" method="get">
+								<input type="hidden" name="fixedCostId" th:value="${fixedCostForm.fixedCostId}">
+								<input type="hidden" name="today" th:value="${today}">
+								<button type="submit" class="btn btn-sm btn-primary">登録</button>
+							</form>
+
+							<form th:action="@{/fixed-cost/delete}" method="post">
+								<input type="hidden" name="fixedCostId" th:value="${fixedCostForm.fixedCostId}">
+								<input type="hidden" name="today" th:value="${today}">
+								<button type="submit" class="btn btn-sm btn-danger">削除</button>
+							</form>
+
+						</div>
+
+					</div>
+				</li>
+			</ul>
+		</div>
+		<div class="d-grid mt-4">
+
+			<form th:action="@{/fixed-cost/create}" method="get">
+
+				<input type="hidden"
+					   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>
+
+</html>

src/main/resources/templates/fixed_cost_create.html

@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
+	<title>固定費登録</title>
+	<link rel="stylesheet" th:href="@{/css/menu.css}">
+
+	<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;">
+
+	<div th:replace="~{header :: header}"></div>
+
+	<div class="main-container">
+
+		<h1 class="page-title">
+			固定費登録
+		</h1>
+
+		<div class="card shadow-sm">
+
+			<div class="card-body">
+
+				<form th:action="@{/fixed-cost/create}" th:object="${fixedCostForm}" method="post">
+
+
+					<div class="mb-3">
+						<label class="form-label" for="fixedCostName">固定費名</label>
+
+						<input class="form-control" type="text" id="fixedCostName" th:field="*{fixedCostName}" required>
+					</div>
+
+
+					<div class="mb-3">
+						<label class="form-label" for="transactionType">収入・支出</label>
+
+						<select class="form-select" id="transactionType" required>
+
+							<option value="">選択してください</option>
+							<option value="0">支出</option>
+							<option value="1">収入</option>
+
+						</select>
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="categoryId">カテゴリ</label>
+
+						<select class="form-select" id="categoryId" th:field="*{categoryId}" required>
+							<option value="">選択してください</option>
+
+							<option class="expenseListClass" th:each="category : ${expenseList}"
+								th:value="${category.categoryId}" th:text="${category.categoryName}">
+							</option>
+
+							<option class="incomeListClass" th:each="category : ${incomeList}"
+								th:value="${category.categoryId}" th:text="${category.categoryName}">
+							</option>
+						</select>
+
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="amount">金額</label>
+
+						<input class="form-control" type="number" id="amount" th:field="*{amount}" min="1" placeholder="金額を入力してください"
+							required>
+					</div>
+
+					<br>
+					<input type="hidden" name="today" id="today" th:value="${today}">
+					<div class="d-grid">
+					<button class="btn btn-primary" type="submit">登録</button>
+					</div>
+				</form>
+
+				<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 === "0") {
+
+							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 === "1") {
+
+							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>
+
+
+</html>

src/main/resources/templates/footer.html

@@ -15,22 +15,22 @@
 		  <div class="row">
 		    <div class="col border-end">
 		      <button type="button" class="btn btn-link text-black text-decoration-none">
-				<a th:href="@{/transaction/create}">入力</a>
+				<a th:href="@{/transaction/create}" class="a-footer">入力</a>
 			  </button>
 		    </div>
 		    <div class="col border-end">
 			  <button type="button" class="btn btn-link text-black text-decoration-none">
-				<a th:href="@{/transaction/list}">一覧</a>
+				<a th:href="@{/transaction/list}" class="a-footer">一覧</a>
 			  </button>
 		    </div>
 		    <div class="col border-end">
 			  <button type="button" class="btn btn-link text-black text-decoration-none">
-		        <a th:href="@{/analysis}">分析</a>
+		        <a th:href="@{/analysis}" class="a-footer">分析</a>
 			  </button>
 		    </div>
 			<div class="col border-end">
 			  <button type="button" class="btn btn-link text-black text-decoration-none">
-				<a th:href="@{/goal}">目標</a>
+				<a th:href="@{/goal}" class="a-footer">目標</a>
 			  </button>
 		    </div>
 		  </div>

src/main/resources/templates/goal_create.html

@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html 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}">
+</head>
+
+<body style="padding-top:80px; padding-bottom:80px;">
+
+	<div th:replace="~{header :: header}"></div>
+
+	<div class="main-container">
+
+		<h1 class="page-title">目標作成</h1>
+
+		<div class="card shadow-sm">
+
+			<div class="card-body">
+
+				<form th:action="@{/goal/create}" th:object="${goalForm}" method="post">
+					<input type="hidden" th:field="*{goalId}">
+
+					<div>
+						<label>目標名</label>
+						<input type="text" th:field="*{goalTitle}">
+					</div>
+
+					<div>
+						<label>目標説明</label>
+						<textarea th:field="*{goalSubtitle}"></textarea>
+					</div>
+
+					<div>
+						<label>目標金額</label>
+						<input type="number" th:field="*{targetAmount}" required min="1">
+						<br>
+						<span th:text="|所持金：${session.currentAmount}円|"></span>
+						<input type="hidden" name="currentAmount" th:value="${currentAmount}">
+						<span th:if="${message != null}">
+							<span th:text="${message}" style="color: red;"></span>
+						</span>
+					</div>
+
+					<div>
+						<label>目標達成期限</label>
+						<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>
+
+				</form>
+				
+			</div>
+		</div>
+	</div>
+	
+	<div th:replace="~{footer :: footer}"></div>
+
+</body>
+
+</html>

src/main/resources/templates/goal_edit.html

@@ -24,17 +24,17 @@
 
 			<div>
 				<label>目標名</label>
-				<input type="text" th:field="*{goalTitle}" required>
+				<input type="text" th:field="*{goalTitle}">
 			</div>
 
 			<div>
 				<label>目標説明</label>
-				<textarea th:field="*{goalSubtitle}" required></textarea>
+				<textarea th:field="*{goalSubtitle}"></textarea>
 			</div>
 
 			<div>
 				<label>目標金額</label>
-				<input type="number" th:field="*{targetAmount}" min="0" max="1000000000" required>
+				<input type="number" th:field="*{targetAmount}" min="1" max="1000000000" required>
 			</div>
 
 			<div>
@@ -42,12 +42,17 @@
 				<input type="date" th:field="*{deadline}" th:min="${#temporals.format(#temporals.createNow(), 'yyyy-MM-dd')}" required>
 			</div>
 			
+			<div>
+				<input type="hidden" th:field="*{goalComplete}">
+			</div>
+			
+			<button type="submit" class="btn btn-sm btn-primary w-100">更新する</button>
+			
 			</form>
 			
 		</div>
 	</div>
 	
-	<button type="submit" class="btn btn-sm btn-primary w-100">更新する</button>
 	
 	</div>
 

src/main/resources/templates/goal_record.html

@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html 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 rel="stylesheet" th:href="@{/css/style.css}">
+	<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;">
+
+	<div th:replace="~{header :: header}"></div>
+
+	<div class="main-container">
+
+		<h2 class="page-title">目標履歴</h2>
+
+
+		<div class="card shadow-sm mb-3">
+			<div class="card-body">
+				<ul>
+					<li th:each="goalForm : ${goalCompleteFormList}" class="transaction-item">
+						<div class="d-flex justify-content-between">
+							<p>
+								目標名：
+								<span class="fw-bold" th:text="${goalForm.goalTitle}">
+								</span>
+
+								<br>
+
+								目標説明：
+								<span class="fw-bold" th:text="${goalForm.goalSubtitle}">
+								</span>
+
+								<br>
+
+								目標金額：
+								<span class="fw-bold" th:text="${goalForm.targetAmount}">
+								</span>
+
+								<br>
+
+								目標達成期限：
+								<span class="fw-bold" th:text="${goalForm.deadline}">
+								</span>
+
+								<br>
+
+								状態：
+								<span class="fw-bold" th:text="${goalForm.status}">
+								</span>
+
+								<br>
+
+							</p>
+
+							</form>
+
+						</div>
+
+
+						<div class="d-flex justify-content-end gap-2 mt-3">
+
+							<form th:action="@{/goal/delete}" method="post">
+
+								<input type="hidden" name="goalId" th:value="${goalForm.goalId}">
+								<input type="hidden" name="record" th:value="1">
+
+								<button class="btn btn-sm btn-danger" type="submit">
+									削除
+								</button>
+
+							</form>
+
+						</div>
+
+					</li>
+
+				</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 th:replace="~{footer :: footer}"></div>
+
+</body>
+
+
+</html>

src/main/resources/templates/goal_view.html

@@ -1,53 +1,221 @@
 <!DOCTYPE html>
 <html 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}">
-
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.0/chart.umd.min.js"></script>
 </head>
-<body style="padding-top:80px; padding-bottom:80px;">
-	<div th:replace="~{header :: header}"></div>
 
+<body style="padding-top:80px; padding-bottom:80px;">
+
+	<div th:replace="~{header :: header}"></div>
 
 	<div class="main-container">
 
 		<h1 class="page-title">目標詳細</h1>
 
-	<table class="table">
+		<div th:if="${graphGoal != null}">
+
+			<h2 th:text="${graphGoal.goalTitle}"></h2>
+
+			<p>
+				目標金額：
+				<span th:text="${graphGoal.targetAmount}"></span>
+			</p>
+
+		</div>
+
+		<div class="card shadow-sm mb-3">
+
+			<div style="height: 400px;">
+				<canvas id="myChart"></canvas>
+			</div>
+
+		</div>
+
+		<script th:inline="javascript">
+
+			const months =
+				/*[[${achievementList.![month.monthValue]}]]*/[];
+
+			const achievementRates =
+				/*[[${achievementList.![achievementRate]}]]*/[];
+
+			const labels =
+				months.map(month => month + '月');
+
+			const myCt =
+				document.getElementById('myChart');
+
+			const myChart =
+				new Chart(myCt, {
+
+					type: 'bar',
+
+					data: {
+
+						labels: labels,
+
+						datasets: [
+							{
+								label: '達成率',
+
+								data: achievementRates,
+
+								backgroundColor:
+									'rgba(54, 162, 235, 0.5)',
+
+								borderColor:
+									'rgba(54, 162, 235, 1)',
+
+								borderWidth: 1
+							}
+						]
+					},
+
+					options: {
+
+						responsive: true,
+
+						maintainAspectRatio: false,
+
+						scales: {
+
+							y: {
+
+								beginAtZero: true,
+
+								max: 100,
+
+								ticks: {
+
+									callback: function (value) {
+										return value + '%';
+									}
+
+								}
+
+							}
+
+						}
+
+					}
+
+				});
+
+		</script>
+
+		<ul>
+
+			<li th:each="goalForm : ${goalFormList}">
+
+				<div class="d-flex justify-content-between">
+
+					<form th:action="@{/goal}" method="get" class="w-100">
+
+						<div class="table-responsive">
+
+							<table class="table mb-0">
+
+								<input type="radio" name="goalId" th:value="${goalForm.goalId}"
+									th:checked="${graphGoal != null and graphGoal.goalId == goalForm.goalId}"
+									onchange="this.form.submit()">
+
 								<tr>
 									<th>目標名</th>
-			<td th:text="${goalForm.goalTitle}"></td>
+									<td th:text="${goalForm.goalTitle}" 
+									    class="goal"></td>
 								</tr>
 
 								<tr>
-			<th>目標説明</th>
+									<th>目標説明</th >
-			<td th:text="${goalForm.goalSubtitle}"></td>
+									<td th:text="${goalForm.goalSubtitle}"
+									    class="goal"></td>
 								</tr>
+
 								<tr>
 									<th>目標金額</th>
-			<td th:text="${goalForm.targetAmount}"></td>
+									<td th:text="${goalForm.targetAmount}"
+									    class="goal"></td>
 								</tr>
+
 								<tr>
 									<th>目標達成期限</th>
-			<td th:text="${goalForm.deadline}"></td>
+									<td th:text="${goalForm.deadline}"
+									    class="goal"></td>
 								</tr>
 
 								<tr>
 									<th>達成率</th>
-			<td th:text="${goalForm.achievementRate} + '%'"></td>
+									<td th:text="${goalForm.achievementRate} + '%'"
+									    class="goal"></td>
 								</tr>
 
-		
 							</table>
 
-	<a th:href="@{/goal/edit}" class="btn btn-sm btn-primary w-100">編集する</a>
+						</div>
+
+					</form>
+
+				</div>
+
+				<div class="d-flex justify-content-end gap-2 mt-3">
+
+					<form th:action="@{/goal/edit}" method="get">
+
+						<input type="hidden" name="goalId" th:value="${goalForm.goalId}">
+
+						<button type="submit" class="btn btn-sm btn-primary">
+							編集
+						</button>
+
+					</form>
+
+					<form th:action="@{/goal/delete}" method="post">
+
+						<input type="hidden" name="goalId" th:value="${goalForm.goalId}">
+
+						<button type="submit" class="btn btn-sm btn-danger">
+							削除
+						</button>
+
+					</form>
+
+				</div>
+
+			</li>
+
+		</ul>
+
+	</div>
+
+	<div class="d-grid gap-2 mt-4">
+		
+	<form th:action="@{/goal/create}" method="get">
+
+		<button type="submit" class="btn btn-success w-100">
+			新規登録
+		</button>
+
+	</form>
+
+	<form th:action="@{/goal/record}" method="get">
+
+		<button type="submit" class="btn btn-sm btn-primary w-100">
+			履歴
+		</button>
+
+	</form>
 	
 	</div>
 
 	<div th:replace="~{footer :: footer}"></div>
 
 </body>
+
 </html>

src/main/resources/templates/header.html

@@ -1,11 +1,13 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
+
 <head>
-<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1">
+	<meta charset="UTF-8" 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>
 
 	<header th:fragment="header" class="fixed-top">
@@ -13,7 +15,7 @@
 		<nav class="navbar app-header" style="background-color: #e3f2fd;" data-bs-theme="light">
 			<div class="container-fluid">
 				<a th:href="@{/menu}" class="navbar-brand fw-bold">Monegement</a>
-			<div class="d-flex gap-2">
+				<div class="d-flex gap-2" th:if="${session.loginUser != null}">
 					<a class="btn btn-outline-primary btn-sm" th:href="@{/course}">
 						コース
 					</a>
@@ -21,10 +23,12 @@
 						プロフィール
 					</a>
 				</div>
+
 			</div>
 		</nav>
 
 	</header>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>
 </body>
+
 </html>

src/main/resources/templates/menu.html

@@ -8,10 +8,9 @@
 
 	<title>Calendar</title>
 
-	<link rel="stylesheet" th:href="@{/css/style.css}">
-
 	<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>
@@ -64,7 +63,7 @@
 					<a th:if="${week * 7 + weekDay - firstDayOfWeek + 1 >= 1
 					           and week * 7 + weekDay - firstDayOfWeek + 1 <= lastDay}" th:href="@{/transaction/detail(
 					       todayDates=${T(java.time.LocalDate).of(year, month, week * 7 + weekDay - firstDayOfWeek + 1)}
-					   )}">
+					   )}" class="a-footer">
 
 
 						<div

src/main/resources/templates/password_reset.html

@@ -38,7 +38,7 @@
                                class="form-control"
                                th:field="*{password}"
                                minlength="8"
-                               maxlength="255"
+                               maxlength="24"
                                required>
 
                     </div>
@@ -55,11 +55,15 @@
                                class="form-control"
                                th:field="*{passwordConfirm}"
                                minlength="8"
-                               maxlength="255"
+                               maxlength="24"
                                required>
 
                     </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/profile_edit.html

@@ -52,13 +52,15 @@
 
 		                <div class="mb-3">
 		                    <label class="form-label">
-		                        パスワード
+		                        生年月日
 		                    </label>
 
-		                    <input type="password"
+		                    <input type="date"
 		                           class="form-control"
-		                           value="********"
+								   id="birthDate"
-		                           disabled>
+								   name="birthDate"
+		                           th:value="*{birthDate}"
+		                           required>
 		                </div>
 
 		                <div class="mb-3">
@@ -98,17 +100,17 @@
 		                           min="0"
 								   max="10000000"
 		                           required>
-		                </div>
-
 		                </div>
 						
 						<div class="d-grid">
 							<button type="submit"
 							        class="btn btn-primary">
-	                        確認
+								編集
 							</button>
 						</div>
 
+		        	</div>
+				
 				</form>
 
 		    </div>

src/main/resources/templates/select_course.html

@@ -1,37 +1,56 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
-<head>
-<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-top:80px; padding-bottom:80px;">
-	<div th:replace="~{header :: header}"></div>
 
+<head>
+	<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: 80px;">
+	<div th:replace="~{header :: header}"></div>
 	<h1 class="page-title">コース選択</h1>
 
+	<div class="d-grid gap-2 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>
+		    </form>
+	    </th:block>
 
-	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">  
+	</th:block>
+	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" id="totalForm" method="post">
 		<button type="submit" class="btn btn-primary w-100">確定</button>
 
 		<div class="accordion" id="accordionExample">
 			<div class="accordion-item" th:each="course:${courseList}">
 				<h2 class="accordion-header d-flex align-items-center">
-			  <input type="radio" name="courseId" th:value="${course.courseId}" th:checked="${course.courseId==currentCourseId}" class="form-check-input ms-3 me-2">
+					<input type="radio" name="courseId" th:value="${course.courseId}"
-		      <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" th:data-bs-target="'#collapse' + ${course.courseId}" aria-expanded="false" aria-controls="'collapse' + ${course.courseId}">
+						th:checked="${course.courseId==currentCourseId}" class="form-check-input ms-3 me-2">
+					<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
+						th:data-bs-target="'#collapse' + ${course.courseId}" aria-expanded="false"
+						aria-controls="'collapse' + ${course.courseId}">
 						<span th:text="${course.courseName}"></span>
 					</button>
+					
+					<p th:if="${course.courseId > 6}" style="width: 120px;"><button type="button" class="btn btn-danger w-100"
+							th:attr="data-course-id=${course.courseId}" onclick="deleteCourse(this)">削除</button></p>
 				</h2>
-		    <div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
+				<div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse"
+					data-bs-parent="#accordionExample" style="padding-bottom: 120px;">
 					<div class="accordion-body">
 						<span th:text="${course.description}"></span>
 						<table class="table table-bordered">
 							<tr>
-						<th>カテゴリ名</th><th>配分(%)</th>
+								<th>カテゴリ名</th>
+								<th>配分(%)</th>
 							</tr>
-					<tr th:each="courseInfo:${courseInfoList}" th:if="${course.courseId == courseInfo.courseId}">
+							<tr th:each="courseInfo:${courseInfoList}"
+								th:if="${course.courseId == courseInfo.courseId}">
 								<td th:text="${courseInfo.categoryName}"></td>
 								<td th:text="${courseInfo.allocationRatio}"></td>
 							</tr>
@@ -41,11 +60,50 @@
 			</div>
 		</div>
 	</form>
+	</div>
 
 	<th:block th:if="${mode=='change'}">
 		<div th:replace="~{footer :: footer}"></div>
 	</th:block>
 
+	<script th:inline="javascript">
+
+		const message = /*[[${message}]]*/ null;
+
+		if (message != null) {
+			alert(message);
+		}
+
+		function deleteCourse(button) {
+
+			const courseId = button.dataset.courseId;
+
+			const totalForm = document.getElementById("totalForm");
+
+			const input = document.createElement("input");
+
+			const radioButtons = totalForm.querySelectorAll('input[name="courseId"]');
+			radioButtons.forEach(radio => {
+				radio.disabled = true;
+			});
+
+			input.type = "hidden";
+			input.name = "courseId";
+			input.value = courseId;
+
+			totalForm.appendChild(input);
+
+			totalForm.action = "/course/delete";
+			totalForm.method = "post";
+			courseId.value = courseId;
+
+			totalForm.submit();
+		}
+
+
+	</script>
+
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>
 </body>
+
 </html>

src/main/resources/templates/transaction_create.html

@@ -3,11 +3,9 @@
 
 <head>
 	<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
-	<title>Insert title here</title>
-	<link rel="stylesheet" th:href="@{/css/menu.css}">
-
 	<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-top:80px; padding-bottom:80px;">
@@ -24,44 +22,33 @@
 
 			<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" name="transactionType" required>
-	                            class="form-select"
-	                            th:field="*{transactionType}"  
-								required>
 
 							<option value="">
 								選択してください
 							</option>
 
-	                        <option value="1">
+							<option value="0">
 								支出
 							</option>
 
-	                        <option value="2">
+							<option value="1">
 								収入
 							</option>
 
@@ -71,23 +58,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>
@@ -96,30 +82,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">
 
 							登録
 
@@ -137,6 +113,71 @@
 
 	<div th:replace="~{footer :: footer}"></div>
 
+	<script th:inline="javascript">
+			const transactionType = document.getElementById("transactionType");
+			const categoryId = document.getElementById("categoryId");
+
+			const expenseList = document.getElementsByClassName("expenseListClass");
+			const incomeList = document.getElementsByClassName("incomeListClass");
+
+			const tType = '[[${session.tType}]]';
+			
+			console.log("tType: " + tType);
+			
+			if (tType.includes("0")) {
+				console.log("okokokokokokokkkokokokoko");
+				transactionType.value = "0";
+			} else if (tType.includes("1")) {
+				transactionType.value = "1";
+			}
+
+			
+			function toggleCategory() {
+
+			    if (transactionType.value === "0") {
+
+			        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 (transactionType.value === "1") {
+
+			        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";
+					}
+				}
+			}
+
+			transactionType.addEventListener("change", function () {
+
+			    toggleCategory();
+
+			    categoryId.value = "";
+
+			});
+			
+			toggleCategory();
+			
+		</script>
+
 
 </body>
 

src/main/resources/templates/transaction_detail.html

@@ -10,7 +10,7 @@
 	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
-<body>
+<body style="padding-top:80px; padding-bottom:80px;">
 
 	<div th:replace="~{header :: header}"></div>
 	<div class="main-container">
@@ -90,6 +90,7 @@
 
 	            <input type="hidden"
 	                   name="today"
+					   id="today"
 	                   th:value="${today}">
 
 	            <button class="btn btn-success w-100"
@@ -103,6 +104,47 @@
 
 	    </div>
 		
+	    <div class="d-grid mt-4">
+
+	        <form th:action="@{/fixed-cost/list}" method="get">
+
+	            <input type="hidden"
+	                   name="today"
+					   id="today"
+	                   th:value="${today}">
+
+	            <button class="btn btn-dark w-100"
+	                    type="submit">
+
+	                固定費一覧
+
+	            </button>
+
+	        </form>
+
+	    </div>
+		
+	    <div class="d-grid mt-4">
+
+	        <form th:action="@{/category/list}"
+	              method="get">
+
+	            <input type="hidden"
+	                   name="today"
+					   id="today"
+	                   th:value="${today}">
+
+	            <button class="btn btn-dark w-100"
+	                    type="submit">
+
+	                カテゴリ一覧
+
+	            </button>
+
+	        </form>
+
+	    </div>
+
 	</div>
 
 	<div th:replace="~{footer :: footer}"></div>

src/main/resources/templates/transaction_update.html

@@ -83,18 +83,33 @@
                             カテゴリ
                         </label>
 
-                        <select id="categoryId"
+<!--                        <select id="categoryId"-->
-                                class="form-select"
+<!--                                class="form-select"-->
-                                th:field="*{categoryId}"
+<!--                                th:field="*{categoryId}"-->
-								required>
+<!--								required>-->
+
+<!--                            <option value="">-->
+<!--                                選択してください-->
+<!--                            </option>-->
+
+<!--                            <option th:each="category : ${categoryFormList}"-->
+<!--                                    th:value="${category.categoryId}"-->
+<!--                                    th:text="${category.categoryName}">-->
+<!--                            </option>-->
+
+<!--                        </select>-->
+						<select id="categoryId" 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>
@@ -141,6 +156,68 @@
     <div th:replace="~{footer :: footer}">
     </div>
 
+	<script th:inline="javascript">
+		const transactionType = document.getElementById("transactionType");
+		const categoryId = document.getElementById("categoryId");
+
+		const expenseList = document.getElementsByClassName("expenseListClass");
+		const incomeList = document.getElementsByClassName("incomeListClass");
+
+		const tType = '[[${session.tType}]]';
+		
+		function toggleCategory() {
+
+		    if (transactionType.value === "0") {
+
+		        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 (transactionType.value === "1") {
+
+		        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";
+				}
+			}
+		}
+
+		transactionType.addEventListener("change", function () {
+
+		    toggleCategory();
+
+		    categoryId.value = "";
+
+		});
+		
+		if (tType == "0") {
+			transactionType.value = "0";
+		} else if (tType == "1") {
+			transactionType.value = "1";
+		}
+		
+		toggleCategory();
+		
+	</script>
+
+	
 </body>
 
 </html>

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

@@ -39,15 +39,15 @@
 			<div class="mb-3">
 				<label for="password" class="form-label">パスワード</label>
 				<input type="password" id="password" class="form-control" name="password" th:value="*{password}" minlength="8"
-					maxlength="255" required readonly>
+					maxlength="24" required readonly>
 			</div>
 
 			<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,12 +1,14 @@
 <!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">
+	<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
-<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>
 	<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="255"
-				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>
+						<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>