Fixes after rebase

Sylius · Jul 25, 2019 · d080e95 · d080e95
1 parent 2544059
commit d080e95
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 219 deletions.
diff --git a/spec/CommandProvider/ShopUserBasedCommandProviderSpec.php b/spec/CommandProvider/ShopUserBasedCommandProviderSpec.php
diff --git a/src/CommandProvider/ShopUserBasedCommandProvider.php b/src/CommandProvider/ShopUserBasedCommandProvider.php
diff --git a/src/CommandProvider/ShopUserBasedCommandProviderInterface.php b/src/CommandProvider/ShopUserBasedCommandProviderInterface.php
diff --git a/src/Controller/Checkout/CompleteOrderAction.php b/src/Controller/Checkout/CompleteOrderAction.php
@@ -6,10 +6,7 @@
 
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
-use Sylius\ShopApiPlugin\Command\Cart\AssignCustomerToCart;
-use Sylius\ShopApiPlugin\Command\Cart\CompleteOrder;
 use Sylius\ShopApiPlugin\CommandProvider\CommandProviderInterface;
-use Sylius\ShopApiPlugin\CommandProvider\ShopUserBasedCommandProviderInterface;
 use Sylius\ShopApiPlugin\Exception\WrongUserException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -24,7 +21,7 @@ final class CompleteOrderAction
     /** @var MessageBusInterface */
     private $bus;
 
-    /** @var ShopUserBasedCommandProviderInterface */
+    /** @var CommandProviderInterface */
     private $assignCustomerToCartCommandProvider;
 
     /** @var CommandProviderInterface */
@@ -33,7 +30,7 @@ final class CompleteOrderAction
     public function __construct(
         ViewHandlerInterface $viewHandler,
         MessageBusInterface $bus,
-        ShopUserBasedCommandProviderInterface $assignCustomerToCartCommandProvider,
+        CommandProviderInterface $assignCustomerToCartCommandProvider,
         CommandProviderInterface $completeOrderCommandProvider
     ) {
         $this->viewHandler = $viewHandler;
@@ -45,18 +42,11 @@ public function __construct(
     public function __invoke(Request $request): Response
     {
         try {
-            $orderToken = $request->attributes->get('token');
-            $email = $request->request->get('email');
-
-            if (null !== $email) {
-                $this->bus->dispatch(new AssignCustomerToCart($orderToken, $email));
+            if (null !== $request->request->get('email')) {
+                $this->bus->dispatch($this->assignCustomerToCartCommandProvider->getCommand($request));
             }
 
-            $this->bus->dispatch(new CompleteOrder($orderToken, $request->request->get('notes')));
-
-//        try {
-//            $this->bus->dispatch($this->assignCustomerToCartCommandProvider->getCommand($request, $user));
-//            $this->bus->dispatch($this->completeOrderCommandProvider->getCommand($request));
+            $this->bus->dispatch($this->completeOrderCommandProvider->getCommand($request));
         } catch (HandlerFailedException $exception) {
             $previousException = $exception->getPrevious();
 

diff --git a/src/Request/Cart/AssignCustomerToCartRequest.php b/src/Request/Cart/AssignCustomerToCartRequest.php
@@ -4,29 +4,28 @@
 
 namespace Sylius\ShopApiPlugin\Request\Cart;
 
-use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\ShopApiPlugin\Command\Cart\AssignCustomerToCart;
 use Sylius\ShopApiPlugin\Command\CommandInterface;
-use Sylius\ShopApiPlugin\Request\ShopUserBasedRequestInterface;
+use Sylius\ShopApiPlugin\Request\RequestInterface;
 use Symfony\Component\HttpFoundation\Request;
 
-class AssignCustomerToCartRequest implements ShopUserBasedRequestInterface
+class AssignCustomerToCartRequest implements RequestInterface
 {
     /** @var string|null */
     protected $token;
 
     /** @var string|null */
     protected $email;
 
-    private function __construct(Request $request, ?string $email)
+    private function __construct(Request $request)
     {
         $this->token = $request->attributes->get('token');
-        $this->email = $request->request->get('email', $email);
+        $this->email = $request->request->get('email');
     }
 
-    public static function fromHttpRequestAndShopUser(Request $request, ?ShopUserInterface $user): ShopUserBasedRequestInterface
+    public static function fromHttpRequest(Request $request): RequestInterface
     {
-        return new self($request, $user !== null ? $user->getEmail() : null);
+        return new self($request);
     }
 
     public function getCommand(): CommandInterface

diff --git a/src/Request/ShopUserBasedRequestInterface.php b/src/Request/ShopUserBasedRequestInterface.php
diff --git a/src/Resources/config/services/command_providers/cart.xml b/src/Resources/config/services/command_providers/cart.xml
@@ -13,8 +13,8 @@
         </service>
 
         <service
-                id="sylius.shop_api_plugin.command_provider.assign_customer_to_cart"
-                class="Sylius\ShopApiPlugin\CommandProvider\ShopUserBasedCommandProvider"
+            id="sylius.shop_api_plugin.command_provider.assign_customer_to_cart"
+            class="Sylius\ShopApiPlugin\CommandProvider\DefaultCommandProvider"
         >
             <argument>%sylius.shop_api.request.assign_customer_to_cart.class%</argument>
             <argument type="service" id="validator" />

diff --git a/tests/Test/TestShopUserBasedCommand.php b/tests/Test/TestShopUserBasedCommand.php
diff --git a/tests/Test/TestShopUserBasedRequest.php b/tests/Test/TestShopUserBasedRequest.php