refactor(server): Donation Status를 변경한다 #398
Merged
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
WAITING_FOR_EXCHANGE, EXCHANGED 만 존재하도록 변경
|
|
나는 exchangablePoint의 네이밍을 currentPoint로 바꾸면 좀 더 좋을 듯? |
|
수리랑 조이 의견 반영해서 수정했어!! 시간될 때 다시 리뷰부탁해 🙏 |
Be-poz
approved these changes
Oct 1, 2021
| @@ -140,7 +139,7 @@ private void validateExchangeable(Member member, Long exchangeablePoint) { | |||
| if (exchangeRepository.existsByPageName(member.getPageName())) { | |||
There was a problem hiding this comment.
코드 변경은 없는 부분인데 우리가 Exchange를 기존에는 처리하고 난 다음에 지워줬었는데, 이제 지우지 않고 내버려두는 방식으로 하게 된다면 이 부분 검증 로직이 바뀌어야 될 것 같네
There was a problem hiding this comment.
내 쪽에서 exchangeRepository 수정하면서 로직, 테스트코드 바꾸고 있으니까 이런건 넘겨도 될듯
Joyykim
approved these changes
Oct 1, 2021
| private Long exchangedTotalPoint; | ||
|
|
||
| public DetailedPointResponse(Long currentPoint, Long exchangeablePoint, Long exchangedTotalPoint) { | ||
| public DetailedPointResponse(Long currentPoint, Long exchangedTotalPoint) { |
| @@ -140,7 +139,7 @@ private void validateExchangeable(Member member, Long exchangeablePoint) { | |||
| if (exchangeRepository.existsByPageName(member.getPageName())) { | |||
There was a problem hiding this comment.
내 쪽에서 exchangeRepository 수정하면서 로직, 테스트코드 바꾸고 있으니까 이런건 넘겨도 될듯
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.
작업내용
DonationStatus를 기존 4개(‘환불가능’, ‘정산가능’, ‘정산완료’, ‘취소됨’)에서 2개로 (WAITING_FOR_EXCHANGE,EXCHANGED) 변경Donation의 DonationStatus를CANCELLED,EXCHANGEABLE로 변경하는 기능Donation.toCancelled(),Donation.toExchangeable()기능 제거WAITING_FOR_EXCHANGE로 초기화findFirst5ByMemberAndStatusNotOrderByCreatedAtDesc()기능 status로 필터링하지 않도록 변경고민되는 부분
DonationRepositoryImpl 클래스
DonationStatus가 2개로 변경되면서 QueryDsl로 작성한
exchangeablePoint와currentPoint가 동일한 로직으로 보임정산 가능+정산 불가를 합한 총 포인트정산 불가능한 포인트는 없다.currentPoint기능은 없어져야할 것 같음. (테스트도 같이)결론
DonationRepositoryImpl 클래스에
currentPoint(...)삭제해도 되는지...? 🤔(삭제해도 된다고 하면 메서드 삭제 + 테스트 코드 삭제할 예정)
번외…
Closes #397