Merge pull request #76 from goalSetter09/10th-Kampus-BE-74

[FEATURE] 유저정보 조회시 유저 상태 필드 추가
IT-Cotato · Feb 10, 2025 · 2639530 · 2639530
2 parents 01e6f0e + 07b9260
commit 2639530
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/src/main/java/com/cotato/kampus/domain/user/dto/UserDetailsDto.java b/src/main/java/com/cotato/kampus/domain/user/dto/UserDetailsDto.java
@@ -3,19 +3,22 @@
 import com.cotato.kampus.domain.user.domain.User;
 import com.cotato.kampus.domain.user.enums.Nationality;
 import com.cotato.kampus.domain.user.enums.PreferredLanguage;
+import com.cotato.kampus.domain.user.enums.UserStatus;
 
 public record UserDetailsDto(
 	Long id,
 	String nickname,
 	Nationality nationality,
-	PreferredLanguage preferredLanguage
+	PreferredLanguage preferredLanguage,
+	UserStatus userStatus
 ) {
 	public static UserDetailsDto from(User user) {
 		return new UserDetailsDto(
 			user.getId(),
 			user.getNickname(),
 			user.getNationality(),
-			user.getPreferredLanguage()
+			user.getPreferredLanguage(),
+			user.getUserStatus()
 		);
 	}
 }
diff --git a/src/main/java/com/cotato/kampus/domain/user/dto/response/UserDetailsResponse.java b/src/main/java/com/cotato/kampus/domain/user/dto/response/UserDetailsResponse.java
@@ -3,19 +3,22 @@
 import com.cotato.kampus.domain.user.dto.UserDetailsDto;
 import com.cotato.kampus.domain.user.enums.Nationality;
 import com.cotato.kampus.domain.user.enums.PreferredLanguage;
+import com.cotato.kampus.domain.user.enums.UserStatus;
 
 public record UserDetailsResponse(
 	Long id,
 	String nickname,
 	Nationality nationality,
-	PreferredLanguage preferredLanguage
+	PreferredLanguage preferredLanguage,
+	boolean needSetup
 ) {
 	public static UserDetailsResponse from(UserDetailsDto userDetails) {
 		return new UserDetailsResponse(
 			userDetails.id(),
 			userDetails.nickname(),
 			userDetails.nationality(),
-			userDetails.preferredLanguage()
+			userDetails.preferredLanguage(),
+			userDetails.userStatus().equals(UserStatus.PENDING_DETAILS)
 		);
 	}
 }
diff --git a/src/main/java/com/cotato/kampus/global/auth/oauth/handler/OAuthSuccessHandler.java b/src/main/java/com/cotato/kampus/global/auth/oauth/handler/OAuthSuccessHandler.java
@@ -10,7 +10,6 @@
 import org.springframework.stereotype.Component;
 
 import com.cotato.kampus.domain.auth.application.RefreshService;
-import com.cotato.kampus.domain.user.enums.UserStatus;
 import com.cotato.kampus.global.auth.oauth.service.dto.CustomOAuth2User;
 import com.cotato.kampus.global.util.JwtUtil;
 
@@ -52,7 +51,6 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 
 		String uniqueId = customOAuth2User.getUniqueId();
 		String username = customOAuth2User.getName();
-		UserStatus userStatus = customOAuth2User.getUserStatus();
 		Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
 		Iterator<? extends GrantedAuthority> iterator = authorities.iterator();
 		GrantedAuthority auth = iterator.next();
@@ -70,13 +68,9 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 		response.setHeader(ACCESS_HEADER_NAME, TOKEN_PREFIX + access);
 		response.setHeader(REFRESH_HEADER_NAME, TOKEN_PREFIX + refresh);
 
-		boolean needSetup = userStatus == UserStatus.PENDING_DETAILS;
-
 		// 로컬 환경에서 개발할 때는 로컬로 리다이렉트 되도록 설정(추후 삭제 예정)
 		String finalRedirectUrl = isDevelopment(request) ? DEV_REDIRECT_URL : REDIRECT_URL;
 		log.info("Redirect URL: {}", finalRedirectUrl);
-		response.sendRedirect(finalRedirectUrl + "?accessToken=" + access
-			+ "&refreshToken=" + refresh
-			+ "&needSetup=" + needSetup);
+		response.sendRedirect(finalRedirectUrl + "?accessToken=" + access + "&refreshToken=" + refresh);
 	}
 }
diff --git a/src/main/java/com/cotato/kampus/global/auth/oauth/service/dto/CustomOAuth2User.java b/src/main/java/com/cotato/kampus/global/auth/oauth/service/dto/CustomOAuth2User.java
@@ -7,8 +7,6 @@
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 
-import com.cotato.kampus.domain.user.enums.UserStatus;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -44,8 +42,4 @@ public String getUniqueId() {
 	public String getName() {
 		return OAuthUserRequest.getUsername();
 	}
-
-	public UserStatus getUserStatus() {
-		return OAuthUserRequest.getUserStatus();
-	}
 }