Skip to content

#31168 fix for customer which have more than two subscriptions #31261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 21, 2020
Merged

#31168 fix for customer which have more than two subscriptions #31261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5cc98e
#31168 fix for customer which have more than two subscriptions
korovitskyi Dec 11, 2020
66c3bff
#31168 updated after get list method
korovitskyi Dec 14, 2020
b19a6dc
Merge branch '2.4-develop' into 31168_fix_exception_on_customer_getlist
korovitskyi Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,21 @@ public function afterGetById(CustomerRepositoryInterface $subject, CustomerInter
*/
public function afterGetList(CustomerRepositoryInterface $subject, SearchResults $searchResults): SearchResults
{
$customerEmails = [];

foreach ($searchResults->getItems() as $customer) {
$customerEmails[] = $customer->getEmail();
}

$collection = $this->collectionFactory->create();
$collection->addFieldToFilter('subscriber_email', ['in' => $customerEmails]);

foreach ($searchResults->getItems() as $customer) {
/** @var CustomerExtensionInterface $extensionAttributes */
$extensionAttributes = $customer->getExtensionAttributes();

$isSubscribed = (int) $extensionAttributes->getIsSubscribed() === Subscriber::STATUS_SUBSCRIBED ?: false;
/** @var Subscriber $subscribe */
$subscribe = $collection->getItemByColumnValue('subscriber_email', $customer->getEmail());
$isSubscribed = $subscribe && (int) $subscribe->getStatus() === Subscriber::STATUS_SUBSCRIBED;
$extensionAttributes->setIsSubscribed($isSubscribed);
}

Expand Down
6 changes: 1 addition & 5 deletions app/code/Magento/Newsletter/etc/extension_attributes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@

<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
<extension_attributes for="Magento\Customer\Api\Data\CustomerInterface">
<attribute code="is_subscribed" type="boolean" >
<join reference_table="newsletter_subscriber" reference_field="customer_id" join_on_field="entity_id">
<field>subscriber_status</field>
</join>
</attribute>
<attribute code="is_subscribed" type="boolean"/>
</extension_attributes>
</config>
18 changes: 18 additions & 0 deletions dev/tests/integration/testsuite/Magento/Newsletter/Model/Plugin/PluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,4 +205,22 @@ public function testCustomerWithZeroStoreIdIsSubscribed()
$this->assertEquals($customer->getId(), (int)$subscriber->getCustomerId());
$this->assertEquals($currentStore, (int)$subscriber->getStoreId());
}

/**
* Test get list customer, which have more then 2 subscribes in newsletter_subscriber.
*
* @magentoAppArea frontend
* @magentoDataFixture Magento/Newsletter/_files/subscribers.php
*/
public function testCustomerWithTwoNewsLetterSubscriptions()
{
/** @var \Magento\Framework\Api\SearchCriteriaBuilder $searchBuilder */
$searchBuilder = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
$searchCriteria = $searchBuilder->addFilter('entity_id', 1)->create();
$items = $this->customerRepository->getList($searchCriteria)->getItems();
/** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
$customer = $items[0];
$extensionAttributes = $customer->getExtensionAttributes();
$this->assertTrue($extensionAttributes->getIsSubscribed());
}
}