Refactor: findMemberIdAfterSaveMember 메서드와 관련된 로직과 도메인을 분리 #68
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,111 +1,14 @@ | ||
| // package com.wypl.wyplcore.auth.service; | ||
| // | ||
| // import org.springframework.stereotype.Service; | ||
| // import org.springframework.transaction.annotation.Transactional; | ||
| // | ||
| // import lombok.RequiredArgsConstructor; | ||
| // | ||
| // @Transactional(readOnly = true) | ||
| // @RequiredArgsConstructor | ||
| // @Service | ||
| // public class AuthServiceImpl { | ||
| // | ||
| // } | ||
| // |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package com.wypl.wyplcore.facade; | ||
|
|
||
| import com.wypl.googleoauthclient.domain.AuthMember; | ||
| import com.wypl.wyplcore.auth.data.response.AuthTokensResponse; | ||
|
|
||
| public interface AuthMemberFacade { | ||
| AuthTokensResponse generateToken(final String provider, final String code); | ||
| AuthTokensResponse reissueToken(final String accessToken, final String refreshToken); | ||
| void logout(AuthMember authMember); | ||
| void quitMember(AuthMember authMember); | ||
sjhjack marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,77 @@ | ||||||
| package com.wypl.wyplcore.facade; | ||||||
|
|
||||||
| import org.springframework.stereotype.Component; | ||||||
| import org.springframework.transaction.annotation.Transactional; | ||||||
|
|
||||||
| import com.wypl.googleoauthclient.GoogleOAuthClient; | ||||||
| import com.wypl.googleoauthclient.data.response.GoogleTokenResponse; | ||||||
| import com.wypl.googleoauthclient.data.response.GoogleUserInfoResponse; | ||||||
| import com.wypl.googleoauthclient.domain.AuthMember; | ||||||
| import com.wypl.googleoauthclient.exception.GoogleOAuthErrorCode; | ||||||
| import com.wypl.googleoauthclient.exception.GoogleOAuthException; | ||||||
| import com.wypl.wyplcore.auth.data.response.AuthTokensResponse; | ||||||
| import com.wypl.wyplcore.member.service.MemberServiceImpl; | ||||||
| import com.wypl.wyplcore.token.service.TokenServiceImpl; | ||||||
|
|
||||||
| import lombok.RequiredArgsConstructor; | ||||||
|
|
||||||
| @Transactional(readOnly = true) | ||||||
| @RequiredArgsConstructor | ||||||
| @Component | ||||||
| public class AuthMemberFacadeImpl implements AuthMemberFacade { | ||||||
|
There was a problem hiding this comment.
Suggested change
어떠한 기능을 하는 서비스가 있는데 해당 서비스를 구성한 디자인패턴과 같은.. 내용을 클래스에 붙힘 |
||||||
| private final GoogleOAuthClient googleOAuthClient; | ||||||
| private final TokenServiceImpl tokenService; | ||||||
| private final MemberServiceImpl memberService; | ||||||
|
|
||||||
| @Override | ||||||
| @Transactional | ||||||
| public AuthTokensResponse generateToken(final String provider, final String code) { | ||||||
| GoogleTokenResponse googleTokenResponse = googleOAuthClient.fetchGoogleOAuthToken(code); | ||||||
|
|
||||||
| GoogleUserInfoResponse googleUserInfoResponse = googleOAuthClient.fetchUserInfo( | ||||||
| googleTokenResponse.accessToken()); | ||||||
|
|
||||||
| long memberId = memberService.findMemberIdOrSaveMember(googleTokenResponse.accessToken(), googleUserInfoResponse); | ||||||
|
|
||||||
| tokenService.saveToken(googleTokenResponse.accessToken(), googleTokenResponse.refreshToken()); | ||||||
|
|
||||||
| return AuthTokensResponse.of(memberId, googleTokenResponse); | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| @Transactional | ||||||
| public AuthTokensResponse reissueToken(final String accessToken, final String refreshToken) { | ||||||
| if (isInvalidRefreshToken(accessToken, refreshToken)) { | ||||||
| throw new GoogleOAuthException(GoogleOAuthErrorCode.NOT_AUTHORIZATION_MEMBER); | ||||||
| } | ||||||
|
|
||||||
| GoogleTokenResponse googleTokenResponse = googleOAuthClient.fetchRefreshGoogleOAuthToken(refreshToken); | ||||||
|
|
||||||
| tokenService.deleteToken(accessToken); | ||||||
| tokenService.saveToken(googleTokenResponse.accessToken(), refreshToken); | ||||||
|
|
||||||
| return AuthTokensResponse.of(googleTokenResponse.accessToken(), refreshToken); | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| @Transactional | ||||||
| public void logout(AuthMember authMember) { | ||||||
| deleteToken(authMember); | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| @Transactional | ||||||
| public void quitMember(AuthMember authMember) { | ||||||
| // Todo : 회원 탈퇴 로직 논의 | ||||||
| deleteToken(authMember); | ||||||
| memberService.deleteMember(authMember); | ||||||
| } | ||||||
|
There was a problem hiding this comment. 해당 메서드는 인증관련 서비스가 아닌 회원관련 서비스로 이동이 필요해 보입니다! There was a problem hiding this comment. 해당 메서드는 There was a problem hiding this comment. 추가 코멘트 남깁니다! 해당 메서드를 의견 부탁드립니다 😄 |
||||||
|
|
||||||
| private void deleteToken(AuthMember authMember) { | ||||||
| tokenService.deleteToken(authMember.accessToken()); | ||||||
| } | ||||||
|
|
||||||
| private boolean isInvalidRefreshToken(String accessToken, String refreshToken) { | ||||||
| return refreshToken.isEmpty() || !refreshToken.equals(tokenService.getRefreshToken(accessToken)); | ||||||
| } | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,68 @@ | ||
| package com.wypl.wyplcore.member.service; | ||
|
|
||
| import java.time.LocalDate; | ||
|
|
||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| import com.wypl.googleoauthclient.GoogleOAuthClient; | ||
| import com.wypl.googleoauthclient.data.response.GoogleUserInfoResponse; | ||
| import com.wypl.googleoauthclient.domain.AuthMember; | ||
| 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.domain.Member; | ||
| import com.wypl.jpamemberdomain.member.domain.SocialMember; | ||
| import com.wypl.jpamemberdomain.member.repository.MemberRepository; | ||
| import com.wypl.jpamemberdomain.member.repository.SocialMemberRepository; | ||
| import com.wypl.jpamemberdomain.member.utils.SocialMemberRepositoryUtils; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
|
|
||
| @Transactional(readOnly = true) | ||
| @RequiredArgsConstructor | ||
| @Service | ||
| public class MemberServiceImpl { | ||
sjhjack marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| private final GoogleOAuthClient googleOAuthClient; | ||
| private final MemberRepository memberRepository; | ||
| private final SocialMemberRepository socialMemberRepository; | ||
|
|
||
| @Transactional | ||
| public void deleteMember(AuthMember authMember) { | ||
| memberRepository.deleteById(authMember.id()); | ||
| } | ||
|
|
||
| @Transactional | ||
| public long findMemberIdOrSaveMember(String accessToken, GoogleUserInfoResponse googleUserInfoResponse) { | ||
| if (isNewMember(googleUserInfoResponse)) { | ||
| LocalDate birthday = googleOAuthClient.fetchBirthday(accessToken); | ||
|
|
||
| MemberSaveDto memberSaveDto = MemberSaveDto.builder() | ||
| .email(googleUserInfoResponse.email()) | ||
| .birthday(birthday) | ||
| .nickname(googleUserInfoResponse.name()) | ||
| .profileImage(googleUserInfoResponse.picture()) | ||
| .build(); | ||
|
|
||
| SocialMemberSaveDto socialMemberSaveDto = SocialMemberSaveDto.builder() | ||
| .oauthProvider(OauthProvider.GOOGLE) | ||
| .oauthId(googleUserInfoResponse.id()) | ||
| .build(); | ||
|
|
||
| return saveNewMember(memberSaveDto, socialMemberSaveDto); | ||
| } | ||
|
|
||
| return SocialMemberRepositoryUtils.getSocialMember(socialMemberRepository, googleUserInfoResponse.id()).getId(); | ||
| } | ||
|
|
||
| private boolean isNewMember(GoogleUserInfoResponse googleUserInfoResponse) { | ||
| return !socialMemberRepository.existsByOauthProviderAndOauthId(OauthProvider.GOOGLE, | ||
| googleUserInfoResponse.id()); | ||
| } | ||
|
|
||
| private long saveNewMember(MemberSaveDto memberSaveDto, SocialMemberSaveDto socialMemberSaveDto) { | ||
| Member newMember = memberRepository.save(Member.of(memberSaveDto)); | ||
| SocialMember socialMember = socialMemberRepository.save(SocialMember.of(newMember, socialMemberSaveDto)); | ||
| return socialMember.getId(); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
개인적으로 뒤에 Service를 붙여주면 좋을 것 같아요!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Facade는 필요한 Service를 조합해서 사용하기 때문에 Facade Layer와 Service Layer를 명확히 구분하기 위해서 Service는 붙이지 않았습니다!
이 부분에 대해서는 어떻게 생각하시나요?