AC-15054: Fix Performance Acceptance Tests

Author: wip44850

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

@@ -74,31 +74,23 @@ private function validateProductWebsiteAssignment(CartItemInterface $cartItem):
             return;
         }
 
-        $maskedQuoteId = $cartItem->getQuoteId();
-        $quoteIdMask = $this->quoteIdMaskFactory->create()->load($maskedQuoteId, 'masked_id');
-        $quoteId = $quoteIdMask->getQuoteId();
-
-        if (!$quoteId) {
-            return;
-        }
-
-        try {
-            $quote = $this->cartRepository->get($quoteId);
-            $storeId = $quote->getStoreId();
-
-            foreach ($quote->getAllItems() as $item) {
-                if ($sku === $item->getSku()) {
-                    $this->validateWebsiteAssignment($item->getProductId(), $storeId);
-                    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.'));
             }
-
-            // Product not in quote yet
-            $this->validateWebsiteAssignmentBySku($sku, $storeId);
-
-        } catch (NoSuchEntityException) {
-            throw new LocalizedException(__('Product that you are trying to add is not available.'));
         }
+
+        $this->validateWebsiteAssignmentBySku($sku, $storeId);
     }
 
     /**
@@ -119,27 +111,6 @@ private function validateWebsiteAssignmentBySku(string $sku, int $storeId): void
         }
     }
 
-    /**
-     * Validate by product ID for existing items
-     *
-     * @param int $productId
-     * @param int $storeId
-     * @return void
-     * @throws LocalizedException
-     */
-    private function validateWebsiteAssignment(int $productId, int $storeId): void
-    {
-        try {
-            $product = $this->productRepository->getById($productId, false, $storeId);
-            if (empty($product->getWebsiteIds())) {
-                return;
-            }
-            $this->checkProductInWebsite($product->getWebsiteIds(), $storeId);
-        } catch (NoSuchEntityException) {
-            throw new LocalizedException(__('Product that you are trying to add is not available.'));
-        }
-    }
-
     /**
      * Validate by product ID for existing items
      *

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

@@ -51,22 +51,17 @@ public function beforeSave(
             return;
         }
 
-        try {
-            $quote = $this->cartRepository->getActive($cartItem->getQuoteId());
-
-            foreach ($quote->getAllItems() as $item) {
-                if ($sku === $item->getSku()) {
-                    $this->checkProductWebsiteAssignment($item->getProductId(), $item->getStoreId());
-                    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.'));
             }
-
-            // Fallback: product not in quote items yet
-            $this->checkProductWebsiteAssignmentBySku($sku, $quote->getStoreId());
-
-        } catch (NoSuchEntityException $e) {
-            throw new LocalizedException(__('Product that you are trying to add is not available.'));
         }
+
+        $this->checkProductWebsiteAssignmentBySku($sku, $storeId);
     }
 
     /**
@@ -86,26 +81,6 @@ private function checkProductWebsiteAssignmentBySku(string $sku, int $storeId):
         }
     }
 
-    /**
-     * Check product website assignment by product ID
-     *
-     * @param int $productId
-     * @param int|null $storeId
-     * @throws LocalizedException
-     */
-    private function checkProductWebsiteAssignment($productId, $storeId): void
-    {
-        try {
-            $product = $this->productRepository->getById($productId, false, $storeId);
-            if (empty($product->getWebsiteIds())) {
-                return;
-            }
-            $this->validateWebsiteAssignment($product->getWebsiteIds(), $storeId);
-        } catch (NoSuchEntityException $e) {
-            throw new LocalizedException(__('Product that you are trying to add is not available.'));
-        }
-    }
-
     /**
      * Validate product website assignment
      *