OP-289: Fix bundle filter handling

Author: hmfilar

src/Entity/ProductBundlesAwareInterface.php

@@ -18,4 +18,6 @@ public function getProductBundle(): ?ProductBundleInterface;
     public function setProductBundle(?ProductBundleInterface $productBundle): void;
 
     public function isBundle(): bool;
+
+    public function hasProductBundleItems(): bool;
 }

src/Entity/ProductBundlesAwareTrait.php

@@ -11,6 +11,7 @@
 
 namespace BitBag\SyliusProductBundlePlugin\Entity;
 
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 trait ProductBundlesAwareTrait
@@ -45,4 +46,14 @@ public function isBundle(): bool
     {
         return null !== $this->getProductBundle();
     }
+
+    public function hasProductBundleItems(): bool
+    {
+        $items = $this->getProductBundle()?->getProductBundleItems();
+        if (!$items instanceof Collection) {
+            return false;
+        }
+
+        return 0 < $items->count();
+    }
 }

src/Grid/Filter/IsBundleFilter.php

@@ -11,22 +11,28 @@
 
 namespace BitBag\SyliusProductBundlePlugin\Grid\Filter;
 
+use BitBag\SyliusProductBundlePlugin\Repository\ProductBundleRepositoryInterface;
 use Sylius\Component\Grid\Data\DataSourceInterface;
 use Sylius\Component\Grid\Filter\BooleanFilter;
 use Sylius\Component\Grid\Filtering\FilterInterface;
 
 final class IsBundleFilter implements FilterInterface
 {
-    //TODO fix handling bundles with no products added
+    public function __construct(private ProductBundleRepositoryInterface $productBundleRepository)
+    {
+    }
+
     public function apply(DataSourceInterface $dataSource, string $name, $data, array $options): void
     {
+        $productBundleIds = $this->productBundleRepository->getProductIds();
+
         switch ($data) {
             case BooleanFilter::TRUE:
-                $dataSource->restrict('productBundleItems IS NOT NULL');
+                $dataSource->restrict($dataSource->getExpressionBuilder()->in('id', $productBundleIds));
 
                 break;
             case BooleanFilter::FALSE:
-                $dataSource->restrict('productBundleItems IS NULL');
+                $dataSource->restrict($dataSource->getExpressionBuilder()->notIn('id', $productBundleIds));
 
                 break;
         }

src/Repository/ProductBundleRepository.php

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file has been created by developers from BitBag.
+ * Feel free to contact us once you face any issues or want to start
+ * You can find more information about us on https://bitbag.io and write us
+ * an email on hello@bitbag.io.
+ */
+
+declare(strict_types=1);
+
+namespace BitBag\SyliusProductBundlePlugin\Repository;
+
+use Doctrine\Common\Collections\Collection;
+use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
+use Sylius\Component\Product\Model\ProductVariantInterface;
+
+class ProductBundleRepository extends EntityRepository implements ProductBundleRepositoryInterface
+{
+    public function getProductIds(): array
+    {
+        return $this->createQueryBuilder('pb')
+            ->select('product.id')
+            ->leftJoin('pb.product', 'product')
+            ->leftJoin('pb.productBundleItems', 'items')
+            ->andWhere('items.id IS NOT NULL')
+            ->getQuery()
+            ->getSingleColumnResult();
+    }
+
+    /** @param Collection<int, ProductVariantInterface> $variants */
+    public function findBundlesByVariants(Collection $variants): array
+    {
+        return $this->createQueryBuilder('pb')
+            ->select('pb')
+            ->leftJoin('pb.productBundleItems', 'items')
+            ->andWhere('items.productVariant IN (:variants)')
+            ->setParameter('variants', $variants)
+            ->getQuery()
+            ->getResult();
+    }
+}

src/Repository/ProductBundleRepositoryInterface.php

@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file has been created by developers from BitBag.
+ * Feel free to contact us once you face any issues or want to start
+ * You can find more information about us on https://bitbag.io and write us
+ * an email on hello@bitbag.io.
+ */
+
+declare(strict_types=1);
+
+namespace BitBag\SyliusProductBundlePlugin\Repository;
+
+use Doctrine\Common\Collections\Collection;
+use Sylius\Component\Product\Model\ProductVariantInterface;
+use Sylius\Component\Resource\Repository\RepositoryInterface;
+
+interface ProductBundleRepositoryInterface extends RepositoryInterface
+{
+    public function getProductIds(): array;
+
+    /** @param Collection<int, ProductVariantInterface> $variants */
+    public function findBundlesByVariants(Collection $variants): array;
+}

src/Repository/ProductBundlesAwareInterface.php

@@ -1,15 +1,8 @@
 sylius_grid:
   grids:
     sylius_admin_product:
-      driver:
-        name: doctrine/orm
-        options:
-          class: "%sylius.model.product.class%"
-          repository:
-            method: createSearchListQueryBuilder
-            arguments: [ "expr:service('sylius.context.locale').getLocaleCode()", $taxonId ]
       fields:
-        bundle:
+        productBundleItems:
           type: twig
           label: bitbag_sylius_product_bundle.ui.is_bundle
           options:

src/Repository/ProductBundlesAwareTrait.php

@@ -6,3 +6,4 @@ sylius_resource:
                 model: BitBag\SyliusProductBundlePlugin\Entity\ProductBundle
                 interface: BitBag\SyliusProductBundlePlugin\Entity\ProductBundleInterface
                 form: BitBag\SyliusProductBundlePlugin\Form\Type\ProductBundleType
+                repository: BitBag\SyliusProductBundlePlugin\Repository\ProductBundleRepository

src/Resources/config/grids.yml

@@ -4,6 +4,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
         <service id="bitbag_sylius_product_bundle.grid.filter.is_bundle" class="BitBag\SyliusProductBundlePlugin\Grid\Filter\IsBundleFilter">
+            <argument type="service" id="bitbag_sylius_product_bundle.repository.product_bundle"/>
             <tag name="sylius.grid_filter" type="is_bundle" form_type="Sylius\Bundle\GridBundle\Form\Type\Filter\BooleanFilterType" />
         </service>
     </services>