pr-fix

arti0090 · Apr 28, 2021 · 9a07588 · 9a07588
1 parent 1df4714
commit 9a07588
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 17 deletions.
diff --git a/UPGRADE-1.10.md b/UPGRADE-1.10.md
@@ -33,3 +33,7 @@
 1. API Change Quantity endpoint `PATCH api/v2/admin/orders/{tokenValue}/change-quantity` has been changed to `PATCH api/v2/admin/orders/{tokenValue}/items/{orderItemId}` and its body value `orderItemId` has been removed (now it is a route parameter) and `newQuantity` has been renamed to `quantity`.
 
 1. API Add to cart endpoint `PATCH /api/v2/shop/orders/{tokenValue}/items` no longer requires `productCode` in request body.
+
+### Commands
+
+1. We've removed `productCode` from `Sylius\Bundle\ApiBundle\Command\Cart\AddItemToCart` command.
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Cart/AddItemToCartHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Cart/AddItemToCartHandler.php
@@ -60,7 +60,7 @@ public function __construct(
     public function __invoke(AddItemToCart $addItemToCart): OrderInterface
     {
         /** @var ProductVariantInterface|null $productVariant */
-        $productVariant = $this->productVariantRepository->findOneByCode($addItemToCart->productVariantCode);
+        $productVariant = $this->productVariantRepository->findOneBy(['code' => $addItemToCart->productVariantCode]);
 
         Assert::notNull($productVariant);
 

diff --git a/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Cart/AddItemToCartHandlerSpec.php b/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Cart/AddItemToCartHandlerSpec.php
@@ -60,7 +60,7 @@ function it_adds_simple_product_to_cart(
     ): void {
         $orderRepository->findCartByTokenValue('TOKEN')->willReturn($cart);
         $productVariantRepository
-            ->findOneByCode('PRODUCT_VARIANT_CODE')
+            ->findOneBy(['code' => 'PRODUCT_VARIANT_CODE'])
             ->willReturn($productVariant)
         ;
 
@@ -82,7 +82,7 @@ function it_throws_an_exception_if_product_is_not_found(
         ProductVariantRepositoryInterface $productVariantRepository,
         CartItemFactoryInterface $cartItemFactory
     ): void {
-        $productVariantRepository->findOneByCode('PRODUCT_VARIANT_CODE')->willReturn(null);
+        $productVariantRepository->findOneBy(['code' => 'PRODUCT_VARIANT_CODE'])->willReturn(null);
 
         $cartItemFactory->createNew()->shouldNotBeCalled();
 
@@ -103,7 +103,7 @@ function it_throws_an_exception_if_cart_is_not_found(
         ProductVariantInterface $productVariant
     ): void {
         $productVariantRepository
-            ->findOneByCode('PRODUCT_VARIANT_CODE')
+            ->findOneBy(['code' => 'PRODUCT_VARIANT_CODE'])
             ->willReturn($productVariant)
         ;
 

diff --git a/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductVariantRepository.php b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductVariantRepository.php
@@ -85,17 +85,6 @@ public function findOneByCodeAndProductCode(string $code, string $productCode):
         ;
     }
 
-    public function findOneByCode(string $code): ?ProductVariantInterface
-    {
-        return $this->createQueryBuilder('o')
-            ->innerJoin('o.product', 'product')
-            ->andWhere('o.code = :code')
-            ->setParameter('code', $code)
-            ->getQuery()
-            ->getOneOrNullResult()
-            ;
-    }
-
     public function findByCodesAndProductCode(array $codes, string $productCode): array
     {
         return $this->createQueryBuilder('o')

diff --git a/src/Sylius/Component/Product/Repository/ProductVariantRepositoryInterface.php b/src/Sylius/Component/Product/Repository/ProductVariantRepositoryInterface.php
@@ -36,8 +36,6 @@ public function findByNameAndProduct(string $name, string $locale, ProductInterf
 
     public function findOneByCodeAndProductCode(string $code, string $productCode): ?ProductVariantInterface;
 
-    public function findOneByCode(string $code): ?ProductVariantInterface;
-
     /**
      * @param array|string[] $codes
      *