From 867926391fa7477ea166e28437cb5e99510d5dc5 Mon Sep 17 00:00:00 2001 From: k-oshita Date: Thu, 17 Sep 2026 13:56:58 +0900 Subject: [PATCH 01/17] =?UTF-8?q?[ADD]=20=E7=9B=AE=E6=A8=99=E3=81=AE?= =?UTF-8?q?=E3=81=9F=E3=82=81=E3=81=AERepository=E3=82=92=E4=BD=9C?= =?UTF-8?q?=E6=88=90=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/infra/repository/GoalRepository.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/main/java/com/example/demo/app/infra/repository/GoalRepository.java diff --git a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java new file mode 100644 index 0000000..ce05827 --- /dev/null +++ b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java @@ -0,0 +1,11 @@ +package com.example.demo.app.infra.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.example.demo.app.infra.entity.GoalEntity; + +@Repository +public interface GoalRepository extends JpaRepository { + +} \ No newline at end of file From 68fbe403859b62593a9643771e59b513512e0d0a Mon Sep 17 00:00:00 2001 From: k-oshita Date: Thu, 17 Sep 2026 14:03:44 +0900 Subject: [PATCH 02/17] =?UTF-8?q?[EDIT]=20=E6=94=B9=E8=A1=8C=E3=83=BB?= =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E8=AA=BF=E6=95=B4=E3=81=97?= =?UTF-8?q?=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/infra/repository/GoalRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java index ce05827..a5a06cd 100644 --- a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java +++ b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java @@ -7,5 +7,5 @@ import com.example.demo.app.infra.entity.GoalEntity; @Repository public interface GoalRepository extends JpaRepository { - +//aaaaaa } \ No newline at end of file From 0b336dcf5aae3a620f508ae78bea533c98a5481f Mon Sep 17 00:00:00 2001 From: k-oshita Date: Thu, 17 Sep 2026 14:16:29 +0900 Subject: [PATCH 03/17] =?UTF-8?q?[EDIT]=20=E6=94=B9=E8=A1=8C=E3=83=BB?= =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E4=BD=8D=E7=BD=AE=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4=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/infra/repository/GoalRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java index a5a06cd..17d2bbf 100644 --- a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java +++ b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java @@ -7,5 +7,5 @@ import com.example.demo.app.infra.entity.GoalEntity; @Repository public interface GoalRepository extends JpaRepository { -//aaaaaa + //aaa } \ No newline at end of file From 54b909d00d5ec378bab24ec36d9e19607e616eb2 Mon Sep 17 00:00:00 2001 From: k-oshita Date: Thu, 17 Sep 2026 14:22:06 +0900 Subject: [PATCH 04/17] =?UTF-8?q?[ADD]=20=E7=9B=AE=E6=A8=99=E3=81=AE?= =?UTF-8?q?=E3=81=9F=E3=82=81=E3=81=AEModel=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 --- .../demo/app/domain/model/GoalModel.java | 24 +++++++++++++++++++ .../app/infra/repository/GoalRepository.java | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/example/demo/app/domain/model/GoalModel.java diff --git a/src/main/java/com/example/demo/app/domain/model/GoalModel.java b/src/main/java/com/example/demo/app/domain/model/GoalModel.java new file mode 100644 index 0000000..7764281 --- /dev/null +++ b/src/main/java/com/example/demo/app/domain/model/GoalModel.java @@ -0,0 +1,24 @@ +package com.example.demo.app.domain.model; + +import java.time.LocalDate; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class GoalModel { + + private Long goalId; + + private String goalTitle; + + private String goalSubtitle; + + private Integer targetAmount; + + private LocalDate deadline; + + private Integer goalComplete; + +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java index 17d2bbf..c66aa15 100644 --- a/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java +++ b/src/main/java/com/example/demo/app/infra/repository/GoalRepository.java @@ -7,5 +7,5 @@ import com.example.demo.app.infra.entity.GoalEntity; @Repository public interface GoalRepository extends JpaRepository { - //aaa + } \ No newline at end of file From a89c54f8c0be3b81503242377b8cf852a9dc698a Mon Sep 17 00:00:00 2001 From: kkazuya Date: Thu, 17 Sep 2026 15:49:11 +0900 Subject: [PATCH 05/17] =?UTF-8?q?[ADD]=20Course,=20CoureseInfo=E3=81=AE?= =?UTF-8?q?=E3=82=B5=E3=83=BC=E3=83=93=E3=82=B9=E3=81=A8=E3=81=9D=E3=82=8C?= =?UTF-8?q?=E3=82=92=E5=AE=9F=E8=A3=85=E3=81=97=E3=81=9F=E3=82=AF=E3=83=A9?= =?UTF-8?q?=E3=82=B9=E3=82=92=E4=BD=9C=E6=88=90=E3=81=97=E3=81=BE=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/domain/service/CourseInfoService.java | 10 ++++++++ .../app/domain/service/CourseService.java | 11 +++++++++ .../service/impl/CourseInfoServiceImpl.java | 23 ++++++++++++++++++ .../service/impl/CourseServiceImpl.java | 24 +++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 src/main/java/com/example/demo/app/domain/service/CourseInfoService.java create mode 100644 src/main/java/com/example/demo/app/domain/service/CourseService.java create mode 100644 src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java create mode 100644 src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java diff --git a/src/main/java/com/example/demo/app/domain/service/CourseInfoService.java b/src/main/java/com/example/demo/app/domain/service/CourseInfoService.java new file mode 100644 index 0000000..83cf4ab --- /dev/null +++ b/src/main/java/com/example/demo/app/domain/service/CourseInfoService.java @@ -0,0 +1,10 @@ +package com.example.demo.app.domain.service; + +import java.util.List; + +import com.example.demo.app.domain.model.CourseInfoModel; + +public interface CourseInfoService { + + public List findAll(); +} 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 new file mode 100644 index 0000000..4681860 --- /dev/null +++ b/src/main/java/com/example/demo/app/domain/service/CourseService.java @@ -0,0 +1,11 @@ +package com.example.demo.app.domain.service; + +import java.util.List; + +import com.example.demo.app.domain.model.CourseModel; + +public interface CourseService { + + public List findAll(); + +} diff --git a/src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java new file mode 100644 index 0000000..4658a18 --- /dev/null +++ b/src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.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.model.CourseInfoModel; +import com.example.demo.app.domain.service.CourseInfoService; +import com.example.demo.app.infra.repository.AllocationRepository; + +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class CourseInfoServiceImpl implements CourseInfoService { + + private final AllocationRepository allocationRepository; + + @Override + public List findAll() { + return allocationRepository.findAllJoinedAllocation(); + } +} 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 new file mode 100644 index 0000000..a4dec5f --- /dev/null +++ b/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java @@ -0,0 +1,24 @@ +package com.example.demo.app.domain.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Service; + +import com.example.demo.app.domain.model.CourseModel; +import com.example.demo.app.domain.service.CourseService; +import com.example.demo.app.infra.entity.CourseEntity; +import com.example.demo.app.infra.repository.CourseRepository; + +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class CourseServiceImpl implements CourseService { + + private final CourseRepository courseRepository; + + public List findAll(){ + return CourseEntity.createCourseModelList(courseRepository.findAll()); + } + +} From 1e0946398414163441ac7ac510b8be69bcf80a04 Mon Sep 17 00:00:00 2001 From: kkazuya Date: Thu, 17 Sep 2026 15:50:11 +0900 Subject: [PATCH 06/17] =?UTF-8?q?[ADD]=20=E3=82=B3=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E9=81=B8=E6=8A=9E=E7=94=BB=E9=9D=A2=E3=81=AB=E9=81=B7=E7=A7=BB?= =?UTF-8?q?=E3=81=99=E3=82=8BCourseController=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 --- .../controller/CourseController.java | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/main/java/com/example/demo/app/presentation/controller/CourseController.java 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 new file mode 100644 index 0000000..c9199af --- /dev/null +++ b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java @@ -0,0 +1,52 @@ +package com.example.demo.app.presentation.controller; + +import java.util.logging.Logger; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +import com.example.demo.app.domain.service.CourseInfoService; +import com.example.demo.app.domain.service.CourseService; +import com.example.demo.app.presentation.form.CourseForm; +import com.example.demo.app.presentation.form.CourseInfoForm; + +import lombok.RequiredArgsConstructor; + + +@Controller +@RequiredArgsConstructor +public class CourseController { + + private final static Logger LOGGER = Logger.getLogger(CourseController.class.getName()); + // エラーメッセージ用の定数フィールド + private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; + + // private final HttpSession httpSession; + private final CourseService courseService; + private final CourseInfoService courseInfoService; + + + + @GetMapping("/select-course") + public String select(Model model) { + + //try { + model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll())); + model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll())); + + return "select-course"; + + //} catch (Exception e) { +// // ログイン情報の破棄 +// httpSession.invalidate(); +// +// e.printStackTrace(); +// +// // エラーログ出力 +// LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); +// // エラー画面遷移 +// return null; +// } + } +} From bda791567cb7f91ff683f2e4245691ea07befcc8 Mon Sep 17 00:00:00 2001 From: kkazuya Date: Thu, 17 Sep 2026 15:50:43 +0900 Subject: [PATCH 07/17] =?UTF-8?q?[ADD]=20=E3=82=B3=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E9=81=B8=E6=8A=9E=E7=94=BB=E9=9D=A2=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 --- .../resources/templates/select_course.html | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/main/resources/templates/select_course.html diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html new file mode 100644 index 0000000..6718ef4 --- /dev/null +++ b/src/main/resources/templates/select_course.html @@ -0,0 +1,35 @@ + + + + +コース選択 + + + +
+
+

+ +

+
+
+ + + + 配分(%) + + + + + +
カテゴリ名
+
+
+
+
+ + + + \ No newline at end of file From 192191d352f1a468d450890424445c7383c82262 Mon Sep 17 00:00:00 2001 From: s-morimoto Date: Thu, 17 Sep 2026 15:59:33 +0900 Subject: [PATCH 08/17] =?UTF-8?q?[ADD]=E3=83=91=E3=82=B9=E3=83=AF=E3=83=BC?= =?UTF-8?q?=E3=83=89=E5=86=8D=E8=A8=AD=E5=AE=9A=E3=81=AE=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/service/PasswordResetService.java | 8 +++ .../impl/PasswordResetServiceImpl.java | 41 +++++++++++++ .../controller/PasswordResetController.java | 61 +++++++++++++++++++ .../presentation/form/PasswordResetForm.java | 13 ++++ .../resources/templates/password_reset.html | 42 +++++++++++++ .../templates/user_register_confirm.html | 2 +- 6 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/example/demo/app/domain/service/PasswordResetService.java create mode 100644 src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java create mode 100644 src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java create mode 100644 src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java create mode 100644 src/main/resources/templates/password_reset.html diff --git a/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java b/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java new file mode 100644 index 0000000..ec1140e --- /dev/null +++ b/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java @@ -0,0 +1,8 @@ +package com.example.demo.app.domain.service; + +import com.example.demo.app.presentation.form.PasswordResetForm; + +public interface PasswordResetService { + + boolean resetPassword(Long userId, PasswordResetForm passwordResetForm); +} diff --git a/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java new file mode 100644 index 0000000..2866cea --- /dev/null +++ b/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java @@ -0,0 +1,41 @@ +package com.example.demo.app.domain.service.impl; + +import org.springframework.stereotype.Service; + +import com.example.demo.app.domain.service.PasswordResetService; +import com.example.demo.app.infra.entity.UserEntity; +import com.example.demo.app.infra.repository.UserRepository; +import com.example.demo.app.presentation.form.PasswordResetForm; + +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class PasswordResetServiceImpl implements PasswordResetService { + + private final UserRepository userRepository; + + @Override + public boolean resetPassword( + Long userId, + PasswordResetForm passwordResetForm) { + + if (!passwordResetForm.getPassword() + .equals(passwordResetForm.getPasswordConfirm())) { + return false; + } + + UserEntity userEntity = + userRepository.findById(userId).orElse(null); + + if (userEntity == null) { + return false; + } + + userEntity.setPassword(passwordResetForm.getPassword()); + + userRepository.save(userEntity); + + return true; + } +} diff --git a/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java b/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java new file mode 100644 index 0000000..b5fcfba --- /dev/null +++ b/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java @@ -0,0 +1,61 @@ +package com.example.demo.app.presentation.controller; + +import jakarta.servlet.http.HttpSession; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; + +import com.example.demo.app.domain.service.PasswordResetService; +import com.example.demo.app.presentation.form.PasswordResetForm; + +import lombok.RequiredArgsConstructor; + +@Controller +@RequiredArgsConstructor +public class PasswordResetController { + + private final PasswordResetService passwordResetService; + + @GetMapping("/password_reset") + public String showPasswordReset(Model model) { + + model.addAttribute( + "passwordResetForm", + new PasswordResetForm()); + + return "password_reset"; + } + + @PostMapping("/password_reset") + public String resetPassword( + PasswordResetForm passwordResetForm, + Model model, + HttpSession session) { + + Long userId = + (Long) session.getAttribute("passwordResetUserId"); + + if (userId == null) { + return "redirect:/login"; + } + + boolean isReset = + passwordResetService.resetPassword( + userId, + passwordResetForm); + + if (!isReset) { + model.addAttribute( + "errorMessage", + "パスワードが一致していません。"); + + return "password_reset"; + } + + session.removeAttribute("passwordResetUserId"); + + return "redirect:/login"; + } +} diff --git a/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java b/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java new file mode 100644 index 0000000..3213e1b --- /dev/null +++ b/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java @@ -0,0 +1,13 @@ +package com.example.demo.app.presentation.form; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PasswordResetForm { + private String password; + private String passwordConfirm; +} diff --git a/src/main/resources/templates/password_reset.html b/src/main/resources/templates/password_reset.html new file mode 100644 index 0000000..522fd4b --- /dev/null +++ b/src/main/resources/templates/password_reset.html @@ -0,0 +1,42 @@ + + + + +パスワード再設定 + + +
+ +
+

パスワード再設定

+ +
+
+ + +
+ +
+ + +
+ + +
+ +
+

+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/user_register_confirm.html b/src/main/resources/templates/user_register_confirm.html index aad56dd..2b35041 100644 --- a/src/main/resources/templates/user_register_confirm.html +++ b/src/main/resources/templates/user_register_confirm.html @@ -1,5 +1,5 @@ - + 新規会員登録確認 From 49ad550839a2778e23fc67706652bbef6448decf Mon Sep 17 00:00:00 2001 From: s-morimoto Date: Thu, 17 Sep 2026 16:25:46 +0900 Subject: [PATCH 09/17] =?UTF-8?q?[EDIT]=E3=83=A1=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E3=82=A2=E3=83=89=E3=83=AC=E3=82=B9=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/app/infra/repository/UserRepository.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/example/demo/app/infra/repository/UserRepository.java b/src/main/java/com/example/demo/app/infra/repository/UserRepository.java index 239dba4..868dd8a 100644 --- a/src/main/java/com/example/demo/app/infra/repository/UserRepository.java +++ b/src/main/java/com/example/demo/app/infra/repository/UserRepository.java @@ -16,5 +16,6 @@ public interface UserRepository extends JpaRepository { String mailAddress, String password); + Optional findByMailAddress(String mailAddress); } From d87bdfbe916b64083c597bc4e2a627a3d19a69b2 Mon Sep 17 00:00:00 2001 From: s-morimoto Date: Thu, 17 Sep 2026 16:28:23 +0900 Subject: [PATCH 10/17] =?UTF-8?q?[EDIT]controller=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 --- .../presentation/controller/UserController.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 2914032..7b2aef4 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 @@ -31,5 +31,19 @@ public class UserController { return "user_register_confirm"; } + + @PostMapping("/user/register/complete") + public String completeRegister(HttpSession session) { + + UserForm userForm = + (UserForm) session.getAttribute("userForm"); + + // DBへの登録処理 + + session.removeAttribute("userForm"); + + return "redirect:/login"; + } + } From a7d61be4508a1339597b607fc9066add4fd546d4 Mon Sep 17 00:00:00 2001 From: n-kawahito Date: Thu, 17 Sep 2026 16:33:26 +0900 Subject: [PATCH 11/17] =?UTF-8?q?[FIX]=E5=88=86=E6=9E=90=E5=80=A4=E3=81=AE?= =?UTF-8?q?=E3=80=8C=E3=83=BC=E3=80=8D=E9=83=A8=E5=88=86=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=82=92=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 --- src/main/resources/templates/analysis.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html index 55201dd..9f995ef 100644 --- a/src/main/resources/templates/analysis.html +++ b/src/main/resources/templates/analysis.html @@ -24,8 +24,8 @@ 0 @@ -63,16 +63,16 @@
From f68a2569bdfafdbdfc470669e0d50e32058cd0ec Mon Sep 17 00:00:00 2001 From: n-kawahito Date: Thu, 17 Sep 2026 16:36:43 +0900 Subject: [PATCH 12/17] =?UTF-8?q?[FIX]=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E5=8F=96=E5=BE=97=E3=81=AE=E4=BE=8B=E5=A4=96=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=82=92=E8=A8=98=E8=BF=B0=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/app/domain/service/impl/AnalysisServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/app/domain/service/impl/AnalysisServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/AnalysisServiceImpl.java index d0f3388..0764d41 100644 --- a/src/main/java/com/example/demo/app/domain/service/impl/AnalysisServiceImpl.java +++ b/src/main/java/com/example/demo/app/domain/service/impl/AnalysisServiceImpl.java @@ -33,7 +33,9 @@ public class AnalysisServiceImpl implements AnalysisService { public AnalysisModel getAnalysis(Long userId) { // ユーザー情報取得、月別使用可能資金取得 - UserEntity userEntity = userRepository.findById(userId).orElseThrow(); + UserEntity userEntity = userRepository.findById(userId).orElseThrow(() -> + new RuntimeException( + "User not found.")); // コースID取得 Long courseId = userEntity.getCourseEntity().getCourseId(); From aa5bf0c64e4931ce1a8b8d73368e22d68bc16e15 Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 17 Sep 2026 16:58:40 +0900 Subject: [PATCH 13/17] =?UTF-8?q?[FIX]=20=E4=B8=8D=E8=A6=81=E3=81=AA?= =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4=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 --- .../java/com/example/demo/app/infra/entity/CourseEntity.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/com/example/demo/app/infra/entity/CourseEntity.java b/src/main/java/com/example/demo/app/infra/entity/CourseEntity.java index 3afec50..fc66343 100644 --- a/src/main/java/com/example/demo/app/infra/entity/CourseEntity.java +++ b/src/main/java/com/example/demo/app/infra/entity/CourseEntity.java @@ -8,7 +8,6 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.OneToMany; -import jakarta.persistence.OneToOne; import jakarta.persistence.Table; import com.example.demo.app.domain.model.CourseModel; @@ -39,10 +38,6 @@ public class CourseEntity { @OneToMany(mappedBy = "courseEntity") private List userEntity; - @OneToOne(mappedBy = "courseEntity") - private AllocationEntity allocationEntity; - - public static List createCourseModelList(List courseEntityList) { return courseEntityList From 4590c9e5fe1f66294ce00c431908a2f9193f2b8d Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 17 Sep 2026 16:59:40 +0900 Subject: [PATCH 14/17] =?UTF-8?q?[FIX]=20=E9=81=B7=E7=A7=BB=E5=85=88?= =?UTF-8?q?=E3=81=AE=E4=BD=8F=E6=89=80=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97?= =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c9199af..ff520ae 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 @@ -35,7 +35,7 @@ public class CourseController { model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll())); model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll())); - return "select-course"; + return "select_course"; //} catch (Exception e) { // // ログイン情報の破棄 From 902167b6633d1ddc26b78d4b4cf03ee787c53925 Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 17 Sep 2026 17:00:02 +0900 Subject: [PATCH 15/17] =?UTF-8?q?[FIX]=20=E6=95=B0=E5=BC=8F=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/select_course.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html index 6718ef4..bd50a1e 100644 --- a/src/main/resources/templates/select_course.html +++ b/src/main/resources/templates/select_course.html @@ -20,7 +20,7 @@ カテゴリ名配分(%) - + From 6d494e1ac1c8da8cb9331289486ef011c85be6f8 Mon Sep 17 00:00:00 2001 From: n-kawahito Date: Fri, 18 Sep 2026 09:37:07 +0900 Subject: [PATCH 16/17] Merge branch 'k-oshita' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito --- .../app/domain/service/CourseInfoService.java | 10 --- .../app/domain/service/CourseService.java | 11 ---- .../domain/service/PasswordResetService.java | 8 --- .../demo/app/domain/service/UserService.java | 8 --- .../service/impl/CourseInfoServiceImpl.java | 23 ------- .../service/impl/CourseServiceImpl.java | 24 -------- .../impl/PasswordResetServiceImpl.java | 41 ------------- .../domain/service/impl/UserServiceImpl.java | 58 ------------------ .../controller/AnalysisController.java | 15 +++-- .../controller/PasswordResetController.java | 61 ------------------- .../controller/UserController.java | 49 --------------- .../app/presentation/form/AnalysisForm.java | 32 ---------- .../form/CategoryAnalysisForm.java | 48 --------------- .../presentation/form/PasswordResetForm.java | 13 ---- .../demo/app/presentation/form/UserForm.java | 24 -------- src/main/resources/templates/analysis.html | 8 +-- .../resources/templates/password_reset.html | 42 ------------- .../templates/user_register_confirm.html | 2 +- 18 files changed, 10 insertions(+), 467 deletions(-) delete mode 100644 src/main/java/com/example/demo/app/domain/service/CourseInfoService.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/CourseService.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/PasswordResetService.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/UserService.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/impl/UserServiceImpl.java delete mode 100644 src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java delete mode 100644 src/main/java/com/example/demo/app/presentation/controller/UserController.java delete mode 100644 src/main/java/com/example/demo/app/presentation/form/AnalysisForm.java delete mode 100644 src/main/java/com/example/demo/app/presentation/form/CategoryAnalysisForm.java delete mode 100644 src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java delete mode 100644 src/main/java/com/example/demo/app/presentation/form/UserForm.java delete mode 100644 src/main/resources/templates/password_reset.html diff --git a/src/main/java/com/example/demo/app/domain/service/CourseInfoService.java b/src/main/java/com/example/demo/app/domain/service/CourseInfoService.java deleted file mode 100644 index 83cf4ab..0000000 --- a/src/main/java/com/example/demo/app/domain/service/CourseInfoService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.demo.app.domain.service; - -import java.util.List; - -import com.example.demo.app.domain.model.CourseInfoModel; - -public interface CourseInfoService { - - public List findAll(); -} 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 deleted file mode 100644 index 4681860..0000000 --- a/src/main/java/com/example/demo/app/domain/service/CourseService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.demo.app.domain.service; - -import java.util.List; - -import com.example.demo.app.domain.model.CourseModel; - -public interface CourseService { - - public List findAll(); - -} diff --git a/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java b/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java deleted file mode 100644 index ec1140e..0000000 --- a/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.demo.app.domain.service; - -import com.example.demo.app.presentation.form.PasswordResetForm; - -public interface PasswordResetService { - - boolean resetPassword(Long userId, PasswordResetForm passwordResetForm); -} 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 deleted file mode 100644 index 4a7a338..0000000 --- a/src/main/java/com/example/demo/app/domain/service/UserService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.demo.app.domain.service; - -import com.example.demo.app.presentation.form.UserForm; - -public interface UserService { - - void register(UserForm userForm); -} diff --git a/src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java deleted file mode 100644 index 4658a18..0000000 --- a/src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.demo.app.domain.service.impl; - -import java.util.List; - -import org.springframework.stereotype.Service; - -import com.example.demo.app.domain.model.CourseInfoModel; -import com.example.demo.app.domain.service.CourseInfoService; -import com.example.demo.app.infra.repository.AllocationRepository; - -import lombok.RequiredArgsConstructor; - -@Service -@RequiredArgsConstructor -public class CourseInfoServiceImpl implements CourseInfoService { - - private final AllocationRepository allocationRepository; - - @Override - public List findAll() { - return allocationRepository.findAllJoinedAllocation(); - } -} 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 deleted file mode 100644 index a4dec5f..0000000 --- a/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.demo.app.domain.service.impl; - -import java.util.List; - -import org.springframework.stereotype.Service; - -import com.example.demo.app.domain.model.CourseModel; -import com.example.demo.app.domain.service.CourseService; -import com.example.demo.app.infra.entity.CourseEntity; -import com.example.demo.app.infra.repository.CourseRepository; - -import lombok.RequiredArgsConstructor; - -@Service -@RequiredArgsConstructor -public class CourseServiceImpl implements CourseService { - - private final CourseRepository courseRepository; - - public List findAll(){ - return CourseEntity.createCourseModelList(courseRepository.findAll()); - } - -} diff --git a/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java deleted file mode 100644 index 2866cea..0000000 --- a/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.example.demo.app.domain.service.impl; - -import org.springframework.stereotype.Service; - -import com.example.demo.app.domain.service.PasswordResetService; -import com.example.demo.app.infra.entity.UserEntity; -import com.example.demo.app.infra.repository.UserRepository; -import com.example.demo.app.presentation.form.PasswordResetForm; - -import lombok.RequiredArgsConstructor; - -@Service -@RequiredArgsConstructor -public class PasswordResetServiceImpl implements PasswordResetService { - - private final UserRepository userRepository; - - @Override - public boolean resetPassword( - Long userId, - PasswordResetForm passwordResetForm) { - - if (!passwordResetForm.getPassword() - .equals(passwordResetForm.getPasswordConfirm())) { - return false; - } - - UserEntity userEntity = - userRepository.findById(userId).orElse(null); - - if (userEntity == null) { - return false; - } - - userEntity.setPassword(passwordResetForm.getPassword()); - - userRepository.save(userEntity); - - return true; - } -} 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 deleted file mode 100644 index a74f42b..0000000 --- a/src/main/java/com/example/demo/app/domain/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.example.demo.app.domain.service.impl; - -import org.springframework.stereotype.Service; - -import com.example.demo.app.domain.service.UserService; -import com.example.demo.app.infra.entity.CourseEntity; -import com.example.demo.app.infra.entity.GoalEntity; -import com.example.demo.app.infra.entity.QuestionEntity; -import com.example.demo.app.infra.entity.UserEntity; -import com.example.demo.app.infra.repository.CourseRepository; -import com.example.demo.app.infra.repository.GoalRepository; -import com.example.demo.app.infra.repository.QuestionRepository; -import com.example.demo.app.infra.repository.UserRepository; -import com.example.demo.app.presentation.form.UserForm; - -import lombok.RequiredArgsConstructor; - -@Service -@RequiredArgsConstructor -public class UserServiceImpl implements UserService { - - private final UserRepository userRepository; - private final QuestionRepository questionRepository; - private final GoalRepository goalRepository; - private final CourseRepository courseRepository; - - @Override - public void register(UserForm userForm) { - - UserEntity userEntity = new UserEntity(); - - userEntity.setUserName(userForm.getUserName()); - userEntity.setMailAddress(userForm.getMailAddress()); - userEntity.setPassword(userForm.getPassword()); - userEntity.setSecretQuestionAnswer(userForm.getSecretAnswer()); - userEntity.setBirthDate(userForm.getBirthDate()); - userEntity.setSaving(userForm.getSaving()); - userEntity.setAnnualIncome(userForm.getAnnualIncome()); - userEntity.setMonthlyBudget(userForm.getMonthlyBudget()); - - QuestionEntity questionEntity = - questionRepository.findById(userForm.getSecretQuestionId()).orElse(null); - - GoalEntity goalEntity = - goalRepository.findById(userForm.getGoalId()).orElse(null); - - CourseEntity courseEntity = - courseRepository.findById(userForm.getCourseId()).orElse(null); - - userEntity.setQuestionEntity(questionEntity); - userEntity.setGoalEntity(goalEntity); - userEntity.setCourseEntity(courseEntity); - - userEntity.setDeleteFlag(0); - - userRepository.save(userEntity); - } -} diff --git a/src/main/java/com/example/demo/app/presentation/controller/AnalysisController.java b/src/main/java/com/example/demo/app/presentation/controller/AnalysisController.java index 5bc8cd9..6b48a58 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/AnalysisController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/AnalysisController.java @@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.GetMapping; import com.example.demo.app.domain.model.AnalysisModel; import com.example.demo.app.domain.model.LoginModel; import com.example.demo.app.domain.service.AnalysisService; -import com.example.demo.app.presentation.form.AnalysisForm; import lombok.RequiredArgsConstructor; @@ -24,15 +23,15 @@ public class AnalysisController { public String showAnalysis(Model model, HttpSession session) { //ログインユーザーの取得（セッション） - LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); - + LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); + //分析結果の取得(Service) - AnalysisModel analysisModel = analysisService.getAnalysis(loginUser.getUserId()); - - AnalysisForm analysisForm = AnalysisForm.convertFrom(analysisModel); - + AnalysisModel analysisModel = analysisService.getAnalysis(loginUser.getUserId()); + + AnalysisForm analysisForm = AnalysisForm.convertFrom(analysisModel); + //model格納 - model.addAttribute("analysisForm", analysisForm); + model.addAttribute("analysisForm", analysisForm); return "analysis"; } diff --git a/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java b/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java deleted file mode 100644 index b5fcfba..0000000 --- a/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.example.demo.app.presentation.controller; - -import jakarta.servlet.http.HttpSession; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; - -import com.example.demo.app.domain.service.PasswordResetService; -import com.example.demo.app.presentation.form.PasswordResetForm; - -import lombok.RequiredArgsConstructor; - -@Controller -@RequiredArgsConstructor -public class PasswordResetController { - - private final PasswordResetService passwordResetService; - - @GetMapping("/password_reset") - public String showPasswordReset(Model model) { - - model.addAttribute( - "passwordResetForm", - new PasswordResetForm()); - - return "password_reset"; - } - - @PostMapping("/password_reset") - public String resetPassword( - PasswordResetForm passwordResetForm, - Model model, - HttpSession session) { - - Long userId = - (Long) session.getAttribute("passwordResetUserId"); - - if (userId == null) { - return "redirect:/login"; - } - - boolean isReset = - passwordResetService.resetPassword( - userId, - passwordResetForm); - - if (!isReset) { - model.addAttribute( - "errorMessage", - "パスワードが一致していません。"); - - return "password_reset"; - } - - session.removeAttribute("passwordResetUserId"); - - return "redirect:/login"; - } -} 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 deleted file mode 100644 index 7b2aef4..0000000 --- a/src/main/java/com/example/demo/app/presentation/controller/UserController.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.example.demo.app.presentation.controller; - -import jakarta.servlet.http.HttpSession; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; - -import com.example.demo.app.presentation.form.UserForm; - -import lombok.RequiredArgsConstructor; - -@Controller -@RequiredArgsConstructor -public class UserController { - - @GetMapping("/user/register") - public String showRegister(Model model) { - model.addAttribute("userForm", new UserForm()); - 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) { - - UserForm userForm = - (UserForm) session.getAttribute("userForm"); - - // DBへの登録処理 - - session.removeAttribute("userForm"); - - return "redirect:/login"; - } - - -} diff --git a/src/main/java/com/example/demo/app/presentation/form/AnalysisForm.java b/src/main/java/com/example/demo/app/presentation/form/AnalysisForm.java deleted file mode 100644 index c9c4202..0000000 --- a/src/main/java/com/example/demo/app/presentation/form/AnalysisForm.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.example.demo.app.presentation.form; - -import java.util.List; - -import com.example.demo.app.domain.model.AnalysisModel; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class AnalysisForm { - - private Integer currentMonthTotalAmount; - private Integer previousMonthTotalAmount; - private Integer totalDifferenceAmount; - private List categoryAnalysisFormList; - - public static AnalysisForm convertFrom( - AnalysisModel analysisModel) { - - return new AnalysisForm( - analysisModel.getCurrentMonthTotalAmount(), - analysisModel.getPreviousMonthTotalAmount(), - analysisModel.getTotalDifferenceAmount(), - CategoryAnalysisForm.convertFrom( - analysisModel.getCategoryAnalysisModelList())); - } - -} diff --git a/src/main/java/com/example/demo/app/presentation/form/CategoryAnalysisForm.java b/src/main/java/com/example/demo/app/presentation/form/CategoryAnalysisForm.java deleted file mode 100644 index add1762..0000000 --- a/src/main/java/com/example/demo/app/presentation/form/CategoryAnalysisForm.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.example.demo.app.presentation.form; - -import java.util.List; - -import com.example.demo.app.domain.model.CategoryAnalysisModel; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CategoryAnalysisForm { - - private String categoryName; - - private Integer currentMonthAmount; - - private Integer previousMonthAmount; - - private Integer monthDifferenceAmount; - - private Integer courseLimitAmount; - - private Integer courseDifferenceAmount; - - public static CategoryAnalysisForm convertFrom( - - CategoryAnalysisModel categoryAnalysisModel) { - return new CategoryAnalysisForm( - categoryAnalysisModel.getCategoryName(), - categoryAnalysisModel.getCurrentMonthAmount(), - categoryAnalysisModel.getPreviousMonthAmount(), - categoryAnalysisModel.getMonthDifferenceAmount(), - categoryAnalysisModel.getCourseLimitAmount(), - categoryAnalysisModel.getCourseDifferenceAmount()); - } - - public static List convertFrom( - List categoryAnalysisModelList) { - - return categoryAnalysisModelList.stream() - .map(CategoryAnalysisForm::convertFrom) - .toList(); - } - -} diff --git a/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java b/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java deleted file mode 100644 index 3213e1b..0000000 --- a/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.demo.app.presentation.form; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class PasswordResetForm { - private String password; - private String passwordConfirm; -} 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 deleted file mode 100644 index e51f23f..0000000 --- a/src/main/java/com/example/demo/app/presentation/form/UserForm.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.demo.app.presentation.form; - -import java.time.LocalDate; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class UserForm { - private String userName; - private String mailAddress; - private String password; - private Long secretQuestionId; - private String SecretAnswer; - private LocalDate birthDate; - private Integer saving; - private Integer annualIncome; - private Integer monthlyBudget; - private Long goalId; - private Long courseId; -} diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html index 9f995ef..87fbc0f 100644 --- a/src/main/resources/templates/analysis.html +++ b/src/main/resources/templates/analysis.html @@ -12,7 +12,7 @@ - + @@ -42,11 +42,7 @@ - + diff --git a/src/main/resources/templates/password_reset.html b/src/main/resources/templates/password_reset.html deleted file mode 100644 index 522fd4b..0000000 --- a/src/main/resources/templates/password_reset.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - -パスワード再設定 - - -
- -
-

パスワード再設定

- -
-
- - -
- -
- - -
- - - - -
-

-
-
- - \ No newline at end of file diff --git a/src/main/resources/templates/user_register_confirm.html b/src/main/resources/templates/user_register_confirm.html index 2b35041..aad56dd 100644 --- a/src/main/resources/templates/user_register_confirm.html +++ b/src/main/resources/templates/user_register_confirm.html @@ -1,5 +1,5 @@ - +新規会員登録確認 From aa2a511d2bd30d15b65969a45a9d9b4ad9825be9 Mon Sep 17 00:00:00 2001 From: n-kawahito Date: Fri, 18 Sep 2026 09:41:38 +0900 Subject: [PATCH 17/17] Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito --- .../app/domain/service/CourseInfoService.java | 10 --- .../app/domain/service/CourseService.java | 11 ---- .../domain/service/PasswordResetService.java | 8 --- .../demo/app/domain/service/UserService.java | 8 --- .../service/impl/AnalysisServiceImpl.java | 4 +- .../service/impl/CourseInfoServiceImpl.java | 23 ------- .../service/impl/CourseServiceImpl.java | 24 -------- .../impl/PasswordResetServiceImpl.java | 41 ------------- .../domain/service/impl/UserServiceImpl.java | 58 ------------------ .../demo/app/infra/entity/CourseEntity.java | 5 -- .../controller/AnalysisController.java | 15 +++-- .../controller/CourseController.java | 2 +- .../controller/PasswordResetController.java | 61 ------------------- .../controller/UserController.java | 49 --------------- .../app/presentation/form/AnalysisForm.java | 32 ---------- .../form/CategoryAnalysisForm.java | 48 --------------- .../presentation/form/PasswordResetForm.java | 13 ---- .../demo/app/presentation/form/UserForm.java | 24 -------- src/main/resources/templates/analysis.html | 20 +++--- .../resources/templates/password_reset.html | 42 ------------- .../resources/templates/select_course.html | 2 +- .../templates/user_register_confirm.html | 2 +- 22 files changed, 21 insertions(+), 481 deletions(-) delete mode 100644 src/main/java/com/example/demo/app/domain/service/CourseInfoService.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/CourseService.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/PasswordResetService.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/UserService.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java delete mode 100644 src/main/java/com/example/demo/app/domain/service/impl/UserServiceImpl.java delete mode 100644 src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java delete mode 100644 src/main/java/com/example/demo/app/presentation/controller/UserController.java delete mode 100644 src/main/java/com/example/demo/app/presentation/form/AnalysisForm.java delete mode 100644 src/main/java/com/example/demo/app/presentation/form/CategoryAnalysisForm.java delete mode 100644 src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java delete mode 100644 src/main/java/com/example/demo/app/presentation/form/UserForm.java delete mode 100644 src/main/resources/templates/password_reset.html diff --git a/src/main/java/com/example/demo/app/domain/service/CourseInfoService.java b/src/main/java/com/example/demo/app/domain/service/CourseInfoService.java deleted file mode 100644 index 83cf4ab..0000000 --- a/src/main/java/com/example/demo/app/domain/service/CourseInfoService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.demo.app.domain.service; - -import java.util.List; - -import com.example.demo.app.domain.model.CourseInfoModel; - -public interface CourseInfoService { - - public List findAll(); -} 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 deleted file mode 100644 index 4681860..0000000 --- a/src/main/java/com/example/demo/app/domain/service/CourseService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.demo.app.domain.service; - -import java.util.List; - -import com.example.demo.app.domain.model.CourseModel; - -public interface CourseService { - - public List findAll(); - -} diff --git a/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java b/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java deleted file mode 100644 index ec1140e..0000000 --- a/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.demo.app.domain.service; - -import com.example.demo.app.presentation.form.PasswordResetForm; - -public interface PasswordResetService { - - boolean resetPassword(Long userId, PasswordResetForm passwordResetForm); -} 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 deleted file mode 100644 index 4a7a338..0000000 --- a/src/main/java/com/example/demo/app/domain/service/UserService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.demo.app.domain.service; - -import com.example.demo.app.presentation.form.UserForm; - -public interface UserService { - - void register(UserForm userForm); -} diff --git a/src/main/java/com/example/demo/app/domain/service/impl/AnalysisServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/AnalysisServiceImpl.java index d0f3388..0764d41 100644 --- a/src/main/java/com/example/demo/app/domain/service/impl/AnalysisServiceImpl.java +++ b/src/main/java/com/example/demo/app/domain/service/impl/AnalysisServiceImpl.java @@ -33,7 +33,9 @@ public class AnalysisServiceImpl implements AnalysisService { public AnalysisModel getAnalysis(Long userId) { // ユーザー情報取得、月別使用可能資金取得 - UserEntity userEntity = userRepository.findById(userId).orElseThrow(); + UserEntity userEntity = userRepository.findById(userId).orElseThrow(() -> + new RuntimeException( + "User not found.")); // コースID取得 Long courseId = userEntity.getCourseEntity().getCourseId(); diff --git a/src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java deleted file mode 100644 index 4658a18..0000000 --- a/src/main/java/com/example/demo/app/domain/service/impl/CourseInfoServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.demo.app.domain.service.impl; - -import java.util.List; - -import org.springframework.stereotype.Service; - -import com.example.demo.app.domain.model.CourseInfoModel; -import com.example.demo.app.domain.service.CourseInfoService; -import com.example.demo.app.infra.repository.AllocationRepository; - -import lombok.RequiredArgsConstructor; - -@Service -@RequiredArgsConstructor -public class CourseInfoServiceImpl implements CourseInfoService { - - private final AllocationRepository allocationRepository; - - @Override - public List findAll() { - return allocationRepository.findAllJoinedAllocation(); - } -} 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 deleted file mode 100644 index a4dec5f..0000000 --- a/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.demo.app.domain.service.impl; - -import java.util.List; - -import org.springframework.stereotype.Service; - -import com.example.demo.app.domain.model.CourseModel; -import com.example.demo.app.domain.service.CourseService; -import com.example.demo.app.infra.entity.CourseEntity; -import com.example.demo.app.infra.repository.CourseRepository; - -import lombok.RequiredArgsConstructor; - -@Service -@RequiredArgsConstructor -public class CourseServiceImpl implements CourseService { - - private final CourseRepository courseRepository; - - public List findAll(){ - return CourseEntity.createCourseModelList(courseRepository.findAll()); - } - -} diff --git a/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java deleted file mode 100644 index 2866cea..0000000 --- a/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.example.demo.app.domain.service.impl; - -import org.springframework.stereotype.Service; - -import com.example.demo.app.domain.service.PasswordResetService; -import com.example.demo.app.infra.entity.UserEntity; -import com.example.demo.app.infra.repository.UserRepository; -import com.example.demo.app.presentation.form.PasswordResetForm; - -import lombok.RequiredArgsConstructor; - -@Service -@RequiredArgsConstructor -public class PasswordResetServiceImpl implements PasswordResetService { - - private final UserRepository userRepository; - - @Override - public boolean resetPassword( - Long userId, - PasswordResetForm passwordResetForm) { - - if (!passwordResetForm.getPassword() - .equals(passwordResetForm.getPasswordConfirm())) { - return false; - } - - UserEntity userEntity = - userRepository.findById(userId).orElse(null); - - if (userEntity == null) { - return false; - } - - userEntity.setPassword(passwordResetForm.getPassword()); - - userRepository.save(userEntity); - - return true; - } -} 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 deleted file mode 100644 index a74f42b..0000000 --- a/src/main/java/com/example/demo/app/domain/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.example.demo.app.domain.service.impl; - -import org.springframework.stereotype.Service; - -import com.example.demo.app.domain.service.UserService; -import com.example.demo.app.infra.entity.CourseEntity; -import com.example.demo.app.infra.entity.GoalEntity; -import com.example.demo.app.infra.entity.QuestionEntity; -import com.example.demo.app.infra.entity.UserEntity; -import com.example.demo.app.infra.repository.CourseRepository; -import com.example.demo.app.infra.repository.GoalRepository; -import com.example.demo.app.infra.repository.QuestionRepository; -import com.example.demo.app.infra.repository.UserRepository; -import com.example.demo.app.presentation.form.UserForm; - -import lombok.RequiredArgsConstructor; - -@Service -@RequiredArgsConstructor -public class UserServiceImpl implements UserService { - - private final UserRepository userRepository; - private final QuestionRepository questionRepository; - private final GoalRepository goalRepository; - private final CourseRepository courseRepository; - - @Override - public void register(UserForm userForm) { - - UserEntity userEntity = new UserEntity(); - - userEntity.setUserName(userForm.getUserName()); - userEntity.setMailAddress(userForm.getMailAddress()); - userEntity.setPassword(userForm.getPassword()); - userEntity.setSecretQuestionAnswer(userForm.getSecretAnswer()); - userEntity.setBirthDate(userForm.getBirthDate()); - userEntity.setSaving(userForm.getSaving()); - userEntity.setAnnualIncome(userForm.getAnnualIncome()); - userEntity.setMonthlyBudget(userForm.getMonthlyBudget()); - - QuestionEntity questionEntity = - questionRepository.findById(userForm.getSecretQuestionId()).orElse(null); - - GoalEntity goalEntity = - goalRepository.findById(userForm.getGoalId()).orElse(null); - - CourseEntity courseEntity = - courseRepository.findById(userForm.getCourseId()).orElse(null); - - userEntity.setQuestionEntity(questionEntity); - userEntity.setGoalEntity(goalEntity); - userEntity.setCourseEntity(courseEntity); - - userEntity.setDeleteFlag(0); - - userRepository.save(userEntity); - } -} diff --git a/src/main/java/com/example/demo/app/infra/entity/CourseEntity.java b/src/main/java/com/example/demo/app/infra/entity/CourseEntity.java index 3afec50..fc66343 100644 --- a/src/main/java/com/example/demo/app/infra/entity/CourseEntity.java +++ b/src/main/java/com/example/demo/app/infra/entity/CourseEntity.java @@ -8,7 +8,6 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.OneToMany; -import jakarta.persistence.OneToOne; import jakarta.persistence.Table; import com.example.demo.app.domain.model.CourseModel; @@ -39,10 +38,6 @@ public class CourseEntity { @OneToMany(mappedBy = "courseEntity") private List userEntity; - @OneToOne(mappedBy = "courseEntity") - private AllocationEntity allocationEntity; - - public static List createCourseModelList(List courseEntityList) { return courseEntityList diff --git a/src/main/java/com/example/demo/app/presentation/controller/AnalysisController.java b/src/main/java/com/example/demo/app/presentation/controller/AnalysisController.java index 5bc8cd9..6b48a58 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/AnalysisController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/AnalysisController.java @@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.GetMapping; import com.example.demo.app.domain.model.AnalysisModel; import com.example.demo.app.domain.model.LoginModel; import com.example.demo.app.domain.service.AnalysisService; -import com.example.demo.app.presentation.form.AnalysisForm; import lombok.RequiredArgsConstructor; @@ -24,15 +23,15 @@ public class AnalysisController { public String showAnalysis(Model model, HttpSession session) { //ログインユーザーの取得（セッション） - LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); - + LoginModel loginUser = (LoginModel) session.getAttribute("loginUser"); + //分析結果の取得(Service) - AnalysisModel analysisModel = analysisService.getAnalysis(loginUser.getUserId()); - - AnalysisForm analysisForm = AnalysisForm.convertFrom(analysisModel); - + AnalysisModel analysisModel = analysisService.getAnalysis(loginUser.getUserId()); + + AnalysisForm analysisForm = AnalysisForm.convertFrom(analysisModel); + //model格納 - model.addAttribute("analysisForm", analysisForm); + model.addAttribute("analysisForm", analysisForm); return "analysis"; } 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 c9199af..ff520ae 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 @@ -35,7 +35,7 @@ public class CourseController { model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll())); model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll())); - return "select-course"; + return "select_course"; //} catch (Exception e) { // // ログイン情報の破棄 diff --git a/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java b/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java deleted file mode 100644 index b5fcfba..0000000 --- a/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.example.demo.app.presentation.controller; - -import jakarta.servlet.http.HttpSession; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; - -import com.example.demo.app.domain.service.PasswordResetService; -import com.example.demo.app.presentation.form.PasswordResetForm; - -import lombok.RequiredArgsConstructor; - -@Controller -@RequiredArgsConstructor -public class PasswordResetController { - - private final PasswordResetService passwordResetService; - - @GetMapping("/password_reset") - public String showPasswordReset(Model model) { - - model.addAttribute( - "passwordResetForm", - new PasswordResetForm()); - - return "password_reset"; - } - - @PostMapping("/password_reset") - public String resetPassword( - PasswordResetForm passwordResetForm, - Model model, - HttpSession session) { - - Long userId = - (Long) session.getAttribute("passwordResetUserId"); - - if (userId == null) { - return "redirect:/login"; - } - - boolean isReset = - passwordResetService.resetPassword( - userId, - passwordResetForm); - - if (!isReset) { - model.addAttribute( - "errorMessage", - "パスワードが一致していません。"); - - return "password_reset"; - } - - session.removeAttribute("passwordResetUserId"); - - return "redirect:/login"; - } -} 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 deleted file mode 100644 index 7b2aef4..0000000 --- a/src/main/java/com/example/demo/app/presentation/controller/UserController.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.example.demo.app.presentation.controller; - -import jakarta.servlet.http.HttpSession; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; - -import com.example.demo.app.presentation.form.UserForm; - -import lombok.RequiredArgsConstructor; - -@Controller -@RequiredArgsConstructor -public class UserController { - - @GetMapping("/user/register") - public String showRegister(Model model) { - model.addAttribute("userForm", new UserForm()); - 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) { - - UserForm userForm = - (UserForm) session.getAttribute("userForm"); - - // DBへの登録処理 - - session.removeAttribute("userForm"); - - return "redirect:/login"; - } - - -} diff --git a/src/main/java/com/example/demo/app/presentation/form/AnalysisForm.java b/src/main/java/com/example/demo/app/presentation/form/AnalysisForm.java deleted file mode 100644 index c9c4202..0000000 --- a/src/main/java/com/example/demo/app/presentation/form/AnalysisForm.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.example.demo.app.presentation.form; - -import java.util.List; - -import com.example.demo.app.domain.model.AnalysisModel; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class AnalysisForm { - - private Integer currentMonthTotalAmount; - private Integer previousMonthTotalAmount; - private Integer totalDifferenceAmount; - private List categoryAnalysisFormList; - - public static AnalysisForm convertFrom( - AnalysisModel analysisModel) { - - return new AnalysisForm( - analysisModel.getCurrentMonthTotalAmount(), - analysisModel.getPreviousMonthTotalAmount(), - analysisModel.getTotalDifferenceAmount(), - CategoryAnalysisForm.convertFrom( - analysisModel.getCategoryAnalysisModelList())); - } - -} diff --git a/src/main/java/com/example/demo/app/presentation/form/CategoryAnalysisForm.java b/src/main/java/com/example/demo/app/presentation/form/CategoryAnalysisForm.java deleted file mode 100644 index add1762..0000000 --- a/src/main/java/com/example/demo/app/presentation/form/CategoryAnalysisForm.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.example.demo.app.presentation.form; - -import java.util.List; - -import com.example.demo.app.domain.model.CategoryAnalysisModel; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CategoryAnalysisForm { - - private String categoryName; - - private Integer currentMonthAmount; - - private Integer previousMonthAmount; - - private Integer monthDifferenceAmount; - - private Integer courseLimitAmount; - - private Integer courseDifferenceAmount; - - public static CategoryAnalysisForm convertFrom( - - CategoryAnalysisModel categoryAnalysisModel) { - return new CategoryAnalysisForm( - categoryAnalysisModel.getCategoryName(), - categoryAnalysisModel.getCurrentMonthAmount(), - categoryAnalysisModel.getPreviousMonthAmount(), - categoryAnalysisModel.getMonthDifferenceAmount(), - categoryAnalysisModel.getCourseLimitAmount(), - categoryAnalysisModel.getCourseDifferenceAmount()); - } - - public static List convertFrom( - List categoryAnalysisModelList) { - - return categoryAnalysisModelList.stream() - .map(CategoryAnalysisForm::convertFrom) - .toList(); - } - -} diff --git a/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java b/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java deleted file mode 100644 index 3213e1b..0000000 --- a/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.demo.app.presentation.form; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class PasswordResetForm { - private String password; - private String passwordConfirm; -} 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 deleted file mode 100644 index e51f23f..0000000 --- a/src/main/java/com/example/demo/app/presentation/form/UserForm.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.demo.app.presentation.form; - -import java.time.LocalDate; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class UserForm { - private String userName; - private String mailAddress; - private String password; - private Long secretQuestionId; - private String SecretAnswer; - private LocalDate birthDate; - private Integer saving; - private Integer annualIncome; - private Integer monthlyBudget; - private Long goalId; - private Long courseId; -} diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html index 55201dd..87fbc0f 100644 --- a/src/main/resources/templates/analysis.html +++ b/src/main/resources/templates/analysis.html @@ -12,7 +12,7 @@
カテゴリ別 支出 前月比
カテゴリ別 支出 - 前月比 -
- コース比 - 		前月比
コース比
- + @@ -24,8 +24,8 @@ 0 - + @@ -63,16 +59,16 @@ 配分(%) - + diff --git a/src/main/resources/templates/user_register_confirm.html b/src/main/resources/templates/user_register_confirm.html index 2b35041..aad56dd 100644 --- a/src/main/resources/templates/user_register_confirm.html +++ b/src/main/resources/templates/user_register_confirm.html @@ -1,5 +1,5 @@ - +新規会員登録確認
カテゴリ別 支出 前月比
@@ -42,11 +42,7 @@
カテゴリ別 支出 - 前月比 -
- コース比 - 		前月比
コース比

diff --git a/src/main/resources/templates/password_reset.html b/src/main/resources/templates/password_reset.html deleted file mode 100644 index 522fd4b..0000000 --- a/src/main/resources/templates/password_reset.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - -パスワード再設定 - - -
- -
-

パスワード再設定

- -
-
- - -
- -
- - -
- - -
- -
-

-
-
- - \ No newline at end of file diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html index 6718ef4..bd50a1e 100644 --- a/src/main/resources/templates/select_course.html +++ b/src/main/resources/templates/select_course.html @@ -20,7 +20,7 @@
カテゴリ名