Merge pull request #1154 from dpfaffenbauer/issue/1152-add-to-cart

[OrderBundle] properly implement AddMultipleToCart
coreshop · Nov 5, 2019 · 3499795 · 3499795
2 parents 3463af4 + b5d734f
commit 3499795
Show file tree

Hide file tree

Showing 9 changed files with 193 additions and 8 deletions.
diff --git a/src/CoreShop/Bundle/OrderBundle/Controller/CartEditController.php b/src/CoreShop/Bundle/OrderBundle/Controller/CartEditController.php
@@ -2,6 +2,7 @@
 
 namespace CoreShop\Bundle\OrderBundle\Controller;
 
+use CoreShop\Bundle\OrderBundle\DTO\AddMultipleToCartInterface;
 use CoreShop\Bundle\OrderBundle\DTO\AddToCartInterface;
 use CoreShop\Bundle\OrderBundle\Form\Type\AddMultipleToCartType;
 use CoreShop\Bundle\OrderBundle\Form\Type\EditCartType;
@@ -96,16 +97,18 @@ public function addItemsAction(Request $request)
             $commands[] = $this->createAddToCart($cart, $cartItem);
         }
 
-        $form = $this->get('form.factory')->createNamed('', AddMultipleToCartType::class, ['items' => $commands]);
+        $addMultipleAddToCarts = $this->createMultipleAddToCart($commands);
+
+        $form = $this->get('form.factory')->createNamed('', AddMultipleToCartType::class, $addMultipleAddToCarts);
 
         if ($request->isMethod('POST')) {
             if ($form->handleRequest($request)->isValid()) {
-                $addsToCart = $form->getData();
-
                 /**
-                 * @var AddToCartInterface $addToCart
+                 * @var AddMultipleToCartInterface $addsToCart
                  */
-                foreach ($addsToCart['items'] as $addToCart) {
+                $addsToCart = $form->getData();
+
+                foreach ($addsToCart->getItems() as $addToCart) {
                     $this->getCartModifier()->addToList(
                         $addToCart->getCart(),
                         $addToCart->getCartItem()
@@ -173,6 +176,15 @@ public function removeItemAction(Request $request)
         return $this->viewHandler->handle(['success' => true]);
     }
 
+    /**
+     * @param array $addToCarts
+     * @return AddMultipleToCartInterface
+     */
+    protected function createMultipleAddToCart(array $addToCarts)
+    {
+        return $this->get('coreshop.factory.add_multiple_to_cart')->createWithMultipleAddToCarts($addToCarts);
+    }
+
     /**
      * @param CartInterface     $cart
      * @param CartItemInterface $item

diff --git a/src/CoreShop/Bundle/OrderBundle/DTO/AddMultipleToCart.php b/src/CoreShop/Bundle/OrderBundle/DTO/AddMultipleToCart.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * CoreShop.
+ *
+ * This source file is subject to the GNU General Public License version 3 (GPLv3)
+ * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt
+ * files that are distributed with this source code.
+ *
+ * @copyright  Copyright (c) 2015-2019 Dominik Pfaffenbauer (https://www.pfaffenbauer.at)
+ * @license    https://www.coreshop.org/license     GNU General Public License version 3 (GPLv3)
+ */
+
+namespace CoreShop\Bundle\OrderBundle\DTO;
+
+class AddMultipleToCart implements AddMultipleToCartInterface
+{
+    /**
+     * @var AddToCartInterface[]
+     */
+    private $items;
+
+    /**
+     * @param AddToCartInterface[] $items
+     */
+    public function __construct(array $items)
+    {
+        $this->items = $items;
+    }
+
+    /**
+     * @return AddToCartInterface[]
+     */
+    public function getItems()
+    {
+        return $this->items;
+    }
+
+    /**
+     * @param AddToCartInterface[] $items
+     */
+    public function setItems(array $items)
+    {
+        $this->items = $items;
+    }
+
+    /**
+     * @param AddToCartInterface $addToCart
+     */
+    public function addItem(AddToCartInterface $addToCart)
+    {
+        $this->items[] = $addToCart;
+    }
+}
diff --git a/src/CoreShop/Bundle/OrderBundle/DTO/AddMultipleToCartInterface.php b/src/CoreShop/Bundle/OrderBundle/DTO/AddMultipleToCartInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * CoreShop.
+ *
+ * This source file is subject to the GNU General Public License version 3 (GPLv3)
+ * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt
+ * files that are distributed with this source code.
+ *
+ * @copyright  Copyright (c) 2015-2019 Dominik Pfaffenbauer (https://www.pfaffenbauer.at)
+ * @license    https://www.coreshop.org/license     GNU General Public License version 3 (GPLv3)
+ */
+
+namespace CoreShop\Bundle\OrderBundle\DTO;
+
+use CoreShop\Component\Order\Model\CartInterface;
+use CoreShop\Component\Order\Model\CartItemInterface;
+
+interface AddMultipleToCartInterface
+{
+    /**
+     * @return AddToCartInterface[]
+     */
+    public function getItems();
+}
diff --git a/src/CoreShop/Bundle/OrderBundle/Factory/AddMultipleToCartFactory.php b/src/CoreShop/Bundle/OrderBundle/Factory/AddMultipleToCartFactory.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * CoreShop.
+ *
+ * This source file is subject to the GNU General Public License version 3 (GPLv3)
+ * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt
+ * files that are distributed with this source code.
+ *
+ * @copyright  Copyright (c) 2015-2019 Dominik Pfaffenbauer (https://www.pfaffenbauer.at)
+ * @license    https://www.coreshop.org/license     GNU General Public License version 3 (GPLv3)
+ */
+
+namespace CoreShop\Bundle\OrderBundle\Factory;
+
+use CoreShop\Bundle\OrderBundle\DTO\AddMultipleToCartInterface;
+
+class AddMultipleToCartFactory implements AddMultipleToCartFactoryInterface
+{
+    /**
+     * @var string
+     */
+    protected $addMultipleToCartClass;
+
+    /**
+     * @param string $addMultipleToCartClass
+     */
+    public function __construct($addMultipleToCartClass)
+    {
+        $this->addMultipleToCartClass = $addMultipleToCartClass;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createWithMultipleAddToCarts(array $addToCarts)
+    {
+        $class = new $this->addMultipleToCartClass($addToCarts);
+
+        if (!in_array(AddMultipleToCartInterface::class, class_implements($class), true)) {
+            throw new \InvalidArgumentException(
+                sprintf('%s needs to implement "%s".', get_class($class), AddMultipleToCartInterface::class)
+            );
+        }
+
+        return $class;
+    }
+}
diff --git a/src/CoreShop/Bundle/OrderBundle/Factory/AddMultipleToCartFactoryInterface.php b/src/CoreShop/Bundle/OrderBundle/Factory/AddMultipleToCartFactoryInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * CoreShop.
+ *
+ * This source file is subject to the GNU General Public License version 3 (GPLv3)
+ * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt
+ * files that are distributed with this source code.
+ *
+ * @copyright  Copyright (c) 2015-2019 Dominik Pfaffenbauer (https://www.pfaffenbauer.at)
+ * @license    https://www.coreshop.org/license     GNU General Public License version 3 (GPLv3)
+ */
+
+namespace CoreShop\Bundle\OrderBundle\Factory;
+
+use CoreShop\Bundle\OrderBundle\DTO\AddMultipleToCartInterface;
+use CoreShop\Bundle\OrderBundle\DTO\AddToCartInterface;
+use CoreShop\Component\Order\Model\CartInterface;
+use CoreShop\Component\Order\Model\CartItemInterface;
+
+interface AddMultipleToCartFactoryInterface
+{
+    /**
+     * @param AddToCartInterface[] $addToCarts
+     *
+     * @return AddMultipleToCartInterface
+     */
+    public function createWithMultipleAddToCarts(array $addToCarts);
+}
diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/AddMultipleToCartType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/AddMultipleToCartType.php
@@ -12,12 +12,13 @@
 
 namespace CoreShop\Bundle\OrderBundle\Form\Type;
 
-use Symfony\Component\Form\AbstractType;
+use CoreShop\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Valid;
 
-final class AddMultipleToCartType extends AbstractType
+final class AddMultipleToCartType extends AbstractResourceType
 {
     /**
      * {@inheritdoc}
@@ -27,6 +28,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add('items', CollectionType::class, [
             'entry_type' => AddToCartType::class,
             'allow_add' => true,
+            'constraints' => [
+                new Valid()
+            ]
         ]);
     }
 

diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/AddToCartType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/AddToCartType.php
@@ -15,6 +15,7 @@
 use CoreShop\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Valid;
 
 final class AddToCartType extends AbstractResourceType
 {
@@ -23,7 +24,9 @@ final class AddToCartType extends AbstractResourceType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('cartItem', CartItemType::class);
+        $builder->add('cartItem', CartItemType::class, [
+            'constraints' => new Valid()
+        ]);
     }
 
     /**

diff --git a/src/CoreShop/Bundle/OrderBundle/Resources/config/services.yml b/src/CoreShop/Bundle/OrderBundle/Resources/config/services.yml
@@ -1,5 +1,6 @@
 parameters:
     coreshop.dto.add_to_cart.class: 'CoreShop\Bundle\OrderBundle\DTO\AddToCart'
+    coreshop.dto.add_multiple_to_cart.class: 'CoreShop\Bundle\OrderBundle\DTO\AddMultipleToCart'
 
 imports:
     - { resource: "services/order.yml" }
@@ -104,3 +105,8 @@ services:
     CoreShop\Bundle\OrderBundle\Factory\AddToCartFactory:
         arguments:
             - '%coreshop.dto.add_to_cart.class%'
+
+    coreshop.factory.add_multiple_to_cart: '@CoreShop\Bundle\OrderBundle\Factory\AddMultipleToCartFactory'
+    CoreShop\Bundle\OrderBundle\Factory\AddMultipleToCartFactory:
+        arguments:
+            - '%coreshop.dto.add_multiple_to_cart.class%'
diff --git a/src/CoreShop/Bundle/OrderBundle/Resources/config/services/forms.yml b/src/CoreShop/Bundle/OrderBundle/Resources/config/services/forms.yml
@@ -1,6 +1,7 @@
 parameters:
     coreshop.form.type.add_to_cart.validation_groups: [coreshop]
     coreshop.form.type.edit_cart.validation_groups: [coreshop]
+    coreshop.form.type.add_multiple_to_cart.validation_groups: [coreshop]
 
 services:
     CoreShop\Bundle\OrderBundle\Form\Type\AddToCartType:
@@ -10,6 +11,13 @@ services:
         tags:
             - { name: form.type }
 
+    CoreShop\Bundle\OrderBundle\Form\Type\AddMultipleToCartType:
+        arguments:
+            - '%coreshop.dto.add_multiple_to_cart.class%'
+            - '%coreshop.form.type.add_multiple_to_cart.validation_groups%'
+        tags:
+            - { name: form.type }
+
     coreshop.form.type.edit_cart:
         class: CoreShop\Bundle\OrderBundle\Form\Type\EditCartType
         arguments: