From ff9cd2e4f44279e0c6bfd0d0b40c5284eabe1585 Mon Sep 17 00:00:00 2001
From: pureumq <s_pureum@naver.com>
Date: Wed, 5 Feb 2025 14:58:43 +0900
Subject: [PATCH 1/2] feat

---
 .gitignore                                    |  4 +++-
 .../prdoit/controller/UserController.java     | 15 +++++++------
 .../prdoit/service/user/UserService.java      |  2 +-
 .../prdoit/service/user/UserServiceImpl.java  | 21 +++++++++++++++++++
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index fa63701..011d3b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,6 @@ out/
 .vscode/
 
 ### Application Files ###
-application.properties
\ No newline at end of file
+application.properties
+
+.DS_Store
\ No newline at end of file
diff --git a/src/main/java/com/example/prdoit/controller/UserController.java b/src/main/java/com/example/prdoit/controller/UserController.java
index 660613d..a7f7240 100644
--- a/src/main/java/com/example/prdoit/controller/UserController.java
+++ b/src/main/java/com/example/prdoit/controller/UserController.java
@@ -75,18 +75,17 @@ public ResponseEntity<Object> checkNickname(@PathVariable String userNickname){
             return ResponseEntity.badRequest().body(e.getMessage());
         }
     }
-/*
+
     @PostMapping("/login")
-    public ResponseEntity<Object> login(@RequestBody LoginDto loginDto){
-        log.info("[login] 로그인 로직 시작");
+    public ResponseEntity<Object> login(@RequestBody LoginDto loginDto) {
+        log.info("[login] 로그인 시도 - ID: {}", loginDto.getUserId());
 
-        try{
-            userService.signIn(loginDto.getUserId(), loginDto.getPassword());
-            return ResponseEntity.ok().body("로그인 성공");
+        try {
+            userService.login(loginDto.getUserId(), loginDto.getPassword());
+            return ResponseEntity.ok("로그인 성공");
         } catch (CustomException e) {
-            log.error("[login] 로그인 실패");
+            log.error("[login] 로그인 실패 - 이유: {}", e.getMessage());
             return ResponseEntity.badRequest().body(e.getMessage());
         }
     }
-    */
 }
diff --git a/src/main/java/com/example/prdoit/service/user/UserService.java b/src/main/java/com/example/prdoit/service/user/UserService.java
index f57b1ab..b06ef3b 100644
--- a/src/main/java/com/example/prdoit/service/user/UserService.java
+++ b/src/main/java/com/example/prdoit/service/user/UserService.java
@@ -12,6 +12,6 @@ public interface UserService {
 
     void checkNickname(String nickname);
 
-    void signIn(String userId, String password);
+    void login(String userId, String password);
 
 }
diff --git a/src/main/java/com/example/prdoit/service/user/UserServiceImpl.java b/src/main/java/com/example/prdoit/service/user/UserServiceImpl.java
index 7495f23..342cf61 100644
--- a/src/main/java/com/example/prdoit/service/user/UserServiceImpl.java
+++ b/src/main/java/com/example/prdoit/service/user/UserServiceImpl.java
@@ -98,4 +98,25 @@ public void signIn(String userId, String password){
         }
     }
 
+    @Override
+    public void login(String userId, String password) {
+        log.info("[login] 로그인 시도 - ID: {}", userId);
+
+        Optional<IdTable> findUser = idTableRepository.findById(userId);
+
+        if (findUser.isEmpty()) {
+            log.info("[login] 아이디 없음");
+            throw new CustomException("아이디 또는 비밀번호가 잘못되었습니다.");
+        }
+
+        IdTable user = findUser.get();
+
+        // 비밀번호 맞나 안맞나
+        if (!passwordEncoder.matches(password, user.getPassword())) {
+            log.info("[login] 비밀번호 불일치");
+            throw new CustomException("아이디 또는 비밀번호가 잘못되었습니다.");
+        }
+
+        log.info("[login] 로그인 성공 - ID: {}", userId);
+    }
 }

From 5e6231fba6909b231cf2c789cf7b826f183f4810 Mon Sep 17 00:00:00 2001
From: pureumq <s_pureum@naver.com>
Date: Wed, 5 Feb 2025 15:09:09 +0900
Subject: [PATCH 2/2] feat/login

---
 .../example/prdoit/service/user/UserServiceImpl.java | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/main/java/com/example/prdoit/service/user/UserServiceImpl.java b/src/main/java/com/example/prdoit/service/user/UserServiceImpl.java
index 342cf61..325fb0b 100644
--- a/src/main/java/com/example/prdoit/service/user/UserServiceImpl.java
+++ b/src/main/java/com/example/prdoit/service/user/UserServiceImpl.java
@@ -86,18 +86,6 @@ public void checkNickname(String nickname) {
         }
     }
 
-    @Override
-    public void signIn(String userId, String password){
-        log.info("[signIn] 로그인 로직 시작");
-
-        IdTable findUser = idTableRepository.findById(userId).orElseThrow(() -> new CustomException("존재하지 않는 아이디입니다."));
-
-        if(!passwordEncoder.matches(password, findUser.getPassword())){
-            log.info("[signIn] 비밀번호 불일치");
-            throw new CustomException("비밀번호가 일치하지 않습니다.");
-        }
-    }
-
     @Override
     public void login(String userId, String password) {
         log.info("[login] 로그인 시도 - ID: {}", userId);