Merge branch 'main' of https://github.com/NET-ZERO-FitFit/Server

Author: simhyunmin

src/main/java/fitfit/domain/clothes/service/ClothesCommandServiceImpl.java

@@ -16,6 +16,7 @@
 import fitfit.global.apiPayload.exception.handler.MemberHandler;
 import fitfit.global.s3.S3Service;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -34,6 +35,9 @@ public class ClothesCommandServiceImpl implements ClothesCommandService {
     private final S3Service s3Service;
     private final JwtProvider jwtProvider;
 
+    @Value("${cloud.aws.s3.clothes-bucket}")
+    private String clothesBucket;
+
     @Override
     public ClothesResponseDTO.CreateClothesResponse createClothes(String authorization,
                                                                     ClothesRequestDTO.CreateClothesRequest requestDto) throws IOException {
@@ -50,7 +54,7 @@ public ClothesResponseDTO.CreateClothesResponse createClothes(String authorizati
         validateCreateClothesRequest(requestDto);
 
         // 가상 피팅 이미지 업로드 -> 'fitting' 폴더
-        String fittingImageUrl = s3Service.upload(requestDto.getFittingImage(), "fitting");
+        String fittingImageUrl = s3Service.upload(requestDto.getFittingImage(), "fitting", clothesBucket);
 
         // Clothes 엔티티 생성
         Clothes clothes = ClothesConverter.toClothes(requestDto, seller, category, fittingImageUrl);
@@ -59,7 +63,7 @@ public ClothesResponseDTO.CreateClothesResponse createClothes(String authorizati
         if (requestDto.getDisplayImages() != null && !requestDto.getDisplayImages().isEmpty()) {
             for (String displayImage : requestDto.getDisplayImages()) {
                 if(displayImage != null && !displayImage.isEmpty()){
-                    String displayImageUrl = s3Service.upload(displayImage, "display");
+                    String displayImageUrl = s3Service.upload(displayImage, "display", clothesBucket);
                     ClothesImage imageEntity = ClothesImage.builder()
                             .imageUrl(displayImageUrl)
                             .build();

src/main/java/fitfit/domain/member/service/MemberCommandServiceImpl.java

@@ -21,8 +21,10 @@
 import fitfit.global.enums.MemberStatus;
 import fitfit.global.enums.Provider;
 import fitfit.global.enums.Style;
+import fitfit.global.s3.S3Service;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,8 +42,10 @@ public class MemberCommandServiceImpl implements MemberCommandService{
     private final MemberTermRepository memberTermRepository;
     private final TermRepository termRepository;
     private final AccountCommandService accountCommandService; // 의존성 추가
+    private final S3Service s3Service;
 
-    private static final String DEFAULT_BODY_IMG_URL = "https://fitfit-profile-img.s3.ap-northeast-2.amazonaws.com/default_body_img.jpg";
+    @Value("${cloud.aws.s3.profile-bucket}")
+    private String profileBucket;
 
     @Override
     @Transactional
@@ -115,8 +119,9 @@ public MemberResponseDTO.MyProfileDetailDto updateProfile(String authorization,
 
        member.updateNickname(req.nickname());
 
-       if(req.profileImgUrl() !=null){
-           member.updateProfileImgUrl(req.profileImgUrl());
+       if(req.profileImgUrl() != null && !req.profileImgUrl().isBlank() && req.profileImgUrl().startsWith("data:image")){
+           String profileImgUrl = s3Service.upload(req.profileImgUrl(), "profile_images", profileBucket);
+           member.updateProfileImgUrl(profileImgUrl);
        }
 
        if(req.preferredStyles()!=null) {
@@ -147,8 +152,9 @@ public MemberResponseDTO.BodyInfoResDTO updateBodyInfo(String authorization, Mem
 
         member.updateHeight(req.height());
         member.updateWeight(req.weight());
-        if(req.bodyImgUrl()!=null){
-            member.updateFullBodyImgUrl(req.bodyImgUrl());
+        if(req.bodyImgUrl() != null && !req.bodyImgUrl().isBlank() && req.bodyImgUrl().startsWith("data:image")){
+            String bodyImgUrl = s3Service.upload(req.bodyImgUrl(), "fitting_member_images", profileBucket);
+            member.updateFullBodyImgUrl(bodyImgUrl);
         }
         return MemberConverter.toMemberBodyInfoResDTO(member);
     }
@@ -161,6 +167,14 @@ public void withdrawMember(String authorization) {
         Member findMember = memberRepository.findById(memberId)
                 .orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
 
+        // S3에 저장된 이미지 삭제
+        if (findMember.getProfileImgUrl() != null && !findMember.getProfileImgUrl().isBlank()) {
+            s3Service.deleteFile(findMember.getProfileImgUrl());
+        }
+        if (findMember.getFullBodyImgUrl() != null && !findMember.getFullBodyImgUrl().isBlank()) {
+            s3Service.deleteFile(findMember.getFullBodyImgUrl());
+        }
+
         findMember.updateStatus(MemberStatus.INACTIVE);
 
         memberTokenRepository.deleteByMember(findMember);
@@ -299,11 +313,7 @@ private void updateMemberInfo(Member member, MemberRequestDTO.MemberSignupReques
         if (request.getStyleList() != null) {
             member.updatePreferredStyle(request.getStyleList());
         }
-        if (request.getFullBodyImgUrl() != null) {
-            member.updateFullBodyImgUrl(request.getFullBodyImgUrl());
-        } else {
-            member.updateFullBodyImgUrl(DEFAULT_BODY_IMG_URL);
-        }
-
+        member.updateFullBodyImgUrl(request.getFullBodyImgUrl());
     }
 }
+

src/main/java/fitfit/global/s3/S3Service.java

@@ -5,11 +5,9 @@
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
@@ -23,11 +21,8 @@ public class S3Service {
 
     private final AmazonS3Client amazonS3Client;
 
-    @Value("${cloud.aws.s3.bucket}")
-    private String bucket;
-
     // Base64 인코딩된 이미지를 S3에 업로드하는 메서드
-    public String upload(String base64Image, String dirName) {
+    public String upload(String base64Image, String dirName, String bucket) {
         // "data:image/jpeg;base64," 부분 제거
         String[] parts = base64Image.split(",");
         String data = parts[1];
@@ -56,16 +51,13 @@ private ObjectMetadata createMetadata(Long size, String contentType) {
     public void deleteFile(String fileUrl) {
         try {
             URL url = new URL(fileUrl);
-            String path = url.getPath(); // URL에서 path(경로) 부분 추출 (e.g., "/bucket/key" 또는 "/key")
-            String fileKey = path.substring(1); // 맨 앞의 "/" 제거
-
-            // Path-style URL(e.g., "bucket/key")인 경우, 경로 맨 앞의 버킷 이름을 제거하여 순수 키만 남김
-            if (fileKey.startsWith(bucket + "/")) {
-                fileKey = fileKey.substring(bucket.length() + 1);
-            }
+            String host = url.getHost(); // ex: bucket-name.s3.ap-northeast-2.amazonaws.com
+            String bucketName = host.split("\\.")[0];
 
+            String fileKey = url.getPath().substring(1); // ex: /key -> key
             fileKey = URLDecoder.decode(fileKey, StandardCharsets.UTF_8);
-            amazonS3Client.deleteObject(new DeleteObjectRequest(bucket, fileKey));
+
+            amazonS3Client.deleteObject(new DeleteObjectRequest(bucketName, fileKey));
             log.info("S3 파일 삭제 성공: {}", fileKey);
         } catch (Exception e) {
             log.error("S3 파일 삭제 실패. URL: {}, Error: {}", fileUrl, e.getMessage());

src/main/resources/application.yml

@@ -41,7 +41,8 @@ logging:
 cloud:
   aws:
     s3:
-      bucket: fitfit-clothes
+      clothes-bucket: fitfit-clothes
+      profile-bucket: fitfit-profile-img
     credentials:
       access-key: AKIAU3XHQYLTYOFDMQH5
       secret-key: 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