From 63558113feda534aeb4a7f6f6c7eb2996e78b32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=ED=98=B8=EC=9C=A4?= Date: Mon, 11 Dec 2023 11:28:15 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EB=B0=A9=EC=8B=9D=20=EC=9E=90=EB=8F=99=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=9D=B4=20=EC=95=84=EB=8B=8C=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=B0=98=ED=99=98=20=EB=B0=8F=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=EB=A1=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resume/request/ResumeUploadReq.java | 5 --- .../tmp/controller/TmpController.java | 2 +- .../user/controller/UserController.java | 32 ++++++++++++------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/chwipoClova/resume/request/ResumeUploadReq.java b/src/main/java/com/chwipoClova/resume/request/ResumeUploadReq.java index 1221f85..0735e17 100644 --- a/src/main/java/com/chwipoClova/resume/request/ResumeUploadReq.java +++ b/src/main/java/com/chwipoClova/resume/request/ResumeUploadReq.java @@ -7,13 +7,8 @@ import org.springframework.web.multipart.MultipartFile; @Data -@Builder public class ResumeUploadReq { - @Schema(description = "이력서파일", example = "이력서.pdf", name = "file") private MultipartFile file; - @Schema(description = "아이디", example = "1", name = "userId") - private Long userId; - } diff --git a/src/main/java/com/chwipoClova/tmp/controller/TmpController.java b/src/main/java/com/chwipoClova/tmp/controller/TmpController.java index d740ed8..6a7391d 100644 --- a/src/main/java/com/chwipoClova/tmp/controller/TmpController.java +++ b/src/main/java/com/chwipoClova/tmp/controller/TmpController.java @@ -21,7 +21,7 @@ public class TmpController { private final TmpService tmpService; - @Operation(summary = "Tmp 목록 조회", description = "Tmp 목록 조회") + @Operation(summary = "Tmp 목록 조회 (기본 테스트)", description = "Tmp 목록 조회 (기본 테스트)") @GetMapping("/") @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")} ) diff --git a/src/main/java/com/chwipoClova/user/controller/UserController.java b/src/main/java/com/chwipoClova/user/controller/UserController.java index 510d659..e24a521 100644 --- a/src/main/java/com/chwipoClova/user/controller/UserController.java +++ b/src/main/java/com/chwipoClova/user/controller/UserController.java @@ -1,8 +1,6 @@ package com.chwipoClova.user.controller; import com.chwipoClova.common.response.CommonResponse; -import com.chwipoClova.common.response.MessageCode; -import com.chwipoClova.user.request.UserLoginReq; import com.chwipoClova.user.response.UserInfoRes; import com.chwipoClova.user.response.UserLoginRes; import com.chwipoClova.user.response.UserSnsUrlRes; @@ -31,6 +29,18 @@ public class UserController { private final UserService userService; + @Operation(summary = "유저 정보 조회 (테스트용)", description = "유저 정보 조회 (테스트용)") + @GetMapping("/getUserInfo") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "OK") + } + ) + public UserInfoRes getUserInfo( + @Schema(description = "이메일", example = "test@naver.com", name = "email") @RequestParam(name = "email") String email + ) { + return userService.selectUserInfo(email); + } + @Operation(summary = "카카오 로그인 URL", description = "카카오 로그인 URL") @GetMapping("/getKakaoUrl") @ApiResponses(value = { @@ -41,27 +51,25 @@ public UserSnsUrlRes getKakaoUrl() throws Exception { return userService.getKakaoUrl(); } - @Operation(summary = "카카오 로그인", description = "카카오 로그인") - @GetMapping("/kakaoCallback") + @Operation(summary = "카카오 로그인", description = "카카오 로그인 (카카오 로그인 URL 호출해서 로그인 성공하면 나오는 코드를 입력)") + @GetMapping("/kakaoLogin") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = UserLoginRes.class))), @ApiResponse(responseCode = "700", description = "신규 가입되었습니다.", content = @Content(schema = @Schema(implementation = String.class))) } ) - public CommonResponse kakaoCallback(@Schema(description = "로그인코드", example = "1", name = "code") @RequestParam(name = "code") String code, HttpServletResponse response) throws Exception { + public CommonResponse kakaoLogin(@Schema(description = "로그인코드", example = "1", name = "code") @RequestParam(name = "code") String code, HttpServletResponse response) throws Exception { return userService.kakaoLogin(code, response); } - - @Operation(summary = "유저 정보 조회 (테스트용)", description = "유저 정보 조회 (테스트용)") - @GetMapping("/getUserInfo") + @Hidden + @Operation(summary = "카카오 로그인 콜백", description = "카카오 로그인 콜백") + @GetMapping("/kakaoCallback") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "OK") } ) - public UserInfoRes getUserInfo( - @Schema(description = "이메일", example = "test@naver.com", name = "email") @RequestParam(name = "email") String email - ) { - return userService.selectUserInfo(email); + public String kakaoCallback(@Schema(description = "로그인코드", example = "1", name = "code") @RequestParam(name = "code") String code, HttpServletResponse response) throws Exception { + return code; } }