Merge remote-tracking branch 'remotes/github/MAGETWO-91725' into EPAM-PR-19

Author: VeronikaYarats

app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php

@@ -33,20 +33,30 @@ class CustomerMetadata implements CustomerMetadataInterface
      */
     private $attributeMetadataDataProvider;
 
+    /**
+     * List of system attributes which should be available to the clients.
+     *
+     * @var string[]
+     */
+    private $systemAttributes;
+
     /**
      * @param AttributeMetadataConverter $attributeMetadataConverter
      * @param AttributeMetadataDataProvider $attributeMetadataDataProvider
+     * @param string[] $systemAttributes
      */
     public function __construct(
         AttributeMetadataConverter $attributeMetadataConverter,
-        AttributeMetadataDataProvider $attributeMetadataDataProvider
+        AttributeMetadataDataProvider $attributeMetadataDataProvider,
+        array $systemAttributes = []
     ) {
         $this->attributeMetadataConverter = $attributeMetadataConverter;
         $this->attributeMetadataDataProvider = $attributeMetadataDataProvider;
+        $this->systemAttributes = $systemAttributes;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAttributes($formCode)
     {
@@ -67,7 +77,7 @@ public function getAttributes($formCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAttributeMetadata($attributeCode)
     {
@@ -92,7 +102,7 @@ public function getAttributeMetadata($attributeCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAllAttributesMetadata()
     {
@@ -116,7 +126,7 @@ public function getAllAttributesMetadata()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomAttributesMetadata($dataObjectClassName = self::DATA_INTERFACE_NAME)
     {
@@ -134,9 +144,10 @@ public function getCustomAttributesMetadata($dataObjectClassName = self::DATA_IN
             $isDataObjectMethod = isset($this->customerDataObjectMethods['get' . $camelCaseKey])
                 || isset($this->customerDataObjectMethods['is' . $camelCaseKey]);
 
-            /** Even though disable_auto_group_change is system attribute, it should be available to the clients */
             if (!$isDataObjectMethod
-                && (!$attributeMetadata->isSystem() || $attributeCode == 'disable_auto_group_change')
+                && (!$attributeMetadata->isSystem()
+                    || in_array($attributeCode, $this->systemAttributes)
+                )
             ) {
                 $customAttributes[] = $attributeMetadata;
             }

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

@@ -127,6 +127,13 @@
             <argument name="groupManagement" xsi:type="object">Magento\Customer\Api\GroupManagementInterface\Proxy</argument>
         </arguments>
     </type>
+    <type name="Magento\Customer\Model\Metadata\CustomerMetadata">
+        <arguments>
+            <argument name="systemAttributes" xsi:type="array">
+                <item name="disable_auto_group_change" xsi:type="string">disable_auto_group_change</item>
+            </argument>
+        </arguments>
+    </type>
     <virtualType name="SectionInvalidationConfigReader" type="Magento\Framework\Config\Reader\Filesystem">
         <arguments>
             <argument name="idAttributes" xsi:type="array">

dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php

@@ -9,6 +9,7 @@
 use Magento\Customer\Api\Data\CustomerInterface as Customer;
 use Magento\Customer\Model\Data\AttributeMetadata;
 use Magento\TestFramework\TestCase\WebapiAbstract;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * Class CustomerMetadataTest
@@ -19,6 +20,19 @@ class CustomerMetadataTest extends WebapiAbstract
     const SERVICE_VERSION = "V1";
     const RESOURCE_PATH = "/V1/attributeMetadata/customer";
 
+    /**
+     * @var CustomerMetadataInterface
+     */
+    private $customerMetadata;
+
+    /**
+     * Execute per test initialization.
+     */
+    public function setUp()
+    {
+        $this->customerMetadata = Bootstrap::getObjectManager()->create(CustomerMetadataInterface::class);
+    }
+
     /**
      * Test retrieval of attribute metadata for the customer entity type.
      *
@@ -200,8 +214,7 @@ public function testGetCustomAttributesMetadata()
 
         $attributeMetadata = $this->_webApiCall($serviceInfo);
 
-        // There are no default custom attributes.
-        $this->assertCount(0, $attributeMetadata);
+        $this->assertCount(count($this->customerMetadata->getCustomAttributesMetadata()), $attributeMetadata);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php

@@ -51,16 +51,23 @@ protected function setUp()
 
     public function testGetCustomAttributesMetadata()
     {
-        $customAttributesMetadata = $this->service->getCustomAttributesMetadata();
-        $this->assertCount(0, $customAttributesMetadata, "Invalid number of attributes returned.");
+        $customAttributesMetadataQty = count($this->service->getCustomAttributesMetadata()) ;
 
         // Verify the consistency of getCustomerAttributeMetadata() function from the 2nd call of the same service
-        $customAttributesMetadata1 = $this->service->getCustomAttributesMetadata();
-        $this->assertCount(0, $customAttributesMetadata1, "Invalid number of attributes returned.");
+        $customAttributesMetadata1Qty = count($this->service->getCustomAttributesMetadata());
+        $this->assertEquals(
+            $customAttributesMetadataQty,
+            $customAttributesMetadata1Qty,
+            "Invalid number of attributes returned."
+        );
 
         // Verify the consistency of getCustomAttributesMetadata() function from the 2nd service
-        $customAttributesMetadata2 = $this->serviceTwo->getCustomAttributesMetadata();
-        $this->assertCount(0, $customAttributesMetadata2, "Invalid number of attributes returned.");
+        $customAttributesMetadata2Qty = count($this->serviceTwo->getCustomAttributesMetadata());
+        $this->assertEquals(
+            $customAttributesMetadataQty,
+            $customAttributesMetadata2Qty,
+            "Invalid number of attributes returned."
+        );
     }
 
     public function testGetNestedOptionsCustomerAttributesMetadata()