changed method in AddressOrderHandler

Sylius · Aug 6, 2020 · 12c412e · 12c412e
1 parent a508bc1
commit 12c412e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/src/Sylius/Behat/Context/Api/Shop/CheckoutContext.php b/src/Sylius/Behat/Context/Api/Shop/CheckoutContext.php
@@ -58,6 +58,7 @@ public function __construct(
     /**
      * @Given I am at the checkout addressing step
      * @When I complete the shipping step
+     * @When I complete the payment step
      */
     public function intentionallyLeftBlank(): void
     {

diff --git a/src/Sylius/Behat/Resources/config/suites/api/checkout/checkout.yml b/src/Sylius/Behat/Resources/config/suites/api/checkout/checkout.yml
@@ -28,7 +28,6 @@ default:
                 - sylius.behat.context.setup.shipping
                 - sylius.behat.context.setup.shop_api_security
                 - sylius.behat.context.setup.user
-                - sylius.behat.context.setup.customer
 
                 - sylius.behat.context.api.admin.managing_orders
 

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Checkout/AddressOrderHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Checkout/AddressOrderHandler.php
@@ -70,11 +70,8 @@ public function __invoke(AddressOrder $addressOrder): OrderInterface
             sprintf('Order with %s token cannot be addressed.', $tokenValue)
         );
 
-        /** @var CustomerInterface|null $customer */
-        $customer = $this->provideCustomer($order, $addressOrder->email);
-
         if (null === $order->getCustomer()) {
-            $order->setCustomer($customer);
+            $order->setCustomer($this->provideCustomerByEmail($addressOrder->email));
         }
 
         $order->setBillingAddress($addressOrder->billingAddress);
@@ -83,20 +80,16 @@ public function __invoke(AddressOrder $addressOrder): OrderInterface
         $stateMachine->apply(OrderCheckoutTransitions::TRANSITION_ADDRESS);
 
         $this->manager->persist($order);
-        $this->manager->flush();
 
         return $order;
     }
 
-    private function provideCustomer(OrderInterface $order, ?string $email): CustomerInterface
+    private function provideCustomerByEmail(?string $email): CustomerInterface
     {
-        $customer = $order->getCustomer();
-        if (null === $customer) {
-            $customer = $this->customerRepository->findOneBy(['email' => $email]);
-        }
-        if (null === $customer) {
-            Assert::notNull($email, sprintf('Visitor should provide an email.'));
+        Assert::notNull($email, sprintf('Visitor should provide an email.'));
 
+        $customer = $this->customerRepository->findOneBy(['email' => $email]);
+        if (null === $customer) {
             /** @var CustomerInterface $customer */
             $customer = $this->customerFactory->createNew();
             $customer->setEmail($email);

diff --git a/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Checkout/AddressOrderHandlerSpec.php b/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Checkout/AddressOrderHandlerSpec.php
@@ -36,7 +36,7 @@ function let(
         ObjectManager $manager,
         StateMachineFactoryInterface $stateMachineFactory
     ): void {
-        $this->beConstructedWith($orderRepository,$customerRepository, $customerFactory, $manager, $stateMachineFactory);
+        $this->beConstructedWith($orderRepository, $customerRepository, $customerFactory, $manager, $stateMachineFactory);
     }
 
     function it_handles_addressing_an_order_without_provided_shipping_address(
@@ -100,7 +100,6 @@ function it_handles_addressing_an_order_for_visitor(
         $stateMachine->apply(OrderCheckoutTransitions::TRANSITION_ADDRESS)->shouldBeCalled();
 
         $manager->persist($order)->shouldBeCalled();
-        $manager->flush()->shouldBeCalled();
 
         $this($addressOrder);
     }
@@ -140,7 +139,6 @@ function it_handles_addressing_an_order_for_logged_in_shop_user(
         $stateMachine->apply(OrderCheckoutTransitions::TRANSITION_ADDRESS)->shouldBeCalled();
 
         $manager->persist($order)->shouldBeCalled();
-        $manager->flush()->shouldBeCalled();
 
         $this($addressOrder);
     }
@@ -180,7 +178,6 @@ function it_handles_addressing_an_order_for_not_logged_in_shop_user(
         $stateMachine->apply(OrderCheckoutTransitions::TRANSITION_ADDRESS)->shouldBeCalled();
 
         $manager->persist($order)->shouldBeCalled();
-        $manager->flush()->shouldBeCalled();
 
         $this($addressOrder);
     }