Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OP-225: Product option populate #244

Merged
merged 3 commits into from
May 22, 2024
Merged

OP-225: Product option populate #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d97ce0
OP-225: Refactor Option Taxon Builder
GracjanJozefczyk May 22, 2024
c07f46c
OP-225: Add repository method
GracjanJozefczyk May 22, 2024
5945fcb
OP-225: Populate taxon options
GracjanJozefczyk May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/EventListener/ResourceIndexListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
namespace BitBag\SyliusElasticsearchPlugin\EventListener;

use BitBag\SyliusElasticsearchPlugin\Refresher\ResourceRefresherInterface;
use Sylius\Component\Core\Model\Product;
use Sylius\Component\Core\Model\ProductInterface;
use Sylius\Component\Core\Model\ProductVariantInterface;
use Sylius\Component\Product\Model\ProductAttribute;
use Sylius\Component\Product\Model\ProductOption;
use Sylius\Component\Resource\Model\ResourceInterface;
use Sylius\Component\Resource\Repository\RepositoryInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
Expand All @@ -28,14 +30,18 @@ final class ResourceIndexListener implements ResourceIndexListenerInterface

private RepositoryInterface $attributeRepository;

private RepositoryInterface $optionRepository;

public function __construct(
ResourceRefresherInterface $resourceRefresher,
array $persistersMap,
RepositoryInterface $attributeRepository
RepositoryInterface $attributeRepository,
RepositoryInterface $optionRepository
) {
$this->resourceRefresher = $resourceRefresher;
$this->persistersMap = $persistersMap;
$this->attributeRepository = $attributeRepository;
$this->optionRepository = $optionRepository;
}

public function updateIndex(GenericEvent $event): void
Expand All @@ -54,11 +60,16 @@ public function updateIndex(GenericEvent $event): void
$this->resourceRefresher->refresh($resource, $config[self::SERVICE_ID_KEY]);
}

if ($resource instanceof Product
&& ProductAttribute::class === $config[self::MODEL_KEY]
) {
foreach ($this->attributeRepository->findAll() as $attribute) {
$this->resourceRefresher->refresh($attribute, $config[self::SERVICE_ID_KEY]);
if ($resource instanceof ProductInterface || $resource instanceof ProductVariantInterface) {
if (ProductAttribute::class === $config[self::MODEL_KEY]) {
foreach ($this->attributeRepository->findAll() as $attribute) {
$this->resourceRefresher->refresh($attribute, $config[self::SERVICE_ID_KEY]);
}
}
if (ProductOption::class === $config[self::MODEL_KEY]) {
foreach ($this->optionRepository->findAll() as $option) {
$this->resourceRefresher->refresh($option, $config[self::SERVICE_ID_KEY]);
}
}
}
}
Expand Down
18 changes: 7 additions & 11 deletions src/PropertyBuilder/OptionTaxonsBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use BitBag\SyliusElasticsearchPlugin\PropertyBuilder\Mapper\ProductTaxonsMapperInterface;
use BitBag\SyliusElasticsearchPlugin\Repository\ProductVariantRepositoryInterface;
use FOS\ElasticaBundle\Event\PostTransformEvent;
use Sylius\Component\Core\Model\ProductInterface;
use Sylius\Component\Product\Model\ProductOptionInterface;
use Sylius\Component\Product\Model\ProductOptionValueInterface;
use Sylius\Component\Resource\Repository\RepositoryInterface;
Expand Down Expand Up @@ -57,23 +56,20 @@ public function consumeEvent(PostTransformEvent $event): void
}

$document = $event->getDocument();
$optionValues = $this->productOptionValueRepository->findAll();
$optionValues = $this->productOptionValueRepository->findBy(['option' => $documentProductOption]);
$taxons = [];

/** @var ProductOptionValueInterface $optionValue */
foreach ($optionValues as $optionValue) {
$option = $optionValue->getOption();
$productVariant = $this->productVariantRepository->findOneByOptionValue($optionValue);
$productVariants = $this->productVariantRepository->findByOptionValue($optionValue);

if (null === $productVariant) {
continue;
}

/** @var ProductInterface $product */
$product = $productVariant->getProduct();
foreach ($productVariants as $productVariant) {
$product = $productVariant->getProduct();

if ($documentProductOption === $option && $product->isEnabled()) {
$taxons = array_merge($taxons, $this->productTaxonsMapper->mapToUniqueCodes($product));
if ($documentProductOption === $option && $product->isEnabled()) {
$taxons = array_merge($taxons, $this->productTaxonsMapper->mapToUniqueCodes($product));
}
}
}

Expand Down
10 changes: 10 additions & 0 deletions src/Repository/ProductVariantRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,14 @@ public function findOneByOptionValue(ProductOptionValueInterface $productOptionV
->getOneOrNullResult()
;
}

public function findByOptionValue(ProductOptionValueInterface $productOptionValue): array
{
return $this->baseProductVariantRepository->createQueryBuilder('o')
->where(':optionValue MEMBER OF o.optionValues')
->setParameter('optionValue', $productOptionValue)
->getQuery()
->getResult()
;
}
}
2 changes: 2 additions & 0 deletions src/Repository/ProductVariantRepositoryInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@
interface ProductVariantRepositoryInterface
{
public function findOneByOptionValue(ProductOptionValueInterface $productOptionValue): ?ProductVariantInterface;

public function findByOptionValue(ProductOptionValueInterface $productOptionValue): array;
}
5 changes: 5 additions & 0 deletions src/Resources/config/services/event_listener.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,19 @@
</argument>
</argument>
<argument type="service" id="sylius.repository.product_attribute"/>
<argument type="service" id="sylius.repository.product_option"/>
<tag name="kernel.event_listener" event="sylius.product_attribute.post_create" method="updateIndex" />
<tag name="kernel.event_listener" event="sylius.product_attribute.post_update" method="updateIndex" />
<tag name="kernel.event_listener" event="sylius.product_attribute.post_delete" method="updateIndex" />
<tag name="kernel.event_listener" event="sylius.option.post_create" method="updateIndex" />
<tag name="kernel.event_listener" event="sylius.option.post_update" method="updateIndex" />
<tag name="kernel.event_listener" event="sylius.option.post_delete" method="updateIndex" />
<tag name="kernel.event_listener" event="sylius.product.post_create" method="updateIndex" />
<tag name="kernel.event_listener" event="sylius.product.post_update" method="updateIndex" />
<tag name="kernel.event_listener" event="sylius.product.post_delete" method="updateIndex" />
<tag name="kernel.event_listener" event="sylius.product_variant.post_create" method="updateIndex" />
<tag name="kernel.event_listener" event="sylius.product_variant.post_update" method="updateIndex" />
<tag name="kernel.event_listener" event="sylius.product_variant.post_delete" method="updateIndex" />
</service>
<service id="bitbag_sylius_elasticsearch_plugin.event_listener.product_taxon_index" class="BitBag\SyliusElasticsearchPlugin\EventListener\ProductTaxonIndexListener">
<argument type="service" id="bitbag.sylius_elasticsearch_plugin.refresher.resource" />
Expand Down
Loading