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

BUGFIX: Remove indexed virtual specializations of a node #237

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

BUGFIX: Remove indexed virtual specializations of a node #237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 15 additions & 10 deletions Classes/Indexer/NodeIndexer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
use Flowpack\ElasticSearch\Domain\Model\Document as ElasticSearchDocument;
use Flowpack\ElasticSearch\Domain\Model\Index;
use Flowpack\ElasticSearch\Transfer\Exception\ApiException;
use Neos\ContentRepository\Domain\Utility\NodePaths;
use Neos\Flow\Annotations as Flow;
use Neos\ContentRepository\Domain\Model\NodeInterface;
use Neos\ContentRepository\Domain\Service\ContentDimensionCombinator;
Expand Down Expand Up @@ -235,9 +236,9 @@ public function indexNode(NodeInterface $node, $targetWorkspaceName = null)
if ($nodeFromContext instanceof NodeInterface) {
$indexer($nodeFromContext, $targetWorkspaceName);
} else {
$documentIdentifier = $this->calculateDocumentIdentifier($node, $targetWorkspaceName);
$documentIdentifier = $this->calculateDocumentIdentifier($node, $targetWorkspaceName, $context);
if ($node->isRemoved()) {
$this->removeNode($node, $context->getWorkspaceName());
$this->removeNode($node, $context->getWorkspaceName(), $context);
$this->logger->log(sprintf('NodeIndexer (%s): Removed node with identifier %s, no longer in workspace %s', $documentIdentifier, $node->getIdentifier(), $context->getWorkspaceName()), LOG_DEBUG, null, 'ElasticSearch (CR)');
} else {
$this->logger->log(sprintf('NodeIndexer (%s): Could not index node with identifier %s, not found in workspace %s', $documentIdentifier, $node->getIdentifier(), $context->getWorkspaceName()), LOG_DEBUG, null, 'ElasticSearch (CR)');
Expand All @@ -263,15 +264,15 @@ public function indexNode(NodeInterface $node, $targetWorkspaceName = null)
*
* @param NodeInterface $node
* @param string $targetWorkspaceName
* @param Context|null $context
* @return string
*/
protected function calculateDocumentIdentifier(NodeInterface $node, $targetWorkspaceName = null)
protected function calculateDocumentIdentifier(NodeInterface $node, $targetWorkspaceName = null, Context $context = null)
{
$contextPath = $node->getContextPath();

if ($targetWorkspaceName !== null) {
$contextPath = str_replace($node->getContext()->getWorkspace()->getName(), $targetWorkspaceName, $contextPath);
if (!$context) {
$context = $node->getContext();
}
$contextPath = NodePaths::generateContextPath($node->getPath(), $targetWorkspaceName ?: $context->getWorkspaceName(), $context->getDimensions());

return sha1($contextPath);
}
Expand All @@ -281,10 +282,14 @@ protected function calculateDocumentIdentifier(NodeInterface $node, $targetWorks
*
* @param NodeInterface $node
* @param string $targetWorkspaceName
* @param Context|null $context
* @return void
*/
public function removeNode(NodeInterface $node, $targetWorkspaceName = null)
public function removeNode(NodeInterface $node, $targetWorkspaceName = null, Context $context = null)
{
if (!$context) {
$context = $node->getContext();
}
if ($this->settings['indexAllWorkspaces'] === false) {
// we are only supposed to index the live workspace.
// We need to check the workspace at two occasions; checking the
Expand All @@ -293,12 +298,12 @@ public function removeNode(NodeInterface $node, $targetWorkspaceName = null)
return;
}

if ($targetWorkspaceName === null && $node->getContext()->getWorkspaceName() !== 'live') {
if ($targetWorkspaceName === null && $context->getWorkspaceName() !== 'live') {
return;
}
}

$documentIdentifier = $this->calculateDocumentIdentifier($node, $targetWorkspaceName);
$documentIdentifier = $this->calculateDocumentIdentifier($node, $targetWorkspaceName, $context);

$this->currentBulkRequest[] = $this->documentDriver->delete($node, $documentIdentifier);
$this->currentBulkRequest[] = $this->indexerDriver->fulltext($node, [], $targetWorkspaceName);
Expand Down