Merge pull request #8303 from magento-lynx/eav-graphql

Author: svera

app/code/Magento/CustomerGraphQl/etc/schema.graphqls

@@ -49,7 +49,8 @@ input CustomerAddressInput @doc(description: "Contains details about a billing o
     prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs.")
     suffix: String @doc(description: "A value such as Sr., Jr., or III.")
     vat_id: String @doc(description: "The customer's Tax/VAT number (for corporate customers).")
-    custom_attributes: [AttributeValueInput] @doc(description: "Deprecated: Custom attributes should not be put into container.")
+    custom_attributes: [CustomerAddressAttributeInput] @doc(description: "Deprecated. Use custom_attributesV2 instead.") @deprecated(reason: "Use custom_attributesV2 instead.")
+    custom_attributesV2: [AttributeValueInput] @doc(description: "Custom attributes assigned to the customer address.")
 }
 
 input CustomerAddressRegionInput @doc(description: "Defines the customer's state or province.") {
@@ -163,7 +164,7 @@ type CustomerAddress @doc(description: "Contains detailed information about a cu
     default_shipping: Boolean @doc(description: "Indicates whether the address is the customer's default shipping address.")
     default_billing: Boolean @doc(description: "Indicates whether the address is the customer's default billing address.")
     custom_attributes: [CustomerAddressAttribute] @deprecated(reason: "Use custom_attributesV2 instead.")
-    custom_attributesV2: [AttributeValueInterface!]! @doc(description: "Customer address' custom attributes.")
+    custom_attributesV2: [AttributeValueInterface!]! @doc(description: "Custom attributes assigned to the customer address.")
     extension_attributes: [CustomerAddressAttribute] @doc(description: "Contains any extension attributes for the address.")
 }
 
@@ -175,7 +176,7 @@ type CustomerAddressRegion @doc(description: "Defines the customer's state or pr
 
 type CustomerAddressAttribute @doc(description: "Specifies the attribute code and value of a customer address attribute.") {
      attribute_code: String @doc(description: "The name assigned to the customer address attribute.")
-     value: String @doc(description: "The valuue assigned to the customer address attribute.")
+     value: String @doc(description: "The value assigned to the customer address attribute.")
 }
 
 type IsEmailAvailableOutput @doc(description: "Contains the result of the `isEmailAvailable` query.") {

app/code/Magento/EavGraphQl/Model/Output/GetAttributeData.php

@@ -63,6 +63,7 @@ public function execute(
         int $storeId
     ): array {
         return [
+            'id' => $attribute->getAttributeId(),
             'uid' => $this->attributeUid->encode($entityType, $attribute->getAttributeCode()),
             'code' => $attribute->getAttributeCode(),
             'label' => $attribute->getStoreLabel($storeId),

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

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\EavGraphQl\Model\Resolver\Cache;
+
+use Magento\Eav\Model\Entity\Attribute as EavAttribute;
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
+
+/**
+ * Cache identity provider for custom attribute metadata query results.
+ */
+class CustomAttributeMetadataV2Identity implements IdentityInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getIdentities(array $resolvedData): array
+    {
+        $identities = [];
+        if (isset($resolvedData['items']) && !empty($resolvedData['items'])) {
+            foreach ($resolvedData['items'] as $item) {
+                if (is_array($item)) {
+                    $identities[] = sprintf(
+                        "%s_%s",
+                        EavAttribute::CACHE_TAG,
+                        $item['id']
+                    );
+                }
+            }
+        } else {
+            return [];
+        }
+        return $identities;
+    }
+}

app/code/Magento/EavGraphQl/etc/schema.graphqls

@@ -8,7 +8,7 @@ type Query {
     @doc(description: "Return the attribute type, given an attribute code and entity type.")
     @cache(cacheIdentity: "Magento\\EavGraphQl\\Model\\Resolver\\Cache\\CustomAttributeMetadataIdentity")
     @deprecated(reason: "Use `customAttributeMetadataV2` query instead.")
-    customAttributeMetadataV2(attributes: [AttributeInput!]): AttributesMetadataOutput! @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\AttributesMetadata") @doc(description: "Retrieve EAV attributes metadata.")
+    customAttributeMetadataV2(attributes: [AttributeInput!]): AttributesMetadataOutput! @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\AttributesMetadata") @doc(description: "Retrieve EAV attributes metadata.") @cache(cacheIdentity: "Magento\\EavGraphQl\\Model\\Resolver\\Cache\\CustomAttributeMetadataV2Identity")
     attributesForm(formCode: String! @doc(description: "Form code.")): AttributesFormOutput! @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\AttributesForm") @doc(description: "Retrieve EAV attributes associated to a frontend form.")
     attributesList(entityType: AttributeEntityTypeEnum! @doc(description: "Entity type.")): AttributesMetadataOutput @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\AttributesList") @doc(description: "Returns a list of attributes metadata for a given entity type.") @cache(cacheable: false)
 }
@@ -34,16 +34,6 @@ type StorefrontProperties @doc(description: "Indicates where an attribute can be
     use_in_search_results_layered_navigation: Boolean @doc(description: "Indicates whether the attribute can be used in layered navigation on search results pages.")
 }
 
-input AttributeValueInput @doc(description: "Specifies the value for attribute.") {
-    attribute_code: String! @doc(description: "The code of the attribute.")
-    value: String @doc(description: "The value which should be set for the attribute")
-    selected_options: [AttributeInputSelectedOption!] @doc(description: "An array with selected option(s) for select or multiselect attribute")
-}
-
-input AttributeInputSelectedOption @doc(description: "Specifies selected option for dropdown or multiselect attribute value .") {
-    value: String! @doc(description: "The attribute option value.")
-}
-
 enum UseInLayeredNavigationOptions @doc(description: "Defines whether the attribute is filterable in layered navigation.") {
     NO
     FILTERABLE_WITH_RESULTS
@@ -150,13 +140,13 @@ interface AttributeSelectedOptionInterface @typeResolver(class: "Magento\\EavGra
 type AttributeSelectedOption implements AttributeSelectedOptionInterface {
 }
 
-input AttributeValueInput {
-    attribute_code: String! @doc(description: "The attribute code.")
-    value: String @doc(description: "The attribute value.")
-    selected_options: [AttributeInputSelectedOption!] @doc(description: "An array with selected option(s) for select or multiselect attribute")
+input AttributeValueInput @doc(description: "Specifies the value for attribute.") {
+    attribute_code: String! @doc(description: "The code of the attribute.")
+    value: String @doc(description: "The value assigned to the attribute.")
+    selected_options: [AttributeInputSelectedOption!] @doc(description: "An array containing selected options for a select or multiselect attribute.")
 }
 
-input AttributeInputSelectedOption @doc(description: "Specifies selected option for dropdown or multiselect attribute value .") {
+input AttributeInputSelectedOption @doc(description: "Specifies selected option for a select or multiselect attribute value.") {
     uid: ID! @doc(description: "Selected option UID.")
     value: String! @doc(description: "The attribute option value.")
 }