Merge pull request #108 from dachcom-digital/bugfix/document-deletion

fix document deletion

Author: benwalch

UPGRADE.md

@@ -1,5 +1,7 @@
 # Upgrade Notes
 
+## 4.0.9
+- [BUGFIX] fixed document deletion [see more](https://github.com/dachcom-digital/pimcore-dynamic-search/pull/108)
 ## 4.0.8
 - [IMPROVEMENT] `dynamic_search.element_listener_options.allowed_document_types` added, read more about it [here](./docs/01_DispatchWorkflow.md#listener)
 ## 4.0.7

src/Queue/DataCollector.php

@@ -17,8 +17,11 @@
 use DynamicSearchBundle\Context\ContextDefinitionInterface;
 use DynamicSearchBundle\Logger\LoggerInterface;
 use DynamicSearchBundle\Queue\Message\QueueResourceMessage;
+use DynamicSearchBundle\Resource\ResourceInfo;
+use DynamicSearchBundle\Resource\ResourceInfoInterface;
 use DynamicSearchBundle\Service\LockServiceInterface;
 use DynamicSearchBundle\Validator\ResourceValidatorInterface;
+use Pimcore\Model\Document;
 use Pimcore\Model\Element;
 use Pimcore\Model\Element\ElementInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -108,10 +111,19 @@ public function addToContextQueue(string $contextName, string $dispatchType, mix
 
     protected function generateJob(string $contextName, string $dispatchType, mixed $resource, array $options): void
     {
-        // @todo: introduce generic "resource info" dto with resource information
+        // todo: create resource info factory
         if ($resource instanceof ElementInterface) {
-            $resourceType = sprintf('%s-%s', Element\Service::getElementType($resource), $resource->getId());
-            $resource = null;
+            $resourceInfo = new ResourceInfo(
+                $resource->getId(),
+                Element\Service::getElementType($resource)
+            );
+
+            if ($resource instanceof Document && null !== $locale = $resource->getProperty('language')) {
+                $resourceInfo->setResourceLocale($locale);
+            }
+
+            $resourceType = ResourceInfoInterface::TYPE_PIMCORE_ELEMENT;
+            $resource = $resourceInfo;
         } elseif (is_object($resource)) {
             $resourceType = get_class($resource);
         } else {

src/Queue/MessageHandler/QueuedResourcesHandler.php

@@ -20,6 +20,7 @@
 use DynamicSearchBundle\Processor\Harmonizer\ResourceHarmonizerInterface;
 use DynamicSearchBundle\Queue\Message\ProcessResourceMessage;
 use DynamicSearchBundle\Queue\Message\QueueResourceMessage;
+use DynamicSearchBundle\Resource\ResourceInfoInterface;
 use Pimcore\Model\Asset;
 use Pimcore\Model\DataObject;
 use Pimcore\Model\Document;
@@ -55,23 +56,39 @@ private function process(array $jobs): void
         foreach ($jobs as [$message, $ack]) {
             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;
+
+                if ($message->resourceType === ResourceInfoInterface::TYPE_PIMCORE_ELEMENT) {
+                    $resourceInfo = $resource;
+                    if (!$resourceInfo instanceof ResourceInfoInterface) {
+                        $this->logger->error(
+                            'Unable to get resource info for pimcore resource.',
+                            'queue',
+                            $message->contextName
+                        );
+
+                        $ack->ack($message);
+
+                        continue;
                     }
-                    $resource = Element\Service::getElementById($type, $id);
+
+                    $resource = Element\Service::getElementById($resourceInfo->getResourceType(), $resourceInfo->getResourceId());
                     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) {
+                        // we need to create a fake resource in order for the resource normalizer
+                        // to generate a valid resource meta for deletion
+                        $resource = match ($resourceInfo->getResourceType()) {
                             'document' => new Document(),
                             'asset'    => new Asset(),
                             'object'   => new DataObject\Concrete(),
+                            default    => null,
                         };
-                        $resource->setId($id);
+
+                        $resource?->setId($resourceInfo->getResourceId());
+
+                        if ($resource instanceof Document && null !== $locale = $resourceInfo->getResourceLocale()) {
+                            $resource->setProperty('language', 'text', $locale, false, true);
+                        }
                     }
                 }
 

src/Resource/ResourceInfo.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace DynamicSearchBundle\Resource;
+
+class ResourceInfo implements ResourceInfoInterface
+{
+    public function __construct(
+        protected int|string $resourceId,
+        protected string $resourceType,
+        protected ?string $resourceLocale = null
+    )
+    {
+    }
+
+    public function getResourceType(): string
+    {
+        return $this->resourceType;
+    }
+
+    public function getResourceId(): int|string
+    {
+        return $this->resourceId;
+    }
+
+    public function getResourceLocale(): string
+    {
+        return $this->resourceLocale;
+    }
+
+    public function setResourceType(string $resourceType): void
+    {
+        $this->resourceType = $resourceType;
+    }
+
+    public function setResourceId(int|string $resourceId): void
+    {
+        $this->resourceId = $resourceId;
+    }
+
+    public function setResourceLocale(string $resourceLocale): void
+    {
+        $this->resourceLocale = $resourceLocale;
+    }
+
+}

src/Resource/ResourceInfoInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace DynamicSearchBundle\Resource;
+
+interface ResourceInfoInterface
+{
+    public const TYPE_PIMCORE_ELEMENT = 'pimcore_element';
+
+    public function getResourceId(): int|string;
+    public function getResourceType(): string;
+    public function getResourceLocale(): ?string;
+}