ACP2E-294: Category Ids Not Available in scheduled Export Filters

Author: dhorytskyi

app/code/Magento/CatalogImportExport/Model/Export/Product/CategoryFilter.php

@@ -25,6 +25,7 @@ public function filter(Collection $collection, array $filters): Collection
         $value = trim($filters[self::NAME] ?? '');
         if ($value) {
             $collection->addCategoriesFilter(['in' => explode(',', $value)]);
+            $collection->setFlag(self::NAME . '_filter_applied');
         }
         return $collection;
     }

app/code/Magento/CatalogImportExport/Model/Export/Product/StockStatusFilter.php

@@ -48,9 +48,11 @@ public function filter(Collection $collection, array $filters): Collection
         switch ($value) {
             case self::IN_STOCK:
                 $this->stockHelper->addInStockFilterToCollection($collection);
+                $collection->setFlag(self::NAME . '_filter_applied');
                 break;
             case self::OUT_OF_STOCK:
                 $this->stockHelper->addOutOfStockFilterToCollection($collection);
+                $collection->setFlag(self::NAME . '_filter_applied');
                 break;
         }
         return $collection;

app/code/Magento/CatalogImportExport/Model/Export/Product/WebsiteFilter.php

@@ -27,6 +27,7 @@ public function filter(Collection $collection, array $filters): Collection
         }
 
         $collection->addWebsiteFilter($filters[self::NAME]);
+        $collection->setFlag(self::NAME . '_filter_applied');
 
         return $collection;
     }

app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php

@@ -269,6 +269,11 @@ protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection
         foreach ($this->filterAttributeCollection($this->getAttributeCollection()) as $attribute) {
             $attrCode = $attribute->getAttributeCode();
 
+            $filterFlagName = $attrCode . '_filter_applied';
+            if ($collection->hasFlag($filterFlagName)) {
+                continue;
+            }
+
             // filter applying
             if (isset($exportFilter[$attrCode])) {
                 $attrFilterType = \Magento\ImportExport\Model\Export::getAttributeFilterType($attribute);
@@ -320,7 +325,10 @@ protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection
                         }
                     }
                 }
+
+                $collection->setFlag($filterFlagName);
             }
+
             if (in_array($attrCode, $exportAttrCodes)) {
                 $collection->addAttributeToSelect($attrCode);
             }