From 76e3fc2345f159bfe7ccd5456caaf7e489d024ec Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 24 Sep 2026 13:32:23 +0900 Subject: [PATCH] =?UTF-8?q?[FIX]=20Goal=E3=83=86=E3=83=BC=E3=83=96?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E5=A4=89=E6=9B=B4=E3=81=AB=E5=90=88=E3=82=8F?= =?UTF-8?q?=E3=81=9B=E3=81=A6User=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=82=92=E3=81=8A=E3=81=93=E3=81=AA?= =?UTF-8?q?=E3=81=84=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 --- .../java/com/example/demo/app/domain/model/UserModel.java | 2 -- .../com/example/demo/app/domain/service/UserService.java | 2 +- .../demo/app/domain/service/impl/UserServiceImpl.java | 5 ++--- .../demo/app/presentation/controller/UserController.java | 5 ++++- .../com/example/demo/app/presentation/form/UserForm.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/example/demo/app/domain/model/UserModel.java b/src/main/java/com/example/demo/app/domain/model/UserModel.java index 05cb388..c251035 100644 --- a/src/main/java/com/example/demo/app/domain/model/UserModel.java +++ b/src/main/java/com/example/demo/app/domain/model/UserModel.java @@ -20,7 +20,6 @@ public class UserModel { private Integer saving; private Integer annualIncome; private Integer monthlyBudget; - private Long goalId; private Long courseId; private Integer deleteFlag; @@ -36,7 +35,6 @@ public class UserModel { userEntity.getSaving(), userEntity.getAnnualIncome(), userEntity.getMonthlyBudget(), - userEntity.getGoalEntity().getGoalId(), userEntity.getCourseEntity().getCourseId(), userEntity.getDeleteFlag() ); 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 070681d..fa63458 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, Long courseId); + public void register(UserForm userForm, Long courseId, Long userId); 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 bba298a..9cc6639 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 @@ -25,7 +25,7 @@ public class UserServiceImpl implements UserService { private final CourseRepository courseRepository; @Override - public void register(UserForm userForm, Long courseId) { + public void register(UserForm userForm, Long courseId, Long userId) { UserEntity userEntity = new UserEntity(); @@ -44,12 +44,11 @@ public class UserServiceImpl implements UserService { GoalEntity goalEntity = new GoalEntity(); goalEntity.setTargetAmount(Integer.parseInt(String.valueOf(userForm.getGoalId()))); + goalEntity.setUserEntity(userRepository.findById(userId).get()); CourseEntity courseEntity = courseRepository.findById(courseId).orElse(null); userEntity.setQuestionEntity(questionEntity); - userEntity.setGoalEntity(goalRepository.save( - goalEntity)); userEntity.setCourseEntity(courseEntity); userEntity.setDeleteFlag(0); 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 d009d29..a4ac2cb 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 @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; +import com.example.demo.app.domain.model.LoginModel; import com.example.demo.app.domain.service.CourseService; import com.example.demo.app.domain.service.QuestionService; import com.example.demo.app.domain.service.UserService; @@ -83,9 +84,11 @@ public class UserController { Model model, HttpSession session) { + LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); + Long courseId = courseService.findByName((String) session.getAttribute("selectedCourseName")); - userService.register(userForm, courseId); + userService.register(userForm, courseId, loginUser.getUserId()); return "redirect:/login"; } 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 f145059..23fa0da 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 @@ -36,7 +36,7 @@ public class UserForm { userModel.getSaving(), userModel.getAnnualIncome(), userModel.getMonthlyBudget(), - userModel.getGoalId(), + 0L, userModel.getCourseId() ); }