LYNX-167: Remove UID and set attribute code as ID

Author: svera

app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomAttributes.php

@@ -10,18 +10,12 @@
 use Magento\Eav\Model\AttributeRepository;
 use Magento\EavGraphQl\Model\GetAttributeSelectedOptionComposite;
 use Magento\EavGraphQl\Model\GetAttributeValueInterface;
-use Magento\EavGraphQl\Model\Uid;
 
 /**
  * Custom attribute value provider for customer
  */
 class GetCustomAttributes implements GetAttributeValueInterface
 {
-    /**
-     * @var Uid
-     */
-    private Uid $uid;
-
     /**
      * @var AttributeRepository
      */
@@ -38,18 +32,15 @@ class GetCustomAttributes implements GetAttributeValueInterface
     private array $frontendInputs;
 
     /**
-     * @param Uid $uid
      * @param AttributeRepository $attributeRepository
      * @param GetAttributeSelectedOptionComposite $attributeSelectedOptionComposite
      * @param array $frontendInputs
      */
     public function __construct(
-        Uid $uid,
         AttributeRepository $attributeRepository,
         GetAttributeSelectedOptionComposite $attributeSelectedOptionComposite,
         array $frontendInputs = []
     ) {
-        $this->uid = $uid;
         $this->attributeRepository = $attributeRepository;
         $this->frontendInputs = $frontendInputs;
         $this->attributeSelectedOptionComposite = $attributeSelectedOptionComposite;
@@ -66,10 +57,7 @@ public function execute(string $entityType, array $customAttribute): ?array
         );
 
         $result = [
-            'uid' => $this->uid->encode(
-                $entityType,
-                $customAttribute['attribute_code']
-            ),
+            'entity_type' => $entityType,
             'code' => $customAttribute['attribute_code'],
             'sort_order' => $attr->getSortOrder() ?? ''
         ];

app/code/Magento/CustomerGraphQl/Model/Output/CustomerAttributeMetadata.php

@@ -11,27 +11,15 @@
 use Magento\Customer\Model\Data\ValidationRule;
 use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\EavGraphQl\Model\Output\GetAttributeDataInterface;
-use Magento\EavGraphQl\Model\Uid as AttributeUid;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Query\EnumLookup;
-use Magento\Framework\GraphQl\Query\Uid;
 
 /**
  * Format attributes metadata for GraphQL output
  */
 class CustomerAttributeMetadata implements GetAttributeDataInterface
 {
-    /**
-     * @var AttributeUid
-     */
-    private AttributeUid $attributeUid;
-
-    /**
-     * @var Uid
-     */
-    private Uid $uid;
-
     /**
      * @var EnumLookup
      */
@@ -48,21 +36,15 @@ class CustomerAttributeMetadata implements GetAttributeDataInterface
     private string $entityType;
 
     /**
-     * @param AttributeUid $attributeUid
-     * @param Uid $uid
      * @param EnumLookup $enumLookup
      * @param MetadataInterface $metadata
      * @param string $entityType
      */
     public function __construct(
-        AttributeUid $attributeUid,
-        Uid $uid,
         EnumLookup $enumLookup,
         MetadataInterface $metadata,
         string $entityType
     ) {
-        $this->attributeUid = $attributeUid;
-        $this->uid = $uid;
         $this->enumLookup = $enumLookup;
         $this->metadata = $metadata;
         $this->entityType = $entityType;
@@ -103,8 +85,7 @@ public function execute(
 
         if ($attributeMetadata->isVisible()) {
             $data = [
-                'input_filter' =>
-                    empty($attributeMetadata->getInputFilter())
+                'input_filter' => empty($attributeMetadata->getInputFilter())
                         ? 'NONE'
                         : $this->enumLookup->getEnumValueFromField(
                             'InputFilterEnum',

app/code/Magento/CustomerGraphQl/Model/Resolver/CustomAttributeFilter.php

@@ -7,8 +7,6 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
-use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\Api\CustomAttributesDataInterface;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -19,28 +17,6 @@
  */
 class CustomAttributeFilter implements ResolverInterface
 {
-    /**
-     * @var GetCustomer
-     */
-    private GetCustomer $getCustomer;
-
-    /**
-     * @var ExtractCustomerData
-     */
-    private ExtractCustomerData $extractCustomerData;
-
-    /**
-     * @param GetCustomer $getCustomer
-     * @param ExtractCustomerData $extractCustomerData
-     */
-    public function __construct(
-        GetCustomer                $getCustomer,
-        ExtractCustomerData        $extractCustomerData,
-    ) {
-        $this->getCustomer = $getCustomer;
-        $this->extractCustomerData = $extractCustomerData;
-    }
-
     /**
      * @inheritdoc
      */
@@ -52,10 +28,10 @@ public function resolve(
         array $args = null
     ): array {
         $customAttributes = $value[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES];
-        if (isset($args['uids']) && !empty($args['uids'])) {
-            $selectedUids = array_values($args['uids']);
-            return array_filter($customAttributes, function ($attr) use ($selectedUids) {
-                return in_array($attr['uid'], $selectedUids);
+        if (!empty($args['attributeCodes'])) {
+            $attributeCodes = array_values($args['attributeCodes']);
+            return array_filter($customAttributes, function ($attr) use ($attributeCodes) {
+                return in_array($attr['code'], $attributeCodes);
             });
         }
 

app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddressCustomAttributeFilter.php

@@ -7,8 +7,6 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\Address\ExtractCustomerAddressData;
-use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
 use Magento\Framework\Api\CustomAttributesDataInterface;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -19,28 +17,6 @@
  */
 class CustomerAddressCustomAttributeFilter implements ResolverInterface
 {
-    /**
-     * @var GetCustomerAddress
-     */
-    private GetCustomerAddress $getCustomerAddress;
-
-    /**
-     * @var ExtractCustomerAddressData
-     */
-    private ExtractCustomerAddressData $extractCustomerAddressData;
-
-    /**
-     * @param GetCustomerAddress $getCustomerAddress
-     * @param ExtractCustomerAddressData $extractCustomerAddressData
-     */
-    public function __construct(
-        GetCustomerAddress                $getCustomerAddress,
-        ExtractCustomerAddressData        $extractCustomerAddressData,
-    ) {
-        $this->getCustomerAddress = $getCustomerAddress;
-        $this->extractCustomerAddressData = $extractCustomerAddressData;
-    }
-
     /**
      * @inheritdoc
      */
@@ -52,10 +28,10 @@ public function resolve(
         array $args = null
     ): array {
         $customAttributes = $value[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES . 'V2'];
-        if (isset($args['uids']) && !empty($args['uids'])) {
-            $selectedUids = array_values($args['uids']);
-            return array_filter($customAttributes, function ($attr) use ($selectedUids) {
-                return in_array($attr['uid'], $selectedUids);
+        if (isset($args['attributeCodes']) && !empty($args['attributeCodes'])) {
+            $attributeCodes = array_values($args['attributeCodes']);
+            return array_filter($customAttributes, function ($attr) use ($attributeCodes) {
+                return in_array($attr['code'], $attributeCodes);
             });
         }
 

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

@@ -139,7 +139,7 @@ type Customer @doc(description: "Defines the customer name, addresses, and other
     is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter.") @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\IsSubscribed")
     addresses: [CustomerAddress] @doc(description: "An array containing the customer's shipping and billing addresses.") @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CustomerAddresses")
     gender: Int @doc(description: "The customer's gender (Male - 1, Female - 2).")
-    custom_attributes(uids: [ID!]): [AttributeValueInterface] @doc(description: "Customer's custom attributes.") @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\CustomAttributeFilter")
+    custom_attributes(attributeCodes: [ID!]): [AttributeValueInterface] @doc(description: "Customer's custom attributes.") @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\CustomAttributeFilter")
 }
 
 type CustomerAddress @doc(description: "Contains detailed information about a customer's billing or shipping address."){
@@ -164,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(uids: [ID!]): [AttributeValueInterface!]! @doc(description: "Custom attributes assigned to the customer address.") @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\CustomerAddressCustomAttributeFilter")
+    custom_attributesV2(attributeCodes: [ID!]): [AttributeValueInterface!]! @doc(description: "Custom attributes assigned to the customer address.") @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\CustomerAddressCustomAttributeFilter")
     extension_attributes: [CustomerAddressAttribute] @doc(description: "Contains any extension attributes for the address.")
 }
 

app/code/Magento/Eav/Model/Entity/Attribute.php

@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model\Entity;
 
 use Magento\Eav\Model\ReservedAttributeCheckerInterface;
@@ -533,13 +535,13 @@ public function getIdentities()
                 strtoupper($this->getEntityType()->getEntityTypeCode())
             );
 
-            $formsUsedBeforeChange = $this->getOrigData('used_in_forms') ?? [];
+            $usedBeforeChange = $this->getOrigData('used_in_forms') ?? [];
             $usedInForms = $this->getUsedInForms() ?? [];
 
-            if ($formsUsedBeforeChange != $usedInForms) {
+            if (is_array($usedBeforeChange) && is_array($usedInForms) && ($usedBeforeChange != $usedInForms)) {
                 $formsToInvalidate = array_merge(
-                    array_diff($formsUsedBeforeChange, $usedInForms),
-                    array_diff($usedInForms, $formsUsedBeforeChange)
+                    array_diff($usedBeforeChange, $usedInForms),
+                    array_diff($usedInForms, $usedBeforeChange)
                 );
 
                 foreach ($formsToInvalidate as $form) {

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

@@ -11,40 +11,24 @@
 
 use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Eav\Api\Data\AttributeOptionInterface;
-use Magento\EavGraphQl\Model\Uid as AttributeUid;
 use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\GraphQl\Query\EnumLookup;
-use Magento\Framework\GraphQl\Query\Uid;
 
 /**
  * Format attributes for GraphQL output
  */
 class GetAttributeData implements GetAttributeDataInterface
 {
-    /**
-     * @var AttributeUid
-     */
-    private AttributeUid $attributeUid;
-
-    /**
-     * @var Uid
-     */
-    private Uid $uid;
-
     /**
      * @var EnumLookup
      */
     private EnumLookup $enumLookup;
 
     /**
-     * @param AttributeUid $attributeUid
-     * @param Uid $uid
      * @param EnumLookup $enumLookup
      */
-    public function __construct(AttributeUid $attributeUid, Uid $uid, EnumLookup $enumLookup)
+    public function __construct(EnumLookup $enumLookup)
     {
-        $this->attributeUid = $attributeUid;
-        $this->uid = $uid;
         $this->enumLookup = $enumLookup;
     }
 
@@ -64,7 +48,6 @@ public function execute(
     ): array {
         return [
             'id' => $attribute->getAttributeId(),
-            'uid' => $this->attributeUid->encode($entityType, $attribute->getAttributeCode()),
             'code' => $attribute->getAttributeCode(),
             'label' => $attribute->getStoreLabel($storeId),
             'sort_order' => $attribute->getPosition(),
@@ -123,7 +106,6 @@ function (AttributeOptionInterface $option) use ($attribute) {
                         return null;
                     }
                     return [
-                        'uid' => $this->uid->encode($value),
                         'label' => $label,
                         'value' => $value,
                         'is_default' => $attribute->getDefaultValue() ?

app/code/Magento/EavGraphQl/Model/Output/Value/GetCustomAttributes.php

@@ -9,18 +9,12 @@
 
 use Magento\Eav\Model\AttributeRepository;
 use Magento\EavGraphQl\Model\Output\Value\Options\GetAttributeSelectedOptionInterface;
-use Magento\EavGraphQl\Model\Uid;
 
 /**
  * Custom attribute value provider for customer
  */
 class GetCustomAttributes implements GetAttributeValueInterface
 {
-    /**
-     * @var Uid
-     */
-    private Uid $uid;
-
     /**
      * @var AttributeRepository
      */
@@ -37,18 +31,15 @@ class GetCustomAttributes implements GetAttributeValueInterface
     private array $frontendInputs;
 
     /**
-     * @param Uid $uid
      * @param AttributeRepository $attributeRepository
      * @param GetAttributeSelectedOptionInterface $getAttributeSelectedOption
      * @param array $frontendInputs
      */
     public function __construct(
-        Uid $uid,
         AttributeRepository $attributeRepository,
         GetAttributeSelectedOptionInterface $getAttributeSelectedOption,
         array $frontendInputs = []
     ) {
-        $this->uid = $uid;
         $this->attributeRepository = $attributeRepository;
         $this->frontendInputs = $frontendInputs;
         $this->getAttributeSelectedOption = $getAttributeSelectedOption;
@@ -62,7 +53,7 @@ public function execute(string $entity, string $code, string $value): ?array
         $attr = $this->attributeRepository->get($entity, $code);
 
         $result = [
-            'uid' => $this->uid->encode($entity, $code),
+            'entity_type' => $entity,
             'code' => $code,
             'sort_order' => $attr->getSortOrder() ?? ''
         ];