Skip to content

fix Can't remove samples link product downloadable #31895

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

Open
wants to merge 12 commits into
base: 2.4-develop
Choose a base branch
from
Open

fix Can't remove samples link product downloadable #31895

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5115368
remove samples link product downloadable
omaxmo Jan 29, 2021
eb9bcc1
remove variable
omaxmo Jan 29, 2021
9e0e86e
Unit test fix
engcom-Hotel Feb 1, 2021
d13aa48
API test fix
engcom-Hotel Feb 1, 2021
3817a8a
Merge branch '2.4-develop' into downloadable-product-samples-delete-fix
engcom-Hotel Feb 2, 2021
8f7773c
magento/magento2#31887: fix Can't remove samples link product downloa…
engcom-Foxtrot Mar 1, 2021
8372d21
Merge branch '2.4-develop' into downloadable-product-samples-delete-fix
engcom-Foxtrot Mar 1, 2021
7651b1a
magento/magento2#32100: Admin login issue fix - MFTF update.
engcom-Foxtrot Mar 2, 2021
ffb9295
Merge remote-tracking branch 'omaxmo/downloadable-product-samples-del…
engcom-Foxtrot Mar 2, 2021
1abd820
Apply suggestions from code review
gabrieldagama Apr 7, 2021
2ea8e8c
Merge branch '2.4-develop' into downloadable-product-samples-delete-fix
Apr 12, 2021
ba36d39
Merge remote-tracking branch 'magento/2.4-develop' into downloadable-…
engcom-Charlie Jun 17, 2022
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
22 changes: 11 additions & 11 deletions app/code/Magento/Downloadable/Model/Sample/UpdateHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,8 @@ public function __construct(SampleRepository $sampleRepository)
*/
public function execute($entity, $arguments = []): ProductInterface
{
$samples = $entity->getExtensionAttributes()->getDownloadableProductSamples();

if ($samples && $entity->getTypeId() === Type::TYPE_DOWNLOADABLE) {
$this->updateSamples($entity, $samples);
if ($entity->getTypeId() === Type::TYPE_DOWNLOADABLE) {
$this->updateSamples($entity);
}

return $entity;
Expand All @@ -56,20 +54,22 @@ public function execute($entity, $arguments = []): ProductInterface
* Update product samples
*
* @param ProductInterface $entity
* @param array $samples
* @return void
*/
private function updateSamples(ProductInterface $entity, array $samples): void
private function updateSamples(ProductInterface $entity): void
{
$isGlobalScope = (int) $entity->getStoreId() === self::GLOBAL_SCOPE_ID;
$samples = $entity->getExtensionAttributes()->getDownloadableProductSamples();
$oldSamples = $this->sampleRepository->getList($entity->getSku());

$updatedSamples = [];
foreach ($samples as $sample) {
if ($sample->getId()) {
$updatedSamples[$sample->getId()] = true;
if (!empty($samples)) {
$updatedSamples = [];
foreach ($samples as $sample) {
if ($sample->getId()) {
$updatedSamples[$sample->getId()] = true;
}
$this->sampleRepository->save($entity->getSku(), $sample, $isGlobalScope);
}
$this->sampleRepository->save($entity->getSku(), $sample, $isGlobalScope);
}

foreach ($oldSamples as $sample) {
Expand Down
3 changes: 0 additions & 3 deletions app/code/Magento/Downloadable/Test/Unit/Model/Sample/UpdateHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,6 @@ public function testExecuteNonDownloadable(): void
$this->entityMock->expects($this->once())
->method('getTypeId')
->willReturn(Type::TYPE_DOWNLOADABLE . 'some');
$this->entityMock->expects($this->once())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets double check if we need to remove these assertions

->method('getExtensionAttributes')
->willReturn($this->productExtensionMock);
$this->entityMock->expects($this->never())
->method('getSku');
$this->entityMock->expects($this->never())
Expand Down
2 changes: 0 additions & 2 deletions dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,8 @@ public function testUpdateDownloadableProductData(): void
$response = $this->saveProduct($productData);

$this->assertArrayHasKey(ProductInterface::EXTENSION_ATTRIBUTES_KEY, $response);
$this->assertArrayHasKey(self::PRODUCT_SAMPLES, $response[ProductInterface::EXTENSION_ATTRIBUTES_KEY]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets double check if we need to remove these assertions

$this->assertArrayHasKey(self::PRODUCT_LINKS, $response[ProductInterface::EXTENSION_ATTRIBUTES_KEY]);

$this->assertCount(2, $response[ProductInterface::EXTENSION_ATTRIBUTES_KEY][self::PRODUCT_SAMPLES]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets double check if we need to remove these assertions

$this->assertCount(2, $response[ProductInterface::EXTENSION_ATTRIBUTES_KEY][self::PRODUCT_LINKS]);
}

Expand Down