OP-440: Remove unnecessary traits and move methods to existing traits

BitBagCommerce · Jul 24, 2024 · 7f948bd · 7f948bd
1 parent a5144b2
commit 7f948bd
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 56 deletions.
diff --git a/src/Entity/Block.php b/src/Entity/Block.php
@@ -10,8 +10,6 @@
 
 namespace BitBag\SyliusCmsPlugin\Entity;
 
-use BitBag\SyliusCmsPlugin\Entity\Trait\BlockProductAwareTrait;
-use BitBag\SyliusCmsPlugin\Entity\Trait\BlockTaxonAwareTrait;
 use BitBag\SyliusCmsPlugin\Entity\Trait\ChannelsAwareTrait;
 use BitBag\SyliusCmsPlugin\Entity\Trait\CollectibleTrait;
 use BitBag\SyliusCmsPlugin\Entity\Trait\ContentConfigurationAwareTrait;
@@ -31,8 +29,6 @@ class Block implements BlockInterface
     use ProductsAwareTrait;
     use TaxonAwareTrait;
     use ProductsInTaxonsAwareTrait;
-    use BlockTaxonAwareTrait;
-    use BlockProductAwareTrait;
 
     public function __construct()
     {

diff --git a/src/Entity/Trait/BlockProductAwareTrait.php b/src/Entity/Trait/BlockProductAwareTrait.php
diff --git a/src/Entity/Trait/BlockTaxonAwareTrait.php b/src/Entity/Trait/BlockTaxonAwareTrait.php
diff --git a/src/Entity/Trait/ProductsAwareTrait.php b/src/Entity/Trait/ProductsAwareTrait.php
@@ -47,4 +47,9 @@ public function removeProduct(ProductInterface $product): void
             $this->products->removeElement($product);
         }
     }
+
+    public function canBeDisplayedForProduct(ProductInterface $product): bool
+    {
+        return $this->hasProduct($product);
+    }
 }
diff --git a/src/Entity/Trait/ProductsInTaxonsAwareTrait.php b/src/Entity/Trait/ProductsInTaxonsAwareTrait.php
@@ -12,6 +12,7 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Core\Model\TaxonInterface;
 
 trait ProductsInTaxonsAwareTrait
@@ -47,4 +48,14 @@ public function removeProductsInTaxon(TaxonInterface $taxon): void
             $this->productsInTaxons->removeElement($taxon);
         }
     }
+
+    public function canBeDisplayedForProductInTaxon(ProductInterface $product): bool
+    {
+        $taxon = $product->getMainTaxon();
+        if (null === $taxon) {
+            return false;
+        }
+
+        return $this->hasProductsInTaxon($taxon);
+    }
 }
diff --git a/src/Entity/Trait/TaxonAwareTrait.php b/src/Entity/Trait/TaxonAwareTrait.php
@@ -47,4 +47,9 @@ public function removeTaxon(TaxonInterface $taxon): void
             $this->taxons->removeElement($taxon);
         }
     }
+
+    public function canBeDisplayedForTaxon(TaxonInterface $taxon): bool
+    {
+        return $this->hasTaxon($taxon);
+    }
 }