magento/magento2#39111: Product Collection - addMediaGalleryData call… #39681

Himsoft · 2025-02-28T14:31:43Z

Description (*)

\Magento\Catalog\Model\ResourceModel\Product\Collection::addMediaGalleryData calls getSize if the collection is loaded.

Fixed call count instead of getSize if collection is loaded.

Related Pull Requests

Fixed Issues (if relevant)

Fixes Product Collection - addMediaGalleryData calls getSize when the collection maybe or will be loaded (Can use count to avoid an extra DB query) #39111

Manual testing scenarios (*)

Enable dev query log
Call the products GQL with the media_gallery/media_gallery_entries field selected.
The method (getSize or count) call should be in the query log, traced to addMediaGalleryData

Before fix:
getSize is called on a loaded product collection

After fix:
count is called on a loaded product collection

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)

… when the collection maybe or will be loaded (Can use count to avoid an extra DB query) - Fixed call count instead of getSize if collection is loaded.

m2-assistant · 2025-02-28T14:31:47Z

Hi @Himsoft. 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:

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

Himsoft · 2025-02-28T14:32:40Z

@magento run all tests

… when the collection maybe or will be loaded (Can use count to avoid an extra DB query) - Fixed call count instead of getSize if collection is loaded.

Himsoft · 2025-02-28T18:54:21Z

@magento run all tests

Himsoft · 2025-02-28T18:56:43Z

@magento run all tests

… when the collection maybe or will be loaded (Can use count to avoid an extra DB query) - Fixed call count instead of getSize if collection is loaded.

Himsoft · 2025-02-28T21:02:52Z

@magento run all tests

Himsoft · 2025-02-28T21:59:00Z

The failed tests are not related to fixes, they look like false positives, please pay attention to this during the review.

engcom-Hotel · 2025-03-28T04:58:38Z

@magento run all tests

Copilot

Copilot wasn't able to review any files in this pull request.

Files not reviewed (2)

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php: Language not supported
app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php: Language not supported

engcom-Hotel

Hello @Himsoft,

Thanks for the contribution!

The changes looks good to me, just one change as suggested below.

engcom-Hotel · 2025-03-28T06:47:43Z

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php

 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe


This must be 2015, as the file created in this year only.

… when the collection maybe or will be loaded (Can use count to avoid an extra DB query) - Fixed call count instead of getSize if collection is loaded.

Himsoft · 2025-03-28T08:34:06Z

@magento run all tests

engcom-Dash · 2025-04-04T05:09:53Z

@magento run all tests

engcom-Dash · 2025-04-04T12:48:45Z

@Himsoft Thank you for contribution & collaboration!

✔️ QA Passed

Preconditions:
Install Fresh Magento 2.4-develop

Steps to reproduce:

Enable dev query log using command: "bin/magento dev:query-log:enable"
Call the products Graphql with the media_gallery field selected.

Before:

As per PR description getSize() was getting called on already loaded collection which was increasing the call trace with one more query.

After:

Count() function is called if the collection is already loaded. only one trace found for addMediaGalleryData.

Added Loggers in the code to check is count getting called or not as the call was not there in the db.log

Functional Tests are failing hence moving this PR to Extended Testing.

engcom-Dash · 2025-04-04T13:40:19Z

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

engcom-Dash · 2025-04-07T04:35:02Z

All checks have been completed and the build is green. Hence moving this PR in Merge In Progress.

magento#39111: Product Collection - addMediaGalleryData calls getSize…

072a3fe

… when the collection maybe or will be loaded (Can use count to avoid an extra DB query) - Fixed call count instead of getSize if collection is loaded.

m2-github-services added Partner: Perspective partners-contribution Pull Request is created by Magento Partner labels Feb 28, 2025

magento#39111: Product Collection - addMediaGalleryData calls getSize…

b8c6634

… when the collection maybe or will be loaded (Can use count to avoid an extra DB query) - Fixed call count instead of getSize if collection is loaded.

Merge branch '2.4-develop' into fix-for-issue-39111

065ccf5

magento#39111: Product Collection - addMediaGalleryData calls getSize…

c77217f

… when the collection maybe or will be loaded (Can use count to avoid an extra DB query) - Fixed call count instead of getSize if collection is loaded.

engcom-Bravo added the Priority: P2 A defect with this priority could have functionality issues which are not to expectations. label Mar 3, 2025

Merge branch '2.4-develop' into fix-for-issue-39111

b931199

Priyakshic added the Project: Community Picked PRs upvoted by the community label Mar 13, 2025

Priyakshic added this to Community Dashboard Mar 13, 2025

Priyakshic moved this to Pending Review in Community Dashboard Mar 13, 2025

engcom-Bravo added the Triage: Dev.Experience Issue related to Developer Experience and needs help with Triage to Confirm or Reject it label Mar 17, 2025

Merge branch '2.4-develop' into fix-for-issue-39111

bc67271

engcom-Hotel requested review from Copilot and engcom-Hotel March 28, 2025 04:58

Copilot AI reviewed Mar 28, 2025

View reviewed changes

engcom-Hotel requested changes Mar 28, 2025

View reviewed changes

engcom-Hotel moved this from Pending Review to Changes Requested in Community Dashboard Mar 28, 2025

engcom-Hotel added the Progress: needs update label Mar 28, 2025

magento#39111: Product Collection - addMediaGalleryData calls getSize…

29c0c93

… when the collection maybe or will be loaded (Can use count to avoid an extra DB query) - Fixed call count instead of getSize if collection is loaded.

engcom-Hotel moved this from Changes Requested to Pending Review in Community Dashboard Apr 1, 2025

engcom-Hotel removed the Progress: needs update label Apr 1, 2025

engcom-Hotel added the Progress: pending review label Apr 1, 2025

engcom-Hotel moved this from Pending Review to Review in Progress in Community Dashboard Apr 2, 2025

engcom-Hotel added Progress: review and removed Progress: pending review labels Apr 2, 2025

engcom-Hotel approved these changes Apr 2, 2025

View reviewed changes

engcom-Hotel moved this from Review in Progress to Ready for Testing in Community Dashboard Apr 2, 2025

engcom-Hotel added Progress: ready for testing and removed Progress: review labels Apr 2, 2025

engcom-Dash self-assigned this Apr 3, 2025

engcom-Dash moved this from Ready for Testing to Testing in Progress in Community Dashboard Apr 3, 2025

Merge branch '2.4-develop' into fix-for-issue-39111

fb61e3b

engcom-Dash moved this from Testing in Progress to Extended testing (optional) in Community Dashboard Apr 4, 2025

engcom-Dash added Progress: accept and removed Progress: ready for testing labels Apr 7, 2025

engcom-Dash moved this from Extended testing (optional) to Merge in Progress in Community Dashboard Apr 7, 2025

magento-devops-reposync-svc merged commit 5388de0 into magento:2.4-develop Apr 16, 2025
12 checks passed

engcom-Charlie moved this from Merge in Progress to Recently Merged in Community Dashboard Apr 21, 2025

magento/magento2#39111: Product Collection - addMediaGalleryData call… #39681

magento/magento2#39111: Product Collection - addMediaGalleryData call… #39681

Conversation

Himsoft commented Feb 28, 2025

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Manual testing scenarios (*)

Questions or comments

Contribution checklist (*)

Uh oh!

m2-assistant bot commented Feb 28, 2025

Uh oh!

Himsoft commented Feb 28, 2025

Uh oh!

Himsoft commented Feb 28, 2025

Uh oh!

Himsoft commented Feb 28, 2025

Uh oh!

Himsoft commented Feb 28, 2025

Uh oh!

Himsoft commented Feb 28, 2025

Uh oh!

engcom-Hotel commented Mar 28, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

engcom-Hotel left a comment

Choose a reason for hiding this comment

Uh oh!

engcom-Hotel Mar 28, 2025

Choose a reason for hiding this comment

Uh oh!

Himsoft commented Mar 28, 2025

Uh oh!

engcom-Dash commented Apr 4, 2025

Uh oh!

engcom-Dash commented Apr 4, 2025

Uh oh!

engcom-Dash commented Apr 4, 2025

Uh oh!

engcom-Dash commented Apr 7, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants