From ac101172d26cdd831a6b9c3e6b91989ca119b8cb Mon Sep 17 00:00:00 2001 From: n-kawahito Date: Mon, 28 Sep 2026 15:35:30 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[EDIT]=E7=94=9F=E5=B9=B4=E6=9C=88=E6=97=A5?= =?UTF-8?q?=E3=81=AE=E6=83=85=E5=A0=B1=E5=8F=96=E5=BE=97=E7=94=A8=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=81=AE=E8=BF=BD=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/app/presentation/controller/ProfileController.java | 1 + .../example/demo/app/presentation/form/ProfileEditForm.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/example/demo/app/presentation/controller/ProfileController.java b/src/main/java/com/example/demo/app/presentation/controller/ProfileController.java index a78c133..44fd3eb 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/ProfileController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/ProfileController.java @@ -54,6 +54,7 @@ public class ProfileController { new ProfileEditForm( profileModel.getUserName(), profileModel.getMailAddress(), + profileModel.getBirthDate(), profileModel.getSaving(), profileModel.getAnnualIncome(), profileModel.getMonthlyBudget()); diff --git a/src/main/java/com/example/demo/app/presentation/form/ProfileEditForm.java b/src/main/java/com/example/demo/app/presentation/form/ProfileEditForm.java index 78d3e81..fe1751c 100644 --- a/src/main/java/com/example/demo/app/presentation/form/ProfileEditForm.java +++ b/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; From 154e6787d4a253cd199c33785a61422c73ba829f Mon Sep 17 00:00:00 2001 From: n-kawahito Date: Mon, 28 Sep 2026 15:37:41 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[FIX]=E5=8F=96=E5=BC=95=E6=96=B0=E8=A6=8F?= =?UTF-8?q?=E7=99=BB=E9=8C=B2=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E4=B8=80?= =?UTF-8?q?=E3=81=A4=E3=81=AB=E3=81=97=E3=80=81=E3=83=87=E3=82=B6=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=82=92=E7=B5=B1=E4=B8=80=E3=81=97=E3=81=BE=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/error.html | 6 -- .../templates/transaction_detail.html | 56 ++++++++++++++----- 2 files changed, 42 insertions(+), 20 deletions(-) diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html index ab0bd32..4d094da 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/error.html @@ -6,12 +6,6 @@ - -
-
- - -
diff --git a/src/main/resources/templates/transaction_detail.html b/src/main/resources/templates/transaction_detail.html index 69a14e1..fcb9351 100644 --- a/src/main/resources/templates/transaction_detail.html +++ b/src/main/resources/templates/transaction_detail.html @@ -90,6 +90,7 @@ + + + + + +
+ +
+ + + + + +
+ +
- -
- - -
-
- - -
-
- - -
-
From efdaacbb27c051665e9e6d09bc3546e5887e5b53 Mon Sep 17 00:00:00 2001 From: s-choi Date: Mon, 28 Sep 2026 15:51:16 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[FIX]=20=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=A7=E3=82=BB=E3=83=83=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E5=BB=83=E6=A3=84=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/aop/handler/GlobalExceptionHandler.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java b/src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java index c8fc40a..830c07b 100644 --- a/src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java +++ b/src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java @@ -4,6 +4,8 @@ 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; @@ -37,25 +39,31 @@ public class GlobalExceptionHandler { } @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("status", HttpStatus.BAD_REQUEST.value()); e.printStackTrace(); LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e); + + System.out.println("session invalidated"); + session.invalidate(); return "error"; } @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"); + session.invalidate(); + return "error"; } } From e3af89a6947159cee4c4e07601fddd677f861b28 Mon Sep 17 00:00:00 2001 From: s-choi Date: Mon, 28 Sep 2026 16:03:19 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[STYLE]=20=E3=82=B3=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E4=B8=80=E8=A6=A7=E3=81=AE=E4=B8=8B=E9=83=A8=E3=81=AE=E9=96=93?= =?UTF-8?q?=E9=9A=94=E3=82=92=E8=AA=BF=E6=95=B4=E3=81=97=E3=81=BE=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/select_course.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html index aa8b300..b3ed7fa 100644 --- a/src/main/resources/templates/select_course.html +++ b/src/main/resources/templates/select_course.html @@ -8,7 +8,7 @@ コース選択 - +

コース選択

From 7aa8e31bfd4530e68df263053fd2e47e45d3bbf3 Mon Sep 17 00:00:00 2001 From: s-choi Date: Mon, 28 Sep 2026 16:04:31 +0900 Subject: [PATCH 5/8] =?UTF-8?q?[EDIT]=20=E3=83=97=E3=83=AD=E3=83=95?= =?UTF-8?q?=E3=82=A3=E3=83=BC=E3=83=AB=E7=B7=A8=E9=9B=86=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=AE=E9=A0=85=E7=9B=AE=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97?= =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82=EF=BC=88=E3=83=91=E3=82=B9?= =?UTF-8?q?=E3=83=AF=E3=83=BC=E3=83=89=E2=86=92=E7=94=9F=E5=B9=B4=E6=9C=88?= =?UTF-8?q?=E6=97=A5=EF=BC=89=E3=80=81=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE?= =?UTF-8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82=EF=BC=88=E7=A2=BA?= =?UTF-8?q?=E8=AA=8D=E2=86=92=E7=A2=BA=E5=AE=9A=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/domain/service/impl/ProfileServiceImpl.java | 1 + .../presentation/controller/ProfileController.java | 3 ++- .../demo/app/presentation/form/ProfileEditForm.java | 3 +++ src/main/resources/templates/profile_edit.html | 12 +++++++----- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/example/demo/app/domain/service/impl/ProfileServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/ProfileServiceImpl.java index c356dc2..9832d9b 100644 --- a/src/main/java/com/example/demo/app/domain/service/impl/ProfileServiceImpl.java +++ b/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); } } diff --git a/src/main/java/com/example/demo/app/presentation/controller/ProfileController.java b/src/main/java/com/example/demo/app/presentation/controller/ProfileController.java index a78c133..6c58578 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/ProfileController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/ProfileController.java @@ -56,7 +56,8 @@ public class ProfileController { profileModel.getMailAddress(), profileModel.getSaving(), profileModel.getAnnualIncome(), - profileModel.getMonthlyBudget()); + profileModel.getMonthlyBudget(), + profileModel.getBirthDate()); model.addAttribute(PageReturnAttributeKeyword.PROFILE_EDIT_FORM, profileEditForm); return TransitionTargetPageNameKeyword.PROFILE_EDIT_HTML; diff --git a/src/main/java/com/example/demo/app/presentation/form/ProfileEditForm.java b/src/main/java/com/example/demo/app/presentation/form/ProfileEditForm.java index 78d3e81..f20762b 100644 --- a/src/main/java/com/example/demo/app/presentation/form/ProfileEditForm.java +++ b/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; @@ -13,4 +15,5 @@ public class ProfileEditForm { private Integer saving; private Integer annualIncome; private Integer monthlyBudget; + private LocalDate birthDate; } diff --git a/src/main/resources/templates/profile_edit.html b/src/main/resources/templates/profile_edit.html index 7902a3a..c0598f7 100644 --- a/src/main/resources/templates/profile_edit.html +++ b/src/main/resources/templates/profile_edit.html @@ -52,13 +52,15 @@
- + id="birthDate" + name="birthDate" + th:value="*{birthDate}" + required>
@@ -105,7 +107,7 @@
From fd74dee965e92fc51ee42f53f73cce03930ccc3d Mon Sep 17 00:00:00 2001 From: s-choi Date: Mon, 28 Sep 2026 16:32:02 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[FIX]=20=E5=9B=BA=E5=AE=9A=E8=B2=BB?= =?UTF-8?q?=E3=81=A7=E7=99=BB=E9=8C=B2=E3=81=99=E3=82=8B=E9=9A=9B=E3=80=81?= =?UTF-8?q?=E5=8F=8E=E6=94=AF=E5=8C=BA=E5=88=86=E3=81=8C=E8=87=AA=E5=8B=95?= =?UTF-8?q?=E3=81=A7=E5=85=A5=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TransactionController.java | 2 ++ src/main/resources/templates/fixed_cost_create.html | 2 ++ .../resources/templates/transaction_create.html | 13 +++++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java index 009acc8..b81c0ff 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java @@ -237,6 +237,8 @@ public class TransactionController { model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList); model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm); + + session.setAttribute("tType", String.valueOf(transactionForm.getTransactionType())); model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList); diff --git a/src/main/resources/templates/fixed_cost_create.html b/src/main/resources/templates/fixed_cost_create.html index a004f50..c6397e9 100644 --- a/src/main/resources/templates/fixed_cost_create.html +++ b/src/main/resources/templates/fixed_cost_create.html @@ -83,6 +83,7 @@
+