3단계 - 테스트를 통한 코드 보호 #264
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| package kitchenpos.application; | ||
|
|
||
| import kitchenpos.domain.*; | ||
| import kitchenpos.infra.ProfanityClient; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
|
|
@@ -14,18 +14,18 @@ public class MenuService { | |
| private final MenuRepository menuRepository; | ||
| private final MenuGroupRepository menuGroupRepository; | ||
| private final ProductRepository productRepository; | ||
| private final ProfanityClient profanityClient; | ||
|
|
||
| public MenuService( | ||
| final MenuRepository menuRepository, | ||
| final MenuGroupRepository menuGroupRepository, | ||
| final ProductRepository productRepository, | ||
| final ProfanityClient profanityClient | ||
| ) { | ||
| this.menuRepository = menuRepository; | ||
| this.menuGroupRepository = menuGroupRepository; | ||
| this.productRepository = productRepository; | ||
| this.profanityClient = profanityClient; | ||
| } | ||
|
|
||
| @Transactional | ||
|
|
@@ -35,15 +35,15 @@ public Menu create(final Menu request) { | |
| throw new IllegalArgumentException(); | ||
| } | ||
| final MenuGroup menuGroup = menuGroupRepository.findById(request.getMenuGroupId()) | ||
| .orElseThrow(NoSuchElementException::new); | ||
| final List<MenuProduct> menuProductRequests = request.getMenuProducts(); | ||
| if (Objects.isNull(menuProductRequests) || menuProductRequests.isEmpty()) { | ||
| throw new IllegalArgumentException(); | ||
| } | ||
| final List<Product> products = productRepository.findAllByIdIn( | ||
| menuProductRequests.stream() | ||
| .map(MenuProduct::getProductId) | ||
| .collect(Collectors.toList()) | ||
| ); | ||
| if (products.size() != menuProductRequests.size()) { | ||
| throw new IllegalArgumentException(); | ||
|
|
@@ -56,10 +56,10 @@ public Menu create(final Menu request) { | |
| throw new IllegalArgumentException(); | ||
| } | ||
| final Product product = productRepository.findById(menuProductRequest.getProductId()) | ||
| .orElseThrow(NoSuchElementException::new); | ||
| sum = sum.add( | ||
| product.getPrice() | ||
| .multiply(BigDecimal.valueOf(quantity)) | ||
| ); | ||
| final MenuProduct menuProduct = new MenuProduct(); | ||
| menuProduct.setProduct(product); | ||
|
|
@@ -70,7 +70,7 @@ public Menu create(final Menu request) { | |
| throw new IllegalArgumentException(); | ||
| } | ||
| final String name = request.getName(); | ||
| if (Objects.isNull(name) || profanityClient.containsProfanity(name)) { | ||
| throw new IllegalArgumentException(); | ||
| } | ||
| final Menu menu = new Menu(); | ||
|
|
@@ -90,11 +90,11 @@ public Menu changePrice(final UUID menuId, final Menu request) { | |
| throw new IllegalArgumentException(); | ||
| } | ||
| final Menu menu = menuRepository.findById(menuId) | ||
| .orElseThrow(NoSuchElementException::new); | ||
| for (final MenuProduct menuProduct : menu.getMenuProducts()) { | ||
| final BigDecimal sum = menuProduct.getProduct() | ||
| .getPrice() | ||
| .multiply(BigDecimal.valueOf(menuProduct.getQuantity())); | ||
| if (price.compareTo(sum) > 0) { | ||
| throw new IllegalArgumentException(); | ||
| } | ||
|
|
@@ -106,11 +106,11 @@ public Menu changePrice(final UUID menuId, final Menu request) { | |
| @Transactional | ||
| public Menu display(final UUID menuId) { | ||
| final Menu menu = menuRepository.findById(menuId) | ||
| .orElseThrow(NoSuchElementException::new); | ||
| for (final MenuProduct menuProduct : menu.getMenuProducts()) { | ||
| final BigDecimal sum = menuProduct.getProduct() | ||
| .getPrice() | ||
| .multiply(BigDecimal.valueOf(menuProduct.getQuantity())); | ||
| if (menu.getPrice().compareTo(sum) > 0) { | ||
| throw new IllegalStateException(); | ||
| } | ||
|
|
@@ -122,7 +122,7 @@ public Menu display(final UUID menuId) { | |
| @Transactional | ||
| public Menu hide(final UUID menuId) { | ||
| final Menu menu = menuRepository.findById(menuId) | ||
| .orElseThrow(NoSuchElementException::new); | ||
| menu.setDisplayed(false); | ||
| return menu; | ||
| } | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| package kitchenpos.application; | ||
|
|
||
| import kitchenpos.domain.*; | ||
| import kitchenpos.infra.ProfanityClient; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
|
|
@@ -15,16 +15,16 @@ | |
| public class ProductService { | ||
| private final ProductRepository productRepository; | ||
| private final MenuRepository menuRepository; | ||
| private final ProfanityClient profanityClient; | ||
|
|
||
| public ProductService( | ||
| final ProductRepository productRepository, | ||
| final MenuRepository menuRepository, | ||
| final ProfanityClient profanityClient | ||
| ) { | ||
| this.productRepository = productRepository; | ||
| this.menuRepository = menuRepository; | ||
| this.profanityClient = profanityClient; | ||
| } | ||
|
|
||
| @Transactional | ||
|
|
@@ -34,7 +34,7 @@ public Product create(final Product request) { | |
| throw new IllegalArgumentException(); | ||
| } | ||
| final String name = request.getName(); | ||
| if (Objects.isNull(name) || profanityClient.containsProfanity(name)) { | ||
| throw new IllegalArgumentException(); | ||
| } | ||
| final Product product = new Product(); | ||
|
|
@@ -51,15 +51,15 @@ public Product changePrice(final UUID productId, final Product request) { | |
| throw new IllegalArgumentException(); | ||
| } | ||
| final Product product = productRepository.findById(productId) | ||
| .orElseThrow(NoSuchElementException::new); | ||
| product.setPrice(price); | ||
| final List<Menu> menus = menuRepository.findAllByProductId(productId); | ||
| for (final Menu menu : menus) { | ||
| BigDecimal sum = BigDecimal.ZERO; | ||
| for (final MenuProduct menuProduct : menu.getMenuProducts()) { | ||
| sum = menuProduct.getProduct() | ||
| .getPrice() | ||
| .multiply(BigDecimal.valueOf(menuProduct.getQuantity())); | ||
| } | ||
| if (menu.getPrice().compareTo(sum) > 0) { | ||
| menu.setDisplayed(false); | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,19 @@ | |
|
|
||
| import org.springframework.data.jpa.repository.JpaRepository; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.UUID; | ||
|
|
||
| public interface MenuGroupRepository { | ||
| MenuGroup save(MenuGroup menuGroup); | ||
|
|
||
| List<MenuGroup> findAll(); | ||
|
|
||
| Optional<MenuGroup> findById(UUID id); | ||
|
|
||
| } | ||
|
|
||
| interface JpaMenuGroupRepository extends MenuGroupRepository, JpaRepository<MenuGroup, UUID> { | ||
|
There was a problem hiding this comment. 아래의 Google Java Style Guide를 참고해 주세요.
There was a problem hiding this comment. 기본적인건데 이부분을 분리를 안했었네요 |
||
|
|
||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,11 +5,23 @@ | |
| import org.springframework.data.repository.query.Param; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.UUID; | ||
|
|
||
| public interface MenuRepository { | ||
| List<Menu> findAllByIdIn(List<UUID> ids); | ||
|
|
||
| @Query("select m from Menu m, MenuProduct mp where mp.product.id = :productId") | ||
| List<Menu> findAllByProductId(@Param("productId") UUID productId); | ||
|
|
||
| Menu save(Menu menu); | ||
|
|
||
| Optional<Menu> findById(UUID menuId); | ||
|
|
||
| List<Menu> findAll(); | ||
|
|
||
| void deleteDataForTest(); | ||
|
There was a problem hiding this comment. 테스트를 위한 메서드는 과감하게 지우는 것이 좋겠어요. There was a problem hiding this comment. 이 부분을 하면서도 과연 이게 맞는건가하는 의문이 많이 들었습니다. |
||
| } | ||
|
|
||
| interface JpaMenuRepository extends MenuRepository, JpaRepository<Menu, UUID> { | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,8 +2,20 @@ | |
|
|
||
| import org.springframework.data.jpa.repository.JpaRepository; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.UUID; | ||
|
|
||
| public interface OrderRepository { | ||
| boolean existsByOrderTableAndStatusNot(OrderTable orderTable, OrderStatus status); | ||
|
|
||
| Order save(Order order); | ||
|
|
||
| Optional<Order> findById(UUID orderId); | ||
|
|
||
| List<Order> findAll(); | ||
| } | ||
|
|
||
| interface JpaOrderRepository extends OrderRepository, JpaRepository<Order, UUID> { | ||
|
|
||
| } | ||
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.
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.
오타 수정하였습니다 ^^;;;