[feat] 카테고리 ADMIN 역할을 포기하더라도 자신이 생성한 카테고리라면 구독 해제가 안되는 문제를 해결한다. #713
Conversation
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
hyeonic
requested changes
Oct 5, 2022
Comment on lines
54
to
57
| private void validateCategoryType(final CategoryRole categoryRole) { | ||
| CategoryType categoryType = categoryRole.getCategory().getCategoryType(); | ||
| if (categoryType == PERSONAL || categoryType == GOOGLE) { | ||
| throw new NotAbleToChangeRoleException("개인 카테고리 또는 외부 카테고리에 대한 회원의 역할을 변경할 수 없습니다."); | ||
| } | ||
| } |
There was a problem hiding this comment.
category 내부로 로직을 이동하는건 어떨까요?
Comment on lines
59
to
60
| if (!member.getId().equals(memberId)) { | ||
| throw new NoPermissionException("타인의 구독 정보에 접근할 수 없습니다."); |
There was a problem hiding this comment.
이거도 member 쪽으로 위임가능할 것 같네요!
There was a problem hiding this comment.
헉 멤버쪽에 hasSameId() 가 있었네요! 변경했습니다!
|
추가적으로 현재 category와 category role 패키지가 강하게 의존하고 있어요!
관련해서 로직을 옮기던 패키지를 단뱡향으로 의존하는 방향에 대해서도 고려해보면 좋을 것 같네요 😃 |
gudonghee2000
approved these changes
Oct 6, 2022
Comment on lines
-98
to
-102
| deleteSubscription(id, memberId, subscription); | ||
| deleteCategoryRole(memberId, subscription); | ||
| } | ||
|
|
||
| private void deleteSubscription(final Long id, final Long memberId, final Subscription subscription) { |
| @@ -45,7 +45,7 @@ public class ControllerAdvice { | |||
| InvalidSubscriptionException.class, | |||
| ExistSubscriptionException.class, | |||
| ExistExternalCategoryException.class, | |||
| NotAbleToMangeRoleException.class | |||
| NotAbleToChangeRoleException.class | |||
Comment on lines
+146
to
+162
|
|
||
| @DisplayName("개인 카테고리에 대한 회원의 역할을 변경할 경우 예외가 발생한다.") | ||
| @Test | ||
| void 개인_카테고리에_대한_회원의_역할을_변경할_경우_예외가_발생한다() { | ||
| // given | ||
| Member 후디 = memberRepository.save(후디()); | ||
| CategoryResponse 개인_카테고리 = categoryService.save(후디.getId(), 내_일정_생성_요청); | ||
|
|
||
| // when & then | ||
| CategoryRoleUpdateRequest request = new CategoryRoleUpdateRequest(NONE); | ||
| assertThatThrownBy(() -> categoryRoleService.updateRole(후디.getId(), 후디.getId(), 개인_카테고리.getId(), request)) | ||
| .isInstanceOf(NotAbleToChangeRoleException.class); | ||
| } | ||
|
|
||
| @DisplayName("외부 카테고리에 대한 회원의 역할을 변경할 경우 예외가 발생한다.") | ||
| @Test | ||
| void 외부_카테고리에_대한_회원의_역할을_변경할_경우_예외가_발생한다() { |
Comment on lines
-263
to
-275
| @DisplayName("자신이 만든 카테고리에 대한 구독을 삭제할 경우 예외를 던진다") | ||
| @Test | ||
| void 자신이_만든_카테고리에_대한_구독을_삭제할_경우_예외를_던진다() { | ||
| // given | ||
| Member 관리자 = memberRepository.save(관리자()); | ||
| Category 공통_일정 = categoryRepository.save(공통_일정(관리자)); | ||
| Subscription 공통_일정_구독 = subscriptionRepository.save(색상1_구독(관리자, 공통_일정)); | ||
|
|
||
| // when & then | ||
| assertThatThrownBy(() -> subscriptionService.delete(공통_일정_구독.getId(), 관리자.getId())) | ||
| .isInstanceOf(NoPermissionException.class); | ||
| } | ||
|
|
summerlunaa
approved these changes
Oct 6, 2022
- NotAbleToManageRoleException 을 NotAbleToChangeRoleException 으로 변경 - 다른 사람의 구독 정보에 접근하는 것을 차단하는 로직이 없어 추가
devHudi
force-pushed
the
feature/711-category-role-issue
branch
from
c885814
to
907a3e5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
[feat] PR을 등록한다.작업 내용
스크린샷
주의사항
Closes #711