fix cache tags

Author: thomas-kl1

Model/Document.php

@@ -13,10 +13,11 @@
 use Magento\Framework\Model\AbstractExtensibleModel;
 use Opengento\Document\Api\Data\DocumentExtensionInterface;
 use Opengento\Document\Api\Data\DocumentInterface;
+use function array_merge;
 
 class Document extends AbstractExtensibleModel implements DocumentInterface, IdentityInterface
 {
-    public const CACHE_TAG = 'opengento_document';
+    public const CACHE_TAG = 'ope_d';
 
     protected function _construct(): void
     {
@@ -28,12 +29,18 @@ protected function _construct(): void
     public function getIdentities(): array
     {
         return [
+            self::CACHE_TAG,
             self::CACHE_TAG . '_' . $this->getId(),
             self::CACHE_TAG . '_' . $this->getCode(),
             DocumentType::CACHE_TAG . '_' . $this->getTypeId(),
         ];
     }
 
+    public function getCacheTags(): array
+    {
+        return $this->getIdentities() ?: parent::getCacheTags();
+    }
+
     public function getId(): ?int
     {
         return parent::getId() ? (int) parent::getId() : null;

Model/DocumentType.php

@@ -13,11 +13,12 @@
 use Magento\Framework\Model\AbstractExtensibleModel;
 use Opengento\Document\Api\Data\DocumentTypeExtensionInterface;
 use Opengento\Document\Api\Data\DocumentTypeInterface;
+use function array_merge;
 use function explode;
 
 class DocumentType extends AbstractExtensibleModel implements DocumentTypeInterface, IdentityInterface
 {
-    public const CACHE_TAG = 'opengento_document_type';
+    public const CACHE_TAG = 'ope_dt';
 
     protected function _construct(): void
     {
@@ -28,7 +29,12 @@ protected function _construct(): void
 
     public function getIdentities(): array
     {
-        return [self::CACHE_TAG . '_' . $this->getId(), self::CACHE_TAG . '_' . $this->getCode()];
+        return [self::CACHE_TAG, self::CACHE_TAG . '_' . $this->getId(), self::CACHE_TAG . '_' . $this->getCode()];
+    }
+
+    public function getCacheTags(): array
+    {
+        return $this->getIdentities() ?: parent::getCacheTags();
     }
 
     public function getId(): ?int

etc/di.xml

@@ -146,17 +146,6 @@
             <argument name="fetchStrategy" xsi:type="object">Opengento\Document\Model\ResourceModel\Document\Collection\FetchStrategy</argument>
         </arguments>
     </type>
-    <virtualType name="Opengento\Document\Model\Cache\Document" type="Opengento\Document\Model\Cache\Cache">
-        <arguments>
-            <argument name="cacheList" xsi:type="array">
-                <item name="block_html" xsi:type="const">Magento\Framework\App\Cache\Type\Block::TYPE_IDENTIFIER</item>
-                <item name="collections" xsi:type="const">Magento\Framework\App\Cache\Type\Collection::TYPE_IDENTIFIER</item>
-            </argument>
-            <argument name="tags" xsi:type="array">
-                <item name="document" xsi:type="const">Opengento\Document\Model\Document::CACHE_TAG</item>
-            </argument>
-        </arguments>
-    </virtualType>
     <!-- Global Settings -->
     <preference for="Opengento\Document\Model\Document\Operation\CreateFromFileInterface" type="Opengento\Document\Model\Document\Operation\CreateFromFile"/>
     <type name="Opengento\Document\Model\Document\ProcessorFactory">