OP-289: Fix handling unpacked bundles in shop

src/Command/AddProductBundleToCartCommand.php

@@ -11,8 +11,13 @@
 
 namespace BitBag\SyliusProductBundlePlugin\Command;
 
+use Doctrine\Common\Collections\Collection;
+
 final class AddProductBundleToCartCommand implements OrderIdentityAwareInterface, ProductCodeAwareInterface
 {
+    /** @var Collection<int, AddProductBundleItemToCartCommand> */
+    private Collection $productBundleItems;
+
     public function __construct(
         private int $orderId,
         private string $productCode,
@@ -34,4 +39,16 @@ public function getQuantity(): int
     {
         return $this->quantity;
     }
+
+    /** @return Collection<int, AddProductBundleItemToCartCommand> */
+    public function getProductBundleItems(): Collection
+    {
+        return $this->productBundleItems;
+    }
+
+    /** @param Collection<int, AddProductBundleItemToCartCommand> $productBundleItems */
+    public function setProductBundleItems(Collection $productBundleItems): void
+    {
+        $this->productBundleItems = $productBundleItems;
+    }
 }

src/Factory/AddProductBundleToCartCommandFactory.php

@@ -11,25 +11,33 @@
 
 namespace BitBag\SyliusProductBundlePlugin\Factory;
 
+use BitBag\SyliusProductBundlePlugin\Command\AddProductBundleItemToCartCommand;
 use BitBag\SyliusProductBundlePlugin\Command\AddProductBundleToCartCommand;
 use BitBag\SyliusProductBundlePlugin\Dto\AddProductBundleToCartDtoInterface;
+use Doctrine\Common\Collections\Collection;
 
 final class AddProductBundleToCartCommandFactory implements AddProductBundleToCartCommandFactoryInterface
 {
+    /** @param Collection<int, AddProductBundleItemToCartCommand>  */
     public function createNew(
         int $orderId,
         string $productCode,
         int $quantity,
+        Collection $productBundleItems,
     ): AddProductBundleToCartCommand {
-        return new AddProductBundleToCartCommand($orderId, $productCode, $quantity);
+        $command = new AddProductBundleToCartCommand($orderId, $productCode, $quantity);
+        $command->setProductBundleItems($productBundleItems);
+
+        return $command;
     }
 
     public function createFromDto(AddProductBundleToCartDtoInterface $dto): AddProductBundleToCartCommand
     {
         $cartId = $dto->getCart()->getId();
         $productCode = $dto->getProduct()->getCode() ?? '';
         $quantity = $dto->getCartItem()->getQuantity();
+        $productBundleItems = $dto->getProductBundleItems();
 
-        return $this->createNew($cartId, $productCode, $quantity);
+        return $this->createNew($cartId, $productCode, $quantity, $productBundleItems);
     }
 }

src/Factory/AddProductBundleToCartCommandFactoryInterface.php

@@ -13,13 +13,17 @@
 
 use BitBag\SyliusProductBundlePlugin\Command\AddProductBundleToCartCommand;
 use BitBag\SyliusProductBundlePlugin\Dto\AddProductBundleToCartDtoInterface;
+use BitBag\SyliusProductBundlePlugin\Entity\ProductBundleOrderItemInterface;
+use Doctrine\Common\Collections\Collection;
 
 interface AddProductBundleToCartCommandFactoryInterface
 {
+    /** @param Collection<int, ProductBundleOrderItemInterface> $productBundleItems */
     public function createNew(
         int $orderId,
         string $productCode,
         int $quantity,
+        Collection $productBundleItems,
     ): AddProductBundleToCartCommand;
 
     public function createFromDto(AddProductBundleToCartDtoInterface $dto): AddProductBundleToCartCommand;

src/Factory/ProductBundleOrderItemFactory.php

@@ -11,6 +11,7 @@
 
 namespace BitBag\SyliusProductBundlePlugin\Factory;
 
+use BitBag\SyliusProductBundlePlugin\Command\AddProductBundleItemToCartCommand;
 use BitBag\SyliusProductBundlePlugin\Entity\ProductBundleItemInterface;
 use BitBag\SyliusProductBundlePlugin\Entity\ProductBundleOrderItemInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
@@ -41,4 +42,16 @@ public function createFromProductBundleItem(ProductBundleItemInterface $bundleIt
 
         return $productBundleOrderItem;
     }
+
+    public function createFromAddProductBundleItemToCartCommand(AddProductBundleItemToCartCommand $addItemToCartCommand): ProductBundleOrderItemInterface
+    {
+        /** @var ProductBundleOrderItemInterface $productBundleOrderItem */
+        $productBundleOrderItem = $this->decoratedFactory->createNew();
+
+        $productBundleOrderItem->setProductBundleItem($addItemToCartCommand->getProductBundleItem());
+        $productBundleOrderItem->setProductVariant($addItemToCartCommand->getProductVariant());
+        $productBundleOrderItem->setQuantity($addItemToCartCommand->getQuantity());
+
+        return $productBundleOrderItem;
+    }
 }

src/Factory/ProductBundleOrderItemFactoryInterface.php

@@ -11,11 +11,14 @@
 
 namespace BitBag\SyliusProductBundlePlugin\Factory;
 
+use BitBag\SyliusProductBundlePlugin\Command\AddProductBundleItemToCartCommand;
 use BitBag\SyliusProductBundlePlugin\Entity\ProductBundleItemInterface;
 use BitBag\SyliusProductBundlePlugin\Entity\ProductBundleOrderItemInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 
 interface ProductBundleOrderItemFactoryInterface extends FactoryInterface
 {
     public function createFromProductBundleItem(ProductBundleItemInterface $bundleItem): ProductBundleOrderItemInterface;
+
+    public function createFromAddProductBundleItemToCartCommand(AddProductBundleItemToCartCommand $addItemToCartCommand): ProductBundleOrderItemInterface;
 }

src/Handler/AddProductBundleToCartHandler.php

@@ -46,7 +46,10 @@ public function __invoke(AddProductBundleToCartCommand $addProductBundleToCartCo
         $quantity = $addProductBundleToCartCommand->getQuantity();
         Assert::greaterThan($quantity, 0);
 
-        $this->cartProcessor->process($cart, $productBundle, $quantity);
+        $items = $addProductBundleToCartCommand->getProductBundleItems();
+        Assert::false($items->isEmpty());
+
+        $this->cartProcessor->process($cart, $productBundle, $quantity, $items);
         $this->orderRepository->add($cart);
     }
 }

src/Handler/AddProductBundleToCartHandler/CartProcessor.php

@@ -14,6 +14,7 @@
 use BitBag\SyliusProductBundlePlugin\Entity\ProductBundleInterface;
 use BitBag\SyliusProductBundlePlugin\Factory\OrderItemFactoryInterface;
 use BitBag\SyliusProductBundlePlugin\Factory\ProductBundleOrderItemFactoryInterface;
+use Doctrine\Common\Collections\Collection;
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Sylius\Component\Order\Model\OrderInterface;
 use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
@@ -23,17 +24,18 @@
 final class CartProcessor implements CartProcessorInterface
 {
     public function __construct(
-        private OrderItemQuantityModifierInterface $orderItemQuantityModifier,
-        private ProductBundleOrderItemFactoryInterface $productBundleOrderItemFactory,
-        private OrderModifierInterface $orderModifier,
-        private OrderItemFactoryInterface $cartItemFactory,
+        private readonly OrderItemQuantityModifierInterface $orderItemQuantityModifier,
+        private readonly ProductBundleOrderItemFactoryInterface $productBundleOrderItemFactory,
+        private readonly OrderModifierInterface $orderModifier,
+        private readonly OrderItemFactoryInterface $cartItemFactory,
     ) {
     }
 
     public function process(
         OrderInterface $cart,
         ProductBundleInterface $productBundle,
         int $quantity,
+        Collection $productBundleOrderItems,
     ): void {
         Assert::greaterThan($quantity, 0);
 
@@ -47,8 +49,8 @@ public function process(
         $cartItem = $this->cartItemFactory->createWithVariant($productVariant);
         $this->orderItemQuantityModifier->modify($cartItem, $quantity);
 
-        foreach ($productBundle->getProductBundleItems() as $bundleItem) {
-            $productBundleOrderItem = $this->productBundleOrderItemFactory->createFromProductBundleItem($bundleItem);
+        foreach ($productBundleOrderItems as $addBundleItemToCartCommand) {
+            $productBundleOrderItem = $this->productBundleOrderItemFactory->createFromAddProductBundleItemToCartCommand($addBundleItemToCartCommand);
             $cartItem->addProductBundleOrderItem($productBundleOrderItem);
         }
 

src/Handler/AddProductBundleToCartHandler/CartProcessorInterface.php

@@ -12,6 +12,7 @@
 namespace BitBag\SyliusProductBundlePlugin\Handler\AddProductBundleToCartHandler;
 
 use BitBag\SyliusProductBundlePlugin\Entity\ProductBundleInterface;
+use Doctrine\Common\Collections\Collection;
 use Sylius\Component\Order\Model\OrderInterface;
 
 interface CartProcessorInterface
@@ -20,5 +21,6 @@ public function process(
         OrderInterface $cart,
         ProductBundleInterface $productBundle,
         int $quantity,
+        Collection $productBundleOrderItems,
     ): void;
 }