Merge pull request #22 from NET-ZERO-FitFit/develop

main <- develop

Author: simhyunmin

src/main/java/fitfit/domain/clothes/converter/ClothesConverter.java

@@ -57,7 +57,7 @@ public static ClothesResponseDTO.ClothesPreviewDTO toClothesPreviewDTO(Clothes c
                 .style(clothes.getStyle().toString())
                 .price(clothes.getPrice())
                 .createdAt(clothes.getCreatedAt())
-                .isMatched(clothes.isMatched())
+                .isMatched(clothes.getIsMatched())
                 .build();
     }
 

src/main/java/fitfit/domain/clothes/entity/Clothes.java

@@ -6,6 +6,7 @@
 import fitfit.global.enums.Style;
 import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.ColumnDefault;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -67,9 +68,9 @@ public class Clothes extends BaseEntity {
     @Column(name = "is_sold")
     private Boolean isSold; // 판매여부
 
-    @Column(name = "is_matched")
-    @Builder.Default
-    private boolean isMatched = false; // 매칭 확정 여부
+    @Column(name = "is_matched", nullable = false)
+    @ColumnDefault("false")
+    private Boolean isMatched; // 매칭 확정 여부
 
     @Column(name = "sold_date")
     private LocalDateTime soldDate; // 판매날짜

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

@@ -47,6 +47,9 @@ public class MemberCommandServiceImpl implements MemberCommandService{
     @Value("${cloud.aws.s3.profile-bucket}")
     private String profileBucket;
 
+    @Value("${cloud.aws.region.static}")
+    private String region;
+
     @Override
     @Transactional
     public Member findOrCreateMember(MemberDataDTO.MemberData memberData, Provider provider) {
@@ -120,6 +123,9 @@ public MemberResponseDTO.MyProfileDetailDto updateProfile(String authorization,
        member.updateNickname(req.nickname());
 
        if(req.profileImgUrl() != null && !req.profileImgUrl().isBlank() && req.profileImgUrl().startsWith("data:image")){
+           if (member.getProfileImgUrl() != null && !member.getProfileImgUrl().isBlank() && member.getProfileImgUrl().contains("profile_images"))  {
+               s3Service.deleteFile(member.getProfileImgUrl());
+           }
            String profileImgUrl = s3Service.upload(req.profileImgUrl(), "profile_images", profileBucket);
            member.updateProfileImgUrl(profileImgUrl);
        }
@@ -153,6 +159,9 @@ public MemberResponseDTO.BodyInfoResDTO updateBodyInfo(String authorization, Mem
         member.updateHeight(req.height());
         member.updateWeight(req.weight());
         if(req.bodyImgUrl() != null && !req.bodyImgUrl().isBlank() && req.bodyImgUrl().startsWith("data:image")){
+            if (member.getFullBodyImgUrl() != null && !member.getFullBodyImgUrl().isBlank() && member.getFullBodyImgUrl().contains("fitting_member_images")) {
+                s3Service.deleteFile(member.getFullBodyImgUrl());
+            }
             String bodyImgUrl = s3Service.upload(req.bodyImgUrl(), "fitting_member_images", profileBucket);
             member.updateFullBodyImgUrl(bodyImgUrl);
         }
@@ -313,7 +322,18 @@ private void updateMemberInfo(Member member, MemberRequestDTO.MemberSignupReques
         if (request.getStyleList() != null) {
             member.updatePreferredStyle(request.getStyleList());
         }
-        member.updateFullBodyImgUrl(request.getFullBodyImgUrl());
+        if (request.getFullBodyImgUrl() != null && !request.getFullBodyImgUrl().isBlank() && request.getFullBodyImgUrl().startsWith("data:image")) {
+            String bodyImgUrl = s3Service.upload(request.getFullBodyImgUrl(), "fitting_member_images", profileBucket);
+            member.updateFullBodyImgUrl(bodyImgUrl);
+        } else {
+            String defaultImgKey = switch (request.getGender()) {
+                case FEMALE -> "fitting_sample/fitting_girl.png";
+                case MALE -> "fitting_sample/fitting_man.png";
+                case NONE -> "fitting_sample/fitting_man.png";
+            };
+            String defaultImgUrl = "https://" + profileBucket + ".s3." + region + ".amazonaws.com/" + defaultImgKey;
+            member.updateFullBodyImgUrl(defaultImgUrl);
+        }
     }
 }