fix #89 & #88

opengento · Apr 27, 2021 · f3c5dac · f3c5dac
1 parent b15a625
commit f3c5dac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/Observer/InvalidateExport.php b/Observer/InvalidateExport.php
@@ -73,17 +73,18 @@ public function __construct(
 
     public function execute(Observer $observer): void
     {
-        /** @var AbstractModel $entity */
         $entity = $observer->getData('data_object');
 
-        try {
-            foreach ($this->fetchExportEntities($entity)->getItems() as $exportEntity) {
-                $this->exportManagement->invalidate($exportEntity);
+        if ($entity instanceof AbstractModel) {
+            try {
+                foreach ($this->fetchExportEntities($entity)->getItems() as $exportEntity) {
+                    $this->exportManagement->invalidate($exportEntity);
+                }
+            } catch (LocalizedException $e) {
+                $this->logger->error($e->getLogMessage(), $e->getTrace());
+            } catch (Exception $e) {
+                $this->logger->error($e->getMessage(), $e->getTrace());
             }
-        } catch (LocalizedException $e) {
-            $this->logger->error($e->getLogMessage(), $e->getTrace());
-        } catch (Exception $e) {
-            $this->logger->error($e->getMessage(), $e->getTrace());
         }
     }
 

diff --git a/etc/di.xml b/etc/di.xml
@@ -1539,15 +1539,10 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Opengento\Gdpr\Model\Archive\ZipManager" type="Opengento\Gdpr\Model\Archive\ArchiveManager">
+    <type name="Opengento\Gdpr\Model\Archive\ArchiveManager">
         <arguments>
             <argument name="archive" xsi:type="object">Opengento\Gdpr\Model\Archive\Zip</argument>
         </arguments>
-    </virtualType>
-    <type name="Opengento\Gdpr\Model\Export\ExportToFile">
-        <arguments>
-            <argument name="archive" xsi:type="object">Opengento\Gdpr\Model\Archive\ZipManager</argument>
-        </arguments>
     </type>
     <!-- Erase Logged In Customer Notifier Management -->
     <virtualType name="Opengento\Gdpr\Model\Customer\Erase\Notifier\Pending\MailSender" type="Opengento\Gdpr\Model\Customer\Notifier\MailSender">