Repository navigation
[FBE-21] MemberRepository, MemberService 추가 #7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
nimuseel
wants to merge
12
commits into
dev
Choose a base branch
from
feat/FBE-21-member-repository-service
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
b09b73f
feat: MemberRepository 생성
nimuseel 90a35e6
feat: MemberService 생성
nimuseel 7684303
Merge branch 'feat/FBE-15-member-domain' into feat/FBE-21-member-repo…
nimuseel 4ee39ba
feat: 서비스 로직에 nickname 생성 로직 추가
nimuseel 3423e36
docs: 트랜잭션 재시도 관련 TODO 추가
nimuseel 40fc767
test: MemberService 테스트 코드 추가
nimuseel 4c68bcd
Merge remote-tracking branch 'origin/dev' into feat/FBE-21-member-rep…
nimuseel 55723e5
test: NicknameGenertator 테스트 보완
nimuseel e661fdd
refactor: 테스트 코드 폴더링 맞추기
nimuseel 7a53e72
chore: 임시 프로필 기본 이미지 추가
nimuseel 5bec191
feat: 기본 프로필 이미지 처리 로직 추가
nimuseel 4b6b2f0
chore: Member 기본 프로필 경로 프록시 추가
nimuseel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
17 changes: 17 additions & 0 deletions
17
...-application/member-service/src/main/java/framey/member/application/dto/CreateMember.java
This file contains hidden or 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,17 @@ | ||
| package framey.member.application.dto; | ||
|
|
||
| import framey.member.domain.model.Member; | ||
|
|
||
| public record CreateMember( | ||
| String nickname, | ||
| String email, | ||
| String profileImageUrl | ||
| ) { | ||
| public static CreateMember from(final Member member) { | ||
| return new CreateMember( | ||
| member.getNickname(), | ||
| member.getEmail(), | ||
| member.getProfileImageUrl() | ||
| ); | ||
| } | ||
| } |
63 changes: 63 additions & 0 deletions
63
...ication/member-service/src/main/java/framey/member/application/service/MemberService.java
This file contains hidden or 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,63 @@ | ||
| package framey.member.application.service; | ||
|
|
||
| import framey.common.exception.BusinessException; | ||
| import framey.member.application.dto.CreateMember; | ||
| import framey.member.config.MemberProperties; | ||
| import framey.member.domain.constant.NicknameConstant; | ||
| import framey.member.domain.constant.Provider; | ||
| import framey.member.domain.exception.MemberErrorCode; | ||
| import framey.member.domain.model.Member; | ||
| import framey.member.domain.model.NicknameGenerator; | ||
| import framey.member.domain.repository.MemberRepository; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| @Service | ||
| @RequiredArgsConstructor | ||
| @Transactional(readOnly = true) | ||
| public class MemberService { | ||
| private final MemberRepository memberRepository; | ||
| private final MemberProperties memberProperties; | ||
|
|
||
| @Transactional | ||
| public Member createMember(CreateMember createMember) { | ||
| // TODO: 추후 AuthService와 같은 createMember를 처리하는 쪽에서 Transaction 재시도 로직 추가 | ||
|
|
||
| Member member = Member.signUp( | ||
| createMember.email(), | ||
| resolveNickname(createMember.nickname()), | ||
| resolveProfileImageUrl(createMember.profileImageUrl()), | ||
| "123", // TODO: 임시 providerId | ||
| Provider.GOOGLE // TODO: 임시 provider | ||
| ); | ||
|
|
||
| return memberRepository.save(member); | ||
| } | ||
|
|
||
| private String resolveNickname(String nickname) { | ||
| String baseNickname = NicknameGenerator.normalize(nickname); | ||
|
|
||
| if (!baseNickname.equals(NicknameConstant.BASE_NICKNAME) && !memberRepository.existsByNickname(baseNickname)) { | ||
| return baseNickname; | ||
| } | ||
|
|
||
| for (int i = 0; i < NicknameConstant.MAX_RETRY_COUNT; i++) { | ||
| String generatedNickname = NicknameGenerator.appendSuffix(baseNickname); | ||
|
|
||
| if (!memberRepository.existsByNickname(generatedNickname)) { | ||
| return generatedNickname; | ||
| } | ||
| } | ||
|
|
||
| throw new BusinessException(MemberErrorCode.NICKNAME_GENERATION_FAILED); | ||
| } | ||
|
nimuseel marked this conversation as resolved.
Resolved
|
||
|
|
||
| private String resolveProfileImageUrl(String profileImageUrl) { | ||
| if (profileImageUrl == null || profileImageUrl.isBlank()) { | ||
| return memberProperties.defaultProfileImageUrl(); | ||
| } | ||
|
|
||
| return profileImageUrl; | ||
| } | ||
| } | ||
7 changes: 7 additions & 0 deletions
7
framey-application/member-service/src/main/java/framey/member/config/MemberProperties.java
This file contains hidden or 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,7 @@ | ||
| package framey.member.config; | ||
|
|
||
| import org.springframework.boot.context.properties.ConfigurationProperties; | ||
|
|
||
| @ConfigurationProperties(prefix = "member") | ||
| public record MemberProperties(String defaultProfileImageUrl) { | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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
8 changes: 8 additions & 0 deletions
8
...cation/member-service/src/main/java/framey/member/domain/repository/MemberRepository.java
This file contains hidden or 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,8 @@ | ||
| package framey.member.domain.repository; | ||
|
|
||
| import framey.member.domain.model.Member; | ||
| import org.springframework.data.jpa.repository.JpaRepository; | ||
|
|
||
| public interface MemberRepository extends JpaRepository<Member, Long> { | ||
| boolean existsByNickname(String nickname); | ||
| } |
This file contains hidden or 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 hidden or 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
Binary file added
BIN
+11.1 KB
...mber-service/src/main/resources/static/assets/members/default-profile-image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
152 changes: 152 additions & 0 deletions
152
...ion/member-service/src/test/java/framey/member/application/service/MemberServiceTest.java
This file contains hidden or 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,152 @@ | ||
| package framey.member.application.service; | ||
|
|
||
| import framey.common.exception.BusinessException; | ||
| import framey.member.application.dto.CreateMember; | ||
| import framey.member.config.MemberProperties; | ||
| import framey.member.domain.constant.NicknameConstant; | ||
| import framey.member.domain.exception.MemberErrorCode; | ||
| import framey.member.domain.model.Member; | ||
| import framey.member.domain.repository.MemberRepository; | ||
| import org.assertj.core.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.DisplayName; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.NullAndEmptySource; | ||
| import org.junit.jupiter.params.provider.ValueSource; | ||
| import org.mockito.Mock; | ||
| import org.mockito.junit.jupiter.MockitoExtension; | ||
|
|
||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.ArgumentMatchers.anyString; | ||
| import static org.mockito.BDDMockito.given; | ||
| import static org.mockito.BDDMockito.then; | ||
| import static org.mockito.Mockito.never; | ||
| import static org.mockito.Mockito.times; | ||
|
|
||
| @ExtendWith(MockitoExtension.class) | ||
| class MemberServiceTest { | ||
| private static final String DEFAULT_PROFILE_IMAGE_URL = "https://test.framey/default-profile-image.png"; | ||
|
|
||
| @Mock | ||
| private MemberRepository memberRepository; | ||
|
|
||
| private MemberService memberService; | ||
|
|
||
| @BeforeEach | ||
| void setUp() { | ||
| memberService = new MemberService(memberRepository, new MemberProperties(DEFAULT_PROFILE_IMAGE_URL)); | ||
| } | ||
|
|
||
| @Test | ||
| @DisplayName("소셜 닉네임이 사용 중이 아니면 해당 닉네임을 그대로 사용한다") | ||
| void useSocialNicknameWhenNotDuplicated() { | ||
| given(memberRepository.existsByNickname("프레이미")).willReturn(false); | ||
| given(memberRepository.save(any(Member.class))).willAnswer(inv -> inv.getArgument(0)); | ||
|
|
||
| CreateMember member = new CreateMember("프레이미", "framey@exam.com", ""); | ||
|
|
||
| Member newMember = memberService.createMember(member); | ||
|
|
||
| Assertions.assertThat(newMember.getNickname()).isEqualTo("프레이미"); | ||
| } | ||
|
|
||
| @Test | ||
| @DisplayName("소셜 닉네임이 사용 중이라면, 기존 닉네임 뒤에 10자리를 맞춰 임의 숫자를 넣어 사용한다") | ||
| void useAppendSuffixNicknameWhenDuplicated() { | ||
| given(memberRepository.existsByNickname("프레이미")).willReturn(true); | ||
| given(memberRepository.save(any(Member.class))).willAnswer(inv -> inv.getArgument(0)); | ||
|
|
||
| CreateMember member = new CreateMember("프레이미", "framey@exam.com", ""); | ||
|
|
||
| Member newMember = memberService.createMember(member); | ||
|
|
||
| Assertions.assertThat(newMember.getNickname()).matches("^프레이미\\d{6}"); | ||
| } | ||
|
|
||
| @Test | ||
| @DisplayName("소셜 닉네임이 기본 닉네임과 같으면 뒤에 임의 숫자를 붙인다") | ||
| void appendSuffixWhenNicknameEqualsBaseNickname() { | ||
| given(memberRepository.save(any(Member.class))).willAnswer(inv -> inv.getArgument(0)); | ||
|
|
||
| CreateMember member = new CreateMember("framey", "framey@exam.com", ""); | ||
|
|
||
| Member newMember = memberService.createMember(member); | ||
|
|
||
| Assertions.assertThat(newMember.getNickname()).matches("^framey\\d{4}"); | ||
| then(memberRepository).should(never()).existsByNickname("framey"); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @ValueSource(strings = {" ", "\u3000", "\u00A0"}) | ||
| @NullAndEmptySource | ||
| @DisplayName("소셜 닉네임이 없으면 기본 닉네임에 임의 숫자를 붙인다") | ||
| void useBaseNicknameWithSuffixWhenNicknameIsBlank(String nickname) { | ||
| given(memberRepository.save(any(Member.class))).willAnswer(inv -> inv.getArgument(0)); | ||
| CreateMember member = new CreateMember(nickname, "framey@exam.com", ""); | ||
|
|
||
| Member newMember = memberService.createMember(member); | ||
|
|
||
| Assertions.assertThat(newMember.getNickname()).matches("^framey\\d{4}"); | ||
| then(memberRepository).should(never()).existsByNickname("framey"); | ||
| } | ||
|
|
||
| @Test | ||
| @DisplayName("임의 숫자를 붙인 닉네임도 모두 사용 중이면 닉네임 생성에 실패한다") | ||
| void failWhenAllGeneratedNicknamesAreDuplicated() { | ||
| given(memberRepository.existsByNickname(anyString())).willReturn(true); | ||
|
|
||
| CreateMember member = new CreateMember("프레이미", "framey@exam.com", ""); | ||
|
|
||
| Assertions.assertThatThrownBy(() -> memberService.createMember(member)) | ||
| .isInstanceOf(BusinessException.class) | ||
| .extracting("errorCode") | ||
| .isEqualTo(MemberErrorCode.NICKNAME_GENERATION_FAILED); | ||
|
|
||
| then(memberRepository).should(never()).save(any()); | ||
| then(memberRepository).should(times(1 + NicknameConstant.MAX_RETRY_COUNT)).existsByNickname(anyString()); | ||
| } | ||
|
|
||
| @Test | ||
| @DisplayName("임의 숫자를 붙인 닉네임도 사용 중이라면 새 숫자를 붙여 다시 시도한다") | ||
| void retryWithNewSuffixWhenGeneratedNicknameIsDuplicated() { | ||
| given(memberRepository.existsByNickname(anyString())).willReturn(true, true, false); | ||
| given(memberRepository.save(any(Member.class))).willAnswer(inv -> inv.getArgument(0)); | ||
|
|
||
| CreateMember member = new CreateMember("프레이미", "framey@exam.com", ""); | ||
|
|
||
| Member newMember = memberService.createMember(member); | ||
|
|
||
| Assertions.assertThat(newMember.getNickname()).matches("^프레이미\\d{6}"); | ||
| then(memberRepository).should(times(3)).existsByNickname(anyString()); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @ValueSource(strings = " ") | ||
| @NullAndEmptySource | ||
| @DisplayName("프로필 이미지가 없으면 기본 프로필 이미지를 사용한다") | ||
| void useDefaultProfileImageWhenProfileImageIsBlank(String profileImageUrl) { | ||
| given(memberRepository.save(any(Member.class))).willAnswer(inv -> inv.getArgument(0)); | ||
|
|
||
| CreateMember member = new CreateMember("프레이미", "framey@exam.com", profileImageUrl); | ||
|
|
||
| Member newMember = memberService.createMember(member); | ||
|
|
||
| Assertions.assertThat(newMember.getProfileImageUrl()).isEqualTo(DEFAULT_PROFILE_IMAGE_URL); | ||
| } | ||
|
|
||
| @Test | ||
| @DisplayName("프로필 이미지가 있으면 그대로 사용한다") | ||
| void useSocialProfileImageWhenPresent() { | ||
| given(memberRepository.save(any(Member.class))).willAnswer(inv -> inv.getArgument(0)); | ||
|
|
||
| String profileImageUrl = "https://test.framey/profile.png"; | ||
|
|
||
| CreateMember member = new CreateMember("프레이미", "framey@exam.com", profileImageUrl); | ||
|
|
||
| Member newMember = memberService.createMember(member); | ||
|
|
||
| Assertions.assertThat(newMember.getProfileImageUrl()).isEqualTo(profileImageUrl); | ||
| } | ||
| } |
34 changes: 0 additions & 34 deletions
34
...ation/member-service/src/test/java/framey/member/domain/member/NicknameGeneratorTest.java
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
...amey/member/domain/member/MemberTest.java → ...ember/domain/model/member/MemberTest.java
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.