[chore] 코드 정리 - #146

TeamDATEROAD · Jul 17, 2024 · 25fe1f7 · 25fe1f7
1 parent 99a47a8
commit 25fe1f7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/dateroad-api/src/main/java/org/dateroad/user/api/UserController.java b/dateroad-api/src/main/java/org/dateroad/user/api/UserController.java
@@ -34,7 +34,7 @@ public ResponseEntity<UserJwtInfoRes> signUp(@RequestHeader(AUTHORIZATION) final
                                                  @RequestPart("userSignUpReq") final UserSignUpReq userSignUPReq,
                                                  @RequestPart("image") MultipartFile image,
                                                  @RequestPart("tag") List<DateTagType> tag
-    ) throws IOException, ExecutionException, InterruptedException {
+    ) {
         UserJwtInfoRes userSignUpRes = authService.signUp(token, userSignUPReq, image, tag);
         return ResponseEntity.status(HttpStatus.CREATED).body(userSignUpRes);
     }

diff --git a/dateroad-api/src/main/java/org/dateroad/user/service/AuthService.java b/dateroad-api/src/main/java/org/dateroad/user/service/AuthService.java
@@ -54,13 +54,12 @@ public class AuthService {
     private String cachePath;
 
     @Transactional
-    public UserJwtInfoRes signUp(final String token, final UserSignUpReq userSignUpReq, MultipartFile image, List<DateTagType> tag)
-            throws IOException, ExecutionException, InterruptedException {
+    public UserJwtInfoRes signUp(final String token, final UserSignUpReq userSignUpReq, MultipartFile image, List<DateTagType> tag) {
         String platformUserId = getUserPlatformId(userSignUpReq.platform(), token);
         validateUserTagSize(tag);
         checkNickname(userSignUpReq.name());
         validateDuplicatedUser(userSignUpReq.platform(), platformUserId);
-        User newUser = saveUser(userSignUpReq.name(), cachePath + s3Service.uploadImage("/user", image).get(), userSignUpReq.platform(), platformUserId);
+        User newUser = saveUser(userSignUpReq.name(), getImage(image), userSignUpReq.platform(), platformUserId);
         saveUserTag(newUser, tag);
         Token issuedToken = issueToken(newUser.getId());
         return UserJwtInfoRes.of(newUser.getId(), issuedToken.accessToken(), issuedToken.refreshToken());
@@ -179,7 +178,17 @@ private void deleteRefreshToken(final long userId) {
     }
 
     //토큰 발급
-    Token issueToken(final Long userId) {
+    private Token issueToken(final Long userId) {
         return jwtProvider.issueToken(userId);
     }
+
+    //이미지 생성
+    private String getImage(MultipartFile image) {
+        try {
+            return cachePath + s3Service.uploadImage("/user", image).get();
+        } catch (InterruptedException | ExecutionException | IOException e) {
+            log.error(e.getMessage());
+            throw new BadRequestException(FailureCode.WRONG_IMAGE_URL);
+        }
+    }
 }