Merge remote-tracking branch 'origin/imported-magento-magento2-31629' into 2.4-develop-pr120

Author: zakdma

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -17,6 +17,7 @@
 use Magento\Framework\Api\ImageContentValidatorInterface;
 use Magento\Framework\Api\ImageProcessorInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\DB\Adapter\ConnectionException;
 use Magento\Framework\DB\Adapter\DeadlockException;
 use Magento\Framework\DB\Adapter\LockWaitException;
@@ -619,7 +620,7 @@ public function deleteById($sku)
     /**
      * @inheritdoc
      */
-    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
+    public function getList(SearchCriteriaInterface $searchCriteria)
     {
         /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
         $collection = $this->collectionFactory->create();
@@ -628,6 +629,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         $collection->addAttributeToSelect('*');
         $collection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
         $collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
+        $this->joinPositionField($collection, $searchCriteria);
 
         $this->collectionProcessor->process($searchCriteria, $collection);
 
@@ -856,4 +858,36 @@ private function saveProduct($product): void
             );
         }
     }
+
+    /**
+     * Join category position field to make sorting by position possible.
+     *
+     * @param Collection $collection
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return void
+     */
+    private function joinPositionField(
+        Collection $collection,
+        SearchCriteriaInterface $searchCriteria
+    ): void {
+        $categoryIds = [[]];
+        foreach ($searchCriteria->getFilterGroups() as $filterGroup) {
+            foreach ($filterGroup->getFilters() as $filter) {
+                if ($filter->getField() === 'category_id') {
+                    $categoryIds[] = explode(',', $filter->getValue());
+                }
+            }
+        }
+        $categoryIds = array_unique(array_merge(...$categoryIds));
+        if (count($categoryIds) === 1) {
+            $collection->joinField(
+                'position',
+                'catalog_category_product',
+                'position',
+                'product_id=entity_id',
+                ['category_id' => current($categoryIds)],
+                'left'
+            );
+        }
+    }
 }

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -852,6 +852,9 @@ public function testDeleteById()
     public function testGetList()
     {
         $searchCriteriaMock = $this->getMockForAbstractClass(SearchCriteriaInterface::class);
+        $searchCriteriaMock->expects($this->once())
+            ->method('getFilterGroups')
+            ->willReturn([]);
         $collectionMock = $this->createMock(Collection::class);
         $this->collectionFactory->expects($this->once())->method('create')->willReturn($collectionMock);
         $this->product->method('getSku')->willReturn('simple');