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.

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

Enable cache only on prod by default #27

Merged
merged 4 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions src/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,15 @@ public function getConfigTreeBuilder(): TreeBuilder
->end()
->end()
->end()
->arrayNode('metadata')
->addDefaultsIfNotSet()
->children()
->booleanNode('cache')
->info('Whether or not to cache the metadata')
->defaultValue(!'%kernel.debug%')
->end()
->end()
->end()
->arrayNode('search')
->canBeEnabled()
->info('Configures your site search (and autocomplete) experience')
Expand Down
25 changes: 25 additions & 0 deletions src/DependencyInjection/SetonoSyliusMeilisearchExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
use Setono\SyliusMeilisearchPlugin\DataMapper\DataMapperInterface;
use Setono\SyliusMeilisearchPlugin\DataProvider\IndexableDataProviderInterface;
use Setono\SyliusMeilisearchPlugin\Document\Document;
use Setono\SyliusMeilisearchPlugin\Document\Metadata\CachedMetadataFactory;
use Setono\SyliusMeilisearchPlugin\Document\Metadata\MetadataFactory;
use Setono\SyliusMeilisearchPlugin\Document\Metadata\MetadataFactoryInterface;
use Setono\SyliusMeilisearchPlugin\EventSubscriber\IndexableDataFilter\ChannelsAwareFilter;
use Setono\SyliusMeilisearchPlugin\EventSubscriber\IndexableDataFilter\EnabledFilter;
use Setono\SyliusMeilisearchPlugin\EventSubscriber\IndexableDataFilter\StockAvailableFilter;
Expand Down Expand Up @@ -44,6 +47,7 @@ public function load(array $configs, ContainerBuilder $container): void
* @var array{
* indexes: array<string, array{document: class-string<Document>, entities: list<class-string>, data_provider: class-string, indexer: class-string|null, prefix: string|null, default_filters: array<string, bool>}>,
* server: array{ host: string, master_key: string, search_key: string },
* metadata: array{ cache: bool },
* search: array{ enabled: bool, path: string, index: string, hits_per_page: int },
* autocomplete: array{ enabled: bool, indexes: list<string>, container: string, placeholder: string },
* resources: array,
Expand All @@ -59,6 +63,13 @@ public function load(array $configs, ContainerBuilder $container): void
$container->setParameter('setono_sylius_meilisearch.server.master_key', $config['server']['master_key']);
$container->setParameter('setono_sylius_meilisearch.server.search_key', $config['server']['search_key']);

// cache
$metadataCacheEnabled = $config['metadata']['cache'];
$container->setParameter('setono_sylius_meilisearch.cache', $metadataCacheEnabled);
if ($metadataCacheEnabled) {
$this->registerCachedMetadataFactory($container);
}

$loader->load('services.xml');

// auto configuration
Expand Down Expand Up @@ -450,4 +461,18 @@ private static function registerStockAvailableFilter(ContainerBuilder $container
->addTag('kernel.event_subscriber')
;
}

private function registerCachedMetadataFactory(ContainerBuilder $container): void
{
$container
->register(CachedMetadataFactory::class)
->setDecoratedService(MetadataFactory::class)
->setArguments([
new Reference(CachedMetadataFactory::class . '.inner'),
new Reference('setono_sylius_meilisearch.cache.metadata'),
])
;

$container->setAlias(MetadataFactoryInterface::class, CachedMetadataFactory::class);
}
}
62 changes: 62 additions & 0 deletions src/Document/Metadata/CachedMetadataFactory.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?php

declare(strict_types=1);

namespace Setono\SyliusMeilisearchPlugin\Document\Metadata;

use Psr\Cache\CacheItemPoolInterface;
use Setono\SyliusMeilisearchPlugin\Document\Document;
use Webmozart\Assert\Assert;

final class CachedMetadataFactory implements MetadataFactoryInterface
{
/**
* The loaded metadata, indexed by class name
*
* @var array<class-string<Document>, MetadataInterface>
*/
private array $loadedClasses = [];

public function __construct(
private readonly MetadataFactoryInterface $baseMetadataFactory,
private readonly CacheItemPoolInterface $cache,
) {
}

public function getMetadataFor(string|Document $document): MetadataInterface
{
if ($document instanceof Document) {
$document = $document::class;
}

if (isset($this->loadedClasses[$document])) {
return $this->loadedClasses[$document];
}

$cacheItem = $this->cache->getItem($this->escapeClassName($document));
if ($cacheItem->isHit()) {
$metadata = $cacheItem->get();
Assert::isInstanceOf($metadata, MetadataInterface::class);

$this->loadedClasses[$document] = $metadata;

return $this->loadedClasses[$document];
}

$metadata = $this->baseMetadataFactory->getMetadataFor($document);

$this->cache->save($cacheItem->set($metadata));

return $this->loadedClasses[$document] = $metadata;
}

private function escapeClassName(string $class): string
{
if (str_contains($class, '@')) {
// anonymous class: replace all PSR6-reserved characters
return str_replace(["\0", '\\', '/', '@', ':', '{', '}', '(', ')'], '.', $class);
}

return str_replace('\\', '.', $class);
}
}
47 changes: 1 addition & 46 deletions src/Document/Metadata/MetadataFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,12 @@

namespace Setono\SyliusMeilisearchPlugin\Document\Metadata;

use Psr\Cache\CacheItemPoolInterface;
use Setono\SyliusMeilisearchPlugin\Document\Document;
use Webmozart\Assert\Assert;

final class MetadataFactory implements MetadataFactoryInterface

Check failure on line 9 in src/Document/Metadata/MetadataFactory.php

View workflow job for this annotation

GitHub Actions / Backwards Compatibility Check

Method Setono\SyliusMeilisearchPlugin\Document\Metadata\MetadataFactory#__construct() was removed
{
/**
* The loaded metadata, indexed by class name
*
* @var array<class-string<Document>, MetadataInterface>
*/
private array $loadedClasses = [];

public function __construct(private readonly CacheItemPoolInterface $cache)
{
}

public function getMetadataFor(string|Document $document): MetadataInterface
{
if ($document instanceof Document) {
$document = $document::class;
}

if (isset($this->loadedClasses[$document])) {
return $this->loadedClasses[$document];
}

$cacheItem = $this->cache->getItem($this->escapeClassName($document));
if ($cacheItem->isHit()) {
$metadata = $cacheItem->get();
Assert::isInstanceOf($metadata, MetadataInterface::class);

$this->loadedClasses[$document] = $metadata;

return $this->loadedClasses[$document];
}

$metadata = new Metadata($document);

$this->cache->save($cacheItem->set($metadata));

return $this->loadedClasses[$document] = $metadata;
}

private function escapeClassName(string $class): string
{
if (str_contains($class, '@')) {
// anonymous class: replace all PSR6-reserved characters
return str_replace(["\0", '\\', '/', '@', ':', '{', '}', '(', ')'], '.', $class);
}

return str_replace('\\', '.', $class);
return new Metadata($document);
}
}
10 changes: 5 additions & 5 deletions src/Resources/config/services/document.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="Setono\SyliusMeilisearchPlugin\Document\Metadata\MetadataFactoryInterface"
alias="Setono\SyliusMeilisearchPlugin\Document\Metadata\MetadataFactory"/>
<service
id="Setono\SyliusMeilisearchPlugin\Document\Metadata\MetadataFactoryInterface"
alias="Setono\SyliusMeilisearchPlugin\Document\Metadata\MetadataFactory"
/>

<service id="Setono\SyliusMeilisearchPlugin\Document\Metadata\MetadataFactory">
<argument type="service" id="setono_sylius_meilisearch.cache.metadata"/>
</service>
<service id="Setono\SyliusMeilisearchPlugin\Document\Metadata\MetadataFactory" />
</services>
</container>
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,8 @@ setono_sylius_meilisearch:
autocomplete:
indexes:
- products

when@prod:
setono_sylius_meilisearch:
metadata:
cache: true
62 changes: 62 additions & 0 deletions tests/Unit/Document/Metadata/CachedMetadataFactoryTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?php

declare(strict_types=1);

namespace Setono\SyliusMeilisearchPlugin\Tests\Unit\Document\Metadata;

use PHPUnit\Framework\TestCase;
use Prophecy\PhpUnit\ProphecyTrait;
use Psr\Cache\CacheItemInterface;
use Psr\Cache\CacheItemPoolInterface;
use Setono\SyliusMeilisearchPlugin\Document\Metadata\CachedMetadataFactory;
use Setono\SyliusMeilisearchPlugin\Document\Metadata\Metadata;
use Setono\SyliusMeilisearchPlugin\Document\Metadata\MetadataFactoryInterface;

final class CachedMetadataFactoryTest extends TestCase
{
use ProphecyTrait;

public function testItCreatesNewMetadataAndSavesItInCache(): void
{
$cacheItemPool = $this->prophesize(CacheItemPoolInterface::class);
$baseFactory = $this->prophesize(MetadataFactoryInterface::class);
$factory = new CachedMetadataFactory($baseFactory->reveal(), $cacheItemPool->reveal());

$cacheItem = $this->prophesize(CacheItemInterface::class);
$cacheItemPool
->getItem('Setono.SyliusMeilisearchPlugin.Tests.Unit.Document.Metadata.Document')
->willReturn($cacheItem)
;
$cacheItem->isHit()->willReturn(false);
$metadata = new Metadata(Document::class);
$baseFactory->getMetadataFor(Document::class)->willReturn($metadata);
$cacheItem->set($metadata)->shouldBeCalled()->willReturn($cacheItem);
$cacheItemPool->save($cacheItem->reveal())->shouldBeCalled();

self::assertEquals(
new Metadata(Document::class),
$factory->getMetadataFor(Document::class),
);
}

public function testItFetchesMetadataFromCache(): void
{
$cacheItemPool = $this->prophesize(CacheItemPoolInterface::class);
$baseFactory = $this->prophesize(MetadataFactoryInterface::class);
$factory = new CachedMetadataFactory($baseFactory->reveal(), $cacheItemPool->reveal());

$cacheItem = $this->prophesize(CacheItemInterface::class);
$cacheItemPool
->getItem('Setono.SyliusMeilisearchPlugin.Tests.Unit.Document.Metadata.Document')
->willReturn($cacheItem)
;
$cacheItem->isHit()->willReturn(true);
$metadata = new Metadata(Document::class);
$cacheItem->get()->willReturn($metadata);

self::assertEquals(
$metadata,
$factory->getMetadataFor(Document::class),
);
}
}
27 changes: 27 additions & 0 deletions tests/Unit/Document/Metadata/Document.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

declare(strict_types=1);

namespace Setono\SyliusMeilisearchPlugin\Tests\Unit\Document\Metadata;

use Setono\SyliusMeilisearchPlugin\Document\Attribute\Facet;
use Setono\SyliusMeilisearchPlugin\Document\Attribute\Filterable;
use Setono\SyliusMeilisearchPlugin\Document\Attribute\Searchable;
use Setono\SyliusMeilisearchPlugin\Document\Attribute\Sortable;
use Setono\SyliusMeilisearchPlugin\Document\Document as BaseDocument;

final class Document extends BaseDocument
{
#[Searchable]
public ?string $name = null;

#[Facet]
public ?string $size = null;

#[Facet]
#[Sortable]
public ?int $price = null;

#[Filterable]
public array $taxons = [];
}
22 changes: 22 additions & 0 deletions tests/Unit/Document/Metadata/MetadataFactoryTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

declare(strict_types=1);

namespace Setono\SyliusMeilisearchPlugin\Tests\Unit\Document\Metadata;

use PHPUnit\Framework\TestCase;
use Prophecy\PhpUnit\ProphecyTrait;
use Setono\SyliusMeilisearchPlugin\Document\Metadata\Metadata;
use Setono\SyliusMeilisearchPlugin\Document\Metadata\MetadataFactory;

final class MetadataFactoryTest extends TestCase
{
use ProphecyTrait;

public function testItCreatesMetadataWithDocument(): void
{
$factory = new MetadataFactory();

self::assertEquals(new Metadata(Document::class), $factory->getMetadataFor(Document::class));
}
}
26 changes: 1 addition & 25 deletions tests/Unit/Document/Metadata/MetadataTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,11 @@
namespace Setono\SyliusMeilisearchPlugin\Tests\Unit\Document\Metadata;

use PHPUnit\Framework\TestCase;
use Setono\SyliusMeilisearchPlugin\Document\Attribute\Facet;
use Setono\SyliusMeilisearchPlugin\Document\Attribute\Filterable;
use Setono\SyliusMeilisearchPlugin\Document\Attribute\Searchable;
use Setono\SyliusMeilisearchPlugin\Document\Attribute\Sortable;
use Setono\SyliusMeilisearchPlugin\Document\Document as BaseDocument;
use Setono\SyliusMeilisearchPlugin\Document\Metadata\Metadata;

final class MetadataTest extends TestCase
{
/**
* @test
*/
public function it_resolves_attributes(): void
public function testItResolvesAttributes(): void
{
$metadata = new Metadata(Document::class);

Expand All @@ -37,19 +29,3 @@ public function it_resolves_attributes(): void
self::assertArrayHasKey('price', $metadata->getSortableAttributes());
}
}

final class Document extends BaseDocument
{
#[Searchable]
public ?string $name = null;

#[Facet]
public ?string $size = null;

#[Facet]
#[Sortable]
public ?int $price = null;

#[Filterable]
public array $taxons = [];
}
Loading