Lexical: Updated tests for node changes

[bookstack] / app / Exports / ImportRepo.php

diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
index 3265e1c80dc006bded4f3e030e202bc2542d25a7..f72386c47bc949848e6895922fc8c1a91e0d9b10 100644 (file)
--- a/app/Exports/ImportRepo.php
+++ b/app/Exports/ImportRepo.php
@@ -2,22 +2,31 @@
 
 namespace BookStack\Exports;
 
+use BookStack\Activity\ActivityType;
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Exceptions\FileUploadException;
 use BookStack\Exceptions\ZipExportException;
+use BookStack\Exceptions\ZipImportException;
 use BookStack\Exceptions\ZipValidationException;
 use BookStack\Exports\ZipExports\Models\ZipExportBook;
 use BookStack\Exports\ZipExports\Models\ZipExportChapter;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use BookStack\Exports\ZipExports\ZipExportReader;
 use BookStack\Exports\ZipExports\ZipExportValidator;
+use BookStack\Exports\ZipExports\ZipImportRunner;
+use BookStack\Facades\Activity;
 use BookStack\Uploads\FileStorage;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\DB;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class ImportRepo
 {
     public function __construct(
         protected FileStorage $storage,
+        protected ZipImportRunner $importer,
+        protected EntityQueries $entityQueries,
     ) {
     }
 
@@ -54,13 +63,13 @@ class ImportRepo
     public function storeFromUpload(UploadedFile $file): Import
     {
         $zipPath = $file->getRealPath();
+        $reader = new ZipExportReader($zipPath);
 
-        $errors = (new ZipExportValidator($zipPath))->validate();
+        $errors = (new ZipExportValidator($reader))->validate();
         if ($errors) {
             throw new ZipValidationException($errors);
         }
 
-        $reader = new ZipExportReader($zipPath);
         $exportModel = $reader->decodeDataToExportModel();
 
         $import = new Import();
@@ -87,19 +96,42 @@ class ImportRepo
         $import->path = $path;
         $import->save();
 
+        Activity::add(ActivityType::IMPORT_CREATE, $import);
+
         return $import;
     }
 
-    public function runImport(Import $import, ?string $parent = null)
+    /**
+     * @throws ZipImportException
+     */
+    public function runImport(Import $import, ?string $parent = null): Entity
     {
-        // TODO - Download import zip (if needed)
-        // TODO - Validate zip file again
-        // TODO - Check permissions before (create for main item, create for children, create for related items [image, attachments])
+        $parentModel = null;
+        if ($import->type === 'page' || $import->type === 'chapter') {
+            $parentModel = $parent ? $this->entityQueries->findVisibleByStringIdentifier($parent) : null;
+        }
+
+        DB::beginTransaction();
+        try {
+            $model = $this->importer->run($import, $parentModel);
+        } catch (ZipImportException $e) {
+            DB::rollBack();
+            $this->importer->revertStoredFiles();
+            throw $e;
+        }
+
+        DB::commit();
+        $this->deleteImport($import);
+        Activity::add(ActivityType::IMPORT_RUN, $import);
+
+        return $model;
     }
 
     public function deleteImport(Import $import): void
     {
         $this->storage->delete($import->path);
         $import->delete();
+
+        Activity::add(ActivityType::IMPORT_DELETE, $import);
     }
 }