Issue-33519. Added logic for grouping alerts by store

[topanok]

Description (*)

Added logic for grouping alerts by store. The problem was that when sorting collection items, the store ID of the last item of current user is always add to the email object. This fix also fixed the situation with PriceAlerts, because the logic is used by everyone.

Fixed Issues (if relevant)

1. Fixes Template file retrieving should be store scoped #33519

Manual testing scenarios (*)

1. Setup Multiple Stores/websites in Magento
2. Create 2 different Stock Alert Email Templates for each store (Marketing - Communications - Email Templates - Add New Template)
3. Enable Product Alerts and Apply the newly created templates for each Store
4. Stores - Configuration - Catalog - Catalog - Product Alerts - Stock Alert Email Template - Set the new template created for new Store view scope , "Allow Alert When Product Comes Back in Stock" - Yes
   Default Scope: Product Alerts Run Settings - Give the Start time and Save Configuration
   Change the Scope of Store View to another Store view and apply other newly created template and save the configuration
5. Reindex and clear cache
6. Admin - Add a new Product - Set the Product to Out Of Stock and Save
7. Front-end - New Store website (for ex: France website) - Sign in as customer - Product Details page - Click on "Notify me when this product is in stock"
8. Open the same Product in different Store (for ex: Germany website) - Sign in as same customer - Product Details page - Click on "Notify me when this product is in stock"
9. Admin - Edit the same product and Set the stock status to "In Stock" and Save
10. Run the Cron > php bin/magento cron:run
11. Verify emails of both the Stores(You should receive two emails from both Stores with different email templates)

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 @topanok. 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

ℹ️ Run only required test builds during development. Run all test builds before sending your pull request for review.

For more details, 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, join the Community Contributions Triage session to discuss the appropriate ticket.

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

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[topanok]

@magento run Integration Tests, WebAPI Tests

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[topanok]

@magento run Integration Tests, WebAPI Tests

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[topanok]

@magento run all tests

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[topanok]

@magento run Integration Tests, Functional Tests B2B

[engcom-Delta]

@topanok, We have tried to reproduce and test this issue but we are not getting any product stock alert email.

Steps to reproduce:

1.Setup Multiple Stores/websites in Magento
2.Create 2 different Stock Alert Email Templates for each store (Marketing - Communications - Email Templates - Add New Template)
3.Enable Product Alerts and Apply the newly created templates for each Store
4.Stores - Configuration - Catalog - Catalog - Product Alerts - Stock Alert Email Template - Set the new template created for new Store view scope , "Allow Alert When Product Comes Back in Stock" - Yes
Default Scope: Product Alerts Run Settings - Give the Start time and Save Configuration
5.Change the Scope of Store View to another Store view and apply other newly created template and save the configuration
6.Reindex and clear cache
7Admin - Add a new Product - Set the Product to Out Of Stock and Save
8.Front-end - New Store website (for ex: France website) - Sign in as customer - Product Details page - Click on "Notify me when this product is in stock"
9.Open the same Product in different Store (for ex: Germany website) - Sign in as same customer - Product Details page - Click on "Notify me when this product is in stock"
10.Admin - Edit the same product and Set the stock status to "In Stock" and Save
11.Run the Cron > php bin/magento cron:run
12.Verify emails of both the Stores

Kindly suggest if something is missing

[topanok]

@engcom-Delta Hello! Mail server configured? Can you get any email like password reset? And wait until midnight))

[engcom-Delta]

@engcom-Delta Hello! Mail server configured? Can you get any email like password reset? And wait until midnight))

@topanok, Yes Mail server configured and i am getting password reset email but not the alert once till now

[topanok]

@engcom-Delta Perhaps this is related to the time of sending letters, which you have set to midnight, and the one-time start of the cron did not work. Start the cron in constant operation with the php bin/magento cron:install command and wait for the letter after midnight or change the sending time to the nearest one. I hope you cleared the config cache after saving?

[topanok]

@engcom-Delta I checked the functionality. Everything works if the cron is running. Namely... The time set in the admin is responsible for starting the cron, which adds operations to the queue. After that, the cron works, which performs the scheduled operations. It turns out that the command from the message above (php bin/magento cron:install) should fix the situation. But you won't get notifications until midnight.
If you do not receive anything, then subscribe to the product again, because something may have gone wrong due to the disabled cron. This is partly my fault for writing the wrong command to run kron. Sorry!)

[engcom-Delta]

@engcom-Delta I checked the functionality. Everything works if the cron is running. Namely... The time set in the admin is responsible for starting the cron, which adds operations to the queue. After that, the cron works, which performs the scheduled operations. It turns out that the command from the message above (php bin/magento cron:install) should fix the situation. But you won't get notifications until midnight. If you do not receive anything, then subscribe to the product again, because something may have gone wrong due to the disabled cron. This is partly my fault for writing the wrong command to run kron. Sorry!)

@topanok, That's okay and my cron is working fine but we are not getting the alert mails and some more PRs are on hold due to that. May i know in which version of magento it is working for you and more details if any.

Thanks,

[engcom-Delta]

@topanok Waiting for your reply on the PR to move ahead.

[topanok]

@topanok Waiting for your reply on the PR to move ahead.

Hello. Tested on the same branch as PR and Magento version dev-2.4-develop. Please show what you have in the product_alert_stock table in the marked columns.

[topanok]

@topanok Waiting for your reply on the PR to move ahead.

Hello! I raised the magento instance yesterday to test everything again. Here are the results. As you can see, the letters have arrived and you can see it in the magento database. So I can assume that you have some problems with the environment. Maybe ask someone for help.

[engcom-Delta]

Hi @topanok , Thanks for your reply. We are also using 2.4 develop. I have checked the table product_alert_stock. Adding the screenshot for the same.

[engcom-Delta]

Issue related to product alert stock is #35602 is reopened and this is a blocker to test this PR.

So moving this PR to Waiting related PRs.

[topanok]

Hi @topanok , Thanks for your reply. We are also using 2.4 develop. I have checked the table product_alert_stock. Adding the screenshot for the same.

It looks like you don't have cron running or you don't have mail sent configured. As you can see from my previous post, everything was working fine for me. So maybe get someone else to test it. I don't know how to help you.

[engcom-Delta]

Hi @topanok , Thanks for your reply. We are also using 2.4 develop. I have checked the table product_alert_stock. Adding the screenshot for the same.

It looks like you don't have cron running or you don't have mail sent configured. As you can see from my previous post, everything was working fine for me. So maybe get someone else to test it. I don't know how to help you.

Hi @topanok , As mentioned in the below comment we are not getting product alert email as of now when cron is running and email alert has set , so we have reopened the issue.We will wait till the issue is resolved to test this PR.

#35996 (comment)

[topanok]

Hi @topanok , Thanks for your reply. We are also using 2.4 develop. I have checked the table product_alert_stock. Adding the screenshot for the same.

It looks like you don't have cron running or you don't have mail sent configured. As you can see from my previous post, everything was working fine for me. So maybe get someone else to test it. I don't know how to help you.

Hi @topanok , As mentioned in the below comment we are not getting product alert email as of now when cron is running and email alert has set , so we have reopened the issue.We will wait till the issue is resolved to test this PR.

#35996 (comment)

You can wait, but I won't do anything. It's not my problem that you can't test. I'm already fed up with this pull request, which is already 1.5 years old.

[engcom-Hotel]

Hello @topanok,

The issue that was preventing us from receiving alert emails has been resolved. We can now move forward with this PR. However, we kindly request that you resolve the conflicts.

Thanks

[engcom-Hotel]

Hello @topanok,

This is a reminder to resolve the conflicts of this PR. Please do the needful so that we can proceed further with this.

Thanks

[engcom-Hotel]

Hello @topanok,

A gentle reminder to resolve the conflicts on this PR.

Thanks

[engcom-Hotel]

Hello @topanok,

We have noticed that this PR has not been updated for a while. Therefore, we are closing it for now.

Please let us know when you are ready to work on it again, and we will be happy to reopen the PR.

Thank you for your valuable contribution!