Merge pull request #54 from aligent/fix/invalidation_rules

Invalidate both full and incremental exports in pending or uploaded status

Author: aligent-lturner

src/export/Model/InvalidateExports.php

@@ -39,8 +39,14 @@ public function execute(): void
         /** @var Collection $collection */
         $collection = $this->collectionFactory->create();
         // need to check pending and uploaded exports only
-        $collection->addFieldToFilter(ExportInterface::FIELD_STATUS, ExportInterface::STATUS_PENDING);
-        $collection->addFieldToFilter(ExportInterface::FIELD_EXPORT_TYPE, ExportInterface::EXPORT_TYPE_INCREMENTAL);
+        $collection->addFieldToFilter(
+            ExportInterface::FIELD_STATUS,
+            ['in' => [ExportInterface::STATUS_PENDING, ExportInterface::STATUS_UPLOADED]]
+        );
+        $collection->addFieldToFilter(
+            ExportInterface::FIELD_EXPORT_TYPE,
+            ['in' => [ExportInterface::EXPORT_TYPE_INCREMENTAL, ExportInterface::EXPORT_TYPE_FULL]]
+        );
         /** @var Export[] $exports */
         $exports = $collection->getItems();
         foreach ($exports as $export) {