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 b81c0ff..7a0f253 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 @@ -238,8 +238,8 @@ public class TransactionController { model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm); - session.setAttribute("tType", String.valueOf(transactionForm.getTransactionType())); - + session.setAttribute(SessionKeyword.T_TYPE, String.valueOf(transactionForm.getTransactionType())); + model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList); model.addAttribute(PageReturnAttributeKeyword.TODAY, today.format(DateTimeFormatter.ISO_LOCAL_DATE)); diff --git a/src/main/java/com/example/demo/app/presentation/controller/UserController.java b/src/main/java/com/example/demo/app/presentation/controller/UserController.java index 2c3eb8e..d09f9ae 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/UserController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/UserController.java @@ -16,6 +16,7 @@ import com.example.demo.app.domain.service.QuestionService; import com.example.demo.app.domain.service.UserService; 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.SessionKeyword; import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.demo.app.presentation.form.UserForm; @@ -58,7 +59,7 @@ public class UserController { model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName()); } - session.setAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName()); + session.setAttribute(SessionKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName()); model.addAttribute(PageReturnAttributeKeyword.COURSE_ID, courseId); model.addAttribute(PageReturnAttributeKeyword.USER_FORM, userForm); @@ -70,11 +71,9 @@ public class UserController { String selectedCourseName, Model model, HttpSession session) { - model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, (String) session.getAttribute("selectedCourseName")); + model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, (String) session.getAttribute(SessionKeyword.SELECTED_COURSE_NAME)); - session.setAttribute("questionId", userForm.getSecretQuestionId()); - - System.out.println("return questionId: ****************************:" + userForm.getSecretQuestionId()); + session.setAttribute(SessionKeyword.QUESTION_ID, userForm.getSecretQuestionId()); return TransitionTargetPageNameKeyword.USER_RESISTER_CONFIRM_HTML; @@ -86,11 +85,9 @@ public class UserController { Model model, HttpSession session) { - Long courseId = courseService.findByName((String) session.getAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME)); + Long courseId = courseService.findByName((String) session.getAttribute(SessionKeyword.SELECTED_COURSE_NAME)); - Long questionId = (Long) session.getAttribute("questionId"); - - System.out.println("confirm questionId: ****************************:" + questionId); + Long questionId = (Long) session.getAttribute(SessionKeyword.QUESTION_ID); userForm.setSecretQuestionId(questionId); diff --git a/src/main/java/com/example/demo/app/presentation/controller/pageproperty/SessionKeyword.java b/src/main/java/com/example/demo/app/presentation/controller/pageproperty/SessionKeyword.java index b9ee3cc..ca9f1dd 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/pageproperty/SessionKeyword.java +++ b/src/main/java/com/example/demo/app/presentation/controller/pageproperty/SessionKeyword.java @@ -3,4 +3,10 @@ package com.example.demo.app.presentation.controller.pageproperty; public class SessionKeyword { // SESSION情報として格納したいログイン者の情報 public static final String LOGIN_USER = "loginUser"; + + public static final String SELECTED_COURSE_NAME = "selectedCourseName"; + + public static final String QUESTION_ID = "questionId"; + + public static final String T_TYPE = "tType"; }