Fix issue with products GET request being cached despite category positions change #30636

Zifius · 2020-10-24T06:47:43Z

Description (*)

Fixes issue with products GET request being cached despite category positions change

Related Pull Requests

Fixed Issues (if relevant)

Fixes Products positions are not updated in GraphQL query result #30467

Manual testing scenarios (*)

Described in the original issue

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)

"in" condition not tested

m2-assistant · 2020-10-24T06:47:46Z

Hi @Zifius. 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

rogyar · 2020-10-24T11:11:43Z

@Zifius please, feel free to ping me if you need any help with that.

cpartica · 2020-11-03T20:29:04Z

@Zifius your fix looks good, you should open the PR and complete a test.
I think there's some integration tests done on tags as inspiration

cpartica · 2020-11-03T20:29:45Z

app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php

@@ -79,6 +79,11 @@ public function resolve(
            'layer_type' => isset($args['search']) ? Resolver::CATALOG_LAYER_SEARCH : Resolver::CATALOG_LAYER_CATEGORY,
        ];

+        if (isset($args['filter'])) {


you only need some tests, fix looks good

Zifius · 2020-11-09T15:57:03Z

Thanks @cpartica, unfortunately community slack doesn't keep the history of our 1to1 chat, so the question is would you prefer changing \Magento\GraphQl\Catalog\ProductSearchTest::testSortByPosition() (https://github.com/magento/magento2/blob/2.4-develop/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php#L1114) which seems to be testing exactly this functionality but currently passing (I suppose the test is incomplete or incorrect, but need to debug it to see what's really going on there) or creating a new test?

rogyar · 2020-11-12T14:28:36Z

Just from my point of view, I would suggest adjusting an existing test case instead of introducing a new one with a very similar purpose.

Not sure my assumption makes sense. But the existing test might work and the reason for that is utilizing disk/Redis cache for FPC instead of Varnish. But I might be wrong.

cpartica · 2020-11-23T19:12:15Z

Just from my point of view, I would suggest adjusting an existing test case instead of introducing a new one with a very similar purpose.

Not sure my assumption makes sense. But the existing test might work and the reason for that is utilizing disk/Redis cache for FPC instead of Varnish. But I might be wrong.

Yes we can't test Varnish yet, but we sure can do disk builtin cache with the help of integration tests
example: \Magento\GraphQlCache\Controller\Catalog\CategoryCacheTest

Zifius · 2020-11-26T21:09:18Z

Thank you @rogyar and @cpartica both for the replies. I've now created the test

Zifius · 2020-11-26T21:48:24Z

@magento run WebAPI Tests

…ields too

rogyar · 2020-11-27T10:04:45Z

@magento run WebAPI Tests

…ositionChange

engcom-Charlie · 2020-11-30T09:01:08Z

@magento run all tests

Zifius · 2020-11-30T14:15:24Z

@magento run Integration Tests

Zifius · 2020-11-30T19:32:12Z

@magento run all tests

rogyar

Approved. The failing functional tests are not related to the current changeset.

magento-engcom-team · 2020-12-01T13:25:43Z

Hi @rogyar, thank you for the review.
ENGCOM-8504 has been created to process this Pull Request

m2-assistant · 2020-12-04T14:43:02Z

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

Commit initial version of the fix

ef3f684

"in" condition not tested

magento-engcom-team added the Component: CatalogGraphQl label Oct 24, 2020

magento-engcom-team added Release Line: 2.4 Event: MageCONF CD 2020 labels Oct 24, 2020

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

rogyar added the Auto-Tests: Not Covered Changes in Pull Request requires coverage by auto-tests label Oct 24, 2020

ghost added Priority: P1 Once P0 defects have been fixed, a defect having this priority is the next candidate for fixing. Severity: S3 Affects non-critical data or functionality and does not force users to employ a workaround. labels Oct 24, 2020

rogyar self-assigned this Oct 24, 2020

Fix in condition filtering logic

e826862

ghost added Progress: review and removed Progress: pending review labels Oct 27, 2020

cpartica requested changes Nov 3, 2020

View reviewed changes

ghost assigned cpartica Nov 3, 2020

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

engcom-Hotel assigned engcom-Hotel and unassigned engcom-Hotel Nov 20, 2020

Add category cache tags test

be06626

Zifius marked this pull request as ready for review November 26, 2020 21:02

Zifius added 2 commits November 26, 2020 23:08

Check if category id is passed as products can be filtered by other f…

7ccfa66

…ields too

Fix code style

5dfc328

engcom-Charlie self-assigned this Nov 30, 2020

Merge branch '2.4-develop' into bugfix/Issue30467-CacheHitOnProductsP…

46d0032

…ositionChange

Zifius requested a review from cpartica November 30, 2020 10:00

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

gabrieldagama added the Project: GraphQL label Nov 30, 2020

Fix assertion

65255ad

engcom-Charlie removed their assignment Nov 30, 2020

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

rogyar added Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Award: bug fix Award: test coverage and removed Auto-Tests: Not Covered Changes in Pull Request requires coverage by auto-tests labels Dec 1, 2020

rogyar approved these changes Dec 1, 2020

View reviewed changes

m2-community-project bot added Progress: ready for testing and removed Progress: needs update labels Dec 1, 2020

cpartica approved these changes Dec 1, 2020

View reviewed changes

magento-engcom-team merged commit 13b7186 into magento:2.4-develop Dec 4, 2020

magento-engcom-team removed Award: test coverage Award: bug fix labels Dec 4, 2020

Zifius deleted the bugfix/Issue30467-CacheHitOnProductsPositionChange branch December 4, 2020 14:50

sidolov added Award: bug fix Award: test coverage labels Dec 4, 2020

Fix issue with products GET request being cached despite category positions change #30636

Fix issue with products GET request being cached despite category positions change #30636

Uh oh!

Conversation

Zifius commented Oct 24, 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 24, 2020

Uh oh!

rogyar commented Oct 24, 2020

Uh oh!

cpartica commented Nov 3, 2020

Uh oh!

cpartica Nov 3, 2020

Choose a reason for hiding this comment

Uh oh!

Zifius commented Nov 9, 2020

Uh oh!

rogyar commented Nov 12, 2020

Uh oh!

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

Uh oh!

Uh oh!

Zifius commented Nov 26, 2020

Uh oh!

Zifius commented Nov 26, 2020

Uh oh!

rogyar commented Nov 27, 2020

Uh oh!

engcom-Charlie commented Nov 30, 2020

Uh oh!

Zifius commented Nov 30, 2020

Uh oh!

Zifius commented Nov 30, 2020

Uh oh!

rogyar left a comment

Choose a reason for hiding this comment

Uh oh!

magento-engcom-team commented Dec 1, 2020

Uh oh!

m2-assistant bot commented Dec 4, 2020

Uh oh!

Uh oh!

Zifius commented Oct 24, 2020 •

edited

Loading

cpartica commented Nov 23, 2020 •

edited

Loading