Merge pull request #313 from AcclaroInc/hotfix/uninstall-entries-delete

fix: plugin uninstall deleting entries
AcclaroInc · Feb 27, 2022 · 03a3453 · 03a3453
2 parents 263cb72 + 97b27a8
commit 03a3453
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/Translations.php b/src/Translations.php
@@ -206,9 +206,7 @@ function (PluginEvent $event) {
     public function uninstall()
     {
         // Let's clean up the drafts table
-        $files = self::$plugin->fileRepository->getFiles();
-        $drafts = array_column($files, 'draftId');
-
+        $drafts = self::$plugin->fileRepository->getAllDraftIds();
         if ($drafts) {
             Craft::$app->queue->push(new DeleteDrafts([
                 'description' => Constants::JOB_DELETING_DRAFT,

diff --git a/src/services/repository/FileRepository.php b/src/services/repository/FileRepository.php
@@ -103,6 +103,25 @@ public function getFiles($orderId = null, $elementId = null, $targetSite = null)
         return $files ? $files : array();
     }
 
+    /**
+     * @return array
+     */
+    public function getAllDraftIds()
+    {
+
+        $records = FileRecord::find()->where(['IS NOT', 'draftId', NULL])->all();
+
+        $draftIds = [];
+
+        foreach ($records as $key => $record) {
+            if(!empty($record->draftId)){
+                $draftIds[] = $record->draftId;
+            }
+        }
+
+        return $draftIds;
+    }
+
     /**
      * @return \acclaro\translations\models\FileModel
      */