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; +} 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/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; 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/infra/repository/TransactionRepository.java b/src/main/java/com/example/demo/app/infra/repository/TransactionRepository.java index 933aa4f..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 @@ -21,5 +21,7 @@ public interface TransactionRepository extends JpaRepository