-
Notifications
You must be signed in to change notification settings - Fork 2
feat: isEvent dto 추가 #337
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
Merged
Merged
feat: isEvent dto 추가 #337
Changes from all commits
Commits
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,15 +18,13 @@ public record ShopsResponse( | |
| @Schema(description = "상점 정보") | ||
| List<InnerShopResponse> shops | ||
| ) { | ||
| public static ShopsResponse from(List<Shop> shops) { | ||
| return new ShopsResponse( | ||
| shops.size(), | ||
| shops.stream().map(InnerShopResponse::from).toList() | ||
| ); | ||
|
|
||
| public static ShopsResponse from(List<InnerShopResponse> shops) { | ||
| return new ShopsResponse(shops.size(), shops); | ||
| } | ||
|
|
||
| @JsonNaming(value = SnakeCaseStrategy.class) | ||
| private record InnerShopResponse( | ||
| public record InnerShopResponse( | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Service에서 InnerShop을 호출하기 위해 바꿨군요 Good~ |
||
| @Schema(example = "0", description = " 속해있는 상점 카테고리들의 고유 id 리스트") | ||
| List<Long> categoryIds, | ||
|
|
||
|
|
@@ -49,9 +47,13 @@ private record InnerShopResponse( | |
| boolean payCard, | ||
|
|
||
| @Schema(example = "041-000-0000", description = "전화번호") | ||
| String phone | ||
| String phone, | ||
|
|
||
| @Schema(example = "true", description = "삭제 여부") | ||
| boolean isEvent | ||
| ) { | ||
| public static InnerShopResponse from(Shop shop) { | ||
|
|
||
| public static InnerShopResponse from(Shop shop, boolean isEvent) { | ||
| return new InnerShopResponse( | ||
| shop.getShopCategories().stream().map(shopCategoryMap -> | ||
| shopCategoryMap.getShopCategory().getId() | ||
|
|
@@ -62,7 +64,8 @@ public static InnerShopResponse from(Shop shop) { | |
| shop.getShopOpens().stream().map(InnerShopOpen::from).toList(), | ||
| shop.getPayBank(), | ||
| shop.getPayCard(), | ||
| shop.getPhone() | ||
| shop.getPhone(), | ||
| isEvent | ||
| ); | ||
| } | ||
| } | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ | |
| import in.koreatech.koin.domain.shop.dto.ShopMenuResponse; | ||
| import in.koreatech.koin.domain.shop.dto.ShopResponse; | ||
| import in.koreatech.koin.domain.shop.dto.ShopsResponse; | ||
| import in.koreatech.koin.domain.shop.dto.ShopsResponse.InnerShopResponse; | ||
| import in.koreatech.koin.domain.shop.model.EventArticle; | ||
| import in.koreatech.koin.domain.shop.model.Menu; | ||
| import in.koreatech.koin.domain.shop.model.MenuCategory; | ||
|
|
@@ -70,7 +71,12 @@ public ShopMenuResponse getShopMenus(Long shopId) { | |
|
|
||
| public ShopsResponse getShops() { | ||
| List<Shop> shops = shopRepository.findAll(); | ||
| return ShopsResponse.from(shops); | ||
| var innerShopResponses = shops.stream().map(shop -> { | ||
| Boolean eventDuration = eventArticleRepository.isEvent(shop.getId(), LocalDate.now(clock)); | ||
| return InnerShopResponse.from(shop, eventDuration); | ||
| }) | ||
|
Comment on lines
+74
to
+77
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 람다식 Good |
||
| .toList(); | ||
| return ShopsResponse.from(innerShopResponses); | ||
| } | ||
|
|
||
| public ShopCategoriesResponse getShopsCategories() { | ||
|
|
||
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.
사기 자료형 ..발..
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.
🦶