MAGETWO-71829: is_subscribed extended attribute isn't returned in REST customer calls

Author: olysenko

app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php

@@ -81,7 +81,8 @@ public function afterSave(CustomerRepository $subject, CustomerInterface $result
         }
         $newExtensionAttributes = $customer->getExtensionAttributes();
         if ($newExtensionAttributes
-            && $initialExtensionAttributes->getIsSubscribed() !== $newExtensionAttributes->getIsSubscribed()) {
+            && $initialExtensionAttributes->getIsSubscribed() !== $newExtensionAttributes->getIsSubscribed()
+        ) {
             if ($newExtensionAttributes->getIsSubscribed() === true) {
                 $subscriber->subscribeCustomerById($resultId);
             } elseif ($newExtensionAttributes->getIsSubscribed() === false) {
@@ -149,18 +150,13 @@ public function afterGetById(CustomerRepository $subject, CustomerInterface $cus
     {
         $extensionAttributes = $customer->getExtensionAttributes();
         if ($extensionAttributes === null) {
-            /** @var CustomerExtensionInterface $customerExtension */
-            $customerExtension = $this->extensionFactory->create(CustomerInterface::class);
-            $isSubscribed = $this->isSubscribed($customer);
-            $customerExtension->setIsSubscribed($isSubscribed);
-            $customer->setExtensionAttributes($customerExtension);
-            return $customer;
+            /** @var CustomerExtensionInterface $extensionAttributes */
+            $extensionAttributes = $this->extensionFactory->create(CustomerInterface::class);
+            $customer->setExtensionAttributes($extensionAttributes);
         }
         if ($extensionAttributes->getIsSubscribed() === null) {
             $isSubscribed = $this->isSubscribed($customer);
             $extensionAttributes->setIsSubscribed($isSubscribed);
-            $customer->setExtensionAttributes($extensionAttributes);
-            return $customer;
         }
         return $customer;
     }

app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php

@@ -201,6 +201,10 @@ public function testAfterGetByIdCreatesExtensionAttributesIfItIsNotSet(
         $this->extensionFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->customerExtensionMock);
+        $this->customerMock->expects($this->once())
+            ->method('setExtensionAttributes')
+            ->with($this->customerExtensionMock)
+            ->willReturnSelf();
         $this->customerMock->expects($this->any())
             ->method('getId')
             ->willReturn(1);
@@ -209,10 +213,6 @@ public function testAfterGetByIdCreatesExtensionAttributesIfItIsNotSet(
             ->with($this->customerMock)
             ->willReturn($subscriber);
         $this->customerExtensionMock->expects($this->once())->method('setIsSubscribed')->with($isSubscribed);
-        $this->customerMock->expects($this->once())
-            ->method('setExtensionAttributes')
-            ->with($this->customerExtensionMock)
-            ->willReturnSelf();
         $this->assertEquals(
             $this->customerMock,
             $this->plugin->afterGetById($subject, $this->customerMock)
@@ -236,10 +236,6 @@ public function testAfterGetByIdSetsIsSubscribedFlagIfItIsNotSet()
         $this->customerExtensionMock->expects($this->once())
             ->method('setIsSubscribed')
             ->willReturnSelf();
-        $this->customerMock->expects($this->once())
-            ->method('setExtensionAttributes')
-            ->with($this->customerExtensionMock)
-            ->willReturnSelf();
         $this->assertEquals(
             $this->customerMock,
             $this->plugin->afterGetById($subject, $this->customerMock)