Skip to content

[Fix]: Add missing check to enqueue data object for deletion #305

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

Merged
merged 1 commit into from
Mar 31, 2025
Merged

[Fix]: Add missing check to enqueue data object for deletion #305

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
14 changes: 9 additions & 5 deletions src/Service/SearchIndex/IndexService/ElementTypeAdapter/DataObjectTypeAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,12 @@ public function getRelatedItemsOnUpdateQuery(
return null;
}

if (!$element instanceof Concrete || !$element->getClass()->getAllowInherit()) {
return $this->getRelatedItemsQueryBuilder($element, $operation, $operationTime, $includeElement);
if (
($operation === IndexQueueOperation::DELETE->value) ||
!$element instanceof Concrete ||
!$element->getClass()->getAllowInherit()
) {
return $this->getElementQueryBuilder($element, $operation, $operationTime, $includeElement);
}

if ($operation !== IndexQueueOperation::UPDATE->value) {
Expand Down Expand Up @@ -153,7 +157,7 @@ public function getUpdateIndexDataEvent(
throw new InvalidArgumentException('Element must be instance of ' . AbstractObject::class);
}

private function getRelatedItemsQueryBuilder(
private function getElementQueryBuilder(
AbstractObject $element,
string $operation,
int $operationTime,
Expand All @@ -164,7 +168,7 @@ private function getRelatedItemsQueryBuilder(
}

$queryBuilder = $this->dbConnection->createQueryBuilder()
->select($this->getSelectParametersByOperation($element, $operation, $operationTime))
->select($this->getSelectParameters($element, $operation, $operationTime))
->setMaxResults(1);

if ($operation === IndexQueueOperation::DELETE->value) {
Expand All @@ -177,7 +181,7 @@ private function getRelatedItemsQueryBuilder(
->setParameter('id', $element->getId());
}

private function getSelectParametersByOperation(
private function getSelectParameters(
AbstractObject $element,
string $operation,
int $operationTime
Expand Down
Loading