Merge remote-tracking branch 'mpi/MC-36721' into MPI-2020-09-14

Author: bubasuma

app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php

@@ -80,11 +80,16 @@ protected function setUp(): void
     }
 
     /**
-     * @covers \Magento\Customer\Ui\Component\DataProvider\Document::getCustomAttribute
+     * @dataProvider getGenderAttributeDataProvider
+     * @covers       \Magento\Customer\Ui\Component\DataProvider\Document::getCustomAttribute
+     * @param int $genderId
+     * @param string $attributeValue
+     * @param string $attributeLabel
      */
-    public function testGetGenderAttribute()
+    public function testGetGenderAttribute(int $genderId, string $attributeValue, string $attributeLabel): void
     {
-        $genderId = 1;
+        $expectedResult = !empty($attributeValue) ? $attributeLabel : $genderId;
+
         $this->document->setData('gender', $genderId);
 
         $this->groupRepository->expects(static::never())
@@ -106,11 +111,37 @@ public function testGetGenderAttribute()
             ->willReturn([$genderId => $option]);
 
         $option->expects(static::once())
+            ->method('getValue')
+            ->willReturn($attributeValue);
+
+        $option->expects(static::any())
             ->method('getLabel')
-            ->willReturn('Male');
+            ->willReturn($attributeLabel);
 
         $attribute = $this->document->getCustomAttribute('gender');
-        static::assertEquals('Male', $attribute->getValue());
+        static::assertEquals($expectedResult, $attribute->getValue());
+    }
+
+    /**
+     * Data provider for testGetGenderAttribute
+     * @return array
+     */
+    public function getGenderAttributeDataProvider()
+    {
+        return [
+            'with valid gender label and value' => [
+                1, '1', 'Male'
+            ],
+            'with empty gender label' => [
+                2, '2', ''
+            ],
+            'with empty gender value' => [
+                3, '', 'test'
+            ],
+            'with empty gender label and value' => [
+                4, '', ''
+            ]
+        ];
     }
 
     /**

app/code/Magento/Customer/Ui/Component/DataProvider/Document.php

@@ -5,18 +5,23 @@
  */
 namespace Magento\Customer\Ui\Component\DataProvider;
 
+use Exception;
 use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Customer\Api\Data\OptionInterface;
+use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Customer\Model\AccountManagement;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class Document
+ *
+ * Set the attribute label and value for UI Component
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Document extends \Magento\Framework\View\Element\UiComponent\DataProvider\Document
 {
@@ -127,16 +132,23 @@ public function getCustomAttribute($attributeCode)
     private function setGenderValue()
     {
         $value = $this->getData(self::$genderAttributeCode);
-        
+
         if (!$value) {
             $this->setCustomAttribute(self::$genderAttributeCode, 'N/A');
             return;
         }
 
         try {
             $attributeMetadata = $this->customerMetadata->getAttributeMetadata(self::$genderAttributeCode);
-            $option = $attributeMetadata->getOptions()[$value];
-            $this->setCustomAttribute(self::$genderAttributeCode, $option->getLabel());
+            $options = $attributeMetadata->getOptions();
+            array_walk(
+                $options,
+                function (OptionInterface $option) use ($value) {
+                    if ($option->getValue() == $value) {
+                        $this->setCustomAttribute(self::$genderAttributeCode, $option->getLabel());
+                    }
+                }
+            );
         } catch (NoSuchEntityException $e) {
             $this->setCustomAttribute(self::$genderAttributeCode, 'N/A');
         }
@@ -199,6 +211,7 @@ private function setConfirmationValue()
      * Update lock expires value. Method set account lock text value to match what is shown in grid
      *
      * @return void
+     * @throws Exception
      */
     private function setAccountLockValue()
     {