Merge pull request #18 from KusitmsHDmedi/feature/17-user

[feat] 회원가입 api 구현
KusitmsHDmedi · Sep 13, 2023 · a00e55a · a00e55a
2 parents 7d79aba + 9d546b0
commit a00e55a
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 3 deletions.
diff --git a/src/main/java/com/kusithm/hdmedi_server/domain/user/controller/AuthController.java b/src/main/java/com/kusithm/hdmedi_server/domain/user/controller/AuthController.java
@@ -1,6 +1,7 @@
 package com.kusithm.hdmedi_server.domain.user.controller;
 
 import com.kusithm.hdmedi_server.domain.user.dto.request.UserAuthRequestDto;
+import com.kusithm.hdmedi_server.domain.user.dto.request.UserSignUpRequestDto;
 import com.kusithm.hdmedi_server.domain.user.dto.response.UserAuthResponseDto;
 import com.kusithm.hdmedi_server.domain.user.service.AuthService;
 import com.kusithm.hdmedi_server.global.common.BaseResponse;
@@ -27,4 +28,12 @@ public ResponseEntity<BaseResponse<?>> signIn(@RequestHeader("Authorization") fi
         return ResponseEntity.status(HttpStatus.OK)
                 .body(BaseResponse.of(SuccessCode.OK, responseDto));
     }
+
+    @PostMapping("/signUp")
+    public ResponseEntity<BaseResponse<?>> signUp(@RequestHeader("Authorization") final String token,
+                                                  @RequestBody final UserSignUpRequestDto userSignUpRequestDto){
+        final UserAuthResponseDto responseDto = authService.signUp(token, userSignUpRequestDto);
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(BaseResponse.of(SuccessCode.OK, responseDto));
+    }
 }
diff --git a/src/main/java/com/kusithm/hdmedi_server/domain/user/domain/Gender.java b/src/main/java/com/kusithm/hdmedi_server/domain/user/domain/Gender.java
@@ -0,0 +1,6 @@
+package com.kusithm.hdmedi_server.domain.user.domain;
+
+public enum Gender {
+    NAN,
+    WOMAN;
+}
diff --git a/src/main/java/com/kusithm/hdmedi_server/domain/user/domain/User.java b/src/main/java/com/kusithm/hdmedi_server/domain/user/domain/User.java
@@ -18,6 +18,8 @@ public class User {
     private Platform platform;
     private String platformId;
     private String userName;
+    @Enumerated(value = EnumType.STRING)
+    private Gender gender;
 
     public static User createUser(Platform platform, String platformId, String userName){
         return User.builder()

diff --git a/src/main/java/com/kusithm/hdmedi_server/domain/user/dto/request/UserSignUpRequestDto.java b/src/main/java/com/kusithm/hdmedi_server/domain/user/dto/request/UserSignUpRequestDto.java
@@ -0,0 +1,18 @@
+package com.kusithm.hdmedi_server.domain.user.dto.request;
+
+import com.kusithm.hdmedi_server.domain.user.domain.Gender;
+import com.kusithm.hdmedi_server.domain.user.domain.Platform;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+public class UserSignUpRequestDto {
+    private String userName;
+    private LocalDateTime birthday;
+    private String gender;
+    private String platform;
+}
diff --git a/src/main/java/com/kusithm/hdmedi_server/domain/user/repository/UserRepository.java b/src/main/java/com/kusithm/hdmedi_server/domain/user/repository/UserRepository.java
@@ -8,4 +8,5 @@
 
 public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findUserByPlatformAndPlatformId(Platform platform, String platformId);
+    boolean existsUserByPlatformAndPlatformId(Platform platform, String platformId);
 }
diff --git a/src/main/java/com/kusithm/hdmedi_server/domain/user/service/AuthService.java b/src/main/java/com/kusithm/hdmedi_server/domain/user/service/AuthService.java
@@ -4,19 +4,20 @@
 import com.kusithm.hdmedi_server.domain.user.domain.Platform;
 import com.kusithm.hdmedi_server.domain.user.domain.User;
 import com.kusithm.hdmedi_server.domain.user.dto.request.UserAuthRequestDto;
+import com.kusithm.hdmedi_server.domain.user.dto.request.UserSignUpRequestDto;
 import com.kusithm.hdmedi_server.domain.user.dto.response.UserAuthResponseDto;
 import com.kusithm.hdmedi_server.domain.user.repository.RefreshTokenRepository;
 import com.kusithm.hdmedi_server.domain.user.repository.UserRepository;
 import com.kusithm.hdmedi_server.global.config.jwt.JwtProvider;
 import com.kusithm.hdmedi_server.global.config.jwt.Token;
+import com.kusithm.hdmedi_server.global.error.exception.ConflictException;
 import com.kusithm.hdmedi_server.global.error.exception.EntityNotFoundException;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.Optional;
-
 import static com.kusithm.hdmedi_server.domain.user.domain.RefreshToken.createRefreshToken;
+import static com.kusithm.hdmedi_server.global.error.exception.ErrorCode.DUPLICATE_USER;
 import static com.kusithm.hdmedi_server.global.error.exception.ErrorCode.USER_NOT_FOUND;
 
 @RequiredArgsConstructor
@@ -37,6 +38,16 @@ public UserAuthResponseDto signIn(String token, UserAuthRequestDto requestDto) {
         return UserAuthResponseDto.of(issuedToken, findUser);
     }
 
+    public UserAuthResponseDto signUp(String token, UserSignUpRequestDto requestDto){
+        Platform platform = Platform.getEnumPlatformFrom(requestDto.getPlatform());
+        String platformId = getPlatformId(token);
+        validateDuplicateUser(platform, platformId);
+        User saveUser = saveUser(platform, platformId, requestDto.getUserName());
+        Token issuedToken = issueAccessTokenAndRefreshToken(saveUser);
+        updateRefreshToken(issuedToken.getRefreshToken(), saveUser);
+        return UserAuthResponseDto.of(issuedToken, saveUser);
+    }
+
     private User getUser(Platform platform, String platformId) {
         return userRepository.findUserByPlatformAndPlatformId(platform, platformId)
                 .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND));
@@ -59,4 +70,9 @@ private Token issueAccessTokenAndRefreshToken(User user) {
     private void updateRefreshToken(String refreshToken, User user) {
         refreshTokenRepository.save(createRefreshToken(user.getId(), refreshToken));
     }
+
+    private void validateDuplicateUser(Platform platform, String platformId) {
+        if (userRepository.existsUserByPlatformAndPlatformId(platform, platformId))
+            throw new ConflictException(DUPLICATE_USER);
+    }
 }
diff --git a/src/main/java/com/kusithm/hdmedi_server/global/config/auth/SecurityConfig.java b/src/main/java/com/kusithm/hdmedi_server/global/config/auth/SecurityConfig.java
@@ -20,7 +20,7 @@ public class SecurityConfig {
     private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
     private final JwtProvider jwtProvider;
     // TODO api 추가될 때 white list url 확인해서 추가하기.
-    private static final String[] whiteList = {"/api/user/signin", "/api/user/signup", "/api/user/reissue", "/"};
+    private static final String[] whiteList = {"/api/user/signIn", "/api/user/signUp", "/api/user/reissue", "/"};
 
     @Bean
     public WebSecurityCustomizer webSecurityCustomizer() {

diff --git a/src/main/java/com/kusithm/hdmedi_server/global/error/exception/ErrorCode.java b/src/main/java/com/kusithm/hdmedi_server/global/error/exception/ErrorCode.java
@@ -48,6 +48,7 @@ public enum ErrorCode {
      * 409 Conflict
      */
     CONFLICT(HttpStatus.CONFLICT, "이미 존재하는 리소스입니다."),
+    DUPLICATE_USER(HttpStatus.CONFLICT, "이미 존재하는 회원입니다."),
 
     /**
      * 500 Internal Server Error