Add next iteration

Sylius · Sep 22, 2020 · 51eb736 · 51eb736
1 parent c384acf
commit 51eb736
Show file tree

Hide file tree

Showing 15 changed files with 130 additions and 231 deletions.
diff --git a/src/Sylius/Behat/Context/Api/Shop/CartContext.php b/src/Sylius/Behat/Context/Api/Shop/CartContext.php
@@ -148,7 +148,7 @@ public function iRemoveProductFromTheCart(ProductInterface $product, string $tok
      */
     public function iDoNotHaveAccessToSeeTheSummaryOfMyCart(): void
     {
-        Assert::true($this->getCart()['code'] === 404);
+        Assert::same($this->getCart()['code'], 404);
     }
 
     /**

diff --git a/src/Sylius/Behat/Context/Api/Shop/CheckoutContext.php b/src/Sylius/Behat/Context/Api/Shop/CheckoutContext.php
@@ -252,6 +252,10 @@ public function iConfirmMyOrder(): void
      */
     public function iProceededWithShippingMethod(ShippingMethodInterface $shippingMethod): void
     {
+        $y = $this->getCart();
+
+        $x =  (string) $this->iriConverter->getItemFromIri($y['shipments'][0])->getId();
+
         $this->client->request(
             Request::METHOD_PATCH,
             \sprintf(
@@ -276,7 +280,7 @@ public function iProceededWithShippingMethod(ShippingMethodInterface $shippingMe
      */
     public function theVisitorHasNoProceedWithShippingMethodInTheCustomerCart(): void
     {
-        Assert::true($this->getCart()['code'] === 404);
+        Assert::same($this->getCart()['code'], 404);
     }
 
     /**

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Checkout/AddressOrderHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Checkout/AddressOrderHandler.php
@@ -16,7 +16,6 @@
 use Doctrine\Persistence\ObjectManager;
 use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
 use Sylius\Bundle\ApiBundle\Command\Checkout\AddressOrder;
-use Sylius\Bundle\ApiBundle\Context\CartVisitorsCustomerContextInterface;
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\OrderCheckoutTransitions;
@@ -43,23 +42,18 @@ final class AddressOrderHandler
     /** @var StateMachineFactoryInterface */
     private $stateMachineFactory;
 
-    /** @var CartVisitorsCustomerContextInterface */
-    private $cartVisitorsCustomerContext;
-
     public function __construct(
         OrderRepositoryInterface $orderRepository,
         CustomerRepositoryInterface $customerRepository,
         FactoryInterface $customerFactory,
         ObjectManager $manager,
-        StateMachineFactoryInterface $stateMachineFactory,
-        CartVisitorsCustomerContextInterface $cartVisitorsCustomerContext
+        StateMachineFactoryInterface $stateMachineFactory
     ) {
         $this->orderRepository = $orderRepository;
         $this->customerRepository = $customerRepository;
         $this->customerFactory = $customerFactory;
         $this->manager = $manager;
         $this->stateMachineFactory = $stateMachineFactory;
-        $this->cartVisitorsCustomerContext = $cartVisitorsCustomerContext;
     }
 
     public function __invoke(AddressOrder $addressOrder): OrderInterface
@@ -82,8 +76,6 @@ public function __invoke(AddressOrder $addressOrder): OrderInterface
             $customer = $this->provideCustomerByEmail($addressOrder->email);
 
             $order->setCustomer($customer);
-
-            $this->cartVisitorsCustomerContext->setCartCustomerId((string) $customer->getId());
         }
 
         $order->setBillingAddress($addressOrder->billingAddress);
@@ -106,7 +98,6 @@ private function provideCustomerByEmail(?string $email): CustomerInterface
             $customer = $this->customerFactory->createNew();
             $customer->setEmail($email);
             $this->manager->persist($customer);
-            $this->manager->flush();
         }
 
         return $customer;

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/PickupCartHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/PickupCartHandler.php
@@ -16,7 +16,6 @@
 use Doctrine\Persistence\ObjectManager;
 use Sylius\Bundle\AdminApiBundle\Model\UserInterface;
 use Sylius\Bundle\ApiBundle\Command\Cart\PickupCart;
-use Sylius\Bundle\ApiBundle\Context\CartVisitorsCustomerContextInterface;
 use Sylius\Bundle\ApiBundle\Context\UserContextInterface;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
@@ -46,23 +45,18 @@ final class PickupCartHandler implements MessageHandlerInterface
     /** @var RandomnessGeneratorInterface */
     private $generator;
 
-    /** @var CartVisitorsCustomerContextInterface */
-    private $cartVisitorsCustomerContext;
-
     public function __construct(
         FactoryInterface $cartFactory,
         ChannelContextInterface $channelContext,
         UserContextInterface $userContext,
         ObjectManager $orderManager,
-        RandomnessGeneratorInterface $generator,
-        CartVisitorsCustomerContextInterface $cartVisitorsCustomerContext
+        RandomnessGeneratorInterface $generator
     ) {
         $this->cartFactory = $cartFactory;
         $this->channelContext = $channelContext;
         $this->userContext = $userContext;
         $this->orderManager = $orderManager;
         $this->generator = $generator;
-        $this->cartVisitorsCustomerContext = $cartVisitorsCustomerContext;
     }
 
     public function __invoke(PickupCart $pickupCart)
@@ -83,8 +77,6 @@ public function __invoke(PickupCart $pickupCart)
             $cart->setCustomer($customer);
         }
 
-        $this->cartVisitorsCustomerContext->setCartCustomerId(null);
-
         $cart->setChannel($channel);
         $cart->setLocaleCode($locale->getCode());
         $cart->setCurrencyCode($currency->getCode());

diff --git a/src/Sylius/Bundle/ApiBundle/Context/CartVisitorsCustomerContext.php b/src/Sylius/Bundle/ApiBundle/Context/CartVisitorsCustomerContext.php
diff --git a/src/Sylius/Bundle/ApiBundle/Context/CartVisitorsCustomerContextInterface.php b/src/Sylius/Bundle/ApiBundle/Context/CartVisitorsCustomerContextInterface.php
diff --git a/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderGetMethodItemExtension.php b/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderGetMethodItemExtension.php
@@ -16,16 +16,12 @@
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use Doctrine\ORM\QueryBuilder;
-use Sylius\Bundle\ApiBundle\Context\CartVisitorsCustomerContextInterface;
 use Sylius\Bundle\ApiBundle\Context\UserContextInterface;
-use Sylius\Bundle\ApiBundle\Doctrine\ApiShopRequestMethodsTypes;
 use Sylius\Bundle\ApiBundle\Serializer\ContextKeys;
 use Sylius\Component\Core\Model\AdminUserInterface;
-use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Security\Core\User\UserInterface;
 
@@ -35,15 +31,9 @@ final class OrderGetMethodItemExtension implements QueryItemExtensionInterface
     /** @var UserContextInterface */
     private $userContext;
 
-    /** @var CartVisitorsCustomerContextInterface */
-    private $cartVisitorsCustomerContext;
-
-    public function __construct(
-        UserContextInterface $userContext,
-        CartVisitorsCustomerContextInterface $cartVisitorsCustomerContext
-    ) {
+    public function __construct(UserContextInterface $userContext)
+    {
         $this->userContext = $userContext;
-        $this->cartVisitorsCustomerContext = $cartVisitorsCustomerContext;
     }
 
     public function applyToItem(
@@ -73,19 +63,12 @@ private function applyToItemForGetMethod(
         QueryBuilder $queryBuilder,
         string $rootAlias
     ): void {
-        /** @var string|null $cartCustomerId */
-        $cartCustomerId = $this->cartVisitorsCustomerContext->getCartCustomerId();
-
-        if ($user === null && $cartCustomerId === null) {
-            $queryBuilder->andWhere(sprintf('%s.customer IS NULL', $rootAlias));
-
-            return;
-        }
-
-        if ($user === null && $cartCustomerId !== null) {
+        if ($user === null) {
             $queryBuilder
-                ->andWhere(sprintf('%s.customer = :customer', $rootAlias))
-                ->setParameter('customer', $cartCustomerId)
+                ->leftJoin(sprintf('%s.customer', $rootAlias), 'customer')
+                ->leftJoin('customer.user', 'user')
+                ->andWhere('user IS NULL')
+                ->orWhere(sprintf('%s.customer IS NULL', $rootAlias))
             ;
 
             return;

diff --git a/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderMethodsItemExtension.php b/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderMethodsItemExtension.php
@@ -16,7 +16,6 @@
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use Doctrine\ORM\QueryBuilder;
-use Sylius\Bundle\ApiBundle\Context\CartVisitorsCustomerContextInterface;
 use Sylius\Bundle\ApiBundle\Context\UserContextInterface;
 use Sylius\Bundle\ApiBundle\Serializer\ContextKeys;
 use Sylius\Component\Core\Model\AdminUserInterface;
@@ -32,15 +31,9 @@ final class OrderMethodsItemExtension implements QueryItemExtensionInterface
     /** @var UserContextInterface */
     private $userContext;
 
-    /** @var CartVisitorsCustomerContextInterface */
-    private $cartVisitorsCustomerContext;
-
-    public function __construct(
-        UserContextInterface $userContext,
-        CartVisitorsCustomerContextInterface $cartVisitorsCustomerContext
-    ) {
+    public function __construct(UserContextInterface $userContext)
+    {
         $this->userContext = $userContext;
-        $this->cartVisitorsCustomerContext = $cartVisitorsCustomerContext;
     }
 
     public function applyToItem(
@@ -73,23 +66,12 @@ private function applyUserRulesToItem(
         string $rootAlias,
         string $httpRequestMethodType
     ): void {
-        /** @var string|null $cartCustomerId */
-        $cartCustomerId = $this->cartVisitorsCustomerContext->getCartCustomerId();
-
-        if ($user === null && $cartCustomerId === null) {
-            $queryBuilder
-                ->andWhere(sprintf('%s.customer IS NULL', $rootAlias))
-                ->andWhere(sprintf('%s.state = :state', $rootAlias))
-                ->setParameter('state', OrderInterface::STATE_CART)
-            ;
-
-            return;
-        }
-
-        if ($user === null && $cartCustomerId !== null) {
+        if ($user === null) {
             $queryBuilder
-                ->andWhere(sprintf('%s.customer = :customer', $rootAlias))
-                ->setParameter('customer', $cartCustomerId)
+                ->leftJoin(sprintf('%s.customer', $rootAlias), 'customer')
+                ->leftJoin('customer.user', 'user')
+                ->andWhere('user IS NULL')
+                ->orWhere(sprintf('%s.customer IS NULL', $rootAlias))
                 ->andWhere(sprintf('%s.state = :state', $rootAlias))
                 ->setParameter('state', OrderInterface::STATE_CART)
             ;
@@ -108,9 +90,11 @@ private function applyUserRulesToItem(
             return;
         }
 
-        if ($user instanceof AdminUserInterface &&
+        if (
+            $user instanceof AdminUserInterface &&
             in_array('ROLE_API_ACCESS', $user->getRoles(), true) &&
-            $httpRequestMethodType === Request::METHOD_DELETE) {
+            $httpRequestMethodType === Request::METHOD_DELETE
+        ) {
             $queryBuilder
                 ->andWhere(sprintf('%s.state = :state', $rootAlias))
                 ->setParameter('state', OrderInterface::STATE_CART)
@@ -119,9 +103,11 @@ private function applyUserRulesToItem(
             return;
         }
 
-        if ($user instanceof AdminUserInterface &&
+        if (
+            $user instanceof AdminUserInterface &&
             in_array('ROLE_API_ACCESS', $user->getRoles(), true) &&
-            $httpRequestMethodType !== Request::METHOD_DELETE) {
+            $httpRequestMethodType !== Request::METHOD_DELETE
+        ) {
             //admin has also access to modified orders in states other than cart
 
             return;

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@@ -29,7 +29,6 @@
             <argument type="service" id="sylius.api.context.user" />
             <argument type="service" id="sylius.manager.order" />
             <argument type="service" id="sylius.random_generator" />
-            <argument type="service" id="sylius.api.context.cart.visitors.customer" />
             <tag name="messenger.message_handler" />
         </service>
 
@@ -56,7 +55,6 @@
             <argument type="service" id="sylius.factory.customer"/>
             <argument type="service" id="sylius.manager.customer"/>
             <argument type="service" id="sm.factory" />
-            <argument type="service" id="sylius.api.context.cart.visitors.customer" />
             <tag name="messenger.message_handler" />
         </service>
 

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/data_providers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/data_providers.xml
@@ -67,9 +67,5 @@
         <service id="sylius.api.context.user" class="Sylius\Bundle\ApiBundle\Context\TokenBasedUserContext">
             <argument type="service" id="security.token_storage" />
         </service>
-
-        <service id="sylius.api.context.cart.visitors.customer" class="Sylius\Bundle\ApiBundle\Context\CartVisitorsCustomerContext">
-            <argument type="service" id="session"/>
-        </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/extensions.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/extensions.xml
@@ -40,7 +40,6 @@
             public="true"
         >
             <argument type="service" id="sylius.api.context.user" />
-            <argument type="service" id="sylius.api.context.cart.visitors.customer" />
             <tag name="api_platform.doctrine.orm.query_extension.item" />
         </service>
 
@@ -50,7 +49,6 @@
             public="true"
         >
             <argument type="service" id="sylius.api.context.user" />
-            <argument type="service" id="sylius.api.context.cart.visitors.customer" />
             <tag name="api_platform.doctrine.orm.query_extension.item" />
         </service>
     </services>