4 Commits

Author SHA1 Message Date
8de220ca8e [DELETE] deleteFlagを削除しました。 2026-09-28 16:47:41 +09:00
f6b03e789d 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/transaction_detail.html
2026-09-28 16:41:52 +09:00
s-choi
0687a1837e [STYLE] 重複コードを削除しました。 2026-09-28 16:40:38 +09:00
s-choi
2a4150c883 [STYLE] 重複コードを削除しました。 2026-09-28 16:37:04 +09:00
5 changed files with 56 additions and 60 deletions

View File

@@ -57,7 +57,7 @@ public class GoalModel {
goalModel.getTargetAmount(), goalModel.getTargetAmount(),
goalModel.getDeadline(), goalModel.getDeadline(),
0, 0,
userEntity, 0); userEntity);
} }
public static GoalModel convertFrom(GoalForm goalForm) { public static GoalModel convertFrom(GoalForm goalForm) {

View File

@@ -47,6 +47,4 @@ public class GoalEntity {
@JoinColumn(name = "user_id") @JoinColumn(name = "user_id")
private UserEntity userEntity; private UserEntity userEntity;
private Integer deleteFlag;
} }

View File

@@ -57,8 +57,7 @@ public class ProfileController {
profileModel.getBirthDate(), profileModel.getBirthDate(),
profileModel.getSaving(), profileModel.getSaving(),
profileModel.getAnnualIncome(), profileModel.getAnnualIncome(),
profileModel.getMonthlyBudget(), profileModel.getMonthlyBudget());
profileModel.getBirthDate());
model.addAttribute(PageReturnAttributeKeyword.PROFILE_EDIT_FORM, profileEditForm); model.addAttribute(PageReturnAttributeKeyword.PROFILE_EDIT_FORM, profileEditForm);
return TransitionTargetPageNameKeyword.PROFILE_EDIT_HTML; return TransitionTargetPageNameKeyword.PROFILE_EDIT_HTML;

View File

@@ -16,5 +16,4 @@ public class ProfileEditForm {
private Integer saving; private Integer saving;
private Integer annualIncome; private Integer annualIncome;
private Integer monthlyBudget; private Integer monthlyBudget;
private LocalDate birthDate;
} }