Merge pull request #106 from JA-yeong-eop-JA-moeu-JA/feat/#105-profile

✨ feat: 기본프로필 관련 개선

Author: floreo1242

src/main/java/com/jajaja/domain/member/converter/MemberConverter.java

@@ -12,6 +12,7 @@ public static Member toEntity(OAuth2ResponseDto oAuth2Response) {
                 .name(oAuth2Response.getName())
                 .phone(oAuth2Response.getPhone())
                 .email(oAuth2Response.getEmail())
+                .profileKeyName("default-profile-image.png")
                 .point(0)
                 .build();
     }

src/main/java/com/jajaja/domain/member/dto/response/MemberInfoResponseDto.java

@@ -11,11 +11,11 @@ public record MemberInfoResponseDto(
         String phone,
         String email
 ) {
-    public static MemberInfoResponseDto from(Member member) {
+    public static MemberInfoResponseDto of(Member member, String profileUrl) {
         return MemberInfoResponseDto.builder()
                 .id(member.getId())
                 .name(member.getName())
-                .profileUrl(member.getProfileUrl())
+                .profileUrl(profileUrl)
                 .phone(member.getPhone())
                 .email(member.getEmail())
                 .build();

src/main/java/com/jajaja/domain/member/entity/Member.java

@@ -36,23 +36,23 @@ public class Member extends BaseEntity {
     @Column(nullable = false, length = 10)
     private String name;
 
-    @Column(name = "profile_url", length = 512)
-    private String profileUrl;
+    @Column(name = "profile_key_name")
+    private String profileKeyName;
 
     @Column(length = 16)
     private String phone;
 
     @Column(nullable = false)
     private String email;
-    
+
     @Column(nullable = false)
     private Integer point;
 
     @OneToOne(mappedBy = "member", fetch = FetchType.LAZY)
     private MemberBusinessCategory memberBusinessCategory;
 
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<MemberCoupon> memberCoupons = new ArrayList <>();
+    private List<MemberCoupon> memberCoupons = new ArrayList<>();
 
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<TeamMember> teamMembers = new ArrayList<>();
@@ -86,8 +86,12 @@ public void updatePhone(String phone) {
     public void updateEmail(String email) {
         this.email = email;
     }
-  
-    public void updatePoint(int point) { this.point = point; }
-    
-    public void updateProfileUrl(String profileUrl) { this.profileUrl = profileUrl; }
+
+    public void updatePoint(int point) {
+        this.point = point;
+    }
+
+    public void updateProfileKeyName(String profileKeyName) {
+        this.profileKeyName = profileKeyName;
+    }
 }

src/main/java/com/jajaja/domain/member/service/MemberCommandServiceImpl.java

@@ -26,9 +26,13 @@ public MemberInfoResponseDto updateMemberInfo(Long memberId, MemberProfileUpdate
         if (request.name() != null) member.updateName(request.name());
         if (request.phone() != null) member.updatePhone(request.phone());
         if (request.profileKeyName() != null) {
-            String imageUrl = s3Service.generateStaticUrl(request.profileKeyName());
-            member.updateProfileUrl(imageUrl);
+            if (request.profileKeyName().isBlank()) {
+                member.updateProfileKeyName("default-profile-image.png");
+            } else {
+                member.updateProfileKeyName(request.profileKeyName());
+            }
         }
-        return MemberInfoResponseDto.from(member);
+        String profileUrl = s3Service.generateStaticUrl(member.getProfileKeyName());
+        return MemberInfoResponseDto.of(member, profileUrl);
     }
 }

src/main/java/com/jajaja/domain/member/service/MemberQueryServiceImpl.java

@@ -3,6 +3,7 @@
 import com.jajaja.domain.member.dto.response.MemberInfoResponseDto;
 import com.jajaja.domain.member.entity.Member;
 import com.jajaja.domain.member.repository.MemberRepository;
+import com.jajaja.global.S3.service.S3Service;
 import com.jajaja.global.apiPayload.code.status.ErrorStatus;
 import com.jajaja.global.apiPayload.exception.custom.BadRequestException;
 import lombok.RequiredArgsConstructor;
@@ -16,11 +17,13 @@
 public class MemberQueryServiceImpl implements MemberQueryService {
 
     private final MemberRepository memberRepository;
+    private final S3Service s3Service;
 
     @Override
     public MemberInfoResponseDto getMemberInfo(Long memberId) {
         Member member = memberRepository.findById(memberId)
                 .orElseThrow(() -> new BadRequestException(ErrorStatus.MEMBER_NOT_FOUND));
-        return MemberInfoResponseDto.from(member);
+        String profileUrl = s3Service.generateStaticUrl(member.getProfileKeyName());
+        return MemberInfoResponseDto.of(member, profileUrl);
     }
 }