Fix for Indexer created for websites excluded in Customer groups

Author: mohitalgolia

Helper/ConfigHelper.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Api\GroupExcludedWebsiteRepositoryInterface;
 
 class ConfigHelper
 {
@@ -175,6 +176,11 @@ class ConfigHelper
      */
     protected $groupCollection;
 
+    /**
+     * @var GroupExcludedWebsiteRepositoryInterface
+     */
+    protected $groupExcludedWebsiteRepository;
+
     /**
      * @param Magento\Framework\App\Config\ScopeConfigInterface $configInterface
      * @param StoreManagerInterface $storeManager
@@ -186,6 +192,7 @@ class ConfigHelper
      * @param Magento\Framework\Event\ManagerInterface $eventManager
      * @param SerializerInterface $serializer
      * @param GroupCollection $groupCollection
+     * @param GroupExcludedWebsiteRepositoryInterface $groupExcludedWebsiteRepository
      */
     public function __construct(
         Magento\Framework\App\Config\ScopeConfigInterface $configInterface,
@@ -197,7 +204,8 @@ public function __construct(
         Magento\Framework\App\ProductMetadataInterface    $productMetadata,
         Magento\Framework\Event\ManagerInterface          $eventManager,
         SerializerInterface                               $serializer,
-        GroupCollection                                   $groupCollection
+        GroupCollection                                   $groupCollection,
+        GroupExcludedWebsiteRepositoryInterface           $groupExcludedWebsiteRepository
     ) {
         $this->configInterface = $configInterface;
         $this->currency = $currency;
@@ -209,6 +217,7 @@ public function __construct(
         $this->eventManager = $eventManager;
         $this->serializer = $serializer;
         $this->groupCollection = $groupCollection;
+        $this->groupExcludedWebsiteRepository = $groupExcludedWebsiteRepository;
     }
 
     /**
@@ -939,12 +948,17 @@ public function getSortingIndices($originalIndexName, $storeId = null, $currentC
             $indexName = false;
             $sortAttribute = false;
             if ($this->isCustomerGroupsEnabled($storeId) && $attr['attribute'] === 'price') {
+                $websiteId = (int)$this->storeManager->getStore($storeId)->getWebsiteId();
                 $groupCollection = $this->groupCollection;
                 if (!is_null($currentCustomerGroupId)) {
                     $groupCollection->addFilter('customer_group_id', $currentCustomerGroupId);
                 }
                 foreach ($groupCollection as $group) {
                     $customerGroupId = (int)$group->getData('customer_group_id');
+                    $excludedWebsites = $this->groupExcludedWebsiteRepository->getCustomerGroupExcludedWebsites($customerGroupId);
+                    if (in_array($websiteId, $excludedWebsites)) {
+                        continue;
+                    }
                     $groupIndexNameSuffix = 'group_' . $customerGroupId;
                     $groupIndexName =
                         $originalIndexName . '_' . $attr['attribute'] . '_' . $groupIndexNameSuffix . '_' . $attr['sort'];

Helper/Entity/Product/PriceManager/ProductWithoutChildren.php

@@ -105,13 +105,17 @@ public function addPriceData($customData, Product $product, $subProducts): array
         if (!$this->areCustomersGroupsEnabled) {
             $this->groups->addFieldToFilter('main_table.customer_group_id', 0);
         } else {
+            $excludedGroups = array();
             foreach ($this->groups as $group) {
                 $groupId = (int)$group->getData('customer_group_id');
                 $excludedWebsites = $this->groupExcludedWebsiteRepository->getCustomerGroupExcludedWebsites($groupId);
                 if (in_array($product->getStore()->getWebsiteId(), $excludedWebsites)) {
-                    $group->delete();
+                    $excludedGroups[] = $groupId;
                 }
             }
+            if(count($excludedGroups) > 0) {
+                $this->groups->addFieldToFilter('main_table.customer_group_id', ["nin" => $excludedGroups]);
+            }
         }
         // price/price_with_tax => true/false
         foreach ($fields as $field => $withTax) {