Commit 70c367de authored by Roman Lekeš's avatar Roman Lekeš Committed by Martin Kolar
Browse files

Issue #3293625: Updating revisions in queue works just for nodes

parent ca07e764

search_api_revisions.module

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ function search_api_revisions_entity_presave(EntityInterface $entity) { 
    $queue->createQueue();

    $queue->createItem([

      'entity_id' => $entity->id(),

      'entity_type_id' => $entity->getEntityTypeId(),

    ]);

  }

  else {

src/Plugin/QueueWorker/SearchApiRevisionsQueue.php

+59 −4
Original line number Diff line number Diff line
@@ -2,8 +2,12 @@ 


namespace Drupal\search_api_revisions\Plugin\QueueWorker;



use Drupal\Core\Database\Connection;

use Drupal\Core\Entity\EntityTypeManagerInterface;

use Drupal\Core\Plugin\ContainerFactoryPluginInterface;

use Drupal\Core\Queue\QueueWorkerBase;

use Drupal\search_api_revisions\Plugin\search_api\datasource\ContentEntityRevisions;

use Symfony\Component\DependencyInjection\ContainerInterface;



/**

 * Processes search index.
@@ -14,18 +18,69 @@ use Drupal\search_api_revisions\Plugin\search_api\datasource\ContentEntityRevisi 
 *   cron = {"time" = 30}

 * )

 */

class SearchApiRevisionsQueue extends QueueWorkerBase {

class SearchApiRevisionsQueue extends QueueWorkerBase implements ContainerFactoryPluginInterface {



  /**

   * The entity type manager service.

   *

   * @var \Drupal\Core\Entity\EntityTypeManagerInterface

   */

  protected $entityTypeManager;



  /**

   * The database.

   *

   * @var \Drupal\Core\Database\Connection

   */

  protected $database;



  /**

   * Constructs a new OrphanPurger instance.

   *

   * @param array $configuration

   *   A configuration array containing information about the plugin instance.

   * @param string $plugin_id

   *   The plugin_id for the plugin instance.

   * @param mixed $plugin_definition

   *   The plugin implementation definition.

   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager

   *   The entity type manager service.

   * @param \Drupal\Core\Database\Connection $database

   *   The database service.

   */

  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, Connection $database) {

    parent::__construct($configuration, $plugin_id, $plugin_definition);

    $this->entityTypeManager = $entity_type_manager;

    $this->database = $database;

  }



  /**

   * {@inheritdoc}

   */

  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {

    return new static(

      $configuration,

      $plugin_id,

      $plugin_definition,

      $container->get('entity_type.manager'),

      $container->get('database')

    );

  }



  /**

   * {@inheritdoc}

   */

  public function processItem($data) {

    $entity = \Drupal::entityTypeManager()->getStorage('node')->load($data['entity_id']);

    $entity_type_id = $data['entity_type_id'] ?? 'node';

    if (!$this->entityTypeManager->hasDefinition($entity_type_id)) {

      return;

    }

    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */

    $entity = $this->entityTypeManager->getStorage($entity_type_id)->load($data['entity_id']);



    if ($entity) {

      $update_ids = [];



      /** @var \Drupal\search_api\IndexInterface[] $indexes */

      $indexes = ContentEntityRevisions::getIndexesForEntity($entity);



      $entity_type = $entity->getEntityType();
@@ -33,7 +88,7 @@ class SearchApiRevisionsQueue extends QueueWorkerBase { 
      $entity_revision_key = $entity_type->getKey('revision');

      $entity_id_key = $entity_type->getKey('id');



      $select = \Drupal::database()->select($entity_table, 'et');

      $select = $this->database->select($entity_table, 'et');

      $select->addField('et', $entity_revision_key, 'revision');

      $select->condition($entity_id_key, $entity->id());

      foreach ($select->execute()->fetchAll() as $item) {