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/dayChallenge/domain/DayChallenge.java

@@ -34,11 +34,10 @@ public class DayChallenge extends BaseTimeEntity {
     @OneToMany(mappedBy = "dayChallenge")
     private List<App> apps;
 
-    @Builder
     public DayChallenge(Challenge challenge, Long goalTime) {
         this.challenge = challenge;
         this.goalTime = goalTime;
-        this.isSuccess = false;
+        this.isSuccess = true;
         this.didGettingPoint = false;
     }
 }

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

@@ -10,11 +10,13 @@
 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.dto.response.UserInfoResponse;
 import sopt.org.HMH.domain.user.service.UserService;
-import sopt.org.HMH.global.auth.jwt.JwtProvider;
-import sopt.org.HMH.global.auth.jwt.TokenDto;
+import sopt.org.HMH.global.auth.jwt.TokenResponse;
+import sopt.org.HMH.global.common.Util;
 import sopt.org.HMH.global.common.response.ApiResponse;
 import sopt.org.HMH.global.common.response.EmptyJsonResponse;
 
@@ -26,17 +28,27 @@ public class UserController {
     private final UserService userService;
 
     @PostMapping("/login")
-    public ResponseEntity<ApiResponse<LoginResponse>> login(
+    public ResponseEntity<ApiResponse<LoginResponse>> orderLogin(
             @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>> orderSignup(
+            @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(
+    public ResponseEntity<ApiResponse<TokenResponse>> orderReissue(
             @RequestHeader("Authorization") String refreshToken
     ) {
         return ResponseEntity
@@ -45,10 +57,18 @@ public ResponseEntity<ApiResponse<TokenDto>> reissue(
     }
 
     @PostMapping("/logout")
-    public ResponseEntity<ApiResponse<?>> logout(Principal principal) {
-        userService.logout(JwtProvider.getUserFromPrincipal(principal));
+    public ResponseEntity<ApiResponse<?>> orderLogout(Principal principal) {
+        userService.logout(Util.getUserId(principal));
         return ResponseEntity
                 .status(UserSuccess.LOGOUT_SUCCESS.getHttpStatus())
-                .body(ApiResponse.success(UserSuccess.LOGOUT_SUCCESS,new EmptyJsonResponse()));
+                .body(ApiResponse.success(UserSuccess.LOGOUT_SUCCESS, new EmptyJsonResponse()));
+    }
+
+    @GetMapping("/")
+    public ResponseEntity<ApiResponse<UserInfoResponse>> orderGetUserInfo(Principal principal) {
+        System.out.println(Util.getUserId(principal));
+        return ResponseEntity
+                .status(UserSuccess.GET_USER_INFO_SUCCESS.getHttpStatus())
+                .body(ApiResponse.success(UserSuccess.GET_USER_INFO_SUCCESS, userService.getUserInfo(Util.getUserId(principal))));
     }
 }

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;
 
@@ -39,9 +44,20 @@ public class User extends BaseTimeEntity {
     @Column(name = "social_id")
     private Long socialId;
 
+    @Column(name = "point")
+    @Builder.Default
+    private Integer point = 0;
+
     @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,8 +8,10 @@
 public enum UserSuccess implements SuccessBase {
 
     LOGIN_SUCCESS(HttpStatus.OK, "로그인에 성공했습니다."),
+    SIGNUP_SUCCESS(HttpStatus.OK, "회원가입에 성공했습니다."),
     REISSUE_SUCCESS(HttpStatus.OK, "토큰 재발급에 성공했습니다."),
     LOGOUT_SUCCESS(HttpStatus.OK, "로그아웃에 성공했습니다."),
+    GET_USER_INFO_SUCCESS(HttpStatus.OK, "유저의 정보를 불러오는데에 성공했습니다."),
     ;
 
     private final HttpStatus status;

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

@@ -0,0 +1,13 @@
+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,15 @@
+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/dto/response/LoginResponse.java

@@ -1,19 +1,19 @@
 package sopt.org.HMH.domain.user.dto.response;
 
 import sopt.org.HMH.domain.user.domain.User;
-import sopt.org.HMH.global.auth.jwt.TokenDto;
+import sopt.org.HMH.global.auth.jwt.TokenResponse;
 
 public record LoginResponse(
         Long userId,
         String accessToken,
         String refreshToken
 ){
 
-    public static LoginResponse of(User loginUser, TokenDto tokenDto) {
+    public static LoginResponse of(User loginUser, TokenResponse tokenResponse) {
         return new LoginResponse(
                 loginUser.getId(),
-                tokenDto.getAccessToken(),
-                tokenDto.getRefreshToken()
+                tokenResponse.getAccessToken(),
+                tokenResponse.getRefreshToken()
         );
     }
 

src/main/java/sopt/org/HMH/domain/user/dto/response/UserInfoResponse.java

@@ -0,0 +1,15 @@
+package sopt.org.HMH.domain.user.dto.response;
+
+import sopt.org.HMH.domain.user.domain.User;
+
+public record UserInfoResponse(
+        String name,
+        Integer point
+) {
+    public static UserInfoResponse of(User user) {
+        return new UserInfoResponse(
+                user.getName(),
+                user.getPoint()
+        );
+    }
+}

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);
 }