LYNX-162: Add uids filters to entity queries custom_attriubtes fields (…

…#117)
magento · May 24, 2023 · 2e845b8 · 2e845b8
1 parent 82ebf79
commit 2e845b8
Show file tree

Hide file tree

Showing 8 changed files with 837 additions and 388 deletions.
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomAttributeFilter.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomAttributeFilter.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+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;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Resolver Custom Attribute filter
+ */
+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
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        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);
+            });
+        }
+
+        return $customAttributes;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddressCustomAttributeFilter.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddressCustomAttributeFilter.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+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;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Resolver Customer Address Custom Attribute filter
+ */
+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
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        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);
+            });
+        }
+
+        return $customAttributes;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/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: [AttributeValueInterface] @doc(description: "Customer's custom attributes.")
+    custom_attributes(uids: [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: [AttributeValueInterface!]! @doc(description: "Custom attributes assigned to the customer address.")
+    custom_attributesV2(uids: [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.")
 }
 

diff --git a/app/code/Magento/EavGraphQl/Model/GetAttributeValueComposite.php b/app/code/Magento/EavGraphQl/Model/GetAttributeValueComposite.php
@@ -34,7 +34,7 @@ public function __construct(array $providers = [])
      * @param string $entityType
      * @param array $customAttribute
      * @return array|null
-     * @throws RuntimeException
+     * @throws RuntimeException|LocalizedException
      */
     public function execute(string $entityType, array $customAttribute): ?array
     {

diff --git a/...unctional/testsuite/Magento/GraphQl/Customer/CreateCustomerV2WithCustomAttributesTest.php b/...unctional/testsuite/Magento/GraphQl/Customer/CreateCustomerV2WithCustomAttributesTest.php
@@ -98,7 +98,7 @@ class CreateCustomerV2WithCustomAttributesTest extends GraphQlAbstract
             password: "test123#"
             custom_attributes: [
                 {
-                    attribute_code: "%s",
+                    attribute_code: "%s"
                     value: "%s"
                 }
                 {