Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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))
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/com/soongsil/CoffeeChat/dto/PhoneNumUpdateDto.java
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 기본값 설정
Expand Down
15 changes: 8 additions & 7 deletions src/main/java/com/soongsil/CoffeeChat/service/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
Loading