Merge pull request #90 from dachcom-digital/bugfix/resource-deletion

fix resource deletion
dachcom-digital · Aug 5, 2024 · b5c6dda · b5c6dda
2 parents ae24475 + 4d4af0d
commit b5c6dda
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,9 @@
 # Upgrade Notes
 
+# 4.0.1
+
+* fix resource deletion [#90](https://github.com/dachcom-digital/pimcore-dynamic-search/pull/90)
+
 ## Migrating from Version 3.x to Version 4.x
 
 ### Breaking Changes 

diff --git a/src/EventListener/PimcoreElementListener.php b/src/EventListener/PimcoreElementListener.php
@@ -99,6 +99,7 @@ public function onObjectPostUpdate(DataObjectEvent $event): void
         /** @var DataObject\Concrete $object */
         $object = $event->getObject();
 
+        // @deprecated since 5.0: published/unpublished must be handled by project-specific resource validation
         $dispatchType = ContextDefinitionInterface::CONTEXT_DISPATCH_TYPE_UPDATE;
         if (method_exists($object, 'isPublished') && $object->isPublished() === false) {
             $dispatchType = ContextDefinitionInterface::CONTEXT_DISPATCH_TYPE_DELETE;
@@ -199,6 +200,7 @@ protected function checkInheritanceIndex(ElementInterface $element): void
 
         foreach ($list->getObjects() as $childObject) {
             $dispatchType = ContextDefinitionInterface::CONTEXT_DISPATCH_TYPE_UPDATE;
+            // @deprecated since 5.0: published/unpublished must be handled by project-specific resource validation
             if (method_exists($childObject, 'isPublished') && $childObject->isPublished() === false) {
                 $dispatchType = ContextDefinitionInterface::CONTEXT_DISPATCH_TYPE_DELETE;
             }

diff --git a/src/Queue/DataCollector.php b/src/Queue/DataCollector.php
@@ -96,8 +96,8 @@ public function addToContextQueue(string $contextName, string $dispatchType, mix
 
     protected function generateJob(string $contextName, string $dispatchType, mixed $resource, array $options): void
     {
-
-        if($resource instanceof ElementInterface) {
+        // @todo: introduce generic "resource info" dto with resource information
+        if ($resource instanceof ElementInterface) {
             $resourceType = sprintf('%s-%s', Element\Service::getElementType($resource), $resource->getId());
             $resource = null;
         } elseif (is_object($resource)) {

diff --git a/src/Queue/MessageHandler/QueuedResourcesHandler.php b/src/Queue/MessageHandler/QueuedResourcesHandler.php
@@ -3,11 +3,15 @@
 namespace DynamicSearchBundle\Queue\MessageHandler;
 
 use DynamicSearchBundle\Builder\ContextDefinitionBuilderInterface;
+use DynamicSearchBundle\Context\ContextDefinitionInterface;
 use DynamicSearchBundle\Logger\LoggerInterface;
 use DynamicSearchBundle\Normalizer\Resource\NormalizedDataResourceInterface;
 use DynamicSearchBundle\Processor\Harmonizer\ResourceHarmonizerInterface;
 use DynamicSearchBundle\Queue\Message\ProcessResourceMessage;
 use DynamicSearchBundle\Queue\Message\QueueResourceMessage;
+use Pimcore\Model\Asset;
+use Pimcore\Model\DataObject;
+use Pimcore\Model\Document;
 use Pimcore\Model\Element;
 use Symfony\Component\Messenger\Handler\Acknowledger;
 use Symfony\Component\Messenger\Handler\BatchHandlerInterface;
@@ -42,11 +46,23 @@ private function process(array $jobs): void
             try {
 
                 $resource = $message->resource;
+                // @todo: use introduced "resource info" dto to determinate resource / type
                 if (str_contains($message->resourceType, '-')) {
                     [$type, $id] = explode('-', $message->resourceType);
+                    if (is_numeric($id)) {
+                        $id = (int) $id;
+                    }
                     $resource = Element\Service::getElementById($type, $id);
-                    if (!$resource instanceof Element\ElementInterface) {
-                        continue;
+                    if ($resource === null && $message->dispatchType === ContextDefinitionInterface::CONTEXT_DISPATCH_TYPE_DELETE) {
+                        // at this time, the resource is already deleted by pimcore
+                        // since we do not serialize the resource into the message,
+                        // we need to create a dummy resource to retrieve a valid resource meta for deletion
+                        $resource = match ($type) {
+                            'document' => new Document(),
+                            'asset' => new Asset(),
+                            'object' => new DataObject\Concrete(),
+                        };
+                        $resource->setId($id);
                     }
                 }