Skip to content

Commit 2d1bff5

Browse files
committed
MAGETWO-72775: is_subscribed extended attribute isn't returned in REST customer calls
1 parent e602f89 commit 2d1bff5

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ public function afterSave(CustomerRepository $subject, CustomerInterface $result
8383
if ($newExtensionAttributes
8484
&& $initialExtensionAttributes->getIsSubscribed() !== $newExtensionAttributes->getIsSubscribed()
8585
) {
86-
if ($newExtensionAttributes->getIsSubscribed() === true) {
86+
if ($newExtensionAttributes->getIsSubscribed()) {
8787
$subscriber->subscribeCustomerById($resultId);
88-
} elseif ($newExtensionAttributes->getIsSubscribed() === false) {
88+
} else {
8989
$subscriber->unsubscribeCustomerById($resultId);
9090
}
9191
}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected function setUp()
6868
'updateSubscription',
6969
'subscribeCustomerById',
7070
'unsubscribeCustomerById',
71-
'isSubscribed'
71+
'isSubscribed',
7272
]
7373
)->disableOriginalConstructor()
7474
->getMock();
@@ -77,14 +77,14 @@ protected function setUp()
7777
->setMethods(['create'])
7878
->getMock();
7979
$this->customerExtensionMock = $this->getMockBuilder(CustomerExtensionInterface::class)
80-
->setMethods(["getIsSubscribed", "setIsSubscribed"])
80+
->setMethods(['getIsSubscribed', 'setIsSubscribed'])
8181
->disableOriginalConstructor()
8282
->getMockForAbstractClass();
8383
$this->subscriberResourceMock = $this->getMockBuilder(Subscriber::class)
8484
->disableOriginalConstructor()
8585
->getMock();
8686
$this->customerMock = $this->getMockBuilder(CustomerInterface::class)
87-
->setMethods(["getExtensionAttributes"])
87+
->setMethods(['getExtensionAttributes'])
8888
->disableOriginalConstructor()
8989
->getMockForAbstractClass();
9090
$this->subscriberFactory->expects($this->any())->method('create')->willReturn($this->subscriber);
@@ -104,6 +104,7 @@ protected function setUp()
104104
* @param bool $subscriptionOriginalValue
105105
* @param bool $subscriptionNewValue
106106
* @dataProvider afterSaveDataProvider
107+
* @return void
107108
*/
108109
public function testAfterSave($subscriptionOriginalValue, $subscriptionNewValue)
109110
{
@@ -137,9 +138,9 @@ public function testAfterSave($subscriptionOriginalValue, $subscriptionNewValue)
137138
->willReturn($subscriptionNewValue);
138139

139140
if ($subscriptionOriginalValue !== $subscriptionNewValue) {
140-
if ($subscriptionNewValue === true) {
141+
if ($subscriptionNewValue) {
141142
$this->subscriber->expects($this->once())->method('subscribeCustomerById')->with($customerId);
142-
} elseif ($subscriptionNewValue === false) {
143+
} else {
143144
$this->subscriber->expects($this->once())->method('unsubscribeCustomerById')->with($customerId);
144145
}
145146
$this->subscriber->expects($this->once())->method('isSubscribed')->willReturn($subscriptionNewValue);
@@ -196,6 +197,7 @@ public function testAroundDeleteById()
196197
* @param int|null $subscriberStatusValue
197198
* @param bool $isSubscribed
198199
* @dataProvider afterGetByIdDataProvider
200+
* @return void
199201
*/
200202
public function testAfterGetByIdCreatesExtensionAttributesIfItIsNotSet(
201203
$subscriberStatusKey,

0 commit comments

Comments
 (0)