Merge pull request #21 from Team-HMH/feat/#18-social-sign-up-api

feat - 회원가입 기능 구현

src/main/java/sopt/org/HMH/domain/challenge/dto/request/ChallengeRequest.java

@@ -1,10 +1,11 @@
 package sopt.org.HMH.domain.challenge.dto.request;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import sopt.org.HMH.domain.app.dto.request.AppGoalTimeRequest;
-
 import java.util.List;
 
 public record ChallengeRequest(
+
         Integer period,
         Long goalTime,
         List<AppGoalTimeRequest> apps

src/main/java/sopt/org/HMH/domain/user/controller/UserController.java

@@ -10,7 +10,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import sopt.org.HMH.domain.user.domain.exception.UserSuccess;
-import sopt.org.HMH.domain.user.dto.request.SocialLoginRequest;
+import sopt.org.HMH.domain.user.dto.request.SocialPlatformRequest;
+import sopt.org.HMH.domain.user.dto.request.SocialSignUpRequest;
 import sopt.org.HMH.domain.user.dto.response.LoginResponse;
 import sopt.org.HMH.domain.user.service.UserService;
 import sopt.org.HMH.global.auth.jwt.JwtProvider;
@@ -28,13 +29,23 @@ public class UserController {
     @PostMapping("/login")
     public ResponseEntity<ApiResponse<LoginResponse>> login(
             @RequestHeader("Authorization") String socialAccessToken,
-            @RequestBody SocialLoginRequest request
+            @RequestBody SocialPlatformRequest request
     ) {
         return ResponseEntity
                 .status(UserSuccess.LOGIN_SUCCESS.getHttpStatus())
                 .body(ApiResponse.success(UserSuccess.LOGIN_SUCCESS, userService.login(socialAccessToken, request)));
     }
 
+    @PostMapping("/signup")
+    public ResponseEntity<ApiResponse<LoginResponse>> signup(
+            @RequestHeader("Authorization") String socialAccessToken,
+            @RequestBody SocialSignUpRequest request
+    ) {
+        return ResponseEntity
+                .status(UserSuccess.SIGNUP_SUCCESS.getHttpStatus())
+                .body(ApiResponse.success(UserSuccess.SIGNUP_SUCCESS, userService.signup(socialAccessToken, request)));
+    }
+
     @GetMapping("/reissue")
     public ResponseEntity<ApiResponse<TokenDto>> reissue(
             @RequestHeader("Authorization") String refreshToken

src/main/java/sopt/org/HMH/domain/user/domain/OnboardingInfo.java

@@ -0,0 +1,36 @@
+package sopt.org.HMH.domain.user.domain;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Entity
+@Table(name = "onboarding_info")
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class OnboardingInfo {
+
+    @Id
+    @Column(name = "onboarding_info_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+    @JoinColumn(name = "onboarding_info_id")
+    private List<OnboardingProblem> problem;
+
+    private String averageUseTime;
+}

src/main/java/sopt/org/HMH/domain/user/domain/OnboardingProblem.java

@@ -0,0 +1,29 @@
+package sopt.org.HMH.domain.user.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Entity
+@Table(name = "problem")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Builder
+public class OnboardingProblem {
+
+    @Id
+    @Column(name = "problem_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String problem;
+}

src/main/java/sopt/org/HMH/domain/user/domain/User.java

@@ -7,12 +7,17 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
+import java.util.List;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import sopt.org.HMH.domain.challenge.domain.Challenge;
 import sopt.org.HMH.global.auth.social.SocialPlatform;
 import sopt.org.HMH.global.common.domain.BaseTimeEntity;
 
@@ -42,6 +47,13 @@ public class User extends BaseTimeEntity {
     @Column(name = "profile_image_url")
     private String profileImageUrl;
 
+    @OneToOne
+    @JoinColumn(name = "onboarding_info_id")
+    private OnboardingInfo onboardingInfo;
+
+    @OneToMany(mappedBy = "user")
+    private List<Challenge> challenges;
+
     public void updateSocialInfo(String nickname, String profileImageUrl) {
         this.name = nickname;
         this.profileImageUrl = profileImageUrl;

src/main/java/sopt/org/HMH/domain/user/domain/exception/UserError.java

@@ -9,6 +9,7 @@ public enum UserError implements ErrorBase {
 
     // 400 BAD REQUEST
     INVALID_USER(HttpStatus.BAD_REQUEST, "Principle 객체가 없습니다."),
+    DUPLICATE_USER(HttpStatus.BAD_REQUEST, "이미 회원가입된 유저입니다."),
 
     // 401 UNAUTHORIZED
 

src/main/java/sopt/org/HMH/domain/user/domain/exception/UserSuccess.java

@@ -8,6 +8,7 @@
 public enum UserSuccess implements SuccessBase {
 
     LOGIN_SUCCESS(HttpStatus.OK, "로그인에 성공했습니다."),
+    SIGNUP_SUCCESS(HttpStatus.OK, "회원가입에 성공했습니다."),
     REISSUE_SUCCESS(HttpStatus.OK, "토큰 재발급에 성공했습니다."),
     LOGOUT_SUCCESS(HttpStatus.OK, "로그아웃에 성공했습니다."),
     ;

src/main/java/sopt/org/HMH/domain/user/dto/request/OnboardingRequest.java

@@ -0,0 +1,12 @@
+package sopt.org.HMH.domain.user.dto.request;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+public record OnboardingRequest(
+        String averageUseTime,
+
+        @JsonProperty(value = "problem")
+        List<String> problemList
+) {
+}

src/main/java/sopt/org/HMH/domain/user/dto/request/SocialLoginRequest.java → src/main/java/sopt/org/HMH/domain/user/dto/request/SocialPlatformRequest.java

@@ -2,7 +2,7 @@
 
 import sopt.org.HMH.global.auth.social.SocialPlatform;
 
-public record SocialLoginRequest(
+public record SocialPlatformRequest(
         SocialPlatform socialPlatform
 ) {
 }

src/main/java/sopt/org/HMH/domain/user/dto/request/SocialSignUpRequest.java

@@ -0,0 +1,16 @@
+package sopt.org.HMH.domain.user.dto.request;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import sopt.org.HMH.domain.challenge.dto.request.ChallengeRequest;
+import sopt.org.HMH.global.auth.social.SocialPlatform;
+
+public record SocialSignUpRequest(
+        SocialPlatform socialPlatform,
+
+        @JsonProperty(value = "onboarding")
+        OnboardingRequest onboardingRequest,
+
+        @JsonProperty(value = "challenge")
+        ChallengeRequest challengeRequest
+) {
+}

src/main/java/sopt/org/HMH/domain/user/repository/OnboardingInfoRepository.java

@@ -0,0 +1,7 @@
+package sopt.org.HMH.domain.user.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import sopt.org.HMH.domain.user.domain.OnboardingInfo;
+
+public interface OnboardingInfoRepository extends JpaRepository<OnboardingInfo, Long> {
+}

src/main/java/sopt/org/HMH/domain/user/repository/UserRepository.java

@@ -20,4 +20,5 @@ default User findByIdOrThrowException(Long userId) {
     }
 
     Optional<User> findBySocialPlatformAndSocialId(SocialPlatform socialPlatform, Long socialId);
+    boolean existsBySocialPlatformAndSocialId(SocialPlatform socialPlatform, Long socialId);
 }

src/main/java/sopt/org/HMH/domain/user/service/UserService.java

@@ -1,13 +1,19 @@
 package sopt.org.HMH.domain.user.service;
 
+import java.util.ArrayList;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import sopt.org.HMH.domain.user.domain.OnboardingInfo;
+import sopt.org.HMH.domain.user.domain.OnboardingProblem;
 import sopt.org.HMH.domain.user.domain.User;
 import sopt.org.HMH.domain.user.domain.exception.UserError;
 import sopt.org.HMH.domain.user.domain.exception.UserException;
-import sopt.org.HMH.domain.user.dto.request.SocialLoginRequest;
+import sopt.org.HMH.domain.user.dto.request.SocialPlatformRequest;
+import sopt.org.HMH.domain.user.dto.request.SocialSignUpRequest;
 import sopt.org.HMH.domain.user.dto.response.LoginResponse;
+import sopt.org.HMH.domain.user.repository.OnboardingInfoRepository;
 import sopt.org.HMH.domain.user.repository.UserRepository;
 import sopt.org.HMH.global.auth.jwt.JwtProvider;
 import sopt.org.HMH.global.auth.jwt.TokenDto;
@@ -24,28 +30,38 @@ public class UserService {
 
     private final JwtProvider jwtProvider;
     private final UserRepository userRepository;
+    private final OnboardingInfoRepository onboardingInfoRepository;
     private final KakaoLoginService kakaoLoginService;
 
     @Transactional
-    public LoginResponse login(String socialAccessToken, SocialLoginRequest request) {
-        socialAccessToken = parseTokenString(socialAccessToken);
+    public LoginResponse login(String socialAccessToken, SocialPlatformRequest request) {
+
         SocialPlatform socialPlatform = request.socialPlatform();
-        Long socialId = getUserIdBySocialAccessToken(socialPlatform, socialAccessToken);
+        Long socialId = getSocialIdBySocialAccessToken(socialPlatform, socialAccessToken);
+
         // 유저를 찾지 못하면 404 Error를 던져 클라이언트에게 회원가입 api를 요구한다.
-        User loginUser = getUserBySocialAndSocialId(socialPlatform, socialId);
+        User loginUser = getUserBySocialPlatformAndSocialId(socialPlatform, socialId);
 
-        if (socialPlatform == SocialPlatform.KAKAO) {
-            kakaoLoginService.updateUserInfoByKakao(loginUser, socialAccessToken);
-        }
+        return performLogin(socialAccessToken, socialPlatform, loginUser);
+    }
 
-        TokenDto tokenDto = jwtProvider.issueToken(new UserAuthentication(loginUser.getId(), null, null));
+    @Transactional
+    public LoginResponse signup(String socialAccessToken, SocialSignUpRequest request) {
 
-        return LoginResponse.of(loginUser, tokenDto);
+        SocialPlatform socialPlatform = request.socialPlatform();
+        Long socialId = getSocialIdBySocialAccessToken(socialPlatform, socialAccessToken);
+
+        // 이미 회원가입된 유저가 있다면 400 Error 발생
+        validateDuplicateUser(socialId, socialPlatform);
+
+        OnboardingInfo onboardingInfo = createOnboardingInfo(request);
+        User user = createUser(socialPlatform, socialId, onboardingInfo);
+
+        return performLogin(socialAccessToken, socialPlatform, user);
     }
 
     @Transactional
     public TokenDto reissueToken(String refreshToken) {
-
         refreshToken = parseTokenString(refreshToken);
         Long userId = jwtProvider.validateRefreshToken(refreshToken);
         validateUserId(userId);  // userId가 DB에 저장된 유효한 값인지 검사
@@ -64,23 +80,69 @@ private void validateUserId(Long userId) {
         }
     }
 
-    private User getUserBySocialAndSocialId(SocialPlatform socialPlatform, Long socialId) {
+    private User getUserBySocialPlatformAndSocialId(SocialPlatform socialPlatform, Long socialId) {
         return userRepository.findBySocialPlatformAndSocialIdOrThrowException(socialPlatform, socialId);
     }
 
-    private Long getUserIdBySocialAccessToken(SocialPlatform socialPlatform, String socialAccessToken) {
+    private Long getSocialIdBySocialAccessToken(SocialPlatform socialPlatform, String socialAccessToken) {
         return switch (socialPlatform.toString()) {
-            case "KAKAO" -> kakaoLoginService.getUserIdByKakao(socialAccessToken);
+            case "KAKAO" -> kakaoLoginService.getSocialIdByKakao(socialAccessToken);
             default -> throw new JwtException(JwtError.INVALID_SOCIAL_ACCESS_TOKEN);
         };
     }
 
-    private static String parseTokenString(String tokenString) {
-        String[] strings = tokenString.split(" ");
-        if (strings.length != 2) {
+    /**
+     * 소셜 액세스 토큰에서 "Bearer " 부분을 삭제시키고 유효한 소셜 액세스 토큰만을 받기 위한 함수
+     */
+    private String parseTokenString(String tokenString) {
+        String[] parsedTokens = tokenString.split(" ");
+        if (parsedTokens.length != 2) {
             throw new JwtException(JwtError.INVALID_TOKEN_HEADER);
         }
-        return strings[1];
+        String validSocialAccessToken = parsedTokens[1];
+        return validSocialAccessToken;
+    }
+
+    private void validateDuplicateUser(Long socialId, SocialPlatform socialPlatform) {
+        if (userRepository.existsBySocialPlatformAndSocialId(socialPlatform, socialId)) {
+            throw new UserException(UserError.DUPLICATE_USER);
+        }
+    }
+
+    private LoginResponse performLogin(String socialAccessToken, SocialPlatform socialPlatform, User loginUser) {
+        if (socialPlatform == SocialPlatform.KAKAO) {
+            kakaoLoginService.updateUserInfoByKakao(loginUser, socialAccessToken);
+        }
+        TokenDto tokenDto = jwtProvider.issueToken(new UserAuthentication(loginUser.getId(), null, null));
+        return LoginResponse.of(loginUser, tokenDto);
+    }
+
+    private User createUser(SocialPlatform socialPlatform, Long socialId, OnboardingInfo onboardingInfo) {
+        User user = User.builder()
+                .socialPlatform(socialPlatform)
+                .socialId(socialId)
+                .onboardingInfo(onboardingInfo)
+                .build();
+        userRepository.save(user);
+        return user;
+    }
+
+    private OnboardingInfo createOnboardingInfo(SocialSignUpRequest request) {
+        List<OnboardingProblem> problemList = new ArrayList<>();
+        for (String problem : request.onboardingRequest().problemList()) {
+            problemList.add(
+                    OnboardingProblem.builder()
+                            .problem(problem)
+                            .build()
+            );
+        }
+
+        OnboardingInfo onboardingInfo = OnboardingInfo.builder()
+                .averageUseTime(request.onboardingRequest().averageUseTime())
+                .problem(problemList)
+                .build();
+        onboardingInfoRepository.save(onboardingInfo);
+        return onboardingInfo;
     }
 
     public User getUserId(Long userId) {

src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoApiClient.java

@@ -4,11 +4,11 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
-import sopt.org.HMH.global.auth.social.kakao.response.KakaoUserResponse;
+import sopt.org.HMH.global.auth.social.kakao.request.KakaoUserRequest;
 
 @FeignClient(name = "kakaoApiClient", url = "${oauth2.kakao.base-url}")
 public interface KakaoApiClient {
 
     @GetMapping(value = "/v2/user/me")
-    KakaoUserResponse getUserInformation(@RequestHeader(HttpHeaders.AUTHORIZATION) String accessToken);
+    KakaoUserRequest getUserInformation(@RequestHeader(HttpHeaders.AUTHORIZATION) String accessToken);
 }