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/app/presentation/controller/TransactionController.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/impl/CourseServiceImpl.java

@@ -133,8 +133,6 @@ public class CourseServiceImpl implements CourseService {
 		System.out.println("***********************ここでエラー1");
 		if (userEntity.getCourseEntity().getCourseId() == courseId) {
 			return "selected";
-		} else if (courseId <= 6) {
-			return "original";
 		}
 		System.out.println("***********************ここでエラー2");
 		allocationRepository.deleteByCourseId(courseId);

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

@@ -141,10 +141,6 @@ public class CourseController {
 
 			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;
 		}

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

@@ -430,6 +430,7 @@ public class TransactionController {
 		UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
 
 		List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0 && goal.getDeadline().isAfter(today) )
+
 				.collect(Collectors.toList());
 
 		if (!resultList.isEmpty()) {

src/main/resources/templates/select_course.html

@@ -36,8 +36,7 @@
 						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"
+					<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"