[BUGFIX] Node publishing does not trigger indexing

Nodes being published are not indexed, because the signals in Node
are never emitted during publishing.

In addition the node coming from the PublishingService (through an
additional signal) never has the target workspace assigned, so it
is passed to the indexing as separate information.

Author: kdambekalns

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexer.php

@@ -163,19 +163,24 @@ public function getIndex() {
 	 * index this node, and add it to the current bulk request.
 	 *
 	 * @param Node $node
-	 * @throws \Exception
+	 * @param string $targetWorkspaceName In case this is triggered during publishing, a workspace name will be passed in
 	 * @return void
+	 * @throws \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\IndexingException
 	 */
-	public function indexNode(Node $node) {
-		$contextPathHash = sha1($node->getContextPath());
+	public function indexNode(Node $node, $targetWorkspaceName = NULL) {
+		$contextPath = $node->getContextPath();
+		if ($targetWorkspaceName !== NULL) {
+			$contextPath = str_replace($node->getWorkspace()->getName(), $targetWorkspaceName, $contextPath);
+		}
+		$contextPathHash = sha1($contextPath);
 		$nodeType = $node->getNodeType();
 
 		$mappingType = $this->getIndex()->findType(NodeTypeMappingBuilder::convertNodeTypeNameToMappingName($nodeType));
 
 		if ($node->isRemoved()) {
 			// TODO: handle deletion from the fulltext index as well
 			$mappingType->deleteDocumentById($contextPathHash);
-			$this->logger->log(sprintf('NodeIndexer: Removed node %s from index (node flagged as removed). ID: %s', $node->getContextPath(), $contextPathHash), LOG_DEBUG, NULL, 'ElasticSearch (CR)');
+			$this->logger->log(sprintf('NodeIndexer: Removed node %s from index (node flagged as removed). ID: %s', $contextPath, $contextPathHash), LOG_DEBUG, NULL, 'ElasticSearch (CR)');
 
 			return;
 		}
@@ -229,6 +234,9 @@ public function indexNode(Node $node) {
 		);
 
 		$documentData = $document->getData();
+		if ($targetWorkspaceName !== NULL) {
+			$documentData['__workspace'] = $targetWorkspaceName;
+		}
 
 		if ($fulltextIndexingEnabledForNode === TRUE) {
 			if ($this->isFulltextRoot($node)) {
@@ -273,7 +281,7 @@ public function indexNode(Node $node) {
 			$this->updateFulltext($node, $fulltextIndexOfNode);
 		}
 
-		$this->logger->log(sprintf('NodeIndexer: Added / updated node %s. ID: %s', $node->getContextPath(), $contextPathHash), LOG_DEBUG, NULL, 'ElasticSearch (CR)');
+		$this->logger->log(sprintf('NodeIndexer: Added / updated node %s. ID: %s', $contextPath, $contextPathHash), LOG_DEBUG, NULL, 'ElasticSearch (CR)');
 	}
 
 	/**

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexingManager.php

@@ -33,6 +33,11 @@ class NodeIndexingManager {
 	 */
 	protected $nodesToBeRemoved;
 
+	/**
+	 * @var array
+	 */
+	protected $targetWorkspaceNamesForNodesToBeIndexed = array();
+
 	/**
 	 * the indexing batch size (from the settings)
 	 *
@@ -65,11 +70,13 @@ public function injectSettings(array $settings) {
 	 * Schedule a node for indexing
 	 *
 	 * @param Node $node
+	 * @param mixed $targetWorkspace In case this is triggered during publishing, a Workspace will be passed in
 	 * @return void
 	 */
-	public function indexNode(Node $node) {
+	public function indexNode(Node $node, $targetWorkspace) {
 		$this->nodesToBeRemoved->detach($node);
 		$this->nodesToBeIndexed->attach($node);
+		$this->targetWorkspaceNamesForNodesToBeIndexed[$node->getContextPath()] = $targetWorkspace instanceof \TYPO3\TYPO3CR\Domain\Model\Workspace ? $targetWorkspace->getName() : NULL;
 
 		$this->flushQueuesIfNeeded();
 	}
@@ -105,8 +112,9 @@ protected function flushQueuesIfNeeded() {
 	 * @return void
 	 */
 	public function flushQueues() {
+		/** @var \TYPO3\TYPO3CR\Domain\Model\NodeInterface $nodeToBeIndexed  */
 		foreach ($this->nodesToBeIndexed as $nodeToBeIndexed) {
-			$this->nodeIndexer->indexNode($nodeToBeIndexed);
+			$this->nodeIndexer->indexNode($nodeToBeIndexed, $this->targetWorkspaceNamesForNodesToBeIndexed[$nodeToBeIndexed->getContextPath()]);
 		}
 
 		foreach ($this->nodesToBeRemoved as $nodeToBeRemoved) {
@@ -115,5 +123,6 @@ public function flushQueues() {
 		$this->nodeIndexer->flush();
 		$this->nodesToBeIndexed = new \SplObjectStorage();
 		$this->nodesToBeRemoved = new \SplObjectStorage();
+		$this->targetWorkspaceNamesForNodesToBeIndexed = array();
 	}
 }

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Package.php

@@ -46,6 +46,7 @@ public function registerIndexingSlots(Bootstrap $bootstrap) {
 		$bootstrap->getSignalSlotDispatcher()->connect('TYPO3\TYPO3CR\Domain\Model\Node', 'nodeAdded', 'Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexingManager', 'indexNode');
 		$bootstrap->getSignalSlotDispatcher()->connect('TYPO3\TYPO3CR\Domain\Model\Node', 'nodeUpdated', 'Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexingManager', 'indexNode');
 		$bootstrap->getSignalSlotDispatcher()->connect('TYPO3\TYPO3CR\Domain\Model\Node', 'nodeRemoved', 'Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexingManager', 'removeNode');
+		$bootstrap->getSignalSlotDispatcher()->connect('TYPO3\Neos\Service\PublishingService', 'nodePublished', 'Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexingManager', 'indexNode', FALSE);
 		$bootstrap->getSignalSlotDispatcher()->connect('TYPO3\Flow\Persistence\Doctrine\PersistenceManager', 'allObjectsPersisted', 'Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexingManager', 'flushQueues');
 	}
 }