feature(#45): find_email controller layer 구현 및 단위테스트 및 ExceptionHandl…

…er 수정
f-lab-edu · Aug 3, 2022 · 8751bfc · 8751bfc
1 parent 57f7de4
commit 8751bfc
Show file tree

Hide file tree

Showing 11 changed files with 364 additions and 36 deletions.
diff --git a/src/main/java/com/airjnc/common/auth/dto/AuthInfoDTO.java b/src/main/java/com/airjnc/common/auth/dto/AuthInfoDTO.java
@@ -8,9 +8,9 @@
 @ToString
 public class AuthInfoDTO {
 
-    private Long id;
-    private String email;
-    private String name;
+    private final Long id;
+    private final String email;
+    private final String name;
 
 
     @Builder

diff --git a/src/main/java/com/airjnc/common/error/controller/ErrorResponseBody.java b/src/main/java/com/airjnc/common/error/controller/ErrorResponseBody.java
@@ -19,7 +19,7 @@ public class ErrorResponseBody {
 
     private final String message;
     private final List<CustomFieldError> errors;
-    private int status;
+    private final int status;
 
 
     private ErrorResponseBody(final MessageSource messageSource, final ErrorCode code, final List<CustomFieldError> errors) {
@@ -54,9 +54,9 @@ private static String getMessage(final MessageSource messageSource, final ErrorC
 
     @Getter
     public static class CustomFieldError {
-        private String field;
-        private String value;
-        private String reason;
+        private final String field;
+        private final String value;
+        private final String reason;
 
         private CustomFieldError(String field, String value, String reason) {
             this.field = field;

diff --git a/src/main/java/com/airjnc/common/error/controller/GlobalExceptionHandler.java b/src/main/java/com/airjnc/common/error/controller/GlobalExceptionHandler.java
@@ -2,7 +2,6 @@
 
 import com.airjnc.common.error.code.ErrorCode;
 import com.airjnc.common.error.exception.BusinessException;
-import com.airjnc.common.error.exception.DuplicateException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
@@ -43,14 +42,7 @@ protected ResponseEntity<ErrorResponseBody> handleValidationException(Validation
     protected ResponseEntity<ErrorResponseBody> handleBusinessException(BusinessException e) {
         log.error(e.getMessage());
         final ErrorResponseBody errorResponseBody = ErrorResponseBody.of(messageSource, e.getErrorCode());
-        return ResponseEntity.status(resolveHttpStatus(ErrorCode.BUSINESS_EXCEPTION)).body(errorResponseBody);
-    }
-
-    @ExceptionHandler(DuplicateException.class)
-    protected ResponseEntity<ErrorResponseBody> handleDuplicateException(DuplicateException e) {
-        log.error(e.getMessage());
-        final ErrorResponseBody errorResponseBody = ErrorResponseBody.of(messageSource, ErrorCode.DUPLICATE_VALUE);
-        return ResponseEntity.status(resolveHttpStatus(ErrorCode.DUPLICATE_VALUE)).body(errorResponseBody);
+        return ResponseEntity.status(resolveHttpStatus(e.getErrorCode())).body(errorResponseBody);
     }
 
 

diff --git a/src/main/java/com/airjnc/user/controller/UserController.java b/src/main/java/com/airjnc/user/controller/UserController.java
@@ -0,0 +1,78 @@
+package com.airjnc.user.controller;
+
+import com.airjnc.common.annotation.CurrentUser;
+import com.airjnc.common.annotation.UserLoginCheck;
+import com.airjnc.common.auth.dto.AuthInfoDTO;
+import com.airjnc.common.auth.service.AuthService;
+import com.airjnc.user.dto.request.FindEmailRequestDTO;
+import com.airjnc.user.dto.request.LogInRequestDTO;
+import com.airjnc.user.dto.request.SignUpDTO;
+import com.airjnc.user.dto.response.FindEmailResponseDTO;
+import com.airjnc.user.dto.response.FindPwdResponseDTO;
+import com.airjnc.user.dto.response.UserDTO;
+import com.airjnc.user.service.UserService;
+import com.airjnc.user.valid.group.SignUpValid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+
+@RestController
+@RequestMapping("/user")
+@Validated
+@RequiredArgsConstructor
+public class UserController {
+
+    private final UserService userService;
+    private final AuthService authService;
+
+    @GetMapping("login/findemail")
+    public ResponseEntity<FindEmailResponseDTO> findEmailByNameAndPhoneNumber(@RequestParam("name") String name, @RequestParam("phoneNumber") String phoneNumber) {
+        FindEmailResponseDTO findEmailResponseDTO = userService.findEmailByNameAndPhoneNumber(
+            FindEmailRequestDTO.builder()
+                .name(name).phoneNumber(phoneNumber)
+                .build());
+        return ResponseEntity.ok().body(findEmailResponseDTO);
+    }
+
+    @GetMapping("login/findpassword")
+    public ResponseEntity<FindPwdResponseDTO> findPasswordByEmail(@RequestParam("email")
+                                                                  @NotBlank(message = "{Validation.NotNull}") @Email(message = "{Validation.Email}") String email) {
+        FindPwdResponseDTO findPwdResponseDTO = userService.findPasswordByEmail(email);
+        return ResponseEntity.ok().body(findPwdResponseDTO);
+    }
+
+    @PostMapping("signup")
+    public ResponseEntity<UserDTO> userSignUp(@Validated(SignUpValid.class) @RequestBody SignUpDTO signUpDTO) {
+        UserDTO userDTO = userService.create(signUpDTO);
+        return ResponseEntity.status(HttpStatus.CREATED).body(userDTO);
+    }
+
+    @PostMapping("login")
+    public ResponseEntity<Object> userLogIn(@RequestBody LogInRequestDTO logInRequestDTO) {
+        AuthInfoDTO authInfoDTO = userService.logIn(logInRequestDTO);
+        authService.setAuthInfo(authInfoDTO);
+        return ResponseEntity.ok().body("LogIn Success");
+    }
+
+    @GetMapping("logout")
+    public ResponseEntity<Object> userLogOut() {
+        authService.clearAuthInfo();
+        return ResponseEntity.ok().body("LogOut Success");
+    }
+
+
+    // @UserLoginCheck, @CurrentUser 통합테스트를 위한 임시 url  -> 추후 정상 URL추가 후 삭제 예정
+    @GetMapping("")
+    @UserLoginCheck
+
+    public ResponseEntity<AuthInfoDTO> tempMain(@CurrentUser AuthInfoDTO authInfoDTO) {
+        return ResponseEntity.ok().body(authInfoDTO);
+    }
+
+
+}
diff --git a/src/main/java/com/airjnc/user/dao/UserDAO.java b/src/main/java/com/airjnc/user/dao/UserDAO.java
@@ -8,13 +8,13 @@
 
 public interface UserDAO {
 
-    public Optional<User> selectUserById(Long id);
+    Optional<User> selectUserById(Long id);
 
-    public Optional<User> selectUserByEmail(String email);
+    Optional<User> selectUserByEmail(String email);
 
-    public Optional<User> selectUserByNameAndPhoneNumber(@Param("name") String name, @Param("phoneNumber") String phoneNumber);
+    Optional<User> selectUserByNameAndPhoneNumber(@Param("name") String name, @Param("phoneNumber") String phoneNumber);
 
-    public void insertUser(User userEntity);
+    void insertUser(User userEntity);
 
 
 }
diff --git a/src/main/java/com/airjnc/user/dto/request/FindEmailRequestDTO.java b/src/main/java/com/airjnc/user/dto/request/FindEmailRequestDTO.java
@@ -1,12 +1,10 @@
 package com.airjnc.user.dto.request;
 
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@EqualsAndHashCode(of = {"name", "phoneNumber"})
 public class FindEmailRequestDTO {
 
     String name;

diff --git a/src/main/java/com/airjnc/user/dto/response/FindEmailResponseDTO.java b/src/main/java/com/airjnc/user/dto/response/FindEmailResponseDTO.java
@@ -8,7 +8,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class FindEmailResponseDTO {
-    
+
     String email;
 
     @Builder

diff --git a/src/main/java/com/airjnc/user/exception/FindEmailNotMatchException.java b/src/main/java/com/airjnc/user/exception/FindEmailNotMatchException.java
@@ -4,9 +4,9 @@
 import com.airjnc.common.error.exception.EntityNotFoundException;
 
 public class FindEmailNotMatchException extends EntityNotFoundException {
-    
+
     public FindEmailNotMatchException() {
         super("Check Name and PhoneNumber", ErrorCode.FIND_EMAIL_NOT_MATCH_EXCEPTION);
     }
-    
+
 }
diff --git a/src/main/java/com/airjnc/user/repository/UserRepository.java b/src/main/java/com/airjnc/user/repository/UserRepository.java
@@ -7,11 +7,11 @@
 
 public interface UserRepository {
 
-    public Optional<User> selectUserById(Long id);
+    Optional<User> selectUserById(Long id);
 
-    public Optional<User> selectUserByEmail(String email);
-
-    public Optional<User> selectUserByNameAndPhoneNumber(String name, String phoneNumber);
+    Optional<User> selectUserByEmail(String email);
 
-    public User insertUser(User user);
+    Optional<User> selectUserByNameAndPhoneNumber(String name, String phoneNumber);
+
+    User insertUser(User user);
 }
diff --git a/src/main/java/com/airjnc/user/service/UserService.java b/src/main/java/com/airjnc/user/service/UserService.java
@@ -10,11 +10,11 @@
 
 public interface UserService {
 
-    public FindEmailResponseDTO findEmailByNameAndPhoneNumber(FindEmailRequestDTO findEmailRequestDTO);
+    FindEmailResponseDTO findEmailByNameAndPhoneNumber(FindEmailRequestDTO findEmailRequestDTO);
 
-    public FindPwdResponseDTO findPasswordByEmail(String email);
+    FindPwdResponseDTO findPasswordByEmail(String email);
 
-    public UserDTO create(SignUpDTO signUpDTO);
+    UserDTO create(SignUpDTO signUpDTO);
 
-    public AuthInfoDTO logIn(LogInRequestDTO logInRequestDTO);
+    AuthInfoDTO logIn(LogInRequestDTO logInRequestDTO);
 }