refactor: 필드 이름 isProfileRegistered로 변경

dnd-side-project · Oct 8, 2024 · 5f32868 · 5f32868
1 parent e37e4e9
commit 5f32868
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 24 deletions.
diff --git a/src/main/java/com/odiga/fiesta/auth/service/AuthService.java b/src/main/java/com/odiga/fiesta/auth/service/AuthService.java
@@ -83,17 +83,12 @@ public LoginResponse kakaoLogin(String accessTokenByClient) {
 			.build();
 	}
 
+	@Transactional
 	public void deleteUser(User user) {
 		checkLogin(user);
 		userRepository.deleteById(user.getId());
 	}
 
-	private static void validateKakaoAcccount(KakaoAccount kakaoAccount) {
-		if (!kakaoAccount.isHasEmail()) {
-			throw new CustomException(CAN_NOT_FIND_KAKAO_USER);
-		}
-	}
-
 	// JWT 토큰 재발급
 	@Transactional
 	public TokenReissueResponse reissue(String refreshToken) {
@@ -145,6 +140,12 @@ private User saveUser(String email) {
 		return savedUser;
 	}
 
+	private static void validateKakaoAcccount(KakaoAccount kakaoAccount) {
+		if (!kakaoAccount.isHasEmail()) {
+			throw new CustomException(CAN_NOT_FIND_KAKAO_USER);
+		}
+	}
+
 	private UserRole saveUserRole(Role role, User savedUser) {
 		UserRole userRole = UserRole.builder()
 			.roleId(role.getId())

diff --git a/src/main/java/com/odiga/fiesta/user/controller/UserController.java b/src/main/java/com/odiga/fiesta/user/controller/UserController.java
@@ -82,7 +82,7 @@ public ResponseEntity<BasicResponse<UserInfoResponse>> getUserInfo(@AuthUser Use
 			.nickname(user.getNickname())
 			.statusMessage(user.getStatusMessage())
 			.profileImage(user.getProfileImage())
-			.isProfileCreated(user.getUserTypeId() != null)
+			.isProfileRegistered(user.getUserTypeId() != null)
 			.userTypeId(user.getUserTypeId())
 			.build();
 

diff --git a/src/main/java/com/odiga/fiesta/user/dto/response/UserInfoResponse.java b/src/main/java/com/odiga/fiesta/user/dto/response/UserInfoResponse.java
@@ -12,6 +12,6 @@ public class UserInfoResponse {
 	private String nickname;
 	private String statusMessage;
 	private String profileImage;
-	private Boolean isProfileCreated;
+	private Boolean isProfileRegistered;
 	private Long userTypeId;
 }
diff --git a/src/main/java/com/odiga/fiesta/user/service/UserService.java b/src/main/java/com/odiga/fiesta/user/service/UserService.java
@@ -117,6 +117,22 @@ public UserIdResponse updateUserInfo(User user, UserInfoUpdateRequest request) {
 			.build();
 	}
 
+	public UserOnboardingResponse getOnboardingInfo(User user) {
+		validateUser(user);
+
+		List<Long> categoryIds = userCategoryRepository.findCategoryIdsByUserId(user.getId());
+		List<Long> moodIds = userMoodRepository.findMoodIdsByUserId(user.getId());
+		List<Long> companionIds = userCompanionRepository.findCompanionIdsByUserId(user.getId());
+		List<Long> priorityIds = userPriorityRepository.findPriorityIdsByUserId(user.getId());
+
+		return UserOnboardingResponse.builder()
+			.categoryIds(categoryIds)
+			.moodIds(moodIds)
+			.companionIds(companionIds)
+			.priorityIds(priorityIds)
+			.build();
+	}
+
 	private void saveUserCompanions(final Long userId, List<Long> companionIds) {
 		userCompanionRepository.saveAll(
 			companionIds.stream()
@@ -161,22 +177,6 @@ private void saveUserPriorities(final Long userId, List<Long> priorityIds) {
 		);
 	}
 
-	public UserOnboardingResponse getOnboardingInfo(User user) {
-		validateUser(user);
-
-		List<Long> categoryIds = userCategoryRepository.findCategoryIdsByUserId(user.getId());
-		List<Long> moodIds = userMoodRepository.findMoodIdsByUserId(user.getId());
-		List<Long> companionIds = userCompanionRepository.findCompanionIdsByUserId(user.getId());
-		List<Long> priorityIds = userPriorityRepository.findPriorityIdsByUserId(user.getId());
-
-		return UserOnboardingResponse.builder()
-			.categoryIds(categoryIds)
-			.moodIds(moodIds)
-			.companionIds(companionIds)
-			.priorityIds(priorityIds)
-			.build();
-	}
-
 	private void validateCompanions(List<Long> companionIds) {
 		List<Companion> companions = companionRepository.findAllById(companionIds);
 		if (companions.size() != companionIds.size()) {