magento/magento2#40027: Product stock alert's website and stock misma…

[KrasnoshchokBohdan]

Fix product alert website mismatch issue for multi-website setup

Description (*)

In multi-website setups, the admin product alerts grid displays incorrect website information. When a customer subscribes to product alerts on different websites, the grid shows the customer's registered website for all alerts instead of the actual subscription website.

This fix includes website_id and store_id from product_alert_stock and product_alert_price tables in the collection SELECT clause, ensuring the admin grid displays the correct website where each alert was subscribed.

Related Pull Requests

Fixed Issues (if relevant)

1. Fixes Product stock alert's website and stock mismatch issue for multi website #40027

Manual testing scenarios (*)

1. Configure multi-website setup with at least 2 websites
2. Enable customer account sharing across websites (set customer/account_share/scope to 0)
3. Create a customer account on Website A
4. Subscribe to a stock alert for Product 1 on Website A
5. Log in with the same customer on Website B
6. Subscribe to a stock alert for Product 1 on Website B
7. Go to Admin → Catalog → Products → Edit Product 1
8. Click "Product Alerts" tab → verify alert shows Website A (not B)

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)
• README.md files for modified modules are updated and included in the pull request if any README.md predefined sections require an update
• All automated tests passed successfully (all builds are green)

[m2-assistant]

Hi @KrasnoshchokBohdan. Thank you for your contribution!
Here are some useful tips on how you can test your changes using Magento test environment.
❗ 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
ℹ️ Run only required test builds during development. Run all test builds before sending your pull request for review.

---

For more details, review the Code Contributions documentation.
Join Magento Community Engineering Slack and ask your questions in #github channel.

[KrasnoshchokBohdan]

@magento run all tests

[KrasnoshchokBohdan]

@magento run Functional Tests B2B, Functional Tests EE

[engcom-Hotel]

Hello @KrasnoshchokBohdan,

Thank your for your contribution!

The changes looks good to us, but please cover the changes with some automated test in accordance to the DOD.

Thank you

[engcom-Charlie]

@magento run all tests

[engcom-Charlie]

@magento run all tests

[engcom-Charlie]

@magento run Functional Tests B2B, Functional Tests CE, Functional Tests EE, Integration Tests,
Static Tests, Unit Tests

[engcom-Charlie]

@magento run all tests

[engcom-Charlie]

@magento run Static Tests

[engcom-Charlie]

Hello @KrasnoshchokBohdan,

Thank your for your contribution!

The changes looks good to us, but please cover the changes with some automated test in accordance to the DOD.

Thank you

@engcom-Hotel and @KrasnoshchokBohdan, I have implemented integration test to cover the changes. Requesting for the review.

[engcom-Hotel]

@magento run all tests

[engcom-Hotel]

The failed tests seems flaky to me.

Approving the PR for further processing.

[engcom-Bravo]

Hi @KrasnoshchokBohdan,

Thanks for the collaboration & contribution!

✔️ QA Passed

Preconditions:

• Install fresh Magento 2.4-develop

Steps to reproduce

• Configure multi-website setup with at least 2 websites
• Enable customer account sharing across websites (set customer/account_share/scope to 0)
• Create a customer account on Website A
• Subscribe to a stock alert for Product 1 on Website A
• Log in with the same customer on Website B
• Subscribe to a stock alert for Product 1 on Website B
• Go to Admin → Catalog → Products → Edit Product 1
• Click "Product Alerts" tab → verify alert shows Website A (not B)

Before: ✖️

After: ✔️

Builds are failed. Hence, moving this PR to Extended Testing.

Thanks

[engcom-Charlie]

@magento run Functional Tests B2B, Functional Tests CE, Functional Tests EE, Integration Tests

[engcom-Charlie]

Some of the Functional B2B, CE and EE failures are not consistent in recent 2 builds, they neither failing because of the PR changes nor part of the PR. Considered to be flaky. The rest consistent failures are known issues and having related JIRA. Hence moving this to Merge in Progress.

Functional B2B: Run 1:
https://public-results-storage-prod.magento-testing-service.engineering/reports/magento/magento2/pull/40431/5bf8590c25bf48855d94e67ee5f3d3e2/Functional/allure-report-b2b/index.html#categories

Run 2:
https://public-results-storage-prod.magento-testing-service.engineering/reports/magento/magento2/pull/40431/6f03ebeb831a7dc8668acf9376f420fd/Functional/allure-report-b2b/index.html#categories/dad3b5a7b0574462665553fcc880a350/61cf4060ae70c62f/

Functional CE: Run 1:
https://public-results-storage-prod.magento-testing-service.engineering/reports/magento/magento2/pull/40431/e4bbbdc6e4228a6e63934f8b8e506744/Functional/allure-report-ce/index.html#categories

Run 2:
https://public-results-storage-prod.magento-testing-service.engineering/reports/magento/magento2/pull/40431/20ab047784130e3a0875ad9d0bdbb79f/Functional/allure-report-ce/index.html#categories/dad3b5a7b0574462665553fcc880a350/5b7f39e360fef73b/

Functional EE: Run 1:
https://public-results-storage-prod.magento-testing-service.engineering/reports/magento/magento2/pull/40431/6dc75a4661a865402c2e01720133fd2d/Functional/allure-report-ee/index.html#categories

Run 2:
https://public-results-storage-prod.magento-testing-service.engineering/reports/magento/magento2/pull/40431/a57d24baab7f833dd871362b1a443998/Functional/allure-report-ee/index.html#categories/dad3b5a7b0574462665553fcc880a350/68c3004a1cd380/

Known issues:
ACQE-9362: PurchaseOrderEnableDisableE2ETest
ACQE-9418: AdminDisplayingCartAndCatalogPriceRulesGridsTest
ACQE-9359: AssertSuccessMessageAppearsAfterAddingProductToCartThatContainsOutOfStockProductTest
ACQE-9450: AsyncOrderWithAsyncStockReservationTest