2 Commits

Author SHA1 Message Date
kkazuya
ff21efa943 [EDIT] 全コントローラに定数を反映させました。 2026-09-25 14:59:27 +09:00
kkazuya
a0ef7145d2 [FIX] 定数クラスの誤字を修正しました。 2026-09-25 14:58:09 +09:00
12 changed files with 220 additions and 182 deletions

View File

@@ -13,6 +13,9 @@ import com.example.demo.aop.aspect.SessionCheck;
import com.example.demo.app.domain.model.AnalysisModel; import com.example.demo.app.domain.model.AnalysisModel;
import com.example.demo.app.domain.model.LoginModel; import com.example.demo.app.domain.model.LoginModel;
import com.example.demo.app.domain.service.AnalysisService; import com.example.demo.app.domain.service.AnalysisService;
import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.demo.app.presentation.form.AnalysisForm; import com.example.demo.app.presentation.form.AnalysisForm;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -25,7 +28,7 @@ public class AnalysisController {
private final AnalysisService analysisService; private final AnalysisService analysisService;
@SessionCheck @SessionCheck
@GetMapping("/analysis") @GetMapping(TransitionTargetPageNameKeyword.ANALYSIS)
public String showAnalysis( public String showAnalysis(
@RequestParam(required = false) Integer year, @RequestParam(required = false) Integer year,
@RequestParam(required = false) Integer month, @RequestParam(required = false) Integer month,
@@ -33,7 +36,7 @@ public class AnalysisController {
HttpSession session) { HttpSession session) {
//ログインユーザーの取得(セッション) //ログインユーザーの取得(セッション)
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
//初期年月表示 //初期年月表示
LocalDate nowDate = LocalDate.now(); LocalDate nowDate = LocalDate.now();
@@ -58,15 +61,15 @@ public class AnalysisController {
AnalysisForm analysisForm = AnalysisForm.convertFrom(analysisModel); AnalysisForm analysisForm = AnalysisForm.convertFrom(analysisModel);
//model格納 //model格納
model.addAttribute("analysisForm", analysisForm); model.addAttribute(PageReturnAttributeKeyword.ANALYSIS_FORM, analysisForm);
model.addAttribute("year", year); model.addAttribute(PageReturnAttributeKeyword.YEAR, year);
model.addAttribute("month", month); model.addAttribute(PageReturnAttributeKeyword.MONTH, month);
model.addAttribute("previousYear", previousDate.getYear()); model.addAttribute(PageReturnAttributeKeyword.PREVIOUS_YEAR, previousDate.getYear());
model.addAttribute("previousMonth", previousDate.getMonthValue()); model.addAttribute(PageReturnAttributeKeyword.PREVIOUS_MONTH, previousDate.getMonthValue());
model.addAttribute("nextYear", nextDate.getYear()); model.addAttribute(PageReturnAttributeKeyword.NEXT_YEAR, nextDate.getYear());
model.addAttribute("nextMonth", nextDate.getMonthValue()); model.addAttribute(PageReturnAttributeKeyword.NEXT_MONTH, nextDate.getMonthValue());
return "analysis"; return TransitionTargetPageNameKeyword.ANALYSIS_HTML;
} }
} }

View File

@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import com.example.demo.app.domain.model.AuthenticationModel; import com.example.demo.app.domain.model.AuthenticationModel;
import com.example.demo.app.domain.service.AuthenticationService; import com.example.demo.app.domain.service.AuthenticationService;
import com.example.demo.app.infra.repository.QuestionRepository; import com.example.demo.app.infra.repository.QuestionRepository;
import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.demo.app.presentation.form.AuthenticationForm; import com.example.demo.app.presentation.form.AuthenticationForm;
import com.example.demo.app.presentation.form.PasswordResetForm; import com.example.demo.app.presentation.form.PasswordResetForm;
@@ -22,16 +24,16 @@ public class AuthenticationController {
private final AuthenticationService authenticationService; private final AuthenticationService authenticationService;
private final QuestionRepository questionRepository; private final QuestionRepository questionRepository;
@GetMapping("/authentication") @GetMapping(TransitionTargetPageNameKeyword.AUTHENTICATION)
public String showAuthentication(Model model) { public String showAuthentication(Model model) {
model.addAttribute("authenticationForm", new AuthenticationForm()); model.addAttribute(PageReturnAttributeKeyword.AUTHENTICATION_FORM, new AuthenticationForm());
model.addAttribute("questionList", questionRepository.findAll()); model.addAttribute(PageReturnAttributeKeyword.QUESTION_LIST, questionRepository.findAll());
return "authentication"; return TransitionTargetPageNameKeyword.AUTHENTICATION_HTML;
} }
@PostMapping("/authentication") @PostMapping(TransitionTargetPageNameKeyword.AUTHENTICATION)
public String authenticate( public String authenticate(
AuthenticationForm authenticationForm, AuthenticationForm authenticationForm,
Model model, Model model,
@@ -41,21 +43,21 @@ public class AuthenticationController {
authenticationService.authenticate(authenticationForm); authenticationService.authenticate(authenticationForm);
if (authenticationModel == null) { if (authenticationModel == null) {
model.addAttribute("errorMessage", "認証情報が正しくありません。"); model.addAttribute(PageReturnAttributeKeyword.ERROR_MESSAGE, "認証情報が正しくありません。");
model.addAttribute("questionList", questionRepository.findAll()); model.addAttribute(PageReturnAttributeKeyword.QUESTION_LIST, questionRepository.findAll());
return "authentication"; return TransitionTargetPageNameKeyword.AUTHENTICATION_HTML;
} }
session.setAttribute( session.setAttribute(
"passwordResetUserId", PageReturnAttributeKeyword.PASSWOR_RESET_USER_ID,
authenticationModel.getUserId()); authenticationModel.getUserId());
model.addAttribute( model.addAttribute(
"passwordResetForm", PageReturnAttributeKeyword.PASSWOR_RESET_FORM,
new PasswordResetForm()); new PasswordResetForm());
return "password_reset"; return TransitionTargetPageNameKeyword.PASSWORD_RESET_HTML;
} }
} }

View File

@@ -14,6 +14,9 @@ import com.example.demo.app.domain.model.LoginModel;
import com.example.demo.app.domain.service.CourseInfoService; import com.example.demo.app.domain.service.CourseInfoService;
import com.example.demo.app.domain.service.CourseService; import com.example.demo.app.domain.service.CourseService;
import com.example.demo.app.domain.service.UserService; import com.example.demo.app.domain.service.UserService;
import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.demo.app.presentation.form.CourseForm; import com.example.demo.app.presentation.form.CourseForm;
import com.example.demo.app.presentation.form.CourseInfoForm; import com.example.demo.app.presentation.form.CourseInfoForm;
import com.example.demo.app.presentation.form.UserForm; import com.example.demo.app.presentation.form.UserForm;
@@ -30,51 +33,53 @@ public class CourseController {
private final UserService userService; private final UserService userService;
@PostMapping("/user/register/course") @PostMapping(TransitionTargetPageNameKeyword.SHOW_SELECT_COURSE)
public String showSelectCourse(@ModelAttribute UserForm userForm, Model model, HttpSession session) { public String showSelectCourse(@ModelAttribute UserForm userForm, Model model, HttpSession session) {
final String MODE = "regist";
final String DEFAULT = "バランスコース";
session.setAttribute(PageReturnAttributeKeyword.USER_FORM, userForm);
model.addAttribute(PageReturnAttributeKeyword.MODE, MODE);
model.addAttribute(PageReturnAttributeKeyword.CURRENT_COURSE_ID, courseService.findByName(DEFAULT));
model.addAttribute(PageReturnAttributeKeyword.COURSE_LIST, CourseForm.convertFrom(courseService.findAll()));
model.addAttribute(PageReturnAttributeKeyword.COURSE_INFO_LIST, CourseInfoForm.convertFrom(courseInfoService.findAll()));
session.setAttribute("userForm", userForm); return TransitionTargetPageNameKeyword.SELECT_COURSE_HTML;
model.addAttribute("mode", "regist");
model.addAttribute("currentCourseId", courseService.findByName("バランスコース"));
model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll()));
model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll()));
return "select_course";
} }
@SessionCheck @SessionCheck
@GetMapping("/course") @GetMapping(TransitionTargetPageNameKeyword.COURSE)
public String showChangeCourse(Model model, HttpSession session) { public String showChangeCourse(Model model, HttpSession session) {
final String MODE = "change";
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
Long userId = loginUser.getUserId(); Long userId = loginUser.getUserId();
Long currentCourseId = userService.findByUserId(userId).getCourseId(); Long currentCourseId = userService.findByUserId(userId).getCourseId();
model.addAttribute("mode", "change"); model.addAttribute(PageReturnAttributeKeyword.MODE, MODE);
model.addAttribute("currentCourseId", currentCourseId); model.addAttribute(PageReturnAttributeKeyword.CURRENT_COURSE_ID, currentCourseId);
model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll())); model.addAttribute(PageReturnAttributeKeyword.COURSE_LIST, CourseForm.convertFrom(courseService.findAll()));
model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll())); model.addAttribute(PageReturnAttributeKeyword.COURSE_INFO_LIST, CourseInfoForm.convertFrom(courseInfoService.findAll()));
return "select_course"; return TransitionTargetPageNameKeyword.SELECT_COURSE_HTML;
} }
@SessionCheck @SessionCheck
@PostMapping("/change") @PostMapping(TransitionTargetPageNameKeyword.CHANGE)
public String changeCourse(@RequestParam Long courseId, HttpSession httpSession) { public String changeCourse(@RequestParam Long courseId, HttpSession httpSession) {
LoginModel loginUser = (LoginModel) httpSession.getAttribute("loginUser"); LoginModel loginUser = (LoginModel) httpSession.getAttribute(SessionKeyword.LOGIN_USER);
userService.updateCourse(loginUser.getUserId(), courseId); userService.updateCourse(loginUser.getUserId(), courseId);
return "redirect:/menu"; return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.MENU;
} }

View File

@@ -3,10 +3,12 @@ package com.example.demo.app.presentation.controller;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
@Controller @Controller
public class ErrorController { public class ErrorController {
@GetMapping("/error") @GetMapping(TransitionTargetPageNameKeyword.ERROR)
public String showError() { public String showError() {
return "error"; return TransitionTargetPageNameKeyword.ERROR_HTML;
} }
} }

View File

@@ -13,13 +13,16 @@ import com.example.demo.aop.aspect.SessionCheck;
import com.example.demo.app.domain.model.GoalModel; import com.example.demo.app.domain.model.GoalModel;
import com.example.demo.app.domain.model.LoginModel; import com.example.demo.app.domain.model.LoginModel;
import com.example.demo.app.domain.service.GoalService; import com.example.demo.app.domain.service.GoalService;
import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.demo.app.presentation.form.GoalForm; import com.example.demo.app.presentation.form.GoalForm;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@Controller @Controller
@RequiredArgsConstructor @RequiredArgsConstructor
@RequestMapping("/goal") @RequestMapping(TransitionTargetPageNameKeyword.GOAL)
public class GoalController { public class GoalController {
private final GoalService goalService; private final GoalService goalService;
@@ -28,36 +31,36 @@ public class GoalController {
@GetMapping("") @GetMapping("")
public String getGoal(Model model, HttpSession session) { public String getGoal(Model model, HttpSession session) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
Long userId = loginUser.getUserId(); Long userId = loginUser.getUserId();
GoalModel goalModel = goalService.getGoalByUserId(userId); GoalModel goalModel = goalService.getGoalByUserId(userId);
GoalForm goalForm = GoalForm.convertFrom(goalModel); GoalForm goalForm = GoalForm.convertFrom(goalModel);
model.addAttribute("goalForm", goalForm); model.addAttribute(PageReturnAttributeKeyword.GOAL_FORM, goalForm);
return "goal_view"; return TransitionTargetPageNameKeyword.GOAL_VIEW_HTML;
} }
@SessionCheck @SessionCheck
@GetMapping("/edit") @GetMapping(TransitionTargetPageNameKeyword.EDIT)
public String editGoal(Model model, HttpSession session) { public String editGoal(Model model, HttpSession session) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
Long userId = loginUser.getUserId(); Long userId = loginUser.getUserId();
GoalModel goalModel = goalService.getGoalByUserId(userId); GoalModel goalModel = goalService.getGoalByUserId(userId);
GoalForm goalForm = GoalForm.convertFrom(goalModel); GoalForm goalForm = GoalForm.convertFrom(goalModel);
model.addAttribute("goalForm", goalForm); model.addAttribute(PageReturnAttributeKeyword.GOAL_FORM, goalForm);
return "goal_edit"; return TransitionTargetPageNameKeyword.GOAL_EDIT_HTML;
} }
@SessionCheck @SessionCheck
@PostMapping("/update") @PostMapping(TransitionTargetPageNameKeyword.UPDATE)
public String updateGoal(@ModelAttribute GoalForm goalForm, HttpSession session) { public String updateGoal(@ModelAttribute GoalForm goalForm, HttpSession session) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
Long userId = loginUser.getUserId(); Long userId = loginUser.getUserId();
@@ -65,13 +68,13 @@ public class GoalController {
GoalModel currentGoal = goalService.getGoalByUserId(userId); GoalModel currentGoal = goalService.getGoalByUserId(userId);
if (!currentGoal.getGoalId().equals(goalForm.getGoalId())) { if (!currentGoal.getGoalId().equals(goalForm.getGoalId())) {
return "redirect:/goal"; // 他人のデータを更新しようとしたら弾く return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL; // 他人のデータを更新しようとしたら弾く
} }
GoalModel goalModel = GoalModel.convertFrom(goalForm); GoalModel goalModel = GoalModel.convertFrom(goalForm);
goalService.updateGoal(goalModel); goalService.updateGoal(goalModel);
return "redirect:/goal"; return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
} }
} }

View File

@@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import com.example.demo.app.domain.model.LoginModel; import com.example.demo.app.domain.model.LoginModel;
import com.example.demo.app.domain.service.LoginService; import com.example.demo.app.domain.service.LoginService;
import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.demo.app.presentation.form.LoginForm; import com.example.demo.app.presentation.form.LoginForm;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -20,13 +23,13 @@ public class LoginController {
private final LoginService loginService; private final LoginService loginService;
@GetMapping("/login") @GetMapping(TransitionTargetPageNameKeyword.LOGIN)
public String showLogin(@ModelAttribute LoginForm loginForm) { public String showLogin(@ModelAttribute LoginForm loginForm) {
return "login"; return TransitionTargetPageNameKeyword.LOGIN_HTML;
} }
@PostMapping("/login") @PostMapping(TransitionTargetPageNameKeyword.LOGIN)
public String login( public String login(
@ModelAttribute LoginForm loginForm, @ModelAttribute LoginForm loginForm,
Model model, Model model,
@@ -38,15 +41,15 @@ public class LoginController {
if (loginModel == null) { if (loginModel == null) {
model.addAttribute( model.addAttribute(
"errorMessage", PageReturnAttributeKeyword.ERROR_MESSAGE,
"Email address or password is incorrect."); "IDまたはパスワードが間違っています.");
return "login"; return TransitionTargetPageNameKeyword.LOGIN_HTML;
} }
session.setAttribute("loginUser", loginModel); session.setAttribute(SessionKeyword.LOGIN_USER, loginModel);
return "redirect:/menu"; return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.MENU;
} }
} }

View File

@@ -9,6 +9,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import com.example.demo.app.domain.model.LoginModel; import com.example.demo.app.domain.model.LoginModel;
import com.example.demo.app.domain.service.PasswordResetService; import com.example.demo.app.domain.service.PasswordResetService;
import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.demo.app.presentation.form.PasswordResetForm; import com.example.demo.app.presentation.form.PasswordResetForm;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -18,24 +21,24 @@ import lombok.RequiredArgsConstructor;
public class PasswordResetController { public class PasswordResetController {
private final PasswordResetService passwordResetService; private final PasswordResetService passwordResetService;
@GetMapping("/password/reset") @GetMapping(TransitionTargetPageNameKeyword.PASSWORD_RESET)
public String showPasswordReset(Model model) { public String showPasswordReset(Model model) {
model.addAttribute("passwordResetForm", new PasswordResetForm()); model.addAttribute(PageReturnAttributeKeyword.PASSWOR_RESET_FORM, new PasswordResetForm());
return "password_reset"; return TransitionTargetPageNameKeyword.PASSWORD_RESET_HTML;
} }
@PostMapping("/password/reset") @PostMapping(TransitionTargetPageNameKeyword.PASSWORD_RESET)
public String resetPassword( public String resetPassword(
PasswordResetForm passwordResetForm, PasswordResetForm passwordResetForm,
Model model, Model model,
HttpSession session){ HttpSession session){
Long userId = Long userId =
(Long) session.getAttribute("passwordResetUserId"); (Long) session.getAttribute(PageReturnAttributeKeyword.PASSWOR_RESET_USER_ID);
if (userId == null) { if (userId == null) {
LoginModel loginUser = LoginModel loginUser =
(LoginModel) session.getAttribute("loginUser"); (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
if (loginUser != null) { if (loginUser != null) {
userId = loginUser.getUserId(); userId = loginUser.getUserId();
@@ -43,28 +46,29 @@ public class PasswordResetController {
} }
if (userId == null) { if (userId == null) {
return "redirect:/login"; return TransitionTargetPageNameKeyword.REDIRECT +
TransitionTargetPageNameKeyword.LOGIN;
} }
boolean isReset = boolean isReset =
passwordResetService.resetPassword(userId, passwordResetForm); passwordResetService.resetPassword(userId, passwordResetForm);
System.out.println("isReset=" + isReset);
if(!isReset) { if(!isReset) {
model.addAttribute("message", "パスワードが一致しません。"); model.addAttribute(PageReturnAttributeKeyword.MESSAGE, "パスワードが一致しません。");
return "password_reset"; return TransitionTargetPageNameKeyword.PASSWORD_RESET_HTML;
} }
session.removeAttribute("passwordResetUserId"); session.removeAttribute(PageReturnAttributeKeyword.PASSWOR_RESET_USER_ID);
LoginModel loginUser = LoginModel loginUser =
(LoginModel) session.getAttribute("loginUser"); (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
if (loginUser != null) { if (loginUser != null) {
return "redirect:/menu"; return TransitionTargetPageNameKeyword.REDIRECT +
TransitionTargetPageNameKeyword.MENU;
} }
return "redirect:/login"; return TransitionTargetPageNameKeyword.REDIRECT +
TransitionTargetPageNameKeyword.LOGIN;
} }
} }

View File

@@ -12,6 +12,9 @@ import com.example.demo.aop.aspect.SessionCheck;
import com.example.demo.app.domain.model.LoginModel; import com.example.demo.app.domain.model.LoginModel;
import com.example.demo.app.domain.model.ProfileModel; import com.example.demo.app.domain.model.ProfileModel;
import com.example.demo.app.domain.service.ProfileService; import com.example.demo.app.domain.service.ProfileService;
import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.demo.app.presentation.form.ProfileEditForm; import com.example.demo.app.presentation.form.ProfileEditForm;
import com.example.demo.app.presentation.form.ProfileForm; import com.example.demo.app.presentation.form.ProfileForm;
@@ -23,26 +26,26 @@ public class ProfileController {
private final ProfileService profileService; private final ProfileService profileService;
@SessionCheck @SessionCheck
@GetMapping("/profile") @GetMapping(TransitionTargetPageNameKeyword.PROFILE)
public String profile(Model model, HttpSession session) { public String profile(Model model, HttpSession session) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
ProfileModel profileModel = profileService.findOne(loginUser.getUserId()); ProfileModel profileModel = profileService.findOne(loginUser.getUserId());
ProfileForm profileForm = ProfileForm.convertForm(profileModel); ProfileForm profileForm = ProfileForm.convertForm(profileModel);
model.addAttribute("profileForm", profileForm); model.addAttribute(PageReturnAttributeKeyword.PROFILE_FORM, profileForm);
return "profile"; return TransitionTargetPageNameKeyword.PROFILE_HTML;
} }
@SessionCheck @SessionCheck
@GetMapping("/profile/edit") @GetMapping(TransitionTargetPageNameKeyword.PROFILE_EDIT)
public String showEditProfile( public String showEditProfile(
Model model, Model model,
HttpSession session) { HttpSession session) {
LoginModel loginUser = LoginModel loginUser =
(LoginModel) session.getAttribute("loginUser"); (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
ProfileModel profileModel = ProfileModel profileModel =
profileService.findOne(loginUser.getUserId()); profileService.findOne(loginUser.getUserId());
@@ -55,42 +58,42 @@ public class ProfileController {
profileModel.getAnnualIncome(), profileModel.getAnnualIncome(),
profileModel.getMonthlyBudget()); profileModel.getMonthlyBudget());
model.addAttribute("profileEditForm", profileEditForm); model.addAttribute(PageReturnAttributeKeyword.PROFILE_EDIT_FORM, profileEditForm);
return "profile_edit"; return TransitionTargetPageNameKeyword.PROFILE_EDIT_HTML;
} }
@PostMapping("/profile/edit") @PostMapping(TransitionTargetPageNameKeyword.PROFILE_EDIT)
public String updateProfile( public String updateProfile(
@ModelAttribute ProfileEditForm profileEditForm, @ModelAttribute ProfileEditForm profileEditForm,
HttpSession session) { HttpSession session) {
LoginModel loginUser = LoginModel loginUser =
(LoginModel) session.getAttribute("loginUser"); (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
profileService.update( profileService.update(
loginUser.getUserId(), loginUser.getUserId(),
profileEditForm); profileEditForm);
return "redirect:/profile"; return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.PROFILE;
} }
@PostMapping("/withdraw") @PostMapping(TransitionTargetPageNameKeyword.WITHDRAW)
public String withdraw(HttpSession session) { public String withdraw(HttpSession session) {
LoginModel loginUser = LoginModel loginUser =
(LoginModel) session.getAttribute("loginUser"); (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
profileService.withdraw(loginUser.getUserId()); profileService.withdraw(loginUser.getUserId());
session.invalidate(); session.invalidate();
return "redirect:/login"; return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.LOGIN;
} }
@PostMapping("/logout") @PostMapping(TransitionTargetPageNameKeyword.LOGOUT)
public String logout(HttpSession session) { public String logout(HttpSession session) {
session.invalidate(); session.invalidate();
return "redirect:/login"; return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.LOGIN;
} }
} }

View File

@@ -23,6 +23,9 @@ import com.example.demo.app.domain.service.CategoryService;
import com.example.demo.app.domain.service.GoalService; import com.example.demo.app.domain.service.GoalService;
import com.example.demo.app.domain.service.TransactionService; import com.example.demo.app.domain.service.TransactionService;
import com.example.demo.app.domain.service.UserService; import com.example.demo.app.domain.service.UserService;
import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.demo.app.presentation.form.CategoryForm; import com.example.demo.app.presentation.form.CategoryForm;
import com.example.demo.app.presentation.form.Expense; import com.example.demo.app.presentation.form.Expense;
import com.example.demo.app.presentation.form.GoalForm; import com.example.demo.app.presentation.form.GoalForm;
@@ -43,14 +46,14 @@ public class TransactionController {
// 一覧画面 // 一覧画面
@SessionCheck @SessionCheck
@GetMapping("/transaction/list") @GetMapping(TransitionTargetPageNameKeyword.TRANSACTION_LIST)
public String transactionList( public String transactionList(
@RequestParam(required = false, defaultValue = "0") String years, @RequestParam(required = false, defaultValue = "0") String years,
@RequestParam(required = false, defaultValue = "0") String months, @RequestParam(required = false, defaultValue = "0") String months,
Model model, Model model,
HttpSession session) { HttpSession session) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
LocalDate today = LocalDate.now(); LocalDate today = LocalDate.now();
@@ -111,28 +114,28 @@ public class TransactionController {
transactionFormMap.put(date, transactionFormList); transactionFormMap.put(date, transactionFormList);
}); });
model.addAttribute("year", year); model.addAttribute(PageReturnAttributeKeyword.YEAR, year);
model.addAttribute("month", month); model.addAttribute(PageReturnAttributeKeyword.MONTH, month);
model.addAttribute("previousYear", previousYear); model.addAttribute(PageReturnAttributeKeyword.PREVIOUS_YEAR, previousYear);
model.addAttribute("previousMonth", previousMonth); model.addAttribute(PageReturnAttributeKeyword.PREVIOUS_MONTH, previousMonth);
model.addAttribute("nextYear", nextYear); model.addAttribute(PageReturnAttributeKeyword.NEXT_YEAR, nextYear);
model.addAttribute("nextMonth", nextMonth); model.addAttribute(PageReturnAttributeKeyword.NEXT_MONTH, nextMonth);
model.addAttribute("transactionFormMap", transactionFormMap); model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM_MAP, transactionFormMap);
return "transaction_list"; return TransitionTargetPageNameKeyword.TRANSACTION_LIST_HTML;
} }
// 詳細画面 // 詳細画面
@SessionCheck @SessionCheck
@GetMapping("/transaction/detail") @GetMapping(TransitionTargetPageNameKeyword.TRANSACTION_DETAIL)
public String findOne(@RequestParam(required = false) LocalDate todayDates, Model model, HttpSession session) { public String findOne(@RequestParam(required = false) LocalDate todayDates, Model model, HttpSession session) {
LocalDate todayDate = (todayDates == null) ? LocalDate.now() : todayDates; LocalDate todayDate = (todayDates == null) ? LocalDate.now() : todayDates;
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
List<TransactionForm> transactionFormList = transactionService List<TransactionForm> transactionFormList = transactionService
.findByUserIdAndDate(todayDate, loginUser.getUserId()).stream() .findByUserIdAndDate(todayDate, loginUser.getUserId()).stream()
@@ -173,14 +176,14 @@ public class TransactionController {
return transactionForm; return transactionForm;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
model.addAttribute("today", todayDate); model.addAttribute(PageReturnAttributeKeyword.TODAY, todayDate);
model.addAttribute("transactionFormList", transactionFormList); model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM_LIST, transactionFormList);
return "transaction_detail"; return TransitionTargetPageNameKeyword.TRANSACTION_DETAIL_HTML;
} }
@SessionCheck @SessionCheck
@GetMapping("/transaction/create") @GetMapping(TransitionTargetPageNameKeyword.TRANSACTION_CREATE)
public String createOneGet(@RequestParam(defaultValue = "") LocalDate today, public String createOneGet(@RequestParam(defaultValue = "") LocalDate today,
Model model) { Model model) {
@@ -193,35 +196,38 @@ public class TransactionController {
TransactionForm transactionForm = new TransactionForm(); TransactionForm transactionForm = new TransactionForm();
transactionForm.setTransactionDate(today); transactionForm.setTransactionDate(today);
System.out.println(transactionForm.getCategoryName() + " " + transactionForm.getAmount()); model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm);
model.addAttribute("transactionForm", transactionForm); model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList);
model.addAttribute("categoryFormList", categoryFormList); model.addAttribute(PageReturnAttributeKeyword.TODAY, today.format(DateTimeFormatter.ISO_LOCAL_DATE));
model.addAttribute("today", today.format(DateTimeFormatter.ISO_LOCAL_DATE)); return TransitionTargetPageNameKeyword.TRANSACTION_CREATE_HTML;
return "transaction_create";
} }
@SessionCheck @SessionCheck
@PostMapping("/transaction/create") @PostMapping(TransitionTargetPageNameKeyword.TRANSACTION_CREATE)
public String createOnePost(@ModelAttribute TransactionForm transactionForm, @RequestParam LocalDate today, public String createOnePost(@ModelAttribute TransactionForm transactionForm, @RequestParam LocalDate today,
Model model, Model model,
HttpSession session) { HttpSession session) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
transactionForm.setUserId(loginUser.getUserId()); transactionForm.setUserId(loginUser.getUserId());
if (transactionService.createTransaction(TransactionForm.convertTo(transactionForm)) != 0) { if (transactionService.createTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
return "error"; return TransitionTargetPageNameKeyword.ERROR_HTML;
} }
return "redirect:/transaction/detail?todayDates=" + transactionForm.getTransactionDate(); return TransitionTargetPageNameKeyword.REDIRECT +
TransitionTargetPageNameKeyword.TRANSACTION_DETAIL +
TransitionTargetPageNameKeyword.INTERROGATION +
TransitionTargetPageNameKeyword.TODAY_DATES +
TransitionTargetPageNameKeyword.EQUAL +
transactionForm.getTransactionDate();
} }
@SessionCheck @SessionCheck
@GetMapping("/transaction/update") @GetMapping(TransitionTargetPageNameKeyword.TRANSACTION_UPDATE)
public String updateOneGet(@RequestParam Long transactionId, @RequestParam(defaultValue = "") LocalDate today, public String updateOneGet(@RequestParam Long transactionId, @RequestParam(defaultValue = "") LocalDate today,
Model model) { Model model) {
@@ -238,22 +244,20 @@ public class TransactionController {
transactionService.findMoneyRecord(transactionId), transactionService.findMoneyRecord(transactionId),
CategoryForm.convertFrom(categoryService.findByTransactionId(transactionId)).getTransactionType()); CategoryForm.convertFrom(categoryService.findByTransactionId(transactionId)).getTransactionType());
System.out.println("category: " + transactionForm.getCategoryId() + "金額: " + transactionForm.getAmount()); model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_ID, transactionId);
model.addAttribute("transactionId", transactionId); model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm);
model.addAttribute("transactionForm", transactionForm); model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList);
model.addAttribute("categoryFormList", categoryFormList); model.addAttribute(PageReturnAttributeKeyword.TODAY, today);
model.addAttribute("today", today); return TransitionTargetPageNameKeyword.TRANSACTION_UPDATE_HTML;
return "transaction_update";
} }
@SessionCheck @SessionCheck
@PostMapping("/transaction/update") @PostMapping(TransitionTargetPageNameKeyword.TRANSACTION_UPDATE)
public String updateOnePost(@RequestParam Long transactionId, @ModelAttribute TransactionForm transactionForm, public String updateOnePost(@RequestParam Long transactionId, @ModelAttribute TransactionForm transactionForm,
@RequestParam LocalDate today, Model model, @RequestParam LocalDate today, Model model,
HttpSession session) { HttpSession session) {
@@ -264,28 +268,38 @@ public class TransactionController {
transactionForm.setTransactionId(transactionId); transactionForm.setTransactionId(transactionId);
if (transactionService.updateTransaction(TransactionForm.convertTo(transactionForm)) != 0) { if (transactionService.updateTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
return "error"; return TransitionTargetPageNameKeyword.ERROR_HTML;
} }
return "redirect:/transaction/detail?todayDates=" + transactionForm.getTransactionDate(); return TransitionTargetPageNameKeyword.REDIRECT +
TransitionTargetPageNameKeyword.TRANSACTION_DETAIL +
TransitionTargetPageNameKeyword.INTERROGATION +
TransitionTargetPageNameKeyword.TODAY_DATES +
TransitionTargetPageNameKeyword.EQUAL +
transactionForm.getTransactionDate();
} }
@SessionCheck @SessionCheck
@PostMapping("/transaction/delete") @PostMapping(TransitionTargetPageNameKeyword.TRANSACTION_DELETE)
public String deleteOne(@RequestParam Long transactionId, @RequestParam LocalDate today) { public String deleteOne(@RequestParam Long transactionId, @RequestParam LocalDate today) {
transactionService.deleteTransaction(transactionId); transactionService.deleteTransaction(transactionId);
return "redirect:/transaction/detail?todayDates=" + today; return TransitionTargetPageNameKeyword.REDIRECT +
TransitionTargetPageNameKeyword.TRANSACTION_DETAIL +
TransitionTargetPageNameKeyword.INTERROGATION +
TransitionTargetPageNameKeyword.TODAY_DATES +
TransitionTargetPageNameKeyword.EQUAL +
today;
} }
@SessionCheck @SessionCheck
@GetMapping("/menu") @GetMapping(TransitionTargetPageNameKeyword.MENU)
public String menu(HttpSession session, Model model, public String menu(HttpSession session, Model model,
@RequestParam(required = false, defaultValue = "0") String years, @RequestParam(required = false, defaultValue = "0") String years,
@RequestParam(required = false, defaultValue = "0") String months) { @RequestParam(required = false, defaultValue = "0") String months) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
LocalDate today = LocalDate.now(); LocalDate today = LocalDate.now();
@@ -309,18 +323,18 @@ public class TransactionController {
int nextYear = nextYearMonth.getYear(); int nextYear = nextYearMonth.getYear();
int nextMonth = nextYearMonth.getMonthValue(); int nextMonth = nextYearMonth.getMonthValue();
model.addAttribute("year", year); model.addAttribute(PageReturnAttributeKeyword.YEAR, year);
model.addAttribute("month", month); model.addAttribute(PageReturnAttributeKeyword.MONTH, month);
model.addAttribute("day", today.getDayOfMonth()); model.addAttribute(PageReturnAttributeKeyword.DAY, today.getDayOfMonth());
model.addAttribute("lastDay", lastDay); model.addAttribute(PageReturnAttributeKeyword.LAST_DAY, lastDay);
model.addAttribute("firstDayOfWeek", firstDayOfWeek); model.addAttribute(PageReturnAttributeKeyword.FIRST_DAY_OF_WEEK, firstDayOfWeek);
model.addAttribute("previousYear", previousYear); model.addAttribute(PageReturnAttributeKeyword.PREVIOUS_YEAR, previousYear);
model.addAttribute("previousMonth", previousMonth); model.addAttribute(PageReturnAttributeKeyword.PREVIOUS_MONTH, previousMonth);
model.addAttribute("nextYear", nextYear); model.addAttribute(PageReturnAttributeKeyword.NEXT_YEAR, nextYear);
model.addAttribute("nextMonth", nextMonth); model.addAttribute(PageReturnAttributeKeyword.NEXT_MONTH, nextMonth);
LocalDate startDate = yearMonth.atDay(1); LocalDate startDate = yearMonth.atDay(1);
LocalDate endDate = yearMonth.atEndOfMonth(); LocalDate endDate = yearMonth.atEndOfMonth();
@@ -329,31 +343,31 @@ public class TransactionController {
List<Expense> expenseList = transactionService.findTotalExpenseList(startDate, endDate, loginUser.getUserId()); List<Expense> expenseList = transactionService.findTotalExpenseList(startDate, endDate, loginUser.getUserId());
model.addAttribute("incomeList", incomeList); model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
model.addAttribute("expenseList", expenseList); model.addAttribute(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList);
int totalIncome = transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId()); int totalIncome = transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId());
int totalExpense = transactionService.findTotalExpense(startDate, endDate, loginUser.getUserId()); int totalExpense = transactionService.findTotalExpense(startDate, endDate, loginUser.getUserId());
model.addAttribute("totalIncome", totalIncome); model.addAttribute(PageReturnAttributeKeyword.TOTAL_INCOME, totalIncome);
model.addAttribute("totalExpense", totalExpense); model.addAttribute(PageReturnAttributeKeyword.TOTAL_EXPENSE, totalExpense);
GoalForm goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId())); GoalForm goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId()));
UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId())); UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
model.addAttribute("achievementRate", goalForm.getAchievementRate()); model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, goalForm.getAchievementRate());
model.addAttribute("currentAmount", goalForm.getCurrentAmount()); model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, goalForm.getCurrentAmount());
model.addAttribute("targetAmount", goalForm.getTargetAmount()); model.addAttribute(PageReturnAttributeKeyword.TARGET_AMOUNT, goalForm.getTargetAmount());
model.addAttribute("saving", userForm.getSaving()); model.addAttribute(PageReturnAttributeKeyword.SAVING, userForm.getSaving());
model.addAttribute("deadline", goalForm.getDeadline()); model.addAttribute(PageReturnAttributeKeyword.DEADLINE, goalForm.getDeadline());
return "menu"; return TransitionTargetPageNameKeyword.MENU_HTML;
} }
} }

View File

@@ -15,6 +15,8 @@ import com.example.demo.app.domain.service.CourseService;
import com.example.demo.app.domain.service.QuestionService; import com.example.demo.app.domain.service.QuestionService;
import com.example.demo.app.domain.service.UserService; import com.example.demo.app.domain.service.UserService;
import com.example.demo.app.infra.entity.QuestionEntity; import com.example.demo.app.infra.entity.QuestionEntity;
import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.demo.app.presentation.form.UserForm; import com.example.demo.app.presentation.form.UserForm;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -30,24 +32,22 @@ public class UserController {
private final QuestionService questionService; private final QuestionService questionService;
@GetMapping("/user/register") @GetMapping(TransitionTargetPageNameKeyword.USER_RESISTER)
public String showRegister(Model model, HttpSession session) { public String showRegister(Model model, HttpSession session) {
UserForm userForm = new UserForm(); UserForm userForm = new UserForm();
List<QuestionEntity> questionList = questionService.findAll(); List<QuestionEntity> questionList = questionService.findAll();
session.setAttribute("questionList", questionList); session.setAttribute(PageReturnAttributeKeyword.QUESTION_LIST, questionList);
model.addAttribute("userForm", userForm); model.addAttribute(PageReturnAttributeKeyword.USER_FORM, userForm);
return "user_register"; return TransitionTargetPageNameKeyword.USER_RESISTER_HTML;
} }
@PostMapping("/user/register/return") @PostMapping(TransitionTargetPageNameKeyword.USER_RESISTER_RETURN)
public String showRegisterReturn(@RequestParam(required = false) Long courseId, Model model, HttpSession session) { public String showRegisterReturn(@RequestParam(required = false) Long courseId, Model model, HttpSession session) {
UserForm userForm = (UserForm) session.getAttribute("userForm"); UserForm userForm = (UserForm) session.getAttribute(PageReturnAttributeKeyword.USER_FORM);
System.out.println(
"######################################################################3" + userForm.getBirthDate());
if (userForm.getUserName().equals("")) { if (userForm.getUserName().equals("")) {
userForm = new UserForm(); userForm = new UserForm();
@@ -55,39 +55,37 @@ public class UserController {
} }
if (courseId != null) { if (courseId != null) {
model.addAttribute("selectedCourseName", courseService.findById(courseId).getCourseName()); model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
} }
session.setAttribute("selectedCourseName", courseService.findById(courseId).getCourseName()); session.setAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
model.addAttribute("courseId", courseId); model.addAttribute(PageReturnAttributeKeyword.COURESE_ID, courseId);
System.out.println( model.addAttribute(PageReturnAttributeKeyword.USER_FORM, userForm);
"######################################################################3" + userForm.getBirthDate());
model.addAttribute("userForm", userForm);
return "user_register_return"; return TransitionTargetPageNameKeyword.USER_RESISTER_RETURN_HTML;
} }
@GetMapping("/user/register/confirm") @GetMapping(TransitionTargetPageNameKeyword.USER_RESISTER_CONFIRM)
public String confirmRegisterGet(@ModelAttribute UserForm userForm, public String confirmRegisterGet(@ModelAttribute UserForm userForm,
String selectedCourseName, Model model, String selectedCourseName, Model model,
HttpSession session) { HttpSession session) {
model.addAttribute("selectedCourseName", (String) session.getAttribute("selectedCourseName")); model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, (String) session.getAttribute("selectedCourseName"));
return "user_register_confirm"; return TransitionTargetPageNameKeyword.USER_RESISTER_CONFIRM_HTML;
} }
@PostMapping("/user/register/complete") @PostMapping(TransitionTargetPageNameKeyword.USER_RESISTER_COMPLETE)
public String confirmRegister( public String confirmRegister(
@ModelAttribute UserForm userForm, @ModelAttribute UserForm userForm,
Model model, Model model,
HttpSession session) { HttpSession session) {
Long courseId = courseService.findByName((String) session.getAttribute("selectedCourseName")); Long courseId = courseService.findByName((String) session.getAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME));
userService.register(userForm, courseId); userService.register(userForm, courseId);
return "redirect:/login"; return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.LOGIN;
} }

View File

@@ -14,7 +14,7 @@ public class PageReturnAttributeKeyword {
public static final String PASSWOR_RESET_FORM = "passwordResetForm"; public static final String PASSWOR_RESET_FORM = "passwordResetForm";
public static final String PASSWOR_RESET_USER_ID = "passwordResetUserId"; public static final String PASSWOR_RESET_USER_ID = "passwordResetUserId";
public static final String AUTENTICATION_FORM = "authenticationForm"; public static final String AUTHENTICATION_FORM = "authenticationForm";
public static final String PROFILE_FORM = "profileForm"; public static final String PROFILE_FORM = "profileForm";
public static final String PROFILE_EDIT_FORM = "profileEditForm"; public static final String PROFILE_EDIT_FORM = "profileEditForm";

View File

@@ -5,13 +5,13 @@ public class TransitionTargetPageNameKeyword {
// HTML // HTML
public static final String ERROR_HTML = "error"; public static final String ERROR_HTML = "error";
public static final String USER_RESISTER_HTML = "user_resiter"; public static final String USER_RESISTER_HTML = "user_register";
public static final String USER_RESISTER_RETURN_HTML = "user_resiter_return"; public static final String USER_RESISTER_RETURN_HTML = "user_register_return";
public static final String USER_RESISTER_CONFIRM_HTML = "user_resiter_confirm"; public static final String USER_RESISTER_CONFIRM_HTML = "user_register_confirm";
public static final String LOGIN_HTML = "login"; public static final String LOGIN_HTML = "login";
public static final String PASSWORD_RESET_HTML = "passsword_reset"; public static final String PASSWORD_RESET_HTML = "password_reset";
public static final String AUTHENTICATION_HTML = "authentication"; public static final String AUTHENTICATION_HTML = "authentication";
@@ -47,7 +47,7 @@ public class TransitionTargetPageNameKeyword {
public static final String AUTHENTICATION = "/authentication"; public static final String AUTHENTICATION = "/authentication";
public static final String PASSWORD_RESET = "/passsword/reset"; public static final String PASSWORD_RESET = "/password/reset";
public static final String MENU = "/menu"; public static final String MENU = "/menu";
@@ -65,12 +65,13 @@ public class TransitionTargetPageNameKeyword {
public static final String TRANSACTION_DETAIL = "/transaction/detail"; public static final String TRANSACTION_DETAIL = "/transaction/detail";
public static final String TRANSACTION_CREATE = "/transaction/create"; public static final String TRANSACTION_CREATE = "/transaction/create";
public static final String TRANSACTION_UPDATE = "/transaction/update"; public static final String TRANSACTION_UPDATE = "/transaction/update";
public static final String TRANSACTION_DELETE = "/transaction/delete";
public static final String TODAY_DATES = "todayDates"; public static final String TODAY_DATES = "todayDates";
public static final String ANALYSIS = "/analysis"; public static final String ANALYSIS = "/analysis";
public static final String GOAL = "/goal"; public static final String GOAL = "/goal";
public static final String GOAL_EDIT = "/goal/edit"; public static final String EDIT = "/edit";
public static final String GOAL_UPDATE = "/goal/update"; public static final String UPDATE = "/update";
} }