Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto

# Conflicts:
#	src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java

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

@@ -49,7 +49,7 @@ public class GlobalExceptionHandler {
 
 		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
 		
-		System.out.println("session invalidated");
+		System.out.println("session invalidated method not supported exception");
     	session.invalidate();
 
 		return TransitionTargetPageNameKeyword.ERROR_HTML;

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

@@ -8,4 +8,6 @@ public interface AllocationService {
 	
 	public List<AllocationModel> findAll();
 	
+	public List<AllocationModel> save(List<AllocationModel> allocationModelList);
+
 }

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

@@ -3,7 +3,6 @@ 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 {
 	
@@ -13,14 +12,12 @@ public interface CourseService {
 	
 	public Long findByName(String courName);
 	
-	public CourseModel save(CourseModel courseModel, Long userId, AllocationFormList allocationFormList);
+	public CourseModel save(CourseModel courseModel, Long userId);
 
 	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/impl/AllocationServiceImpl.java

@@ -1,5 +1,6 @@
 package com.example.demo.app.domain.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
@@ -25,5 +26,26 @@ public class AllocationServiceImpl implements AllocationService {
 		return AllocationEntity.createAllocationModelList(allocationRepository.findAll());
 	}
 
+	public List<AllocationModel> save(List<AllocationModel> allocationModelList) {
+
+		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> result = new ArrayList<>();
+		for (AllocationEntity allocationEntity : allocationEntityList) {
+			result.add(AllocationModel.convertFrom(allocationRepository.save(allocationEntity)));
+		}
+
+		
+		return result;
+	}
 
 }

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

@@ -7,19 +7,14 @@ 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;
 
@@ -27,121 +22,53 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class CourseServiceImpl implements CourseService {
 
-	private final AllocationRepository allocationRepository;
-
 	private final CourseRepository courseRepository;
 	private final UserRepository userRepository;
 	private final CourseOwnerRepository courseOwnerRepository;
-	private final CategoryRepository categoryRepository;
-
-	public List<CourseModel> findAll() {
-
+	
+	public List<CourseModel> findAll(){
+		
 		return CourseEntity.createCourseModelList(courseRepository.findAll());
 	}
-
-	public List<CourseModel> findAllByUserId(Long userId) {
-
+	
+	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));
 	}
-
+	
 	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());
-		});
-
+	public CourseModel save(CourseModel courseModel, Long userId) {
+		
+		 List<UserEntity> userEntityList = new ArrayList<>();
+		 userEntityList.add(userRepository.findById(userId).get());
+		CourseEntity result = courseRepository.save( CourseModel.convertTo(courseModel));
+		
 		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";
-		}
-		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/infra/repository/AllocationRepository.java

@@ -3,7 +3,6 @@ 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,9 +28,5 @@ public interface AllocationRepository extends JpaRepository<AllocationEntity, Al
 			+ " ORDER BY a.courseEntity.courseId ASC, "
 			+ " 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/CourseOwnerRepository.java

@@ -1,15 +1,9 @@
 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/presentation/controller/CourseController.java

@@ -13,6 +13,7 @@ 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.AllocationModel;
 import com.example.demo.app.domain.model.CourseModel;
 import com.example.demo.app.domain.model.LoginModel;
 import com.example.demo.app.domain.service.AllocationService;
@@ -110,44 +111,48 @@ public class CourseController {
 
 		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
-		model.addAttribute("courseForm", courseForm);
+		CourseForm form = CourseForm
+				.convertFrom(courseService.save(CourseForm.convertTo(courseForm), loginUser.getUserId()));
+
+		session.setAttribute(PageReturnAttributeKeyword.COURSE_ID, form.getCourseId());
 
 		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);
+	public String createCoursePost(@ModelAttribute AllocationFormList allocationFormList, HttpSession session) {
 
-		courseService.save(CourseForm.convertTo(courseForm), loginUser.getUserId(), allocationFormList);
+		List<AllocationModel> allocationModelList = new ArrayList<>();
+
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId4(),
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
+				allocationFormList.getAllocationRatio4()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId5(),
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
+				allocationFormList.getAllocationRatio5()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId6(),
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
+				allocationFormList.getAllocationRatio6()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId7(),
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
+				allocationFormList.getAllocationRatio7()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId8(),
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
+				allocationFormList.getAllocationRatio8()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId9(),
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
+				allocationFormList.getAllocationRatio9()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId10(),
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
+				allocationFormList.getAllocationRatio10()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId11(),
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
+				allocationFormList.getAllocationRatio11()));
+
+		allocationService.save(allocationModelList);
 
 		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("ok")) {
-			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
-		}
-		model.addAttribute("message", "エラーが発生しました");
-
-		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
-
-	}
-
 }

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

@@ -57,8 +57,6 @@ public class GoalController {
 
 		Long userId = loginUser.getUserId();
 
-		LocalDate today = LocalDate.now();
-
 		goalService.updateGoalComplete(userId);
 
 		List<GoalModel> goalModelList = goalService.getGoalByUserId(userId);
@@ -66,8 +64,7 @@ public class GoalController {
 		List<GoalForm> goalFormList1 = GoalForm.convertFrom(goalModelList);
 
 		List<GoalForm> goalFormList = goalFormList1.stream()
-				.filter(goalForm -> goalForm.getGoalComplete() == 0
-						&& !goalForm.getDeadline().isBefore(today))
+				.filter(goalForm -> goalForm.getGoalComplete() == 0)
 				.collect(Collectors.toList());
 
 		model.addAttribute(
@@ -110,6 +107,8 @@ public class GoalController {
 				1,
 				1);
 
+		LocalDate today = LocalDate.now();
+
 		Map<LocalDate, List<TransactionForm>> transactionFormMap = new HashMap<>();
 
 		transactionService
@@ -234,14 +233,15 @@ public class GoalController {
 	@GetMapping(TransitionTargetPageNameKeyword.EDIT)
 	public String editGoal(Model model, HttpSession session, Long goalId) {
 		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
-
+		
 		Long userId = loginUser.getUserId();
-
+				
 		GoalForm goalForm = GoalForm.convertFrom(goalService.getGoalById(goalId));
+		
 
 		model.addAttribute(PageReturnAttributeKeyword.GOAL_FORM, goalForm);
 		return TransitionTargetPageNameKeyword.GOAL_EDIT_HTML;
-
+		
 	}
 
 	@SessionCheck
@@ -272,11 +272,11 @@ public class GoalController {
 		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 		Long userId = loginUser.getUserId();
-
+		
 		int currentAmount = goalService.getCurrentAmount(userId);
-
+		
 		model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
-
+		
 		return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
 	}
 
@@ -305,8 +305,7 @@ public class GoalController {
 		if (record == null) {
 			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
 		} else {
-			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL
-					+ TransitionTargetPageNameKeyword.RECORD;
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL + TransitionTargetPageNameKeyword.RECORD;
 		}
 
 	}
@@ -315,8 +314,6 @@ public class GoalController {
 	@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();
@@ -328,13 +325,7 @@ public class GoalController {
 		List<GoalForm> goalCompleteFormList = new ArrayList<>();
 
 		goalFormList.stream().forEach(goalForm -> {
-			if (goalForm.getGoalComplete() == 1 || goalForm.getDeadline().isBefore(today)) {
-
-				goalForm.setStatus(
-						goalForm.getGoalComplete() == 1
-								? "達成"
-								: "未達成");
-
+			if (goalForm.getGoalComplete() == 1) {
 				goalCompleteFormList.add(goalForm);
 			}
 		});

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

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

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

@@ -29,8 +29,6 @@ public class GoalForm {
 
 	private Integer goalComplete;
 	
-	private String status;
-	
 	private Integer achievementRate; // 達成率
 	
 	private Integer currentAmount; // 現在の資産
@@ -45,7 +43,6 @@ public class GoalForm {
 				goalModel.getTargetAmount(),
 				goalModel.getDeadline(),
 				goalModel.getGoalComplete(),
-				null,
 				goalModel.getAchievementRate(),
 				goalModel.getCurrentAmount(),
 				goalModel.getUserId());

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

@@ -46,10 +46,6 @@ body {
     border-top: 1px solid #d0d7de;
 }
 
-.a-footer {
-	text-decoration: none;
-}
-
 /* =======================
    カード
 ======================= */
@@ -182,10 +178,6 @@ td:hover {
     text-align: right;
 }
 
-.a-calender {
-	text-decoration: none;
-}
-
 /* =======================
    金額表示
 ======================= */

src/main/resources/templates/course_create_ratio.html

@@ -24,66 +24,60 @@
 
 					<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>
+						<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>
+						<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>
+						<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>
+						<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>
+						<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>
+						<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>
+						<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>
+						<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>
@@ -94,40 +88,32 @@
 						<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>
+				</form>
 			</div>
 		</div>
 	</div>
-	</div>
 
 	<div th:replace="~{footer :: footer}"></div>
-
+	
 	<script>
-
-		function inputChange() {
-			let total = 0;
-
-			for (let i = 4; i <= 11; i++) {
+		
+		function inputChange(){
+			let total=0;
+			
+			for(let i=4; i<=11; i++){
 				total += Number(document.getElementById(`allocationRatio${i}`).value || 0);
-				if (total == 100) {
+				if(total == 100){
 					document.getElementById('submit').disabled = false;
-				} else {
+				}else{
 					document.getElementById('submit').disabled = true;
 				}
 			}
-
-
+			
+			
 			document.getElementById("allocationRatioTotal").value = total;
-
+			
 		}
-
+		
 	</script>
 
 </body>

src/main/resources/templates/fixed_cost.html

@@ -58,7 +58,7 @@
 		</div>
 		<div class="d-grid mt-4">
 
-			<form th:action="@{/fixed-cost/create}" method="get">
+			<form th:action="@{/category/create}" method="get">
 
 				<input type="hidden"
 					   name="today"

src/main/resources/templates/fixed_cost_create.html

@@ -37,7 +37,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="transactionType">収入・支出</label>
 
-						<select class="form-select" id="transactionType" required>
+						<select class="form-select" id="transactionType">
 
 							<option value="">選択してください</option>
 							<option value="0">支出</option>
@@ -51,7 +51,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="categoryId">カテゴリ</label>
 
-						<select class="form-select" id="categoryId" th:field="*{categoryId}" required>
+						<select class="form-select" id="categoryId" th:field="*{categoryId}">
 							<option value="">選択してください</option>
 
 							<option class="expenseListClass" th:each="category : ${expenseList}"

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

src/main/resources/templates/goal_record.html

@@ -47,12 +47,6 @@
 
 								<br>
 
-								状態：
-								<span class="fw-bold" th:text="${goalForm.status}">
-								</span>
-
-								<br>
-
 							</p>
 
 							</form>

src/main/resources/templates/menu.html

@@ -63,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/select_course.html

@@ -23,13 +23,6 @@
 	    </th:block>
 	
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
-	<th:block th:if="${mode == 'change'}">
-		<form th:action="@{/course/create}" method="get">
-			<button type="submit">新規登録</button>
-		</form>
-
-	</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">
@@ -42,8 +35,6 @@
 						aria-controls="'collapse' + ${course.courseId}">
 						<span th:text="${course.courseName}"></span>
 					</button>
-					<p 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" style="padding-bottom: 120px;">
@@ -71,43 +62,6 @@
 		<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>
 

src/main/resources/templates/transaction_create.html

@@ -113,66 +113,58 @@
 
 	<div th:replace="~{footer :: footer}"></div>
 
-	<script th:inline="javascript">
-			const transactionType = document.getElementById("transactionType");
-			const categoryId = document.getElementById("categoryId");
+	<script inline="javascript">
+		const transactionType = document.getElementById("transactionType");
+		const categoryId = document.getElementById("categoryId");
 
-			const expenseList = document.getElementsByClassName("expenseListClass");
-			const incomeList = document.getElementsByClassName("incomeListClass");
+		const expenseList = document.getElementsByClassName("expenseListClass");
+		const incomeList = document.getElementsByClassName("incomeListClass");
 
-			const tType = '[[${session.tType}]]';
-			
-			function toggleCategory() {
+		const tType = '[[${session.tType}]]';
+		
+		if (tType == "0") {
+			transactionType.value = 0;
+		} else if (tType == "1") {
+			transactionType.value = 1;
+		}
+		
+		
+		transactionType.addEventListener("change", function () {
 
-			    if (transactionType.value === "0") {
+			if (this.value === "0") {
 
-			        for (let i = 0; i < expenseList.length; i++) {
-			            expenseList[i].style.display = "";
-			        }
+				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";
-			        }
+				for (let i = 0; i < incomeList.length; i++) {
+					incomeList[i].style.display = "none";
+				}
 
-			    } else if (transactionType.value === "1") {
+			} else if (this.value === "1") {
 
-			        for (let i = 0; i < expenseList.length; i++) {
-			            expenseList[i].style.display = "none";
-			        }
+				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 = "";
-			        }
+				for (let i = 0; i < incomeList.length; i++) {
+					incomeList[i].style.display = "";
+				}
 
-			    } else {
+			} else {
 
-					for (let i = 0; i < expenseList.length; i++) {
-						expenseList[i].style.display = "none";
-					}
+				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";
-					}
+				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>
+			categoryId.value = "";
+		});
+	</script>
 
 
 </body>

src/main/resources/templates/transaction_update.html

@@ -83,36 +83,21 @@
                             カテゴリ
                         </label>
 
-<!--                        <select id="categoryId"-->
-<!--                                class="form-select"-->
-<!--                                th:field="*{categoryId}"-->
-<!--								required>-->
+                        <select id="categoryId"
+                                class="form-select"
+                                th:field="*{categoryId}"
+								required>
 
-<!--                            <option value="">-->
-<!--                                選択してください-->
-<!--                            </option>-->
+                            <option value="">
+                                選択してください
+                            </option>
 
-<!--                            <option th:each="category : ${categoryFormList}"-->
-<!--                                    th:value="${category.categoryId}"-->
-<!--                                    th:text="${category.categoryName}">-->
-<!--                            </option>-->
+                            <option 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 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>
+                        </select>
 
                     </div>
 
@@ -156,68 +141,6 @@
     <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>