feat: 회원가입 단계 응답 수정 (#206)

Soongsil-CoffeeChat · Jan 7, 2025 · 4446108 · 4446108
1 parent 317b45f
commit 4446108
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 15 deletions.
diff --git a/src/main/java/com/soongsil/CoffeeChat/controller/UserController.java b/src/main/java/com/soongsil/CoffeeChat/controller/UserController.java
@@ -5,20 +5,16 @@
 import java.net.URI;
 import java.util.Map;
 
+import com.soongsil.CoffeeChat.dto.*;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
 
 import com.soongsil.CoffeeChat.controller.handler.ApiResponseGenerator;
-import com.soongsil.CoffeeChat.dto.MenteeJoinRequestDto;
-import com.soongsil.CoffeeChat.dto.MentorJoinRequestDto;
 import com.soongsil.CoffeeChat.dto.Oauth.CustomOAuth2User;
 import com.soongsil.CoffeeChat.dto.UserController.MenteeInfoDto;
 import com.soongsil.CoffeeChat.dto.UserController.MentorInfoDto;
 import com.soongsil.CoffeeChat.dto.UserController.UserInfoDto;
-import com.soongsil.CoffeeChat.dto.UserGetDto;
-import com.soongsil.CoffeeChat.dto.UserJoinRequestDto;
-import com.soongsil.CoffeeChat.dto.UserUpdateDto;
 import com.soongsil.CoffeeChat.repository.User.UserRepository;
 import com.soongsil.CoffeeChat.service.UserService;
 
@@ -124,8 +120,8 @@ public ResponseEntity<ApiResponseGenerator<Map<String, String>>> getSmsCode(Auth
 	@PatchMapping("/phone")
 	@Operation(summary = "번호 저장하기")
 	@ApiResponse(responseCode = "200", description = "성공!")
-	public ResponseEntity<ApiResponseGenerator<UserInfoDto>> saveUserPhone(Authentication authentication,
-		@RequestParam("phoneNum") String phoneNum) throws Exception {
+	public ResponseEntity<ApiResponseGenerator<PhoneNumUpdateDto>> saveUserPhone(Authentication authentication,
+																				 @RequestParam("phoneNum") String phoneNum) throws Exception {
 		return ResponseEntity.created(URI.create(USER_URI + "/phone")).body(
 			ApiResponseGenerator.onSuccessOK(
 				userService.saveUserPhone(phoneNum, getUserNameByAuthentication(authentication))

diff --git a/src/main/java/com/soongsil/CoffeeChat/dto/PhoneNumUpdateDto.java b/src/main/java/com/soongsil/CoffeeChat/dto/PhoneNumUpdateDto.java
@@ -0,0 +1,16 @@
+package com.soongsil.CoffeeChat.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+public class PhoneNumUpdateDto {
+    private String name;
+    private String phoneNum;  //전화번호
+    private boolean isNewAccount;
+}
diff --git a/src/main/java/com/soongsil/CoffeeChat/dto/UserController/MenteeInfoDto.java b/src/main/java/com/soongsil/CoffeeChat/dto/UserController/MenteeInfoDto.java
@@ -13,10 +13,12 @@
 @Getter
 public class MenteeInfoDto {
     private PartEnum part;
+    private boolean isNewAccount;
 
     public static MenteeInfoDto toDto(Mentee mentee){
         return MenteeInfoDto.builder()
                 .part(mentee.getPart())
+                .isNewAccount(false)
                 .build();
     }
 }
diff --git a/src/main/java/com/soongsil/CoffeeChat/dto/UserController/MentorInfoDto.java b/src/main/java/com/soongsil/CoffeeChat/dto/UserController/MentorInfoDto.java
@@ -18,12 +18,14 @@ public class MentorInfoDto {
     private PartEnum part;
     private ClubEnum club;
     private Long introductionId;
+    private boolean isNewAccount;
 
     public static MentorInfoDto toDto(Mentor mentor){
         return MentorInfoDto.builder()
                 .part(mentor.getPart())
                 .club(mentor.getClub())
                 .introductionId(mentor.getIntroduction().getId())
+                .isNewAccount(false)
                 .build();
     }
 }
diff --git a/src/main/java/com/soongsil/CoffeeChat/service/CustomOAuth2UserService.java b/src/main/java/com/soongsil/CoffeeChat/service/CustomOAuth2UserService.java
@@ -118,7 +118,7 @@ public MobileTokenResponseDTO verifyGoogleToken(String accessToken, String name)
                 if (existingUser.isPresent()) {
                     // 기존 사용자: Role 정보 가져오기
                     role = existingUser.get().getRole();
-                    isNewAccount = false;
+                    isNewAccount = true;
                     log.info("Existing user found: " + username);
                 } else {
                     // 새로운 사용자: Role 기본값 설정

diff --git a/src/main/java/com/soongsil/CoffeeChat/service/UserService.java b/src/main/java/com/soongsil/CoffeeChat/service/UserService.java
@@ -5,18 +5,14 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.soongsil.CoffeeChat.dto.*;
 import com.soongsil.CoffeeChat.dto.Oauth.MobileUserDTO;
 import org.springframework.stereotype.Service;
 
 import com.soongsil.CoffeeChat.controller.exception.CustomException;
-import com.soongsil.CoffeeChat.dto.MenteeJoinRequestDto;
-import com.soongsil.CoffeeChat.dto.MentorJoinRequestDto;
 import com.soongsil.CoffeeChat.dto.UserController.MenteeInfoDto;
 import com.soongsil.CoffeeChat.dto.UserController.MentorInfoDto;
 import com.soongsil.CoffeeChat.dto.UserController.UserInfoDto;
-import com.soongsil.CoffeeChat.dto.UserGetDto;
-import com.soongsil.CoffeeChat.dto.UserJoinRequestDto;
-import com.soongsil.CoffeeChat.dto.UserUpdateDto;
 import com.soongsil.CoffeeChat.entity.Introduction;
 import com.soongsil.CoffeeChat.entity.Mentee;
 import com.soongsil.CoffeeChat.entity.Mentor;
@@ -103,10 +99,15 @@ public Map<String, String> getSmsCode(String to) {
 		}
 	}
 
-	public UserInfoDto saveUserPhone(String phone, String username) {
+	public PhoneNumUpdateDto saveUserPhone(String phone, String username) {
 		User user = findUserByUsername(username);
 		user.setPhoneNum(phone);
-		return UserInfoDto.toDto(userRepository.save(user));
+		userRepository.save(user);
+		return PhoneNumUpdateDto.builder()
+				.name(user.getName())
+				.phoneNum(user.getPhoneNum())
+				.isNewAccount(true)
+				.build();
 	}
 
 	public UserInfoDto saveUserEmail(String email, String username) {