Merge remote-tracking branch 'magento-l3/ACP2E-2689' into Tier4-Kings-PR-03-05-2024

Author: glanujnehra

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

@@ -16,6 +16,11 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Catalog\Helper\Data;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Validate Tier Price and check duplication
@@ -91,6 +96,11 @@ class TierPriceValidator implements ResetAfterRequestInterface
      */
     private $productsCacheBySku = [];
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * TierPriceValidator constructor.
      *
@@ -103,17 +113,20 @@ class TierPriceValidator implements ResetAfterRequestInterface
      * @param InvalidSkuProcessor $invalidSkuProcessor
      * @param ProductRepositoryInterface $productRepository
      * @param array $allowedProductTypes [optional]
+     * @param ScopeConfigInterface|null $scopeConfig
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        ProductIdLocatorInterface          $productIdLocator,
-        SearchCriteriaBuilder              $searchCriteriaBuilder,
-        FilterBuilder                      $filterBuilder,
-        GroupRepositoryInterface            $customerGroupRepository,
-        WebsiteRepositoryInterface             $websiteRepository,
-        Result                                                    $validationResult,
-        InvalidSkuProcessor                                       $invalidSkuProcessor,
+        ProductIdLocatorInterface $productIdLocator,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        FilterBuilder $filterBuilder,
+        GroupRepositoryInterface $customerGroupRepository,
+        WebsiteRepositoryInterface $websiteRepository,
+        Result $validationResult,
+        InvalidSkuProcessor $invalidSkuProcessor,
         ProductRepositoryInterface $productRepository,
-        array                                                     $allowedProductTypes = []
+        array $allowedProductTypes = [],
+        ?ScopeConfigInterface $scopeConfig = null
     ) {
         $this->productIdLocator = $productIdLocator;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
@@ -124,6 +137,7 @@ public function __construct(
         $this->invalidSkuProcessor = $invalidSkuProcessor;
         $this->productRepository = $productRepository;
         $this->allowedProductTypes = $allowedProductTypes;
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -355,10 +369,19 @@ private function checkQuantity(TierPriceInterface $price, $key, Result $validati
      * @param Result $validationResult
      * @return void
      */
-    private function checkWebsite(TierPriceInterface $price, $key, Result $validationResult)
+    private function checkWebsite(TierPriceInterface $price, $key, Result $validationResult): void
     {
         try {
             $this->websiteRepository->getById($price->getWebsiteId());
+            $isWebsiteScope = $this->scopeConfig
+                ->isSetFlag(
+                    Data::XML_PATH_PRICE_SCOPE,
+                    ScopeInterface::SCOPE_STORE,
+                    ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+                );
+            if (!$isWebsiteScope && (int) $this->allWebsitesValue !== $price->getWebsiteId()) {
+                throw NoSuchEntityException::singleField('website_id', $price->getWebsiteId());
+            }
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
             $validationResult->addFailedItem(
                 $key,

dev/tests/api-functional/testsuite/Magento/Catalog/Api/TierPriceStorageTest.php

@@ -9,6 +9,9 @@
 use Magento\Catalog\Api\Data\TierPriceInterface;
 use Magento\Framework\Webapi\Rest\Request;
 use Magento\TestFramework\TestCase\WebapiAbstract;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
+use Magento\Customer\Model\Group;
 
 /**
  * Test all API calls for tier price storage.
@@ -300,6 +303,57 @@ public function testDelete()
         $this->assertEquals($pricesToStore, $tierPrice);
     }
 
+    /**
+     * Test to validate the incorrect website id.
+     */
+    #[
+        DataFixture(
+            ProductFixture::class,
+            [
+                'sku' => 'simple',
+                'website_id' => 0,
+                'tier_prices' => [
+                    [
+                        'customer_group_id' => Group::NOT_LOGGED_IN_ID,
+                        'qty' => 3.2,
+                        'value' => 6
+                    ]
+                ]
+            ]
+        )
+    ]
+    public function testCheckWebsite()
+    {
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/products/tier-prices',
+                'httpMethod' => Request::HTTP_METHOD_POST
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Update',
+            ],
+        ];
+        $tierPriceWithInvalidWebsiteId = [
+            'price' => 38.97,
+            'price_type' => TierPriceInterface::PRICE_TYPE_FIXED,
+            'website_id' => 1,
+            'sku' => self::SIMPLE_PRODUCT_SKU,
+            'customer_group' => 'ALL GROUPS',
+            'quantity' => 3,
+            'extension_attributes' => []
+        ];
+        $response = $this->_webApiCall($serviceInfo, ['prices' => [$tierPriceWithInvalidWebsiteId]]);
+        if (is_array($response) && count($response) > 0) {
+            $this->assertNotEmpty($response);
+            // phpcs:disable Generic.Files.LineLength.TooLong
+            $message = 'Invalid attribute Website ID = %websiteId. Row ID: SKU = %SKU, Website ID: %websiteId, Customer Group: %customerGroup, Quantity: %qty.';
+            $this->assertEquals($message, $response[0]['message']);
+            $this->assertEquals(['simple', '1', 'ALL GROUPS', '3'], $response[0]['parameters']);
+        }
+    }
+
     /**
      * Check prise exists and is correct.
      *