diff --git a/src/Plugin/facets/processor/TranslateEntityProcessor.php b/src/Plugin/facets/processor/TranslateEntityProcessor.php index 4b1591e..16cbac5 100644 --- a/src/Plugin/facets/processor/TranslateEntityProcessor.php +++ b/src/Plugin/facets/processor/TranslateEntityProcessor.php @@ -101,14 +101,12 @@ class TranslateEntityProcessor extends ProcessorPluginBase implements BuildProce /** @var \Drupal\facets\FacetSource\SearchApiFacetSourceInterface $source */ $index = $source->getIndex(); $field = $index->getField($field_id); - $datasource = $field->getDatasource(); - - // Load the field from the entity manager and find the entity type trough - // that. - $entity_id = $datasource->getEntityTypeId() . '.' . $field_id; - $field_storage = $this->entityTypeManager->getStorage('field_storage_config'); - $field_config = $field_storage->load($entity_id); - $entity_type = $field_config->getSetting('target_type'); + + // Determine the target entity type. + $entity_type = $field->getDataDefinition() + ->getPropertyDefinition('entity') + ->getTargetDefinition() + ->getEntityTypeId(); } // Load all indexed entities of this type. diff --git a/tests/src/Unit/Plugin/processor/TranslateEntityProcessorTest.php b/tests/src/Unit/Plugin/processor/TranslateEntityProcessorTest.php index 5de7d64..373c3f0 100644 --- a/tests/src/Unit/Plugin/processor/TranslateEntityProcessorTest.php +++ b/tests/src/Unit/Plugin/processor/TranslateEntityProcessorTest.php @@ -4,17 +4,18 @@ namespace Drupal\Tests\facets\Unit\Plugin\processor; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; +use Drupal\Core\Entity\TypedData\EntityDataDefinition; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageManagerInterface; +use Drupal\Core\TypedData\ComplexDataDefinitionInterface; +use Drupal\Core\TypedData\DataReferenceDefinitionInterface; use Drupal\facets\Entity\Facet; use Drupal\facets\Plugin\facets\facet_source\SearchApiDisplay; use Drupal\facets\Plugin\facets\processor\TranslateEntityProcessor; use Drupal\facets\Result\Result; -use Drupal\field\FieldStorageConfigInterface; use Drupal\node\Entity\Node; use Drupal\search_api\IndexInterface; use Drupal\search_api\Item\FieldInterface; -use Drupal\search_api\Datasource\DatasourceInterface; use Drupal\taxonomy\Entity\Term; use Drupal\Tests\UnitTestCase; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -29,7 +30,7 @@ class TranslateEntityProcessorTest extends UnitTestCase { /** * The mocked facet. * - * @var \Drupal\Core\Language\LanguageManagerInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Drupal\facets\FacetInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $facet; @@ -48,40 +49,69 @@ class TranslateEntityProcessorTest extends UnitTestCase { protected $entityTypeManager; /** + * The original results for the facet, before transformation. + * + * @var \Drupal\facets\Result\ResultInterface[] + */ + protected $original_results; + + /** * {@inheritdoc} */ protected function setUp() { parent::setUp(); - // Mock facet. - $datasource = $this->getMock(DatasourceInterface::class); - $datasource->expects($this->any()) + // Mock the typed data chain. + $target_field_definition = $this->getMock(EntityDataDefinition::class); + $target_field_definition->expects($this->once()) ->method('getEntityTypeId') - ->willReturn('node'); + ->willReturn('entity_type'); + $property_definition = $this->getMock(DataReferenceDefinitionInterface::class); + $property_definition->expects($this->any()) + ->method('getTargetDefinition') + ->willReturn($target_field_definition); + $data_definition = $this->getMock(ComplexDataDefinitionInterface::class); + $data_definition->expects($this->any()) + ->method('getPropertyDefinition') + ->willReturn($property_definition); + + // Add the typed data definition to the search api field. $field = $this->getMock(FieldInterface::class); $field->expects($this->any()) - ->method('getDatasource') - ->willReturn($datasource); + ->method('getDataDefinition') + ->willReturn($data_definition); + + // Add the search api field to the index. $index = $this->getMock(IndexInterface::class); $index->expects($this->any()) ->method('getField') ->willReturn($field); + + // Create a search api based facet source and link the index to it. $facet_source = $this->getMockBuilder(SearchApiDisplay::class) ->disableOriginalConstructor() ->getMock(); $facet_source->expects($this->any()) ->method('getIndex') ->willReturn($index); + + // Create the actual facet. $this->facet = $this->getMockBuilder(Facet::class) ->disableOriginalConstructor() ->getMock(); + + // Return the configured facet source. $this->facet->expects($this->any()) ->method('getFacetSource') ->willReturn($facet_source); + // Add a field identifier. $this->facet->expects($this->any()) ->method('getFieldIdentifier') ->willReturn('testfield'); + $this->original_results = [new Result(2, 2, 5)]; + $this->facet->setResults($this->original_results); + // Mock language manager. $this->languageManager = $this->getMockBuilder(LanguageManagerInterface::class) ->disableOriginalConstructor() @@ -96,7 +126,8 @@ class TranslateEntityProcessorTest extends UnitTestCase { ->disableOriginalConstructor() ->getMock(); - // Create container. + // Create and set a global container with the language manager and entity + // type manager. $container = new ContainerBuilder(); $container->set('language_manager', $this->languageManager); $container->set('entity_type.manager', $this->entityTypeManager); @@ -107,28 +138,7 @@ class TranslateEntityProcessorTest extends UnitTestCase { * Tests that node results were correctly changed. */ public function testNodeResultsChanged() { - // Set original results. - /** @var \Drupal\facets\Result\ResultInterface[] $original_results */ - $original_results = [ - new Result(2, 2, 6), - ]; - $this->facet->setResults($original_results); - - // Mock entity type. - $field_config = $this->getMock(FieldStorageConfigInterface::class); - $field_config->expects($this->any()) - ->method('getSetting') - ->willReturn('node'); - $field_storage = $this->getMock(EntityStorageInterface::class); - $field_storage->expects($this->any()) - ->method('load') - ->willReturn($field_config); - $this->entityTypeManager->expects($this->at(0)) - ->method('getStorage') - ->with('field_storage_config') - ->willReturn($field_storage); - - // Mock node. + // Mock a node and add the label to it. $node = $this->getMockBuilder(Node::class) ->disableOriginalConstructor() ->getMock(); @@ -142,7 +152,7 @@ class TranslateEntityProcessorTest extends UnitTestCase { $node_storage->expects($this->any()) ->method('loadMultiple') ->willReturn($nodes); - $this->entityTypeManager->expects($this->at(1)) + $this->entityTypeManager->expects($this->exactly(1)) ->method('getStorage') ->willReturn($node_storage); @@ -153,14 +163,14 @@ class TranslateEntityProcessorTest extends UnitTestCase { // Without the processor we expect the id to display. foreach ($expected_results as $key => $expected) { - $this->assertEquals($expected['nid'], $original_results[$key]->getRawValue()); - $this->assertEquals($expected['nid'], $original_results[$key]->getDisplayValue()); + $this->assertEquals($expected['nid'], $this->original_results[$key]->getRawValue()); + $this->assertEquals($expected['nid'], $this->original_results[$key]->getDisplayValue()); } // With the processor we expect the title to display. /** @var \Drupal\facets\Result\ResultInterface[] $filtered_results */ $processor = new TranslateEntityProcessor([], 'translate_entity', [], $this->languageManager, $this->entityTypeManager); - $filtered_results = $processor->build($this->facet, $original_results); + $filtered_results = $processor->build($this->facet, $this->original_results); foreach ($expected_results as $key => $expected) { $this->assertEquals($expected['nid'], $filtered_results[$key]->getRawValue()); $this->assertEquals($expected['title'], $filtered_results[$key]->getDisplayValue()); @@ -171,27 +181,6 @@ class TranslateEntityProcessorTest extends UnitTestCase { * Tests that term results were correctly changed. */ public function testTermResultsChanged() { - // Set original results. - /** @var \Drupal\facets\Result\ResultInterface[] $original_results */ - $original_results = [ - new Result(1, 1, 5), - ]; - $this->facet->setResults($original_results); - - // Mock entity type. - $field_config = $this->getMock(FieldStorageConfigInterface::class); - $field_config->expects($this->any()) - ->method('getSetting') - ->willReturn('taxonomy_term'); - $field_storage = $this->getMock(EntityStorageInterface::class); - $field_storage->expects($this->any()) - ->method('load') - ->willReturn($field_config); - $this->entityTypeManager->expects($this->at(0)) - ->method('getStorage') - ->with('field_storage_config') - ->willReturn($field_storage); - // Mock term. $term = $this->getMockBuilder(Term::class) ->disableOriginalConstructor() @@ -200,31 +189,32 @@ class TranslateEntityProcessorTest extends UnitTestCase { ->method('label') ->willReturn('Burrowing owl'); $terms = [ - 1 => $term, + 2 => $term, ]; $term_storage = $this->getMock(EntityStorageInterface::class); $term_storage->expects($this->any()) ->method('loadMultiple') ->willReturn($terms); - $this->entityTypeManager->expects($this->at(1)) + $this->entityTypeManager->expects($this->exactly(1)) ->method('getStorage') ->willReturn($term_storage); // Set expected results. $expected_results = [ - ['tid' => 1, 'name' => 'Burrowing owl'], + ['tid' => 2, 'name' => 'Burrowing owl'], ]; // Without the processor we expect the id to display. foreach ($expected_results as $key => $expected) { - $this->assertEquals($expected['tid'], $original_results[$key]->getRawValue()); - $this->assertEquals($expected['tid'], $original_results[$key]->getDisplayValue()); + $this->assertEquals($expected['tid'], $this->original_results[$key]->getRawValue()); + $this->assertEquals($expected['tid'], $this->original_results[$key]->getDisplayValue()); } - // With the processor we expect the title to display. /** @var \Drupal\facets\Result\ResultInterface[] $filtered_results */ $processor = new TranslateEntityProcessor([], 'translate_entity', [], $this->languageManager, $this->entityTypeManager); - $filtered_results = $processor->build($this->facet, $original_results); + $filtered_results = $processor->build($this->facet, $this->original_results); + + // With the processor we expect the title to display. foreach ($expected_results as $key => $expected) { $this->assertEquals($expected['tid'], $filtered_results[$key]->getRawValue()); $this->assertEquals($expected['name'], $filtered_results[$key]->getDisplayValue()); @@ -236,38 +226,19 @@ class TranslateEntityProcessorTest extends UnitTestCase { */ public function testDeletedEntityResults() { // Set original results. - /** @var \Drupal\facets\Result\ResultInterface[] $original_results */ - $original_results = [ - new Result(1, 1, 5), - ]; - $this->facet->setResults($original_results); - - // Mock entity type. - $field_config = $this->getMock(FieldStorageConfigInterface::class); - $field_config->expects($this->any()) - ->method('getSetting') - ->willReturn('taxonomy_term'); - $field_storage = $this->getMock(EntityStorageInterface::class); - $field_storage->expects($this->any()) - ->method('load') - ->willReturn($field_config); - $this->entityTypeManager->expects($this->at(0)) - ->method('getStorage') - ->with('field_storage_config') - ->willReturn($field_storage); $term_storage = $this->getMock(EntityStorageInterface::class); $term_storage->expects($this->any()) ->method('loadMultiple') ->willReturn([]); - $this->entityTypeManager->expects($this->at(1)) + $this->entityTypeManager->expects($this->exactly(1)) ->method('getStorage') ->willReturn($term_storage); // Processor should return nothing (and not throw an exception). /** @var \Drupal\facets\Result\ResultInterface[] $filtered_results */ $processor = new TranslateEntityProcessor([], 'translate_entity', [], $this->languageManager, $this->entityTypeManager); - $filtered_results = $processor->build($this->facet, $original_results); + $filtered_results = $processor->build($this->facet, $this->original_results); $this->assertEmpty($filtered_results); }