From 79cbbc1f2bc6d548fe06b109690e5a58d1bf8efb Mon Sep 17 00:00:00 2001
From: s-morimoto <s-morimoto@iij.ad.jp>
Date: Thu, 17 Sep 2026 12:59:17 +0900
Subject: [PATCH] =?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";
     }
 }
-