Merge branch 'ACP2E-4334' of https://github.com/adobe-commerce-tier-4/magento2ce into ACP2E-4334

# Conflicts:
#	app/code/Magento/Catalog/Model/Product/Price/Validation/TierPriceValidator.php
#	app/code/Magento/Catalog/Test/Unit/Model/Product/Price/Validation/TierPriceValidatorTest.php

Author: aplapana

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

@@ -1,13 +1,24 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Api;
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\TierPriceInterface;
+use Magento\Catalog\Helper\Data;
 use Magento\Framework\Webapi\Rest\Request;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\ResourceModel\Website as WebsiteResource;
+use Magento\Store\Test\Fixture\Group as StoreGroupFixture;
+use Magento\Store\Test\Fixture\Store as StoreFixture;
+use Magento\Store\Test\Fixture\Website as WebsiteFixture;
+use Magento\TestFramework\Fixture\Config;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
+use Magento\TestFramework\Fixture\DbIsolation;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\TestFramework\Fixture\DataFixture;
 use Magento\Catalog\Test\Fixture\Product as ProductFixture;
@@ -27,16 +38,28 @@ class TierPriceStorageTest extends WebapiAbstract
     private const WRONG_CUSTOMER_GROUP_NAME ='general';
 
     /**
-     * @var \Magento\TestFramework\ObjectManager
+     * @var ObjectManager
      */
     private $objectManager;
 
+    /**
+     * @var WebsiteRepositoryInterface
+     */
+    private $websiteRepository;
+
+    /**
+     * @var WebsiteResource
+     */
+    private $websiteResource;
+
     /**
      * Set up.
      */
     protected function setUp(): void
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->websiteRepository = $this->objectManager->create(WebsiteRepositoryInterface::class);
+        $this->websiteResource = $this->objectManager->create(WebsiteResource::class);
     }
 
     /**
@@ -59,7 +82,7 @@ public function testGet()
             ],
         ];
         $response = $this->_webApiCall($serviceInfo, ['skus' => [self::SIMPLE_PRODUCT_SKU]]);
-        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         /** @var ProductInterface $product */
         $tierPrices = $productRepository->get(self::SIMPLE_PRODUCT_SKU)->getTierPrices();
         $this->assertNotEmpty($response);
@@ -77,7 +100,7 @@ public function testGet()
      */
     public function testUpdate()
     {
-        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         $prices = $productRepository->get(self::SIMPLE_PRODUCT_SKU)->getTierPrices();
         $tierPrice = array_shift($prices);
         $serviceInfo = [
@@ -108,7 +131,7 @@ public function testUpdate()
             'quantity' => $tierPrice->getQty()
         ];
         $response = $this->_webApiCall($serviceInfo, ['prices' => [$updatedPrice, $newPrice]]);
-        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         $tierPrices = $productRepository->get(self::SIMPLE_PRODUCT_SKU)->getTierPrices();
         $this->assertEmpty($response);
         $this->assertTrue($this->isPriceCorrect($newPrice, $tierPrices));
@@ -198,7 +221,7 @@ public function testReplaceWithoutErrorMessage()
             ]
         ];
         $response = $this->_webApiCall($serviceInfo, ['prices' => $newPrices]);
-        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         /** @var ProductInterface $product */
         $tierPrices = $productRepository->get(self::SIMPLE_PRODUCT_SKU)->getTierPrices();
         $this->assertEmpty($response);
@@ -260,7 +283,7 @@ public function testReplaceWithErrorMessage()
      */
     public function testDelete()
     {
-        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         $tierPrices = $productRepository->get(self::SIMPLE_PRODUCT_SKU)->getTierPrices();
         $pricesToStore = array_pop($tierPrices);
         $pricesToDelete = [];
@@ -270,7 +293,7 @@ public function testDelete()
             $priceType = $tierPrice->getExtensionAttributes()->getPercentageValue()
                 ? TierPriceInterface::PRICE_TYPE_DISCOUNT
                 : TierPriceInterface::PRICE_TYPE_FIXED;
-            $customerGroup = $tierPrice->getCustomerGroupId() == \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID
+            $customerGroup = $tierPrice->getCustomerGroupId() == Group::NOT_LOGGED_IN_ID
                 ? self::CUSTOMER_NOT_LOGGED_IN_GROUP_NAME
                 : self::CUSTOMER_ALL_GROUPS_NAME;
             $pricesToDelete[] = [
@@ -295,7 +318,7 @@ public function testDelete()
             ],
         ];
         $response = $this->_webApiCall($serviceInfo, ['prices' => $pricesToDelete]);
-        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         $tierPrices = $productRepository->get(self::SIMPLE_PRODUCT_SKU)->getTierPrices();
         $tierPrice = $tierPrices[0];
         $this->assertEmpty($response);
@@ -354,6 +377,66 @@ public function testCheckWebsite()
         }
     }
 
+    /**
+     * Test to validate the incorrect website id for multi website setup.
+     */
+    #[
+        Config(Data::XML_PATH_PRICE_SCOPE, Data::PRICE_SCOPE_WEBSITE),
+        DataFixture(WebsiteFixture::class, ['code' => 'second'], 'second_website'),
+        DataFixture(StoreGroupFixture::class, ['website_id' => '$second_website.id$'], 'second_store_group'),
+        DataFixture(StoreFixture::class, ['store_group_id' => '$second_store_group.id$'], 'second_store'),
+        DataFixture(
+            ProductFixture::class,
+            [
+                'sku' => 'simple',
+                'website_id' => '$second_website.id$',
+                'tier_prices' => [
+                    [
+                        'customer_group_id' => Group::NOT_LOGGED_IN_ID,
+                        'qty' => 100,
+                        'value' => 100
+                    ]
+                ]
+            ]
+        )
+    ]
+    public function testCheckWebsiteWithMultiWebsite()
+    {
+        $fixture = DataFixtureStorageManager::getStorage();
+        $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',
+            ],
+        ];
+
+        $secondWebsite = $fixture->get('second_website');
+        $secondWebsiteCode = $secondWebsite->getCode();
+        $secondWebsiteDetails = $this->websiteRepository->get($secondWebsiteCode);
+        $secondWebsiteDetails->setIsDefault(true);
+        $this->websiteResource->save($secondWebsiteDetails);
+        $tierPriceWithInvalidWebsiteId = [
+            'price' => 28,
+            'price_type' => TierPriceInterface::PRICE_TYPE_DISCOUNT,
+            'website_id' => 1,
+            'sku' => self::SIMPLE_PRODUCT_SKU,
+            'customer_group' => 'ALL GROUPS',
+            'quantity' => 3,
+            'extension_attributes' => []
+        ];
+        $response = $this->_webApiCall($serviceInfo, ['prices' => [$tierPriceWithInvalidWebsiteId]]);
+        $this->assertEmpty($response);
+
+        $mainWebsite = $this->websiteRepository->get('base');
+        $mainWebsite->setIsDefault(true);
+        $this->websiteResource->save($mainWebsite);
+    }
+
     /**
      * Test replace method.
      *