diff --git a/src/main/java/com/kusitms/jipbap/auth/AuthController.java b/src/main/java/com/kusitms/jipbap/auth/AuthController.java index 7020e23..3d03f9f 100644 --- a/src/main/java/com/kusitms/jipbap/auth/AuthController.java +++ b/src/main/java/com/kusitms/jipbap/auth/AuthController.java @@ -21,9 +21,8 @@ public class AuthController { @Operation(summary = "일반 회원 가입") @PostMapping("/signup") @ResponseStatus(HttpStatus.OK) - public CommonResponse signUp(@Valid @RequestBody SignUpRequestDto dto) { - authService.signUp(dto); - return new CommonResponse<>("회원가입 성공"); + public CommonResponse signUp(@Valid @RequestBody SignUpRequestDto dto) { + return new CommonResponse<>(authService.signUp(dto)); } @Operation(summary = "로그인") diff --git a/src/main/java/com/kusitms/jipbap/auth/AuthService.java b/src/main/java/com/kusitms/jipbap/auth/AuthService.java index ee568d4..0c9d5cc 100644 --- a/src/main/java/com/kusitms/jipbap/auth/AuthService.java +++ b/src/main/java/com/kusitms/jipbap/auth/AuthService.java @@ -4,10 +4,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.kusitms.jipbap.auth.dto.KakaoProfileDto; -import com.kusitms.jipbap.auth.dto.ReissueResponseDto; -import com.kusitms.jipbap.auth.dto.SignInResponseDto; -import com.kusitms.jipbap.auth.dto.SignUpRequestDto; +import com.kusitms.jipbap.auth.dto.*; import com.kusitms.jipbap.auth.exception.*; import com.kusitms.jipbap.security.jwt.JwtTokenProvider; import com.kusitms.jipbap.security.jwt.TokenInfo; @@ -51,11 +48,11 @@ public class AuthService { * @param dto */ @Transactional - public void signUp(SignUpRequestDto dto) { + public SignUpResponseDto signUp(SignUpRequestDto dto) { if(userRepository.existsByEmail(dto.getEmail())) throw new EmailExistsException("이미 가입한 이메일입니다."); if(userRepository.existsByUsername(dto.getUsername())) throw new UsernameExistsException("이미 존재하는 닉네임입니다."); - userRepository.save( + User user = userRepository.save( User.builder() .id(null) .email(dto.getEmail()) @@ -68,7 +65,7 @@ public void signUp(SignUpRequestDto dto) { .oauth(INAPP) .build() ); - + return new SignUpResponseDto(user.getId(), user.getEmail(), user.getUsername()); } /** diff --git a/src/main/java/com/kusitms/jipbap/auth/dto/SignUpRequestDto.java b/src/main/java/com/kusitms/jipbap/auth/dto/SignUpRequestDto.java index 8c7b70e..93ac3c9 100644 --- a/src/main/java/com/kusitms/jipbap/auth/dto/SignUpRequestDto.java +++ b/src/main/java/com/kusitms/jipbap/auth/dto/SignUpRequestDto.java @@ -2,6 +2,7 @@ import com.kusitms.jipbap.user.CountryPhoneCode; import com.kusitms.jipbap.user.Role; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import javax.validation.constraints.Email; @@ -14,16 +15,22 @@ public class SignUpRequestDto { @Email @NotBlank + @Schema(description = "이메일", example = "goodpoint@gmail.com") private String email; @NotBlank + @Schema(description = "비밀번호", example = "1234abcd") private String password; @NotBlank + @Schema(description = "닉네임", example = "조파랑") private String username; @NotBlank + @Schema(description = "국가 전화번호 코드", example = "KOREA") private CountryPhoneCode countryPhoneCode; @NotBlank + @Schema(description = "전화번호", example = "010-1234-5678") private String phoneNum; @NotBlank + @Schema(description = "역할", example = "USER") private Role role; private String imageUrl; } diff --git a/src/main/java/com/kusitms/jipbap/auth/dto/SignUpResponseDto.java b/src/main/java/com/kusitms/jipbap/auth/dto/SignUpResponseDto.java new file mode 100644 index 0000000..e877bb5 --- /dev/null +++ b/src/main/java/com/kusitms/jipbap/auth/dto/SignUpResponseDto.java @@ -0,0 +1,21 @@ +package com.kusitms.jipbap.auth.dto; + +import com.kusitms.jipbap.user.CountryPhoneCode; +import com.kusitms.jipbap.user.Role; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class SignUpResponseDto { + private Long id; + private String email; + private String username; +}