Merge pull request #297 from WE-ARE-RACCOONS/RAC-410

RAC-410 fix : 응답 객체 변경
WE-ARE-RACCOONS · Jul 9, 2024 · cb7fd9e · cb7fd9e
2 parents 450b5ab + 26adcb7
commit cb7fd9e
Show file tree

Hide file tree

Showing 7 changed files with 133 additions and 111 deletions.
diff --git a/src/main/java/com/postgraduate/domain/auth/presentation/AuthController.java b/src/main/java/com/postgraduate/domain/auth/presentation/AuthController.java
@@ -17,13 +17,15 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 import static com.postgraduate.domain.auth.presentation.constant.AuthResponseCode.*;
 import static com.postgraduate.domain.auth.presentation.constant.AuthResponseMessage.*;
 import static com.postgraduate.domain.senior.presentation.constant.SeniorResponseCode.SENIOR_CREATE;
 import static com.postgraduate.domain.senior.presentation.constant.SeniorResponseMessage.CREATE_SENIOR;
+import static com.postgraduate.global.dto.ResponseDto.create;
 
 @RestController
 @RequiredArgsConstructor
@@ -36,93 +38,93 @@ public class AuthController {
 
     @PostMapping("/login/{provider}")
     @Operation(summary = "소셜 로그인", description = "회원인 경우 JWT를, 회원이 아닌 경우 socialId를 반환합니다(회원가입은 진행하지 않습니다).")
-    public ResponseDto<AuthResponse> authLogin(@RequestBody @Valid CodeRequest request, @PathVariable Provider provider) {
+    public ResponseEntity<ResponseDto<AuthResponse>> authLogin(@RequestBody @Valid CodeRequest request, @PathVariable Provider provider) {
         SignInUseCase signInUseCase = selectOauth.selectSignIn(provider);
         AuthUserResponse authUser = signInUseCase.getUser(request);
         if (authUser.user() == null)
-            return ResponseDto.create(AUTH_NONE.getCode(), NOT_REGISTERED_USER.getMessage(), authUser);
+            return ResponseEntity.ok(create(AUTH_NONE.getCode(), NOT_REGISTERED_USER.getMessage(), authUser));
         JwtTokenResponse jwtToken = jwtUseCase.signIn(authUser.user());
-        return ResponseDto.create(AUTH_ALREADY.getCode(), SUCCESS_AUTH.getMessage(), jwtToken);
+        return ResponseEntity.ok(create(AUTH_ALREADY.getCode(), SUCCESS_AUTH.getMessage(), jwtToken));
     }
 
     @PostMapping("/dev/login/{provider}")
     @Operation(summary = "개발용 소셜 로그인", description = "회원인 경우 JWT를, 회원이 아닌 경우 socialId를 반환합니다(회원가입은 진행하지 않습니다).")
-    public ResponseDto<AuthResponse> authDevLogin(@RequestBody @Valid CodeRequest request, @PathVariable Provider provider) {
+    public ResponseEntity<ResponseDto<AuthResponse>> authDevLogin(@RequestBody @Valid CodeRequest request, @PathVariable Provider provider) {
         SignInUseCase signInUseCase = selectOauth.selectSignIn(provider);
         AuthUserResponse authUser = signInUseCase.getDevUser(request);
         if (authUser.user() == null)
-            return ResponseDto.create(AUTH_NONE.getCode(), NOT_REGISTERED_USER.getMessage(), authUser);
+            return ResponseEntity.ok(create(AUTH_NONE.getCode(), NOT_REGISTERED_USER.getMessage(), authUser));
         JwtTokenResponse jwtToken = jwtUseCase.signIn(authUser.user());
-        return ResponseDto.create(AUTH_ALREADY.getCode(), SUCCESS_AUTH.getMessage(), jwtToken);
+        return ResponseEntity.ok(create(AUTH_ALREADY.getCode(), SUCCESS_AUTH.getMessage(), jwtToken));
     }
 
     @PostMapping("/logout")
     @Operation(summary = "로그아웃", description = "토큰 같이 보내주세요")
-    public ResponseDto<Void> logout(@AuthenticationPrincipal User user) {
+    public ResponseEntity<ResponseDto<Void>> logout(@AuthenticationPrincipal User user) {
         jwtUseCase.logout(user);
-        return ResponseDto.create(AUTH_DELETE.getCode(), LOGOUT_USER.getMessage());
+        return ResponseEntity.ok(create(AUTH_DELETE.getCode(), LOGOUT_USER.getMessage()));
     }
 
     @PostMapping("/signout/{provider}/{userId}")
     @Operation(summary = "회원 탈퇴 | 관리자 토큰 필요", description = "회원 탈퇴 진행")
-    public ResponseDto<Void> signOut(@PathVariable Provider provider, @PathVariable Long userId) {
+    public ResponseEntity<ResponseDto<Void>> signOut(@PathVariable Provider provider, @PathVariable Long userId) {
         SignOutUseCase signOutUseCase = selectOauth.selectSignOut(provider);
         signOutUseCase.signOut(userId);
-        return ResponseDto.create(AUTH_DELETE.getCode(), SIGNOUT_USER.getMessage());
+        return ResponseEntity.ok(create(AUTH_DELETE.getCode(), SIGNOUT_USER.getMessage()));
     }
 
     @PostMapping("/user/signup")
     @Operation(summary = "대학생 회원가입", description = "로그인 API에서 반환한 socialId, 닉네임, 번호, 마케팅 수신여부, 희망 학과, 희망 분야, 매칭 희망 여부")
-    public ResponseDto<JwtTokenResponse> signUpUser(@RequestBody @Valid SignUpRequest request) {
+    public ResponseEntity<ResponseDto<JwtTokenResponse>> signUpUser(@RequestBody @Valid SignUpRequest request) {
         User user = signUpUseCase.userSignUp(request);
         JwtTokenResponse jwtToken = jwtUseCase.signIn(user);
-        return ResponseDto.create(AUTH_CREATE.getCode(), SUCCESS_AUTH.getMessage(), jwtToken);
+        return ResponseEntity.ok(create(AUTH_CREATE.getCode(), SUCCESS_AUTH.getMessage(), jwtToken));
     }
 
     @PostMapping("/user/token")
     @Operation(summary = "후배로 변경 | 토큰 필요", description = "후배로 변경 가능한 경우 후배 토큰 발급")
-    public ResponseDto<JwtTokenResponse> changeUserToken(@AuthenticationPrincipal User user) {
+    public ResponseEntity<ResponseDto<JwtTokenResponse>> changeUserToken(@AuthenticationPrincipal User user) {
         JwtTokenResponse jwtToken = jwtUseCase.changeUser(user);
-        return ResponseDto.create(AUTH_CREATE.getCode(), SUCCESS_AUTH.getMessage(), jwtToken);
+        return ResponseEntity.ok(create(AUTH_CREATE.getCode(), SUCCESS_AUTH.getMessage(), jwtToken));
     }
 
     @PostMapping("/user/change")
     @Operation(summary = "후배로 추가 가입 | 토큰 필요", description = "대학원생 대학생으로 변경 추가 가입")
-    public ResponseDto<JwtTokenResponse> changeUser(@AuthenticationPrincipal User user,
+    public ResponseEntity<ResponseDto<JwtTokenResponse>> changeUser(@AuthenticationPrincipal User user,
                                                     @RequestBody @Valid UserChangeRequest changeRequest) {
         signUpUseCase.changeUser(user, changeRequest);
         JwtTokenResponse jwtToken = jwtUseCase.changeUser(user);
-        return ResponseDto.create(AUTH_CREATE.getCode(), SUCCESS_AUTH.getMessage(), jwtToken);
+        return ResponseEntity.ok(create(AUTH_CREATE.getCode(), SUCCESS_AUTH.getMessage(), jwtToken));
     }
 
     @PostMapping("/senior/signup")
     @Operation(summary = "대학원생 가입 - 필수 과정만", description = "대학원생 회원가입 - 필수 과정만")
-    public ResponseDto<JwtTokenResponse> singUpSenior(@RequestBody @Valid SeniorSignUpRequest request) {
+    public ResponseEntity<ResponseDto<JwtTokenResponse>> singUpSenior(@RequestBody @Valid SeniorSignUpRequest request) {
         User user = signUpUseCase.seniorSignUp(request);
         JwtTokenResponse jwtToken = jwtUseCase.signIn(user);
-        return ResponseDto.create(SENIOR_CREATE.getCode(), CREATE_SENIOR.getMessage(), jwtToken);
+        return ResponseEntity.ok(create(SENIOR_CREATE.getCode(), CREATE_SENIOR.getMessage(), jwtToken));
     }
 
     @PostMapping("/senior/change")
     @Operation(summary = "선배로 추가 가입 | 토큰 필요", description = "대학생 대학원생으로 변경 추가 가입")
-    public ResponseDto<JwtTokenResponse> changeSenior(@AuthenticationPrincipal User user,
+    public ResponseEntity<ResponseDto<JwtTokenResponse>> changeSenior(@AuthenticationPrincipal User user,
                                                       @RequestBody @Valid SeniorChangeRequest changeRequest) {
         User changeUser = signUpUseCase.changeSenior(user, changeRequest);
         JwtTokenResponse jwtToken = jwtUseCase.changeSenior(changeUser);
-        return ResponseDto.create(SENIOR_CREATE.getCode(), CREATE_SENIOR.getMessage(), jwtToken);
+        return ResponseEntity.ok(create(SENIOR_CREATE.getCode(), CREATE_SENIOR.getMessage(), jwtToken));
     }
 
     @PostMapping("/senior/token")
     @Operation(summary = "선배로 변경 | 토큰 필요", description = "선배로 변경 가능한 경우 선배 토큰 발급")
-    public ResponseDto<JwtTokenResponse> changeSeniorToken(@AuthenticationPrincipal User user) {
+    public ResponseEntity<ResponseDto<JwtTokenResponse>> changeSeniorToken(@AuthenticationPrincipal User user) {
         JwtTokenResponse jwtToken = jwtUseCase.changeSenior(user);
-        return ResponseDto.create(AUTH_CREATE.getCode(), SUCCESS_AUTH.getMessage(), jwtToken);
+        return ResponseEntity.ok(create(AUTH_CREATE.getCode(), SUCCESS_AUTH.getMessage(), jwtToken));
     }
 
     @PostMapping("/refresh")
     @Operation(summary = "토큰 재발급 | 토큰 필요", description = "refreshToken 으로 토큰 재발급")
-    public ResponseDto<JwtTokenResponse> refresh(@AuthenticationPrincipal User user, HttpServletRequest request) {
+    public ResponseEntity<ResponseDto<JwtTokenResponse>> refresh(@AuthenticationPrincipal User user, HttpServletRequest request) {
         JwtTokenResponse jwtToken = jwtUseCase.regenerateToken(user, request);
-        return ResponseDto.create(AUTH_UPDATE.getCode(), SUCCESS_REGENERATE_TOKEN.getMessage(), jwtToken);
+        return ResponseEntity.ok(create(AUTH_UPDATE.getCode(), SUCCESS_REGENERATE_TOKEN.getMessage(), jwtToken));
     }
 }
diff --git a/src/main/java/com/postgraduate/domain/image/presentation/ImageController.java b/src/main/java/com/postgraduate/domain/image/presentation/ImageController.java
@@ -10,13 +10,15 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import static com.postgraduate.domain.image.presentation.constant.ImageResponseCode.IMAGE_CREATE;
 import static com.postgraduate.domain.image.presentation.constant.ImageResponseMessage.ISSUE_URL;
 import static com.postgraduate.domain.image.presentation.constant.ImageResponseMessage.UPLOAD_URL;
+import static com.postgraduate.global.dto.ResponseDto.create;
 
 @RestController
 @RequiredArgsConstructor
@@ -28,29 +30,29 @@ public class ImageController {
 
     @PostMapping("/url/profile")
     @Operation(description = "USER Profile 등록 URL API - 이미지 풀네임으로 주세요 xxx.확장자, 이미지 이름을 유니크하게 만들어주세요 UUID+파일명 등등")
-    public ResponseDto<PreSignedUrlResponse> getProfilePreSignedUrl(@RequestBody PreSignedUrlRequest preSignedUrlRequest) {
+    public ResponseEntity<ResponseDto<PreSignedUrlResponse>> getProfilePreSignedUrl(@RequestBody PreSignedUrlRequest preSignedUrlRequest) {
         PreSignedUrlResponse profileUrl = preSignedUseCase.getProfileUrl(preSignedUrlRequest);
-        return ResponseDto.create(IMAGE_CREATE.getCode(), ISSUE_URL.getMessage(), profileUrl);
+        return ResponseEntity.ok(create(IMAGE_CREATE.getCode(), ISSUE_URL.getMessage(), profileUrl));
     }
 
     @PostMapping("/url/certification")
     @Operation(description = "Senior 학생증 인증 등록 URL API - 이미지 풀네임으로 주세요 xxx.확장자, 이미지 이름을 유니크하게 만들어주세요 UUID+파일명 등등")
-    public ResponseDto<PreSignedUrlResponse> getCertificationPreSignedUrl(@RequestBody PreSignedUrlRequest preSignedUrlRequest) {
+    public ResponseEntity<ResponseDto<PreSignedUrlResponse>> getCertificationPreSignedUrl(@RequestBody PreSignedUrlRequest preSignedUrlRequest) {
         PreSignedUrlResponse certificationUrl = preSignedUseCase.getCertificationUrl(preSignedUrlRequest);
-        return ResponseDto.create(IMAGE_CREATE.getCode(), ISSUE_URL.getMessage(), certificationUrl);
+        return ResponseEntity.ok(create(IMAGE_CREATE.getCode(), ISSUE_URL.getMessage(), certificationUrl));
     }
 
     @PostMapping("/upload/profile")
     @Operation(summary = "USER Profile 업로드 후 업로드 URL return / 토큰 필요", description = "profileFile 사진 Multipart File로 보내주세요")
-    public ResponseDto<ImageUrlResponse> getProfileUrl(@AuthenticationPrincipal User user, @RequestPart MultipartFile profileFile) {
+    public ResponseEntity<ResponseDto<ImageUrlResponse>> getProfileUrl(@AuthenticationPrincipal User user, @RequestPart MultipartFile profileFile) {
         ImageUrlResponse imageUrlResponse = imageUploadUseCase.uploadProfile(user, profileFile);
-        return ResponseDto.create(IMAGE_CREATE.getCode(), UPLOAD_URL.getMessage(), imageUrlResponse);
+        return ResponseEntity.ok(create(IMAGE_CREATE.getCode(), UPLOAD_URL.getMessage(), imageUrlResponse));
     }
 
     @PostMapping("/upload/certification")
     @Operation(summary = "SENIOR Certification 업로드 후 업로드 URL return", description = "certificationFile 사진 Multipart File로 보내주세요")
-    public ResponseDto<ImageUrlResponse> getCertificationUrl(@RequestPart MultipartFile certificationFile) {
+    public ResponseEntity<ResponseDto<ImageUrlResponse>> getCertificationUrl(@RequestPart MultipartFile certificationFile) {
         ImageUrlResponse imageUrlResponse = imageUploadUseCase.uploadCertification(certificationFile);
-        return ResponseDto.create(IMAGE_CREATE.getCode(), UPLOAD_URL.getMessage(), imageUrlResponse);
+        return ResponseEntity.ok(create(IMAGE_CREATE.getCode(), UPLOAD_URL.getMessage(), imageUrlResponse));
     }
 }