Fixes customer edit issue when there is a newsletter queue associated with it. #30727

engcom-Golf · 2020-10-30T14:41:03Z

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Fixes Customer Edit Issue when there is a newsletter queue associated with it. #30645 Customer Edit Issue when there is a newsletter queue associated with it.

Manual testing scenarios (*)

Customer Edit Issue when there is a newsletter queue associated with it. #30645 Customer Edit Issue when there is a newsletter queue associated with it.
Please check newsletter tab queue grid functionality on the customer edit page

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 · 2020-10-30T14:41:06Z

Hi @engcom-Golf. Thank you for your contribution
Here is 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:

Database Compare
Functional Tests CE
Functional Tests EE,
Functional Tests B2B
Integration Tests
Magento Health Index
Sample Data Tests CE
Sample Data Tests EE
Sample Data Tests B2B
Static Tests
Unit Tests
WebAPI Tests

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

engcom-Golf · 2020-10-30T14:41:58Z

@magento run all tests

aleron75 · 2020-11-03T17:45:48Z

@magento give me 2.4-develop instance

magento-deployment-service · 2020-11-03T17:45:51Z

Hi @aleron75. Thank you for your request. I'm working on Magento instance for you.

magento-deployment-service · 2020-11-03T17:50:41Z

Hi @aleron75, here is your Magento Instance: https://f480a0970383178466c2d523b11ff535-2-4-develop.instances.magento-community.engineering
Admin access: https://f480a0970383178466c2d523b11ff535-2-4-develop.instances.magento-community.engineering/admin_591b
Login: 67050b77
Password: f225e5ade8b5

aleron75 · 2020-11-03T17:59:53Z

@magento give me test instance

magento-deployment-service · 2020-11-03T17:59:55Z

Hi @aleron75. Thank you for your request. I'm working on Magento instance for you.

magento-deployment-service · 2020-11-03T18:04:56Z

Hi @aleron75, here is your Magento Instance: https://f480a0970383178466c2d523b11ff535.instances.magento-community.engineering
Admin access: https://f480a0970383178466c2d523b11ff535.instances.magento-community.engineering/admin_9686
Login: 58b026c8
Password: 36eb47a7129d

aleron75 · 2020-11-03T18:39:02Z

dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/NewsletterTest.php

@@ -74,6 +76,9 @@ public function testRenderingNewsletterBlock()
        );
        $this->assertStringNotContainsString('checked="checked"', $body);
        $this->assertStringContainsString('\u003Cspan\u003ESubscribed to Newsletter\u003C\/span\u003E', $body);
-        $this->assertStringContainsString('\u003ENo Newsletter Found\u003C', $body);
+        $this->assertMatchesRegularExpression(


Hello @engcom-Golf,
thanks for your PR.

Please help me understand something that is unclear to me.

According to the following assertion:

$this->assertStringNotContainsString('checked="checked"', $body);

we expect that the customer is not subscribed;

but according to the newly added assertion:

$this->assertMatchesRegularExpression('~.+\/newsletter\\\/template\\\/preview\\\/id\\\/\d+\\\/subscriber\\\/\d+\\\/.+~', $body);

it seems we expect that the customer was considered a subscriber because we expect to see the preview link in the grid of queued emails.

Furthermore, looking at the fixtures, I don't see any subscription created for the test customer so I don't get how the tests can pass.

Thanks

As an example, the customer can unsubscribe from newsletters but have already received ones. They have to be shown in the grid with sent status. The logic of drawing the subscription checkbox is not connected with the newsletters queue.

I get the point on the checkbox, but I don't understand where in the fixtures we set a received newsletter for the customer.

To clarify, I verified the PR and it seems ok, it solves the issue, I want just to check whether we have a false positive test or it's just me :)

zakdma · 2020-11-04T13:47:12Z

dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/NewsletterTest.php

@@ -59,6 +59,8 @@ protected function tearDown(): void

    /**
     * @magentoDataFixture Magento/Customer/_files/customer_sample.php
+     * @magentoDataFixture Magento/Newsletter/_files/newsletter_sample.php


I would recommend make new test case for that and leave old as is

zakdma · 2020-11-04T13:52:12Z

app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php

@@ -225,7 +225,10 @@ public function addCustomerFilter(int $customerId): Collection
            )->join(
                ['subscriber' => $this->getTable('newsletter_subscriber')],
                'link.subscriber_id=subscriber.subscriber_id',
-                ['subscriber_store_id' => 'subscriber.store_id']
+                [


Please cover this code changes with integration test

covered in dev/tests/integration/testsuite/Magento/Newsletter/Model/ResourceModel/Queue/CollectionTest.php

…ated with it. magento#30645

engcom-Bravo · 2020-11-05T14:25:00Z

✔️ QA Passed

Manual testing scenario:

Add a new customer which is also subscribed to newsletter.
Create a newsletter in Marketing>Newsletter Templates
Queue the newsletter
Go to the customer edit page and try to edit their information

Before applying changes provided in this PR

After switching to the PR

engcom-Bravo · 2020-11-06T09:18:43Z

✔️
Correct template_id and subscriber_id is set in the View newsletter template link admin/newsletter/template/preview/id/3/subscriber/3/key/5e2ce99354cdf81dbd3a3e2989d4c0706b3f75d43f0a77cd0462e7f98345686a/
Correct subscriber_id and customer_id in newsletter_subscriber database table

engcom-Bravo · 2020-11-09T11:37:57Z

✔️ QA Passed

Retested with the latest commit

zakdma · 2020-11-13T07:05:30Z

@magento import pull request to https://github.com/magento-tsg/magento2ce

magento-engcom-team · 2020-11-13T07:08:04Z

@zakdma the pull request successfully imported.

m2-assistant · 2020-11-14T16:18:56Z

Hi @engcom-Golf, 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.

ghost added the Progress: pending review label Oct 30, 2020

magento-engcom-team added Component: Customer Component: Newsletter Release Line: 2.4 labels Oct 30, 2020

engcom-Golf requested review from zakdma, engcom-Kilo and viktorpetryk November 2, 2020 09:10

engcom-Golf marked this pull request as ready for review November 2, 2020 09:10

ghost added Priority: P1 Once P0 defects have been fixed, a defect having this priority is the next candidate for fixing. Severity: S1 Affects critical data or functionality and forces users to employ a workaround. labels Nov 2, 2020

aleron75 reviewed Nov 3, 2020

View reviewed changes

ghost assigned aleron75 Nov 3, 2020

ghost added Progress: review and removed Progress: pending review labels Nov 3, 2020

zakdma suggested changes Nov 4, 2020

View reviewed changes

m2-community-project bot assigned zakdma Nov 4, 2020

m2-community-project bot added Progress: needs update and removed Progress: review labels Nov 4, 2020

zakdma reviewed Nov 4, 2020

View reviewed changes

m2-community-project bot added Progress: review and removed Progress: needs update labels Nov 4, 2020

MC-38789: Customer Edit Issue when there is a newsletter queue associ…

1f43912

…ated with it. magento#30645

engcom-Bravo mentioned this pull request Nov 5, 2020

Customer Edit Issue when there is a newsletter queue associated with it. #30645

Closed

engcom-Bravo added the QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope label Nov 5, 2020

m2-community-project bot added Progress: ready for testing Progress: accept and removed Progress: testing in progress Progress: ready for testing labels Nov 5, 2020

engcom-Bravo added the Auto-Tests: Covered All changes in Pull Request is covered by auto-tests label Nov 5, 2020

m2-community-project bot added Progress: ready for testing Progress: testing in progress and removed Progress: accept Progress: ready for testing labels Nov 5, 2020

m2-community-project bot added Progress: accept and removed Progress: testing in progress labels Nov 6, 2020

aleron75 added the bugfix label Nov 7, 2020

m2-community-project bot added Progress: ready for testing and removed Progress: accept labels Nov 7, 2020

aleron75 approved these changes Nov 7, 2020

View reviewed changes

m2-community-project bot added Progress: testing in progress and removed Progress: ready for testing labels Nov 9, 2020

m2-community-project bot added Progress: accept and removed Progress: testing in progress labels Nov 9, 2020

magento-engcom-team merged commit 084a8dd into magento:2.4-develop Nov 14, 2020

aleron75 assigned danielrussob Nov 23, 2020

AnnaAPak mentioned this pull request Dec 22, 2020

[MFTF] Coverage for the 30645 Customer Edit Issue when there is a newsletter queue associated with it #31390

Merged

Fixes customer edit issue when there is a newsletter queue associated with it. #30727

Fixes customer edit issue when there is a newsletter queue associated with it. #30727

Uh oh!

Conversation

engcom-Golf commented Oct 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Manual testing scenarios (*)

Questions or comments

Contribution checklist (*)

Uh oh!

m2-assistant bot commented Oct 30, 2020

Uh oh!

engcom-Golf commented Oct 30, 2020

Uh oh!

aleron75 commented Nov 3, 2020

Uh oh!

magento-deployment-service bot commented Nov 3, 2020

Uh oh!

magento-deployment-service bot commented Nov 3, 2020

Uh oh!

aleron75 commented Nov 3, 2020

Uh oh!

magento-deployment-service bot commented Nov 3, 2020

Uh oh!

magento-deployment-service bot commented Nov 3, 2020

Uh oh!

aleron75 Nov 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

engcom-Golf Nov 4, 2020

Choose a reason for hiding this comment

Uh oh!

aleron75 Nov 5, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zakdma Nov 4, 2020

Choose a reason for hiding this comment

Uh oh!

engcom-Golf Nov 5, 2020

Choose a reason for hiding this comment

Uh oh!

zakdma Nov 4, 2020

Choose a reason for hiding this comment

Uh oh!

engcom-Golf Nov 5, 2020

Choose a reason for hiding this comment

Uh oh!

engcom-Bravo commented Nov 5, 2020

Uh oh!

engcom-Bravo commented Nov 6, 2020

Uh oh!

engcom-Bravo commented Nov 9, 2020

Uh oh!

zakdma commented Nov 13, 2020

Uh oh!

magento-engcom-team commented Nov 13, 2020

Uh oh!

m2-assistant bot commented Nov 14, 2020

Uh oh!

Uh oh!

engcom-Golf commented Oct 30, 2020 •

edited

Loading

aleron75 Nov 3, 2020 •

edited

Loading

aleron75 Nov 5, 2020 •

edited

Loading