15 Commits

Author SHA1 Message Date
7e2017a341 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-30 10:09:39 +09:00
26c9be6f71 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 16:09:02 +09:00
181adcd933 Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 16:08:33 +09:00
2ed56f2413 Merge branch 's-choi' 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
2026-09-29 15:30:27 +09:00
baab2a822d Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 15:14:27 +09:00
25986b455e Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 14:48:11 +09:00
c7a33c997c Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 14:38:02 +09:00
3818da7b4e Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 14:37:39 +09:00
f37dd792a0 Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 13:36:21 +09:00
109b8125d6 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 11:15:57 +09:00
626c4d6721 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 11:00:49 +09:00
e43958a1fb Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 10:55:27 +09:00
57a76ae044 no message 2026-09-29 10:24:55 +09:00
4880a4285e Merge branch 's-choi' 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
2026-09-29 10:24:41 +09:00
03b1b7d982 [EDIT]バグ修正 2026-09-29 10:22:58 +09:00
2 changed files with 19 additions and 18 deletions

View File

@@ -49,7 +49,7 @@ public class GlobalExceptionHandler {
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e); 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(); session.invalidate();
return TransitionTargetPageNameKeyword.ERROR_HTML; return TransitionTargetPageNameKeyword.ERROR_HTML;
@@ -61,7 +61,7 @@ public class GlobalExceptionHandler {
e.printStackTrace(); e.printStackTrace();
System.out.println("session invalidated exception"); System.out.println("session invalidated exception");
// session.invalidate(); session.invalidate();
return TransitionTargetPageNameKeyword.ERROR_HTML; return TransitionTargetPageNameKeyword.ERROR_HTML;
} }
} }

View File

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