Skip to content

MC-40780: Moving category in hierarchy causes url_path to be incorrect when using different url keys in multiple storeviews #32598

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.

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 1 commit into from
Mar 31, 2021

Conversation

viktorpetryk
Copy link
Contributor

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes Moving category in hierarchy causes url_path to be incorrect when using different url keys in multiple storeviews #16202

Manual testing scenarios (*)

See #16202

Questions or comments

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds are green)

@m2-assistant
Copy link

m2-assistant bot commented Mar 25, 2021

Hi @victorpetryk. Thank you for your contribution
Here are some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE,
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests
  13. Semantic Version Checker

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

@m2-community-project m2-community-project bot added Priority: P1 Once P0 defects have been fixed, a defect having this priority is the next candidate for fixing. Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. labels Mar 25, 2021
@viktorpetryk viktorpetryk force-pushed the MC-40780 branch 2 times, most recently from 01bf963 to 6793d5f Compare March 26, 2021 16:37
@viktorpetryk
Copy link
Contributor Author

@magento run all tests

@viktorpetryk
Copy link
Contributor Author

@magento run Integration Tests

1 similar comment
@viktorpetryk
Copy link
Contributor Author

@magento run Integration Tests

@viktorpetryk
Copy link
Contributor Author

@magento run all tests

@viktorpetryk viktorpetryk changed the title [WIP] MC-40780: Moving category in hierarchy causes url_path to be incorrect when using different url keys in multiple storeviews MC-40780: Moving category in hierarchy causes url_path to be incorrect when using different url keys in multiple storeviews Mar 29, 2021
@viktorpetryk
Copy link
Contributor Author

@magento run all tests

1 similar comment
@viktorpetryk
Copy link
Contributor Author

@magento run all tests

->columns(['c.value'])
->where(implode(' AND ', $whereConditions));

return current($connection->fetchCol($select));
Copy link
Contributor

@engcom-Kilo engcom-Kilo Mar 29, 2021

Choose a reason for hiding this comment

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

Why not using fetchOne()?

Suggested change
return current($connection->fetchCol($select));
return $connection->fetchOne($select) ?: null;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

* Retrieve 'url_key' value for default store.
*
* @param int $categoryId
* @return string|bool
Copy link
Contributor

Choose a reason for hiding this comment

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

I would be better to return string|null

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

Copy link
Member

Choose a reason for hiding this comment

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

Then we always need add check for a null, which is not good, i think it will be better return always string as per strict type, and in case of empty result empty string. What do you think ?

@@ -90,6 +100,12 @@ public function execute(\Magento\Framework\Event\Observer $observer)
$resultUrlKey = $category->formatUrlKey($category->getOrigData('name'));
$this->updateUrlKey($category, $resultUrlKey);
}
if ($category->hasChildren()) {
$defaultUrlKey = $this->getDefaultUrlKey->execute((int)$category->getId());
if (!empty($defaultUrlKey)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Could be simplified to:

Suggested change
if (!empty($defaultUrlKey)) {
if ($defaultUrlKey) {

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

…t when using different url keys in multiple storeviews
@viktorpetryk
Copy link
Contributor Author

@magento run all tests

@zakdma
Copy link
Contributor

zakdma commented Mar 30, 2021

@magento-engcom-team
Copy link
Contributor

@zakdma the branch with code successfully imported intomagento-tsg/magento2ce repository. Branch name: imported-magento-magento2-32598.

@magento-engcom-team magento-engcom-team merged commit 8fc0d36 into magento:2.4-develop Mar 31, 2021
@m2-assistant
Copy link

m2-assistant bot commented Mar 31, 2021

Hi @victorpetryk, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: CatalogUrlRewrite Priority: P1 Once P0 defects have been fixed, a defect having this priority is the next candidate for fixing. Progress: review Release Line: 2.4 Severity: S2 Major restrictions or short-term circumventions are required until a fix is available.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Moving category in hierarchy causes url_path to be incorrect when using different url keys in multiple storeviews
5 participants