AC-15054: Fix Performance Acceptance Tests

Author: wip44850

app/code/Magento/Quote/Plugin/UpdateCartId.php

@@ -17,6 +17,8 @@
 use Magento\Quote\Api\GuestCartItemRepositoryInterface;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Catalog\Model\ResourceModel\Product\Website\Link as ProductWebsiteLink;
 
 /**
  * Plugin to update cart ID from request and validate product website assignment
@@ -35,7 +37,9 @@ public function __construct(
         private readonly ProductRepositoryInterface $productRepository,
         private readonly StoreManagerInterface $storeManager,
         private readonly QuoteIdMaskFactory $quoteIdMaskFactory,
-        private readonly CartRepositoryInterface $cartRepository
+        private readonly CartRepositoryInterface $cartRepository,
+        private readonly ProductResource $productResource,
+        private readonly ProductWebsiteLink $productWebsiteLink
     ) {
     }
 
@@ -74,23 +78,23 @@ private function validateProductWebsiteAssignment(CartItemInterface $cartItem):
             return;
         }
 
-        $storeId = (int)($cartItem->getStoreId() ?? 0);
-        if (!$storeId) {
-            $maskedQuoteId = $cartItem->getQuoteId();
-            $quoteIdMask = $this->quoteIdMaskFactory->create()->load($maskedQuoteId, 'masked_id');
-            $quoteId = (int)$quoteIdMask->getQuoteId();
-            if (!$quoteId) {
-                return;
-            }
-            try {
-                $quote = $this->cartRepository->get($quoteId);
-                $storeId = (int)$quote->getStoreId();
-            } catch (NoSuchEntityException) {
-                throw new LocalizedException(__('Product that you are trying to add is not available.'));
-            }
+        $maskedQuoteId = $cartItem->getQuoteId();
+        $quoteIdMask = $this->quoteIdMaskFactory->create()->load($maskedQuoteId, 'masked_id');
+        $quoteId = $quoteIdMask->getQuoteId();
+
+        if (!$quoteId) {
+            return;
         }
 
-        $this->validateWebsiteAssignmentBySku($sku, $storeId);
+        try {
+            $quote = $this->cartRepository->get($quoteId);
+            $storeId = $quote->getStoreId();
+            // Product not in quote yet
+            $this->validateWebsiteAssignmentBySku($sku, $storeId);
+
+        } catch (NoSuchEntityException) {
+            throw new LocalizedException(__('Product that you are trying to add is not available.'));
+        }
     }
 
     /**
@@ -103,12 +107,12 @@ private function validateProductWebsiteAssignment(CartItemInterface $cartItem):
      */
     private function validateWebsiteAssignmentBySku(string $sku, int $storeId): void
     {
-        try {
-            $product = $this->productRepository->get($sku, false, $storeId);
-            $this->checkProductInWebsite($product->getWebsiteIds(), $storeId);
-        } catch (NoSuchEntityException) {
+        $productId = (int)$this->productResource->getIdBySku($sku);
+        if (!$productId) {
             throw new LocalizedException(__('Product that you are trying to add is not available.'));
         }
+        $websiteIds = $this->productWebsiteLink->getWebsiteIdsByProductId($productId);
+        $this->checkProductInWebsite($websiteIds, $storeId);
     }
 
     /**

app/code/Magento/Quote/Plugin/Webapi/ValidateProductWebsiteAssignment.php

@@ -14,6 +14,8 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartItemInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Catalog\Model\ResourceModel\Product\Website\Link as ProductWebsiteLink;
 
 /**
  * Plugin to validate product website assignment for REST API cart operations
@@ -28,7 +30,9 @@ class ValidateProductWebsiteAssignment
     public function __construct(
         private readonly ProductRepositoryInterface $productRepository,
         private readonly StoreManagerInterface $storeManager,
-        private readonly CartRepositoryInterface $cartRepository
+        private readonly CartRepositoryInterface $cartRepository,
+        private readonly ProductResource $productResource,
+        private readonly ProductWebsiteLink $productWebsiteLink
     ) {
     }
 
@@ -51,17 +55,13 @@ public function beforeSave(
             return;
         }
 
-        $storeId = (int)($cartItem->getStoreId() ?? 0);
-        if (!$storeId) {
-            try {
-                $quote = $this->cartRepository->getActive($cartItem->getQuoteId());
-                $storeId = (int)$quote->getStoreId();
-            } catch (NoSuchEntityException $e) {
-                throw new LocalizedException(__('Product that you are trying to add is not available.'));
-            }
-        }
+        try {
+            $quote = $this->cartRepository->getActive($cartItem->getQuoteId());
+            $this->checkProductWebsiteAssignmentBySku($sku, $quote->getStoreId());
 
-        $this->checkProductWebsiteAssignmentBySku($sku, $storeId);
+        } catch (NoSuchEntityException $e) {
+            throw new LocalizedException(__('Product that you are trying to add is not available.'));
+        }
     }
 
     /**
@@ -73,12 +73,12 @@ public function beforeSave(
      */
     private function checkProductWebsiteAssignmentBySku(string $sku, int $storeId): void
     {
-        try {
-            $product = $this->productRepository->get($sku, false, $storeId);
-            $this->validateWebsiteAssignment($product->getWebsiteIds(), $storeId);
-        } catch (NoSuchEntityException $e) {
+        $productId = (int)$this->productResource->getIdBySku($sku);
+        if (!$productId) {
             throw new LocalizedException(__('Product that you are trying to add is not available.'));
         }
+        $websiteIds = $this->productWebsiteLink->getWebsiteIdsByProductId($productId);
+        $this->validateWebsiteAssignment($websiteIds, $storeId);
     }
 
     /**