From 9bc5bd20ac24bc0f6c082521d238ab197b30711a Mon Sep 17 00:00:00 2001 From: n-kawahito Date: Thu, 17 Sep 2026 11:29:54 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[DELETE&ADD]AnalysisServiceImpl.java?= =?UTF-8?q?=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=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 --- .../app/domain/service/{ => impl}/AnalysisServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename src/main/java/com/example/demo/app/domain/service/{ => impl}/AnalysisServiceImpl.java (89%) diff --git a/src/main/java/com/example/demo/app/domain/service/AnalysisServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/AnalysisServiceImpl.java similarity index 89% rename from src/main/java/com/example/demo/app/domain/service/AnalysisServiceImpl.java rename to src/main/java/com/example/demo/app/domain/service/impl/AnalysisServiceImpl.java index a75a085..66f4bbc 100644 --- a/src/main/java/com/example/demo/app/domain/service/AnalysisServiceImpl.java +++ b/src/main/java/com/example/demo/app/domain/service/impl/AnalysisServiceImpl.java @@ -1,8 +1,9 @@ -package com.example.demo.app.domain.service; +package com.example.demo.app.domain.service.impl; import org.springframework.stereotype.Service; import com.example.demo.app.domain.model.AnalysisModel; +import com.example.demo.app.domain.service.AnalysisService; import lombok.RequiredArgsConstructor; From 073ed5e8647fbada895fc7ddc8853a754d3f30a1 Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 17 Sep 2026 12:36:35 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[STYLE]=20=E6=94=B9=E8=A1=8C=E3=82=92?= =?UTF-8?q?=E8=BF=BD=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 --- .../demo/app/infra/repository/TransactionRepository.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/app/infra/repository/TransactionRepository.java b/src/main/java/com/example/demo/app/infra/repository/TransactionRepository.java index 933aa4f..478a3c0 100644 --- a/src/main/java/com/example/demo/app/infra/repository/TransactionRepository.java +++ b/src/main/java/com/example/demo/app/infra/repository/TransactionRepository.java @@ -21,5 +21,6 @@ public interface TransactionRepository extends JpaRepository Date: Thu, 17 Sep 2026 12:59:17 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[EDIT]service=E3=81=A8controller=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/app/domain/service/LoginService.java | 4 ++-- .../app/domain/service/impl/LoginServiceImpl.java | 12 +++++++++--- .../app/presentation/controller/LoginController.java | 12 ++++++------ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/example/demo/app/domain/service/LoginService.java b/src/main/java/com/example/demo/app/domain/service/LoginService.java index 4908194..547a5d7 100644 --- a/src/main/java/com/example/demo/app/domain/service/LoginService.java +++ b/src/main/java/com/example/demo/app/domain/service/LoginService.java @@ -1,9 +1,9 @@ package com.example.demo.app.domain.service; -import com.example.demo.app.infra.entity.UserEntity; +import com.example.demo.app.domain.model.LoginModel; public interface LoginService { - UserEntity login(String mailAddress, String password); + LoginModel login(String mailAddress, String password); } diff --git a/src/main/java/com/example/demo/app/domain/service/impl/LoginServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/LoginServiceImpl.java index ac41c21..9e1563a 100644 --- a/src/main/java/com/example/demo/app/domain/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/example/demo/app/domain/service/impl/LoginServiceImpl.java @@ -2,6 +2,7 @@ package com.example.demo.app.domain.service.impl; import org.springframework.stereotype.Service; +import com.example.demo.app.domain.model.LoginModel; import com.example.demo.app.domain.service.LoginService; import com.example.demo.app.infra.entity.UserEntity; import com.example.demo.app.infra.repository.UserRepository; @@ -15,11 +16,16 @@ public class LoginServiceImpl implements LoginService { private final UserRepository userRepository; @Override - public UserEntity login(String mailAddress, String password) { + public LoginModel login(String mailAddress, String password) { - return userRepository.findByMailAddressAndPassword( + UserEntity userEntity = userRepository.findByMailAddressAndPassword( mailAddress, password).orElse(null); + + if (userEntity == null) { + return null; + } + + return new LoginModel(userEntity.getUserId()); } } - diff --git a/src/main/java/com/example/demo/app/presentation/controller/LoginController.java b/src/main/java/com/example/demo/app/presentation/controller/LoginController.java index 2e1439f..20ac8c5 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/LoginController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/LoginController.java @@ -8,8 +8,8 @@ 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.domain.model.LoginModel; import com.example.demo.app.domain.service.LoginService; -import com.example.demo.app.infra.entity.UserEntity; import com.example.demo.app.presentation.form.LoginForm; import lombok.RequiredArgsConstructor; @@ -33,13 +33,14 @@ public class LoginController { @PostMapping("/login") public String login( @ModelAttribute LoginForm loginForm, - Model model, HttpSession session) { + Model model, + HttpSession session) { - UserEntity loginUser = loginService.login( + LoginModel loginModel = loginService.login( loginForm.getMailAddress(), loginForm.getPassword()); - if (loginUser == null) { + if (loginModel == null) { model.addAttribute( "errorMessage", "Email address or password is incorrect."); @@ -47,9 +48,8 @@ public class LoginController { return "login"; } - session.setAttribute("loginUser", loginUser); + session.setAttribute("loginUser", loginModel); return "menu"; } } - From d65a84ea79e8e1361758a211fd5ba930bd35fd15 Mon Sep 17 00:00:00 2001 From: n-kawahito Date: Thu, 17 Sep 2026 13:00:25 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[EDIT]transactionRepository=E3=81=AB?= =?UTF-8?q?=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA=E5=88=A5=E9=9B=86=E8=A8=88?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E8=A8=98=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 --- .../demo/app/infra/repository/TransactionRepository.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/app/infra/repository/TransactionRepository.java b/src/main/java/com/example/demo/app/infra/repository/TransactionRepository.java index 478a3c0..c747917 100644 --- a/src/main/java/com/example/demo/app/infra/repository/TransactionRepository.java +++ b/src/main/java/com/example/demo/app/infra/repository/TransactionRepository.java @@ -22,5 +22,6 @@ public interface TransactionRepository extends JpaRepository Date: Thu, 17 Sep 2026 13:04:34 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[ADD]LoginModel=E3=81=AE=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/app/domain/model/LoginModel.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/main/java/com/example/demo/app/domain/model/LoginModel.java diff --git a/src/main/java/com/example/demo/app/domain/model/LoginModel.java b/src/main/java/com/example/demo/app/domain/model/LoginModel.java new file mode 100644 index 0000000..f9c2e93 --- /dev/null +++ b/src/main/java/com/example/demo/app/domain/model/LoginModel.java @@ -0,0 +1,10 @@ +package com.example.demo.app.domain.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class LoginModel { + private Long userId; +}