fix: 새로운 사장님 조회 로직 버그 수정 #1182
Merged
fix: 새로운 사장님 조회 로직 버그 수정 #1182
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
20HyeonsuLee
approved these changes
Jan 17, 2025
Comment on lines
85
to
97
| for (Owner owner : result.getContent()) { | ||
| Shop shop = adminOwnerShopRedisRepository.findById(owner.getId()) | ||
| .map(ownerShop -> adminShopRepository.findById(ownerShop.getShopId()).orElse(null)) | ||
| .orElse(null); | ||
| Optional<OwnerShop> ownerShopOptional = adminOwnerShopRedisRepository.findById(owner.getId()); | ||
| Shop shop = null; | ||
|
|
||
| if (ownerShopOptional.isPresent()) { | ||
| OwnerShop ownerShop = ownerShopOptional.get(); | ||
| if (!Objects.isNull(ownerShop.getShopId())) { | ||
| shop = adminShopRepository.findById(ownerShop.getShopId()).orElse(null); | ||
| } | ||
| } | ||
|
|
||
| OwnerIncludingShop ownerIncludingShop = OwnerIncludingShop.of(owner, shop); | ||
| ownerIncludingShops.add(ownerIncludingShop); |
There was a problem hiding this comment.
A
요런건 어떠한지
Suggested change
| for (Owner owner : result.getContent()) { | |
| Shop shop = adminOwnerShopRedisRepository.findById(owner.getId()) | |
| .map(ownerShop -> adminShopRepository.findById(ownerShop.getShopId()).orElse(null)) | |
| .orElse(null); | |
| Optional<OwnerShop> ownerShopOptional = adminOwnerShopRedisRepository.findById(owner.getId()); | |
| Shop shop = null; | |
| if (ownerShopOptional.isPresent()) { | |
| OwnerShop ownerShop = ownerShopOptional.get(); | |
| if (!Objects.isNull(ownerShop.getShopId())) { | |
| shop = adminShopRepository.findById(ownerShop.getShopId()).orElse(null); | |
| } | |
| } | |
| OwnerIncludingShop ownerIncludingShop = OwnerIncludingShop.of(owner, shop); | |
| ownerIncludingShops.add(ownerIncludingShop); | |
| List<OwnerIncludingShop> ownerIncludingShops = new ArrayList<>(); | |
| for (Owner owner : result.getContent()) { | |
| Shop shop = adminOwnerShopRedisRepository.findById(owner.getId()) | |
| .map(ownerShop -> { | |
| Long shopId = ownerShop.getShopId(); | |
| return shopId != null ? adminShopRepository.findById(shopId).orElse(null) : null; | |
| }) | |
| .orElse(null); | |
| OwnerIncludingShop ownerIncludingShop = OwnerIncludingShop.of(owner, shop); | |
| ownerIncludingShops.add(ownerIncludingShop); | |
| } |
There was a problem hiding this comment.
if문 주렁주렁 달려있는 거 보다 보기 좋네요 👍
krSeonghyeon
approved these changes
Jan 17, 2025
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.
🔥 연관 이슈
🚀 작업 내용
💬 리뷰 중점사항