Merge branch 'ACP2E-1374' of https://github.com/magento-l3/magento2ce into PR-06022023

Author: chittima

app/code/Magento/Catalog/Model/ResourceModel/Attribute/ConditionBuilder.php

@@ -8,18 +8,17 @@
 
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute as CatalogEavAttribute;
 use Magento\Store\Model\Website;
 use Magento\Framework\Model\Entity\ScopeInterface;
 
 /**
  * Builds scope-related conditions for catalog attributes
  *
  * Class ConditionBuilder
- * @package Magento\Catalog\Model\ResourceModel\Attribute
  */
 class ConditionBuilder
 {
@@ -45,6 +44,7 @@ public function __construct(StoreManagerInterface $storeManager)
      * @param ScopeInterface[] $scopes
      * @param string $linkFieldValue
      * @return array
+     * @throws NoSuchEntityException
      */
     public function buildExistingAttributeWebsiteScope(
         AbstractAttribute $attribute,
@@ -56,7 +56,7 @@ public function buildExistingAttributeWebsiteScope(
         if (!$website) {
             return [];
         }
-        $storeIds = $website->getStoreIds();
+        $storeIds = $this->getStoreIds($website);
 
         $condition = [
             $metadata->getLinkField() . ' = ?' => $linkFieldValue,
@@ -81,6 +81,7 @@ public function buildExistingAttributeWebsiteScope(
      * @param ScopeInterface[] $scopes
      * @param string $linkFieldValue
      * @return array
+     * @throws NoSuchEntityException
      */
     public function buildNewAttributesWebsiteScope(
         AbstractAttribute $attribute,
@@ -92,7 +93,7 @@ public function buildNewAttributesWebsiteScope(
         if (!$website) {
             return [];
         }
-        $storeIds = $website->getStoreIds();
+        $storeIds = $this->getStoreIds($website);
 
         $condition = [
             $metadata->getLinkField() => $linkFieldValue,
@@ -109,8 +110,11 @@ public function buildNewAttributesWebsiteScope(
     }
 
     /**
+     * Get website for website scope
+     *
      * @param array $scopes
      * @return null|Website
+     * @throws NoSuchEntityException
      */
     private function getWebsiteForWebsiteScope(array $scopes)
     {
@@ -119,8 +123,11 @@ private function getWebsiteForWebsiteScope(array $scopes)
     }
 
     /**
+     * Get store from scopes
+     *
      * @param ScopeInterface[] $scopes
      * @return StoreInterface|null
+     * @throws NoSuchEntityException
      */
     private function getStoreFromScopes(array $scopes)
     {
@@ -132,4 +139,20 @@ private function getStoreFromScopes(array $scopes)
 
         return null;
     }
+
+    /**
+     * Get storeIds from the website
+     *
+     * @param Website $website
+     * @return array
+     */
+    private function getStoreIds(Website $website): array
+    {
+        $storeIds = $website->getStoreIds();
+
+        if (empty($storeIds) && $website->getCode() === Website::ADMIN_CODE) {
+            $storeIds[] = Store::DEFAULT_STORE_ID;
+        }
+        return $storeIds;
+    }
 }