로그인 시 회원 프로필 이미지 사진 추가

src/main/java/org/kakaoshare/backend/domain/member/dto/oauth/profile/OAuthProfile.java

@@ -28,6 +28,7 @@ public Member toEntity() {
                 .gender(Gender.from(getGender()))
                 .phoneNumber(getPhoneNumber())
                 .providerId(getProviderId())
+                .profileImageUrl(getProfileImageUrl())
                 .build();
     }
 }

src/main/java/org/kakaoshare/backend/domain/member/entity/Member.java

@@ -43,6 +43,9 @@ public class Member extends BaseTimeEntity {
     @Column(nullable = false)
     private String providerId;
 
+    @Column(nullable = false)
+    private String profileImageUrl;
+
     @Builder.Default
     @Column(nullable = false, columnDefinition = "varchar(255)")
     @Enumerated(EnumType.STRING)
@@ -60,12 +63,13 @@ protected Member() {
     }
 
     @Builder
-    public Member(final Long memberId, final Gender gender, final String name, final String phoneNumber, final String providerId) {
+    public Member(final Long memberId, final Gender gender, final String name, final String phoneNumber, final String providerId, final String profileImageUrl) {
         this.memberId = memberId;
         this.gender = gender;
         this.name = name;
         this.phoneNumber = phoneNumber;
         this.providerId = providerId;
+        this.profileImageUrl = profileImageUrl;
     }
 
     @Override
@@ -76,6 +80,7 @@ public String toString() {
                 ", username='" + name + '\'' +
                 ", phoneNumber='" + phoneNumber + '\'' +
                 ", providerId='" + providerId + '\'' +
+                ", profileImageUrl='" + profileImageUrl + '\'' +
                 ", role=" + role +
                 '}';
     }

src/main/java/org/kakaoshare/backend/domain/member/service/oauth/OAuthService.java

@@ -8,6 +8,7 @@
 import org.kakaoshare.backend.domain.member.dto.oauth.logout.OAuthLogoutRequest;
 import org.kakaoshare.backend.domain.member.dto.oauth.profile.OAuthProfile;
 import org.kakaoshare.backend.domain.member.dto.oauth.profile.OAuthProfileFactory;
+import org.kakaoshare.backend.domain.member.entity.Member;
 import org.kakaoshare.backend.domain.member.entity.MemberDetails;
 import org.kakaoshare.backend.domain.member.entity.token.RefreshToken;
 import org.kakaoshare.backend.domain.member.exception.MemberErrorCode;
@@ -76,8 +77,8 @@ private OAuthProfile getProfile(final OAuthLoginRequest request, final ClientReg
     }
 
     private UserDetails addOrFindByProfile(final OAuthProfile oAuthProfile) {
-        return memberRepository.findDetailsByProviderId(oAuthProfile.getProviderId())
-                .orElseGet(() -> MemberDetails.from(memberRepository.save(oAuthProfile.toEntity())));
+        final Member member = memberRepository.save(oAuthProfile.toEntity());   // TODO: 5/27/24 dirty checking 을 통해 DB내 Member 테이블 프로필 사진 수정
+        return MemberDetails.from(member);
     }
 
     private UserDetails findUserDetailsByProviderId(final String providerId) {

src/main/java/org/kakaoshare/backend/domain/payment/dto/success/response/PaymentFundingSuccessResponse.java

@@ -2,5 +2,5 @@
 
 import org.kakaoshare.backend.domain.product.dto.ProductSummaryResponse;
 
-public record PaymentFundingSuccessResponse(Receiver receiver, ProductSummaryResponse product, Long attributeAmount) {
+public record PaymentFundingSuccessResponse(PaymentSuccessReceiver receiver, ProductSummaryResponse product, Long attributeAmount) {
 }

src/main/java/org/kakaoshare/backend/domain/payment/dto/success/response/PaymentGiftSuccessResponse.java

@@ -4,5 +4,5 @@
 
 import java.util.List;
 
-public record PaymentGiftSuccessResponse(Receiver receiver, List<OrderSummaryResponse> orders) {
+public record PaymentGiftSuccessResponse(PaymentSuccessReceiver receiver, List<OrderSummaryResponse> orders) {
 }

src/main/java/org/kakaoshare/backend/domain/payment/dto/success/response/PaymentSuccessReceiver.java

@@ -0,0 +1,9 @@
+package org.kakaoshare.backend.domain.payment.dto.success.response;
+
+import org.kakaoshare.backend.domain.member.entity.Member;
+
+public record PaymentSuccessReceiver(String name, String photoUrl) {
+    public static PaymentSuccessReceiver from(final Member member) {
+        return new PaymentSuccessReceiver(member.getName(), member.getProfileImageUrl());
+    }
+}

src/main/java/org/kakaoshare/backend/domain/payment/service/PaymentService.java

@@ -46,7 +46,7 @@
 import org.kakaoshare.backend.domain.payment.dto.success.request.PaymentSuccessRequest;
 import org.kakaoshare.backend.domain.payment.dto.success.response.PaymentFundingSuccessResponse;
 import org.kakaoshare.backend.domain.payment.dto.success.response.PaymentGiftSuccessResponse;
-import org.kakaoshare.backend.domain.payment.dto.success.response.Receiver;
+import org.kakaoshare.backend.domain.payment.dto.success.response.PaymentSuccessReceiver;
 import org.kakaoshare.backend.domain.payment.entity.Payment;
 import org.kakaoshare.backend.domain.payment.entity.PaymentMethod;
 import org.kakaoshare.backend.domain.payment.exception.PaymentErrorCode;
@@ -152,7 +152,7 @@ public PaymentGiftSuccessResponse approve(final String providerId,
         saveOrders(payment, receipts);
 
         final List<OrderSummaryResponse> orderSummaries = getOrderSummaries(orderDetails);
-        return new PaymentGiftSuccessResponse(Receiver.from(receiver), orderSummaries);
+        return new PaymentGiftSuccessResponse(PaymentSuccessReceiver.from(receiver), orderSummaries);
     }
 
     @Transactional
@@ -178,8 +178,8 @@ public PaymentFundingSuccessResponse approveFunding(final String providerId,
 
         final Product product = funding.getProduct();
         final ProductSummaryResponse productSummaryResponse = ProductSummaryResponse.from(product);
-        final Receiver receiver = Receiver.from(funding.getMember());
-        return new PaymentFundingSuccessResponse(receiver, productSummaryResponse, amount);
+        final PaymentSuccessReceiver paymentSuccessReceiver = PaymentSuccessReceiver.from(funding.getMember());
+        return new PaymentFundingSuccessResponse(paymentSuccessReceiver, productSummaryResponse, amount);
     }
 
     @Transactional

src/main/resources/db/migration/V8__add_member_profile_url.sql

@@ -0,0 +1,2 @@
+ALTER TABLE member
+ADD COLUMN `profile_image_url` VARCHAR(255) NOT NULL;

src/test/java/org/kakaoshare/backend/domain/member/service/OAuthServiceTest.java

@@ -88,7 +88,6 @@ public void authenticateWhenNewMember() throws Exception {
 
         doReturn(registration).when(clientRegistrationRepository).findByRegistrationId(registrationId);
         doReturn(attributes).when(webClientService).getSocialProfile(registration, socialAccessToken);
-        doReturn(Optional.empty()).when(memberRepository).findDetailsByProviderId(providerId);
         doReturn(member).when(memberRepository).save(any());
         doReturn(accessToken).when(jwtProvider).createAccessToken(userDetails);
         doReturn(refreshToken).when(refreshTokenProvider).createToken(userDetails.getUsername());
@@ -110,7 +109,7 @@ public void authenticateWhenExistingMember() throws Exception {
 
         doReturn(registration).when(clientRegistrationRepository).findByRegistrationId(registrationId);
         doReturn(attributes).when(webClientService).getSocialProfile(registration, socialAccessToken);
-        doReturn(Optional.of(userDetails)).when(memberRepository).findDetailsByProviderId(providerId);
+        doReturn(member).when(memberRepository).save(any());
         doReturn(accessToken).when(jwtProvider).createAccessToken(userDetails);
         doReturn(refreshToken).when(refreshTokenProvider).createToken(userDetails.getUsername());
         doReturn(refreshToken).when(refreshTokenRepository).save(any());

src/test/java/org/kakaoshare/backend/domain/payment/service/PaymentServiceTest.java

@@ -36,7 +36,7 @@
 import org.kakaoshare.backend.domain.payment.dto.success.request.PaymentSuccessRequest;
 import org.kakaoshare.backend.domain.payment.dto.success.response.PaymentFundingSuccessResponse;
 import org.kakaoshare.backend.domain.payment.dto.success.response.PaymentGiftSuccessResponse;
-import org.kakaoshare.backend.domain.payment.dto.success.response.Receiver;
+import org.kakaoshare.backend.domain.payment.dto.success.response.PaymentSuccessReceiver;
 import org.kakaoshare.backend.domain.payment.entity.Payment;
 import org.kakaoshare.backend.domain.payment.entity.PaymentMethod;
 import org.kakaoshare.backend.domain.payment.repository.PaymentRepository;
@@ -217,8 +217,8 @@ public void approveToMe() throws Exception {
                 new OrderSummaryResponse(cakeSummaryResponse, cakeStockQuantity, Collections.emptyList()),
                 new OrderSummaryResponse(coffeeSummaryResponse, coffeeStockQuantity, Collections.emptyList())
         );
-        final Receiver receiver = Receiver.from(member);
-        final PaymentGiftSuccessResponse expect = new PaymentGiftSuccessResponse(receiver, orderSummaries);
+        final PaymentSuccessReceiver paymentSuccessReceiver = PaymentSuccessReceiver.from(member);
+        final PaymentGiftSuccessResponse expect = new PaymentGiftSuccessResponse(paymentSuccessReceiver, orderSummaries);
         final PaymentGiftSuccessResponse actual = paymentService.approve(providerId, paymentSuccessRequest);
         assertThat(actual).isEqualTo(expect);   // TODO: 3/16/24 equals() 및 hashCode()가 재정의되있으므로 isEqualTo() 사용
     }
@@ -279,8 +279,8 @@ public void approveToOther() throws Exception {
                 new OrderSummaryResponse(cakeSummaryResponse, cakeStockQuantity, Collections.emptyList()),
                 new OrderSummaryResponse(coffeeSummaryResponse, coffeeStockQuantity, Collections.emptyList())
         );
-        final Receiver receiver = Receiver.from(receiverMember);
-        final PaymentGiftSuccessResponse expect = new PaymentGiftSuccessResponse(receiver, orderSummaries);
+        final PaymentSuccessReceiver paymentSuccessReceiver = PaymentSuccessReceiver.from(receiverMember);
+        final PaymentGiftSuccessResponse expect = new PaymentGiftSuccessResponse(paymentSuccessReceiver, orderSummaries);
         final PaymentGiftSuccessResponse actual = paymentService.approve(providerId, paymentSuccessRequest);
         assertThat(actual).isEqualTo(expect);   // TODO: 3/16/24 equals() 및 hashCode()가 재정의되있으므로 isEqualTo() 사용
     }
@@ -365,7 +365,7 @@ public void approveFunding() throws Exception {
         doReturn(Optional.of(contributor)).when(memberRepository).findMemberByProviderId(providerId);
 
         final ProductSummaryResponse productSummaryResponse = ProductSummaryResponse.from(cake);
-        final PaymentFundingSuccessResponse expect = new PaymentFundingSuccessResponse(Receiver.from(creator), productSummaryResponse, (long) attributeAmount);
+        final PaymentFundingSuccessResponse expect = new PaymentFundingSuccessResponse(PaymentSuccessReceiver.from(creator), productSummaryResponse, (long) attributeAmount);
         final PaymentFundingSuccessResponse actual = paymentService.approveFunding(providerId, paymentSuccessRequest);
 
         assertThat(actual).isEqualTo(expect);

src/test/java/org/kakaoshare/backend/fixture/MemberFixture.java

@@ -36,6 +36,7 @@ public enum MemberFixture {
                 .gender(gender)
                 .phoneNumber(phoneNumber)
                 .providerId(providerId)
+                .profileImageUrl("defaultProfileImageUrl")
                 .build();
     }
 }