[FIX #144] 이미지 업로드 로직 수정

src/main/java/com/favoriteplace/HelloController.java → src/main/java/com/favoriteplace/HealthCheckController.java

@@ -4,10 +4,10 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class HelloController {
+public class HealthCheckController {
 
-    @GetMapping("/hello")
-    public String hello(){
+    @GetMapping("/health")
+    public String health_check(){
         return "hello success!";
     }
 

src/main/java/com/favoriteplace/app/controller/MemberController.java

@@ -41,14 +41,15 @@ public ResponseEntity<MemberDto.MemberSignUpResDto> kakaoSignUp(
             @RequestHeader("Authorization") final String token,
             @RequestPart(required = false) final List<MultipartFile> images,
             @RequestPart final KaKaoSignUpRequestDto data
-    ) {
-        return ResponseEntity.ok(memberService.kakaoSignUp(token, data));
+    ) throws IOException {
+        return ResponseEntity.ok(memberService.kakaoSignUp(token, data, images));
     }
 
     @PostMapping("/signup")
     public ResponseEntity<MemberDto.MemberSignUpResDto> signup(
             @RequestPart(required = false) List<MultipartFile> images,
-            @RequestPart MemberSignUpReqDto data) throws IOException {
+            @RequestPart MemberSignUpReqDto data
+    ) throws IOException {
         return ResponseEntity.ok(memberService.signup(data, images));
     }
 

src/main/java/com/favoriteplace/app/dto/member/KaKaoSignUpRequestDto.java

@@ -17,7 +17,7 @@ public Member toEntity(String profileImg, Item titleItem, String email) {
                 .email(email)
                 .alarmAllowance(snsAllow)
                 .description(introduction)
-                .profileImageUrl(profileImg == null ? null : ConvertUuidToUrl.convertUuidToUrl(profileImg))
+                .profileImageUrl(profileImg)
                 .point(0L)
                 .loginType(LoginType.KAKAO)
                 .profileTitle(titleItem)

src/main/java/com/favoriteplace/app/dto/member/MemberDto.java

@@ -5,10 +5,7 @@
 import com.favoriteplace.app.domain.enums.MemberStatus;
 import com.favoriteplace.app.domain.item.Item;
 import com.favoriteplace.global.gcpImage.ConvertUuidToUrl;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -21,7 +18,10 @@ public class MemberDto {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class MemberSignUpReqDto {
+
+        @NotBlank(message = "닉네임은 필수값입니다.")
         public String nickname;
+
         public String email;
         public String password;
         public Boolean snsAllow;

src/main/java/com/favoriteplace/app/service/MemberService.java

@@ -59,16 +59,25 @@ public MemberDto.TokenInfo kakaoLogin(final String token) {
     }
 
     @Transactional
-    public MemberDto.MemberSignUpResDto kakaoSignUp(final String token, final KaKaoSignUpRequestDto memberSignUpReqDto) {
+    public MemberDto.MemberSignUpResDto kakaoSignUp(
+            final String token,
+            final KaKaoSignUpRequestDto memberSignUpReqDto,
+            final List<MultipartFile> images
+    ) throws IOException {
+
         String userEmail = kakaoClient.getUserInfo(token).kakaoAccount().email();
 
         memberRepository.findByEmail(userEmail)
                 .ifPresent(a -> {throw new RestApiException(USER_ALREADY_EXISTS);});
 
-        //TODO: 이미지 저장 로직(S3)
+        String profileImageUrl = null;
+        if (images != null && !images.get(0).isEmpty()) {
+            profileImageUrl = uploadProfileImage(images.get(0));
+        }
+
         Item titleItem = itemRepository.findByName("새싹회원").get();
 
-        Member member = memberSignUpReqDto.toEntity(null, titleItem, userEmail);
+        Member member = memberSignUpReqDto.toEntity(profileImageUrl, titleItem, userEmail);
         memberRepository.save(member);
 
         MemberDto.TokenInfo tokenInfo = jwtTokenProvider.generateToken(userEmail);
@@ -79,9 +88,10 @@ public MemberDto.MemberSignUpResDto kakaoSignUp(final String token, final KaKaoS
     }
 
     @Transactional
-    public MemberDto.MemberSignUpResDto signup(MemberSignUpReqDto memberSignUpReqDto, List<MultipartFile> images)
-        throws IOException {
-        List<CompletableFuture<String>> futures = new ArrayList<>();
+    public MemberDto.MemberSignUpResDto signup(
+            final MemberSignUpReqDto memberSignUpReqDto,
+            final List<MultipartFile> images
+    ) throws IOException {
 
         memberRepository.findByEmail(memberSignUpReqDto.getEmail())
             .ifPresent(
@@ -91,12 +101,12 @@ public MemberDto.MemberSignUpResDto signup(MemberSignUpReqDto memberSignUpReqDto
             );
 
         String profileImageUrl = null;
-        String password = passwordEncoder.encode(memberSignUpReqDto.getPassword());
-
         if (images != null && !images.get(0).isEmpty()) {
-            profileImageUrl = amazonS3ImageManager.upload(images.get(0)).join();
+            profileImageUrl = uploadProfileImage(images.get(0));
         }
 
+        String password = passwordEncoder.encode(memberSignUpReqDto.getPassword());
+
         Item titleItem = itemRepository.findByName("새싹회원").get();
 
         Member member = memberSignUpReqDto.toEntity(password, profileImageUrl, titleItem);
@@ -108,6 +118,10 @@ public MemberDto.MemberSignUpResDto signup(MemberSignUpReqDto memberSignUpReqDto
         return MemberDto.MemberSignUpResDto.from(member, tokenInfo);
     }
 
+    public String uploadProfileImage(MultipartFile profileImage) throws IOException {
+        return amazonS3ImageManager.upload(profileImage).join();
+    }
+
     @Transactional
     public MemberDto.EmailDuplicateResDto emailDuplicateCheck(EmailSendReqDto emailSendReqDto) {
         String email = emailSendReqDto.getEmail();

src/main/java/com/favoriteplace/global/s3Image/AmazonS3ImageManager.java

@@ -38,32 +38,18 @@ public CompletableFuture<String> upload(MultipartFile multipartFile) throws IOEx
         return future;
     }
 
-    @Async("S3imageUploadExecutor")
-    public List<CompletableFuture<String>>upload(List<MultipartFile> multipartFiles) throws IOException {
-        List<CompletableFuture<String>> futures =  new ArrayList<CompletableFuture<String>>();
-        CompletableFuture<String> future = new CompletableFuture<>();
-
-        for (MultipartFile file : multipartFiles) {
-            String s3FileName = UUID.randomUUID().toString().substring(0, 10) + file.getOriginalFilename();
-
-            File uploadFile = convert(file)
-                    .orElseThrow(() -> new IllegalArgumentException("MultipartFile -> File 전환 실패"));
-            future.complete((upload(uploadFile, s3FileName)));
-        }
-        futures.add(future);
-
-        return futures;
-    }
-
     public List<String> uploadMultiImages(List<MultipartFile> images) throws IOException{
         List<CompletableFuture<String>> futures = new ArrayList<>();
-        for(MultipartFile file:images){
+
+        for(MultipartFile file : images){
             futures.add(upload(file));
         }
+
         List<String> imageUrls = new ArrayList<>();
         futures.forEach(
                 future -> imageUrls.add(future.join())
         );
+
         return imageUrls;
     }