B2B-2259: customAttributeMetadata GraphQl query has no cache identity

Author: rganin

app/code/Magento/EavGraphQl/Model/Resolver/Cache/CustomAttributeMetadataIdentity.php

@@ -24,6 +24,8 @@ public function getIdentities(array $resolvedData): array
                     $item['attribute_code']
                 );
             }
+        } else {
+            return [];
         }
         return $identities;
     }

app/code/Magento/EavGraphQl/Plugin/Eav/AttributePlugin.php

@@ -8,12 +8,11 @@
 namespace Magento\EavGraphQl\Plugin\Eav;
 
 use Magento\Eav\Model\Entity\Attribute;
-use Magento\Eav\Model\Entity\Attribute as EavAttribute;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Event\ManagerInterface;
 
 /**
- * EAV plugin runs page cache clean and provides peoper EAV identities.
+ * EAV plugin runs page cache clean and provides proper EAV identities.
  */
 class AttributePlugin implements IdentityInterface
 {
@@ -38,25 +37,54 @@ public function __construct(ManagerInterface $eventManager)
     }
 
     /**
-     * Clean cache by relevant tags.
+     * Clean cache by relevant tags after entity save.
      *
      * @param Attribute $subject
      * @param Attribute $result
      * @return Attribute
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterSave(
         Attribute $subject,
         Attribute $result
     ): Attribute
+    {
+        if (!$subject->isObjectNew()) {
+            $this->triggerCacheClean($subject);
+        }
+        return $result;
+    }
+
+    /**
+     * Clean cache by relevant tags after entity is deleted and afterDelete
+     * handler is executed.
+     *
+     * @param Attribute $subject
+     * @param Attribute $result
+     * @return Attribute
+     */
+    public function afterAfterDelete(
+        Attribute $subject,
+        Attribute $result
+    ) : Attribute
+    {
+        $this->triggerCacheClean($subject);
+        return $result;
+    }
+
+    /**
+     * Trigger cache clean event in event manager.
+     *
+     * @param Attribute $entity
+     * @return void
+     */
+    private function triggerCacheClean(Attribute $entity): void
     {
         $this->identities[] = sprintf(
             "%s_%s",
-            EavAttribute::CACHE_TAG,
-            $subject->getAttributeCode()
+            Attribute::CACHE_TAG,
+            $entity->getAttributeCode()
         );
         $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this]);
-        return $result;
     }
 
     /**

app/code/Magento/EavGraphQl/etc/di.xml

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Eav\Model\Entity\Attribute">
-        <plugin name="afterSavePlugin" type="Magento\EavGraphQl\Plugin\Eav\AttributePlugin" />
+        <plugin name="entityAttributeChangePlugin" type="Magento\EavGraphQl\Plugin\Eav\AttributePlugin" />
     </type>
 </config>