bugfix: export sample import data

Author: cklei-carly

config/inspirecms.php

@@ -137,6 +137,7 @@
     'exports' => [
         'disk' => 'local',
         'exporters' => [
+            \SolutionForest\InspireCms\Exports\Exporters\ImportUsedExporter::class,
             \SolutionForest\InspireCms\Exports\Exporters\DocumentTypeExporter::class,
             \SolutionForest\InspireCms\Exports\Exporters\FieldGroupExporter::class,
             \SolutionForest\InspireCms\Exports\Exporters\TemplateExporter::class,

src/Exports/Exporters/BaseExporter.php

@@ -101,16 +101,6 @@ protected static function isProcessCompleted(int $currentPage, int $totalPages,
         return $currentPage >= $totalPages;
     }
 
-    protected static function buildProcessingData(int $currentPage, int $perPage, array $errors, string $folderName)
-    {
-        return [
-            'page' => $currentPage + 1,
-            'perPage' => $perPage,
-            'errors' => $errors,
-            'folderName' => $folderName,
-        ];
-    }
-
     protected function handleExportCompletion(string $folderName, $processingErrors)
     {
         $zippedFile = $this->zipTempFolder($folderName);

src/Exports/Exporters/BaseImportUsedDataExporter.php

@@ -4,11 +4,13 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
+use SolutionForest\InspireCms\Helpers\ImportDataHelper;
 use SolutionForest\InspireCms\Helpers\TemplateHelper;
 use SolutionForest\InspireCms\ImportData\Entities as ImportDataEntities;
 use SolutionForest\InspireCms\Models\Contracts\Content;
 use SolutionForest\InspireCms\Models\Contracts\DocumentType;
 use SolutionForest\InspireCms\Models\Contracts\FieldGroup;
+use SolutionForest\InspireCms\Models\Contracts\Navigation;
 use SolutionForest\InspireCms\Models\Contracts\Template;
 
 abstract class BaseImportUsedDataExporter extends BaseExporter
@@ -52,12 +54,12 @@ protected function prepareImportContentFromModel(Model $record)
         switch (true) {
 
             case $record instanceof DocumentType:
-                $array = ImportDataEntities\DocumentType::fromRecord($record)->toExportArray();
+                $array = ImportDataEntities\DocumentType::fromRecord($record)->toArray();
 
                 return json_encode($array, JSON_PRETTY_PRINT);
 
             case $record instanceof FieldGroup:
-                $array = ImportDataEntities\FieldGroup::fromRecord($record)->toExportArray();
+                $array = ImportDataEntities\FieldGroup::fromRecord($record)->toArray();
 
                 return json_encode($array, JSON_PRETTY_PRINT);
 
@@ -69,12 +71,18 @@ protected function prepareImportContentFromModel(Model $record)
                 //     return $themeContent;
 
             case $record instanceof Content:
-                $array = ImportDataEntities\Content::fromRecord($record)->toExportArray();
+                $array = ImportDataEntities\Content::fromRecord($record)->toArray();
+
+                return json_encode($array, JSON_PRETTY_PRINT);
+
+            case $record instanceof Navigation:
+
+                $array = ImportDataEntities\Navigation::fromRecord($record)->toArray();
 
                 return json_encode($array, JSON_PRETTY_PRINT);
         }
 
-        return '';
+        return '{}';
     }
 
     protected function processRecordForImportUsed(Model $record, $fs, ?string $dir, array &$errors)
@@ -117,4 +125,45 @@ protected function processRecordForImportUsed(Model $record, $fs, ?string $dir,
             ];
         }
     }
+
+    /**
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param string $type
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    protected function buildExportingQueryForImportUsed($query, $type)
+    {
+        switch ($type) {
+            case ImportDataHelper::FOLDER_IDENTIFIER_DOCUMENTTYPE:
+                return $query->with([
+                    'fieldGroups',
+                    'templates',
+                    'allowedDocumentTypes',
+                    'content',
+                ]);
+            case ImportDataHelper::FOLDER_IDENTIFIER_FIELDGROUP:
+                return $query->with([
+                    'fields',
+                ]);
+            case ImportDataHelper::FOLDER_IDENTIFIER_CONTENT:
+                return $query->with([
+                    'parent.path',
+                    'sitemap',
+                    'webSetting',
+                    'documentType',
+                ]);
+        }
+
+        return $query;
+    }
+
+    protected static function buildProcessingDataForImportUsed(int $currentPage, int $perPage, array $errors, string $folderName)
+    {
+        return [
+            'page' => $currentPage + 1,
+            'perPage' => $perPage,
+            'errors' => $errors,
+            'folderName' => $folderName,
+        ];
+    }
 }

src/Exports/Exporters/DocumentTypeExporter.php

@@ -106,7 +106,7 @@ public function export()
         }
 
         return ExportResult::paused(
-            $this->buildProcessingData($page, $perPage, $processingErrors, $folderName),
+            $this->buildProcessingDataForImportUsed($page, $perPage, $processingErrors, $folderName),
         );
     }
 

src/Exports/Exporters/FieldGroupExporter.php

@@ -57,7 +57,7 @@ public function export()
         }
 
         return ExportResult::paused(
-            $this->buildProcessingData($page, $perPage, $processingErrors, $folderName),
+            $this->buildProcessingDataForImportUsed($page, $perPage, $processingErrors, $folderName),
         );
     }