AC-13448: Deliver tier-price operations performance improvement patch into 2.4.8

Fix for WebAPI, Integration & Unit tests failures

Author: sumesh-GL

app/code/Magento/Catalog/Model/Product/Price/Validation/TierPriceValidator.php

@@ -493,7 +493,7 @@ private function retrieveGroupValue(string $code)
                 'customer_group_code = ?',
                 $code
             );
-            $this->customerGroupCheck[$code] = (bool)$connection->fetchOne($select);
+            $this->customerGroupCheck[$code] = $connection->fetchOne($select);
         }
 
         return $this->customerGroupCheck[$code];

app/code/Magento/Catalog/Test/Unit/Model/Product/Price/Validation/TierPriceValidatorTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -14,13 +14,9 @@
 use Magento\Catalog\Model\Product\Price\Validation\TierPriceValidator;
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\ProductIdLocatorInterface;
-use Magento\Customer\Api\Data\GroupInterface;
-use Magento\Customer\Api\Data\GroupSearchResultsInterface;
-use Magento\Customer\Api\GroupRepositoryInterface;
-use Magento\Framework\Api\AbstractSimpleObject;
-use Magento\Framework\Api\FilterBuilder;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
-use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Api\Data\WebsiteInterface;
@@ -45,21 +41,6 @@ class TierPriceValidatorTest extends TestCase
      */
     private $productIdLocator;
 
-    /**
-     * @var SearchCriteriaBuilder|MockObject
-     */
-    private $searchCriteriaBuilder;
-
-    /**
-     * @var FilterBuilder|MockObject
-     */
-    private $filterBuilder;
-
-    /**
-     * @var GroupRepositoryInterface|MockObject
-     */
-    private $customerGroupRepository;
-
     /**
      * @var WebsiteRepositoryInterface|MockObject
      */
@@ -85,6 +66,16 @@ class TierPriceValidatorTest extends TestCase
      */
     private $productRepository;
 
+    /**
+     * @var ResourceConnection|MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var AdapterInterface|MockObject
+     */
+    private $adapterInterface;
+
     /**
      * {@inheritdoc}
      */
@@ -93,15 +84,6 @@ protected function setUp(): void
         $this->productIdLocator = $this->getMockBuilder(ProductIdLocatorInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $this->searchCriteriaBuilder = $this->getMockBuilder(SearchCriteriaBuilder::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->filterBuilder = $this->getMockBuilder(FilterBuilder::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->customerGroupRepository = $this->getMockBuilder(GroupRepositoryInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
         $this->websiteRepository = $this->getMockBuilder(WebsiteRepositoryInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -118,51 +100,54 @@ protected function setUp(): void
         $this->productRepository = $this->getMockBuilder(ProductRepositoryInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->adapterInterface = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
 
         $objectManagerHelper = new ObjectManager($this);
         $this->tierPriceValidator = $objectManagerHelper->getObject(
             TierPriceValidator::class,
             [
                 'productIdLocator' => $this->productIdLocator,
-                'searchCriteriaBuilder' => $this->searchCriteriaBuilder,
-                'filterBuilder' => $this->filterBuilder,
-                'customerGroupRepository' => $this->customerGroupRepository,
                 'websiteRepository' => $this->websiteRepository,
                 'validationResult' => $this->validationResult,
                 'invalidSkuProcessor' => $this->invalidSkuProcessor,
-                'productRepository' => $this->productRepository
+                'productRepository' => $this->productRepository,
+                'resourceConnection' => $this->resourceConnectionMock
             ]
         );
     }
 
     /**
      * Prepare CustomerGroupRepository mock.
      *
-     * @param array $returned
      * @return void
      */
-    private function prepareCustomerGroupRepositoryMock(array $returned)
+    private function prepareCustomerGroupRepositoryMock()
     {
-        $searchCriteria = $this
-            ->getMockBuilder(SearchCriteriaInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $filter = $this->getMockBuilder(AbstractSimpleObject::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $this->filterBuilder->expects($this->atLeastOnce())->method('setField')->willReturnSelf();
-        $this->filterBuilder->expects($this->atLeastOnce())->method('setValue')->willReturnSelf();
-        $this->filterBuilder->expects($this->atLeastOnce())->method('create')->willReturn($filter);
-        $this->searchCriteriaBuilder->expects($this->atLeastOnce())->method('addFilters')->willReturnSelf();
-        $this->searchCriteriaBuilder->expects($this->atLeastOnce())->method('create')->willReturn($searchCriteria);
-        $customerGroupSearchResults = $this
-            ->getMockBuilder(GroupSearchResultsInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $customerGroupSearchResults->expects($this->once())->method('getItems')
-            ->willReturn($returned['customerGroupSearchResults_getItems']);
-        $this->customerGroupRepository->expects($this->atLeastOnce())->method('getList')
-            ->willReturn($customerGroupSearchResults);
+        $select = $this->createMock(Select::class);
+        $select->expects($this->once())
+            ->method('from')
+            ->with('customer_group', 'customer_group_id')
+            ->willReturnSelf();
+        $select->expects($this->once())
+            ->method('where')
+            ->with('customer_group_code = ?', 'test_group')
+            ->willReturnSelf();
+        $this->adapterInterface->expects($this->once())
+            ->method('select')
+            ->willReturn($select);
+
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->adapterInterface);
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getTableName')
+            ->willReturnArgument(0);
     }
 
     /**
@@ -251,11 +236,6 @@ public function testValidateSkus()
      */
     public function testRetrieveValidationResult(array $returned)
     {
-        if (!empty($returned['customerGroupSearchResults_getItems'])) {
-            $groupSearchResult = $returned['customerGroupSearchResults_getItems'][0];
-            $returned['customerGroupSearchResults_getItems'][0] = $groupSearchResult($this);
-        }
-
         $sku = 'ASDF234234';
         $prices = [$this->tierPrice];
         $existingPrices = [$this->tierPrice];
@@ -264,26 +244,14 @@ public function testRetrieveValidationResult(array $returned)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $this->websiteRepository->expects($this->atLeastOnce())->method('getById')->willReturn($website);
-        $this->prepareCustomerGroupRepositoryMock($returned);
+        $this->prepareCustomerGroupRepositoryMock();
 
         $this->assertEquals(
             $this->validationResult,
             $this->tierPriceValidator->retrieveValidationResult($prices, $existingPrices)
         );
     }
 
-    protected function getMockForCustomerGroup($customerGroupName)
-    {
-        $customerGroup = $this->getMockBuilder(GroupInterface::class)
-            ->onlyMethods(['getCode', 'getId'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $customerGroup->expects($this->atLeastOnce())->method('getCode')->willReturn($customerGroupName);
-        $customerGroupId = 23;
-        $customerGroup->expects($this->atLeastOnce())->method('getId')->willReturn($customerGroupId);
-        return $customerGroup;
-    }
-
     /**
      * Data provider for retrieveValidationResult() test.
      *
@@ -292,21 +260,17 @@ protected function getMockForCustomerGroup($customerGroupName)
     public static function retrieveValidationResultDataProvider()
     {
         $customerGroupName = 'test_Group';
-        $customerGroup = static fn (self $testCase) => $testCase->getMockForCustomerGroup($customerGroupName);
-
         return [
             [
                 [
                     'tierPrice_getCustomerGroup' => $customerGroupName,
-                    'tierPrice_getPriceType' => TierPriceInterface::PRICE_TYPE_DISCOUNT,
-                    'customerGroupSearchResults_getItems' => [$customerGroup]
+                    'tierPrice_getPriceType' => TierPriceInterface::PRICE_TYPE_DISCOUNT
                 ]
             ],
             [
                 [
                     'tierPrice_getCustomerGroup' => $customerGroupName,
-                    'tierPrice_getPriceType' => TierPriceInterface::PRICE_TYPE_FIXED,
-                    'customerGroupSearchResults_getItems' => []
+                    'tierPrice_getPriceType' => TierPriceInterface::PRICE_TYPE_FIXED
                 ]
             ]
         ];
@@ -325,13 +289,12 @@ public function testRetrieveValidationResultWithException()
         $existingPrices = [$this->tierPrice];
         $returned = [
             'tierPrice_getPriceType' => TierPriceInterface::PRICE_TYPE_DISCOUNT,
-            'customerGroupSearchResults_getItems' => [],
             'tierPrice_getCustomerGroup' => $customerGroupName,
         ];
         $this->prepareRetrieveValidationResultMethod($sku, $returned);
         $exception = new NoSuchEntityException();
         $this->websiteRepository->expects($this->atLeastOnce())->method('getById')->willThrowException($exception);
-        $this->prepareCustomerGroupRepositoryMock($returned);
+        $this->prepareCustomerGroupRepositoryMock();
 
         $this->assertEquals(
             $this->validationResult,

app/code/Magento/Customer/etc/db_schema.xml

@@ -430,7 +430,7 @@
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="customer_group_id"/>
         </constraint>
-        <index referenceId="CUSTOMER_GROUP_CODE" indexType="btree">
+        <index referenceId="CUSTOMER_GROUP_CUSTOMER_GROUP_CODE" indexType="btree">
             <column name="customer_group_code"/>
         </index>
     </table>

app/code/Magento/Customer/etc/db_schema_whitelist.json

@@ -267,7 +267,7 @@
             "tax_class_id": true
         },
         "index": {
-            "CUSTOMER_GROUP_CODE": true
+            "CUSTOMER_GROUP_CUSTOMER_GROUP_CODE": true
         },
         "constraint": {
             "PRIMARY": true