From 65dfd369abe469a5641bd4b2871742dffc0e87d7 Mon Sep 17 00:00:00 2001
From: rlarlgnszx <rlarlgnszx@naver.com>
Date: Tue, 16 Jul 2024 22:21:15 +0900
Subject: [PATCH] =?UTF-8?q?[fix]=20User=20thumnail=20=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20-=20#127?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/dateroad/user/api/UserApi.java     | 2 +-
 .../main/java/org/dateroad/user/api/UserController.java  | 2 +-
 .../main/java/org/dateroad/user/service/AuthService.java | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dateroad-api/src/main/java/org/dateroad/user/api/UserApi.java b/dateroad-api/src/main/java/org/dateroad/user/api/UserApi.java
index b1a98b99..9faa8a66 100644
--- a/dateroad-api/src/main/java/org/dateroad/user/api/UserApi.java
+++ b/dateroad-api/src/main/java/org/dateroad/user/api/UserApi.java
@@ -46,7 +46,7 @@ ResponseEntity<UserJwtInfoRes> signUp(
             @RequestPart(name = "userSignUpReq", required = true) @Parameter(description = "회원가입 요청 데이터") final UserSignUpReq userSignUpReq,
             @RequestPart(name = "image", required = true) @Parameter(description = "프로필 이미지") MultipartFile image,
             @RequestPart(name = "tag", required = true) @Parameter(description = "사용자 태그") List<DateTagType> tag
-    ) throws IOException;
+    ) throws IOException, ExecutionException, InterruptedException;
 
     @Operation(summary = "로그인", description = "사용자가 로그인을 합니다.")
     @ApiResponses(value = {
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
index 339dfbe7..b1f574cc 100644
--- 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 {
+    ) 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
index 11f97558..87eb12e3 100644
--- a/dateroad-api/src/main/java/org/dateroad/user/service/AuthService.java
+++ b/dateroad-api/src/main/java/org/dateroad/user/service/AuthService.java
@@ -1,5 +1,6 @@
 package org.dateroad.user.service;
 
+import java.util.concurrent.ExecutionException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dateroad.auth.jwt.JwtProvider;
@@ -32,8 +33,6 @@
 import java.io.IOException;
 import java.util.List;
 
-import static org.aspectj.weaver.tools.cache.SimpleCacheFactory.path;
-
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 @Service
@@ -51,13 +50,13 @@ public class AuthService {
     private String cachePath;
 
     @Transactional
-    public UserJwtInfoRes signUp(final String token, final UserSignUpReq userSignUpReq, MultipartFile image, List<DateTagType> tag) throws IOException {
+    public UserJwtInfoRes signUp(final String token, final UserSignUpReq userSignUpReq, MultipartFile image, List<DateTagType> tag)
+            throws IOException, ExecutionException, InterruptedException {
         String platformUserId = getUserPlatformId(userSignUpReq.platform(), token);
         validateUserTagSize(tag);
         checkNickname(userSignUpReq.name());
         validateDuplicatedUser(userSignUpReq.platform(), platformUserId);
-
-        User newUser = saveUser(userSignUpReq.name(), cachePath + s3Service.uploadImage(path, image), userSignUpReq.platform(), platformUserId);
+        User newUser = saveUser(userSignUpReq.name(), cachePath + s3Service.uploadImage("/user", image).get(), userSignUpReq.platform(), platformUserId);
         saveUserTag(newUser, tag);
         Token issuedToken = issueToken(newUser.getId());
         return UserJwtInfoRes.of(newUser.getId(), issuedToken.accessToken(), issuedToken.refreshToken());