From 19218d868c42d479059625386c3bfb595ecc9f8d Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 24 Sep 2026 09:58:38 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[FIX]=20mapping=20error=E3=82=92=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 --- .../demo/app/presentation/controller/CourseController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/example/demo/app/presentation/controller/CourseController.java b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java index def92f4..5a5e2cd 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/CourseController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java @@ -39,12 +39,10 @@ public class CourseController { private final UserService userService; - @SessionCheck - @GetMapping("/course/select/register") + @PostMapping("/course/select/register") public String showSelectCourse(@ModelAttribute UserForm userForm, Model model, HttpSession session) { try { - System.out.println(userForm.getMailAddress()); session.setAttribute("userForm", userForm); model.addAttribute("mode", "regist"); From 4192faecc260bf2f80ff04c7be921d345960d886 Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 24 Sep 2026 09:59:21 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[ADD]=20=E8=B3=AA=E5=95=8F=E3=83=AA?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=82=92=E5=8F=97=E3=81=91=E5=8F=96=E3=82=8B?= =?UTF-8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E4=BD=9C=E6=88=90?= =?UTF-8?q?=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 --- .../app/domain/service/QuestionService.java | 9 ++++++++ .../service/impl/QuestionServiceImpl.java | 23 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 src/main/java/com/example/demo/app/domain/service/QuestionService.java create mode 100644 src/main/java/com/example/demo/app/domain/service/impl/QuestionServiceImpl.java diff --git a/src/main/java/com/example/demo/app/domain/service/QuestionService.java b/src/main/java/com/example/demo/app/domain/service/QuestionService.java new file mode 100644 index 0000000..3d12c8b --- /dev/null +++ b/src/main/java/com/example/demo/app/domain/service/QuestionService.java @@ -0,0 +1,9 @@ +package com.example.demo.app.domain.service; + +import java.util.List; + +import com.example.demo.app.infra.entity.QuestionEntity; + +public interface QuestionService { + public List findAll(); +} diff --git a/src/main/java/com/example/demo/app/domain/service/impl/QuestionServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/QuestionServiceImpl.java new file mode 100644 index 0000000..049cbd0 --- /dev/null +++ b/src/main/java/com/example/demo/app/domain/service/impl/QuestionServiceImpl.java @@ -0,0 +1,23 @@ +package com.example.demo.app.domain.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Service; + +import com.example.demo.app.domain.service.QuestionService; +import com.example.demo.app.infra.entity.QuestionEntity; +import com.example.demo.app.infra.repository.QuestionRepository; + +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class QuestionServiceImpl implements QuestionService{ + + private final QuestionRepository questionRepository; + + public List findAll() { + return questionRepository.findAll(); + } + +} From 06c2d355122f2d611e0da4776dd2ce7762eaffe1 Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 24 Sep 2026 09:59:58 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[EDIT]=20=E5=90=8D=E5=89=8D=E3=82=92?= =?UTF-8?q?=E3=82=82=E3=81=A8=E3=81=AB=E6=83=85=E5=A0=B1=E3=82=92=E5=8F=96?= =?UTF-8?q?=E5=BE=97=E3=81=99=E3=82=8B=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=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 --- .../com/example/demo/app/domain/service/CourseService.java | 1 + .../demo/app/domain/service/impl/CourseServiceImpl.java | 4 ++++ .../example/demo/app/infra/repository/CourseRepository.java | 3 +++ 3 files changed, 8 insertions(+) diff --git a/src/main/java/com/example/demo/app/domain/service/CourseService.java b/src/main/java/com/example/demo/app/domain/service/CourseService.java index c0831a4..406916f 100644 --- a/src/main/java/com/example/demo/app/domain/service/CourseService.java +++ b/src/main/java/com/example/demo/app/domain/service/CourseService.java @@ -10,4 +10,5 @@ public interface CourseService { public CourseModel findById(Long courseId); + public Long findByName(String courName); } diff --git a/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java index 61a4b7d..cc2f776 100644 --- a/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java @@ -25,4 +25,8 @@ public class CourseServiceImpl implements CourseService { public CourseModel findById(Long courseId) { return CourseModel.convertFrom(courseRepository.findByCourseId(courseId)); } + + public Long findByName(String courseName) { + return courseRepository.findByCourseName(courseName).getCourseId(); + } } diff --git a/src/main/java/com/example/demo/app/infra/repository/CourseRepository.java b/src/main/java/com/example/demo/app/infra/repository/CourseRepository.java index 5b74e85..96fb2a9 100644 --- a/src/main/java/com/example/demo/app/infra/repository/CourseRepository.java +++ b/src/main/java/com/example/demo/app/infra/repository/CourseRepository.java @@ -10,5 +10,8 @@ public interface CourseRepository extends JpaRepository { @Query("SELECT c FROM CourseEntity c WHERE c.courseId = :courseId ") public CourseEntity findByCourseId(Long courseId); + @Query("SELECT c FROM CourseEntity c WHERE c.courseName = :courseName ") + public CourseEntity findByCourseName(String courseName); + } From 08c2c06f4a0a3810680131507bdb99d6a5d9314c Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 24 Sep 2026 10:00:36 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[FIX]=20=E3=82=B3=E3=83=BC=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=83=B3=E3=82=B0=E3=83=AB=E3=83=BC=E3=83=AB=E3=81=A8?= =?UTF-8?q?=E7=95=B0=E3=81=AA=E3=82=8B=E5=A4=89=E6=95=B0=E5=90=8D=E3=82=92?= =?UTF-8?q?=E4=BF=AE=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 --- .../com/example/demo/app/presentation/form/UserForm.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/demo/app/presentation/form/UserForm.java b/src/main/java/com/example/demo/app/presentation/form/UserForm.java index f5401c6..f145059 100644 --- a/src/main/java/com/example/demo/app/presentation/form/UserForm.java +++ b/src/main/java/com/example/demo/app/presentation/form/UserForm.java @@ -14,10 +14,10 @@ import lombok.NoArgsConstructor; public class UserForm { private String userName; private String mailAddress; + private LocalDate birthDate; private String password; private Long secretQuestionId; - private String SecretAnswer; - private LocalDate birthDate; + private String secretAnswer; private Integer saving; private Integer annualIncome; private Integer monthlyBudget; @@ -29,10 +29,10 @@ public class UserForm { return new UserForm( userModel.getUserName(), userModel.getMailAddress(), + userModel.getBrithDate(), userModel.getPassword(), userModel.getSecretQuestionId(), userModel.getSecretAnswer(), - userModel.getBrithDate(), userModel.getSaving(), userModel.getAnnualIncome(), userModel.getMonthlyBudget(), From 51310bae256a96877b3dc6a27e91ac54ba03576e Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 24 Sep 2026 10:01:15 +0900 Subject: [PATCH 5/8] =?UTF-8?q?[FIX]=20=E4=BC=9A=E5=93=A1=E7=99=BB?= =?UTF-8?q?=E9=8C=B2=E3=81=AE=E9=9A=9B=E3=80=81=E3=82=B3=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=82=92=E7=9B=B4=E6=8E=A5=E8=A8=AD=E5=AE=9A=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/app/domain/service/UserService.java | 2 +- .../example/demo/app/domain/service/impl/UserServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/demo/app/domain/service/UserService.java b/src/main/java/com/example/demo/app/domain/service/UserService.java index f61fa9e..070681d 100644 --- a/src/main/java/com/example/demo/app/domain/service/UserService.java +++ b/src/main/java/com/example/demo/app/domain/service/UserService.java @@ -5,7 +5,7 @@ import com.example.demo.app.presentation.form.UserForm; public interface UserService { - void register(UserForm userForm); + void register(UserForm userForm, Long courseId); public void updateCourse(Long userId, Long courseId); diff --git a/src/main/java/com/example/demo/app/domain/service/impl/UserServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/UserServiceImpl.java index 00dad91..b4872f7 100644 --- a/src/main/java/com/example/demo/app/domain/service/impl/UserServiceImpl.java +++ b/src/main/java/com/example/demo/app/domain/service/impl/UserServiceImpl.java @@ -26,7 +26,7 @@ public class UserServiceImpl implements UserService { private final CourseRepository courseRepository; @Override - public void register(UserForm userForm) { + public void register(UserForm userForm, Long courseId) { UserEntity userEntity = new UserEntity(); @@ -48,7 +48,7 @@ public class UserServiceImpl implements UserService { goalRepository.findById(userForm.getGoalId()).orElse(null); CourseEntity courseEntity = - courseRepository.findById(userForm.getCourseId()).orElse(null); + courseRepository.findById(courseId).orElse(null); userEntity.setQuestionEntity(questionEntity); userEntity.setGoalEntity(goalEntity); From e2ddffcc6085c19307fe057702b8ff25de38f5bf Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 24 Sep 2026 10:02:22 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[HOTFIX]=20=E8=B3=AA=E5=95=8F=E3=81=AE?= =?UTF-8?q?=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BF=E3=80=81=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E5=90=8D=E3=81=AE=E3=82=BB=E3=83=83=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E5=A4=89=E6=95=B0=E7=99=BB=E9=8C=B2=E3=80=81DB?= =?UTF-8?q?=E7=99=BB=E9=8C=B2=E6=A9=9F=E8=83=BD=E8=BF=BD=E5=8A=A0=E3=81=AA?= =?UTF-8?q?=E3=81=A9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserController.java | 82 +++++++++++-------- 1 file changed, 50 insertions(+), 32 deletions(-) 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 84f2f0c..d009d29 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 @@ -1,5 +1,7 @@ package com.example.demo.app.presentation.controller; +import java.util.List; + import jakarta.servlet.http.HttpSession; import org.springframework.stereotype.Controller; @@ -10,66 +12,82 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import com.example.demo.app.domain.service.CourseService; +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.form.UserForm; import lombok.RequiredArgsConstructor; - @Controller @RequiredArgsConstructor public class UserController { - + + private final UserService userService; + private final CourseService courseService; - + + private final QuestionService questionService; + + @GetMapping("/user/register") public String showRegister(Model model, HttpSession session) { UserForm userForm = new UserForm(); - + + List questionList = questionService.findAll(); + + session.setAttribute("questionList", questionList); + model.addAttribute("userForm", userForm); return "user_register"; } - + @PostMapping("/user/register/return") public String showRegisterReturn(@RequestParam(required = false) Long courseId, Model model, HttpSession session) { - + UserForm userForm = (UserForm) session.getAttribute("userForm"); - - if(userForm == null) { - userForm = new UserForm(); + System.out.println( + "######################################################################3" + userForm.getBirthDate()); + + if (userForm.getUserName().equals("")) { + userForm = new UserForm(); userForm.setCourseId(courseId); } - - if(courseId != null) { + + if (courseId != null) { model.addAttribute("selectedCourseName", courseService.findById(courseId).getCourseName()); } - + + session.setAttribute("selectedCourseName", courseService.findById(courseId).getCourseName()); model.addAttribute("courseId", courseId); + System.out.println( + "######################################################################3" + userForm.getBirthDate()); model.addAttribute("userForm", userForm); + + return "user_register_return"; + } + + @GetMapping("/user/register/confirm") + public String confirmRegisterGet(@ModelAttribute UserForm userForm, + String selectedCourseName, Model model, + HttpSession session) { + + model.addAttribute("selectedCourseName", (String) session.getAttribute("selectedCourseName")); + return "user_register_confirm"; - return "user_register"; } - - @PostMapping("/user/register/confirm") - public String confirmRegister( - @ModelAttribute UserForm userForm, - HttpSession session) { - session.setAttribute("userForm", userForm); - - return "user_register_confirm"; - } - @PostMapping("/user/register/complete") - public String completeRegister(HttpSession session) { + public String confirmRegister( + @ModelAttribute UserForm userForm, + Model model, + HttpSession session) { - UserForm userForm = - (UserForm) session.getAttribute("userForm"); - - // DBへの登録処理 - - session.removeAttribute("userForm"); - - return "redirect:/login"; + Long courseId = courseService.findByName((String) session.getAttribute("selectedCourseName")); + + userService.register(userForm, courseId); + + return "redirect:/login"; } From 56bb7099219ddc0400107dc55a7c2e59fe13174e Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 24 Sep 2026 10:02:53 +0900 Subject: [PATCH 7/8] =?UTF-8?q?[ADD]=20=E4=BC=9A=E5=93=A1=E7=99=BB?= =?UTF-8?q?=E9=8C=B2=E3=81=AE=E3=81=9F=E3=82=81=E3=81=AEHTML=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/user_register_return.html | 126 ++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 src/main/resources/templates/user_register_return.html diff --git a/src/main/resources/templates/user_register_return.html b/src/main/resources/templates/user_register_return.html new file mode 100644 index 0000000..4ecd680 --- /dev/null +++ b/src/main/resources/templates/user_register_return.html @@ -0,0 +1,126 @@ + + + + +新規会員登録 + + +
+
+ +
+

新規会員登録

+ +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + + 未選択 + +
+ +
+ +
+
+ +
+ +
+ +
+ + \ No newline at end of file From 21ca1a72e22a15c552dfaea52557687e9f39b8b8 Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 24 Sep 2026 10:03:30 +0900 Subject: [PATCH 8/8] =?UTF-8?q?[FIX]=20=E9=80=81=E3=82=8A=E5=85=88?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=E5=8F=8A=E3=81=B3=E5=A4=89=E6=95=B0?= =?UTF-8?q?=E5=90=8D=E3=80=81=E8=A1=A8=E7=A4=BA=E6=B3=95=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/select_course.html | 1 + .../resources/templates/user_register.html | 7 +- .../templates/user_register_confirm.html | 153 ++++++++++-------- 3 files changed, 90 insertions(+), 71 deletions(-) diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html index 0c937e1..7fbda20 100644 --- a/src/main/resources/templates/select_course.html +++ b/src/main/resources/templates/select_course.html @@ -13,6 +13,7 @@
+

diff --git a/src/main/resources/templates/user_register.html b/src/main/resources/templates/user_register.html index 8f4e888..c6ec36b 100644 --- a/src/main/resources/templates/user_register.html +++ b/src/main/resources/templates/user_register.html @@ -11,7 +11,7 @@

新規会員登録

- +
- @@ -109,8 +109,7 @@
- 未選択 - +
diff --git a/src/main/resources/templates/user_register_confirm.html b/src/main/resources/templates/user_register_confirm.html index 1ec83ed..ffbcb85 100644 --- a/src/main/resources/templates/user_register_confirm.html +++ b/src/main/resources/templates/user_register_confirm.html @@ -1,79 +1,98 @@ + - -新規会員登録確認 + + 新規会員登録確認 +
-
- +
+

新規会員登録確認

- -
-

氏名

-

-
- -
-

メールアドレス

-

-
- -
-

生年月日

-

-
- -
-

パスワード

-

********

-
- -
-

秘密の質問

-

-
- -
-

秘密の質問の回答

-

-
- -
-

貯蓄金

-

-
- -
-

年収

-

-
- -
-

月別使用可能額

-

-
- -
-

目標

-

-
- -
-

コース

-

-
- -
- - - -
-
- + + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + + 未選択 + +
+ +
+ +
+
+ + +
+
+ +
+ + +
+ + \ No newline at end of file