LYNX-193: Cache for empty AttributesList query result (#130)

* LYNX-183: Add filters to attributesList query * LYNX-183: Add filters to attributesList query * LYNX-183: Add filters to attributesList query * LYNX-183: Add filters to attributesList query * LYNX-183: Add filters to attributesList query - Review comment and static checkss * LYNX-183: Add filters to attributesList query * LYNX-183: Fix for EAV attributes cache invalidation * LYNX-183: Fix for EAV attributes cache invalidation * LYNX-183: Fix for EAV attributes cache invalidation * LYNX-183: Fix for EAV attributes cache invalidation * LYNX-183: Fix for AttributesList query cache when result set is empty * LYNX-183: Add filters to attributesList query * LYNX-183: Add filters to attributesList query - check what is failing in github * LYNX-183: Add filters to attributesList query - Remove print * LYNX-183: Add filters to attributesList query * LYNX-183: Add filters to attributesList query3 * LYNX-183: Add filters to attributesList query * LYNX-193: Cache for empty AttributesList query result * LYNX-193: Fix static tests --------- Co-authored-by: Elisea Cornejo <ecornejo@adobe.com>
magento · Jul 17, 2023 · 5e6e0ef · 5e6e0ef
1 parent e169198
commit 5e6e0ef
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 42 deletions.
diff --git a/app/code/Magento/EavGraphQl/Model/Resolver/AttributesList.php b/app/code/Magento/EavGraphQl/Model/Resolver/AttributesList.php
@@ -77,6 +77,7 @@ public function resolve(
 
         return [
             'items' => $this->getAttributesMetadata($attributesList['items'], $entityType, $storeId),
+            'entity_type' => $entityType,
             'errors' => $attributesList['errors']
         ];
     }

diff --git a/app/code/Magento/EavGraphQl/Model/Resolver/Cache/AttributesListIdentity.php b/app/code/Magento/EavGraphQl/Model/Resolver/Cache/AttributesListIdentity.php
@@ -22,15 +22,16 @@ class AttributesListIdentity implements IdentityInterface
      */
     public function getIdentities(array $resolvedData): array
     {
-        if (empty($resolvedData['items']) || !is_array($resolvedData['items'][0])) {
+        if (empty($resolvedData['entity_type']) || $resolvedData['entity_type'] === "") {
             return [];
         }
 
-        $item = $resolvedData['items'][0];
-        $identities = [];
+        $identities = [
+            Config::ENTITIES_CACHE_ID . "_" . $resolvedData['entity_type'] . "_ENTITY"
+        ];
 
-        if ($item['entity_type'] !== '') {
-            $identities[] = Config::ENTITIES_CACHE_ID . "_" . $item['entity_type'] . "_ENTITY";
+        if (empty($resolvedData['items']) || !is_array($resolvedData['items'][0])) {
+            return $identities;
         }
 
         foreach ($resolvedData['items'] as $item) {

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/EavGraphQl/AttributesListCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/EavGraphQl/AttributesListCacheTest.php
@@ -246,17 +246,10 @@ public function testAttributeListCacheInvalidateOnAttributeDelete()
             }
         }
 
-        if (empty($response['body']['attributesList']['items'])) {
-            $this->assertCacheMissAndReturnResponse(
-                self::QUERY,
-                [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
-            );
-        } else {
-            $this->assertCacheHitAndReturnResponse(
-                self::QUERY,
-                [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
-            );
-        }
+        $this->assertCacheHitAndReturnResponse(
+            self::QUERY,
+            [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
+        );
     }
 
     #[
@@ -288,22 +281,14 @@ public function testAttributeListCacheInvalidateOnAttributeEdit()
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
         );
 
-        $response = $this->assertCacheMissAndReturnResponse(
+        $this->assertCacheMissAndReturnResponse(
             self::QUERY_ADDRESS,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheAddressId]
         );
-
-        if (empty($response['body']['attributesList']['items'])) {
-            $this->assertCacheMissAndReturnResponse(
-                self::QUERY_ADDRESS,
-                [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
-            );
-        } else {
-            $this->assertCacheHitAndReturnResponse(
-                self::QUERY_ADDRESS,
-                [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
-            );
-        }
+        $this->assertCacheHitAndReturnResponse(
+            self::QUERY_ADDRESS,
+            [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
+        );
 
         $customerAttribute0->setDefaultValue('after change default value');
         $this->eavAttributeRepo->save($customerAttribute0);
@@ -317,7 +302,7 @@ public function testAttributeListCacheInvalidateOnAttributeEdit()
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
         );
 
-        $this->assertCacheMissAndReturnResponse(
+        $this->assertCacheHitAndReturnResponse(
             self::QUERY_ADDRESS,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheAddressId]
         );
@@ -403,22 +388,15 @@ public function testAttributesListCacheMissAndHitNewAttribute()
     {
         $cacheId = $this->getCacheIdHeader(self::QUERY);
 
-        $response = $this->assertCacheMissAndReturnResponse(
+        $this->assertCacheMissAndReturnResponse(
             self::QUERY,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
         );
 
-        if (empty($response['body']['attributesList']['items'])) {
-            $this->assertCacheMissAndReturnResponse(
-                self::QUERY,
-                [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
-            );
-        } else {
-            $this->assertCacheHitAndReturnResponse(
-                self::QUERY,
-                [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
-            );
-        }
+        $this->assertCacheHitAndReturnResponse(
+            self::QUERY,
+            [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
+        );
 
         $newAttributeCreate = Bootstrap::getObjectManager()->get(CustomerAttribute::class);
         /** @var AttributeInterface $newAttribute */