Merge pull request #66 from What-s-Your-Plan/feat/#65

deleteMember 메서드 분리

Author: sjhjack

application/wypl-core/src/main/java/com/wypl/wyplcore/auth/service/AuthServiceImpl.java

@@ -15,10 +15,10 @@
 import com.wypl.jpamemberdomain.member.OauthProvider;
 import com.wypl.jpamemberdomain.member.data.MemberSaveDto;
 import com.wypl.jpamemberdomain.member.data.SocialMemberSaveDto;
-import com.wypl.jpamemberdomain.member.repository.MemberRepository;
 import com.wypl.jpamemberdomain.member.repository.SocialMemberRepository;
 import com.wypl.jpamemberdomain.member.utils.SocialMemberRepositoryUtils;
 import com.wypl.wyplcore.auth.data.response.AuthTokensResponse;
+import com.wypl.wyplcore.member.service.MemberServiceImpl;
 
 import lombok.RequiredArgsConstructor;
 
@@ -28,8 +28,8 @@
 public class AuthServiceImpl {
 	private final GoogleOAuthClient googleOAuthClient;
 	private final SocialMemberRepository socialMemberRepository;
-	private final MemberRepository memberRepository;
 	private final AuthDomainServiceImpl authDomainService;
+	private final MemberServiceImpl memberService;
 
 	@Transactional
 	public AuthTokensResponse generateToken(final String provider, final String code) {
@@ -68,21 +68,18 @@ public void logout(AuthMember authMember) {
 	public void quitMember(AuthMember authMember) {
 		// Todo : 회원 탈퇴 로직 논의
 		deleteToken(authMember);
-		deleteMember(authMember);
+		memberService.deleteMember(authMember);
 	}
 
 	private void deleteToken(AuthMember authMember) {
 		authDomainService.deleteToken(authMember.accessToken());
 	}
 
-	private void deleteMember(AuthMember authMember) {
-		memberRepository.deleteById(authMember.id());
-	}
-
 	private boolean isInvalidRefreshToken(String accessToken, String refreshToken) {
 		return refreshToken.isEmpty() || !refreshToken.equals(authDomainService.getRefreshToken(accessToken));
 	}
 
+	// todo:
 	private long findMemberIdAfterSaveMember(String accessToken, GoogleUserInfoResponse googleUserInfoResponse) {
 		if (isNewMember(googleUserInfoResponse)) {
 			LocalDate birthday = googleOAuthClient.fetchBirthday(accessToken);
@@ -105,6 +102,7 @@ private long findMemberIdAfterSaveMember(String accessToken, GoogleUserInfoRespo
 		return SocialMemberRepositoryUtils.getSocialMember(socialMemberRepository, googleUserInfoResponse.id()).getId();
 	}
 
+	// todo:
 	private boolean isNewMember(GoogleUserInfoResponse googleUserInfoResponse) {
 		return !socialMemberRepository.existsByOauthProviderAndOauthId(OauthProvider.GOOGLE,
 			googleUserInfoResponse.id());

application/wypl-core/src/main/java/com/wypl/wyplcore/member/service/MemberServiceImpl.java

@@ -0,0 +1,21 @@
+package com.wypl.wyplcore.member.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.wypl.googleoauthclient.domain.AuthMember;
+import com.wypl.jpamemberdomain.member.repository.MemberRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+@Service
+public class MemberServiceImpl {
+	private final MemberRepository memberRepository;
+
+	@Transactional
+	public void deleteMember(AuthMember authMember) {
+		memberRepository.deleteById(authMember.id());
+	}
+}

application/wypl-core/src/test/java/com/wypl/wyplcore/auth/service/AuthServiceImplTest.java

@@ -30,9 +30,9 @@
 import com.wypl.jpamemberdomain.member.data.MemberSaveDto;
 import com.wypl.jpamemberdomain.member.data.SocialMemberSaveDto;
 import com.wypl.jpamemberdomain.member.domain.SocialMember;
-import com.wypl.jpamemberdomain.member.repository.MemberRepository;
 import com.wypl.jpamemberdomain.member.repository.SocialMemberRepository;
 import com.wypl.wyplcore.auth.data.response.AuthTokensResponse;
+import com.wypl.wyplcore.member.service.MemberServiceImpl;
 
 @ExtendWith(MockitoExtension.class)
 class AuthServiceImplTest {
@@ -45,7 +45,7 @@ class AuthServiceImplTest {
 	@Mock
 	private AuthDomainServiceImpl authDomainService;
 	@Mock
-	private MemberRepository memberRepository;
+	private MemberServiceImpl memberService;
 
 	@DisplayName("로그인 및 회원가입 로직을 테스트한다.")
 	@Nested
@@ -210,6 +210,6 @@ void quitMemberTest() {
 
 		// Then
 		verify(authDomainService).deleteToken(anyString());
-		verify(memberRepository).deleteById(anyLong());
+		verify(memberService).deleteMember(any(AuthMember.class));
 	}
 }

application/wypl-core/src/test/java/com/wypl/wyplcore/member/service/MemberServiceImplTest.java

@@ -0,0 +1,38 @@
+package com.wypl.wyplcore.member.service;
+
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.wypl.googleoauthclient.domain.AuthMember;
+import com.wypl.jpamemberdomain.member.repository.MemberRepository;
+
+@ExtendWith(MockitoExtension.class)
+public class MemberServiceImplTest {
+	@InjectMocks
+	private MemberServiceImpl memberService;
+	@Mock
+	private MemberRepository memberRepository;
+
+	@DisplayName("Member를 정상적으로 삭제한다.")
+	@Test
+	void quitMemberTest() {
+		// Given
+		AuthMember mockAuthMember = AuthMember.of(
+			1L,
+			"accessToken"
+		);
+
+		// When
+		memberService.deleteMember(mockAuthMember);
+
+		// Then
+		verify(memberRepository).deleteById(anyLong());
+	}
+}