Преглед изворни кода

update exporters to set the new File::foder prop

Olivier Massot пре 7 месеци
родитељ
комит
c8decd2fcd
2 измењених фајлова са 10 додато и 3 уклоњено
  1. 8 2
      src/Service/Export/BaseExporter.php
  2. 2 1
      src/Service/Export/ExporterInterface.php

+ 8 - 2
src/Service/Export/BaseExporter.php

@@ -6,6 +6,7 @@ namespace App\Service\Export;
 
 use App\ApiResources\Export\ExportRequest;
 use App\Entity\Core\File;
+use App\Enum\Core\FileFolderEnum;
 use App\Enum\Core\FileTypeEnum;
 use App\Enum\Core\FileVisibilityEnum;
 use App\Repository\Access\AccessRepository;
@@ -128,7 +129,11 @@ abstract class BaseExporter
     /**
      * Create a pending file record in the database.
      */
-    public function prepareFile(ExportRequest $exportRequest, bool $flushFile = true): File
+    public function prepareFile(
+        ExportRequest $exportRequest,
+        bool $flushFile = true,
+        ?FileFolderEnum $folder = FileFolderEnum::DOCUMENTS
+    ): File
     {
         $requesterId = $exportRequest->getRequesterId();
         $requester = $this->accessRepository->find($requesterId);
@@ -149,7 +154,8 @@ abstract class BaseExporter
             true,
             FileVisibilityEnum::NOBODY,
             $this->fileUtils->getMimeTypeFromExt($exportRequest->getFormat()->value),
-            $flushFile
+            $flushFile,
+            $folder
         );
     }
 

+ 2 - 1
src/Service/Export/ExporterInterface.php

@@ -6,6 +6,7 @@ namespace App\Service\Export;
 
 use App\ApiResources\Export\ExportRequest;
 use App\Entity\Core\File;
+use App\Enum\Core\FileFolderEnum;
 use App\Service\Export\Model\ExportModelInterface;
 
 /**
@@ -27,7 +28,7 @@ interface ExporterInterface
     /**
      * Create a pending file record in the database.
      */
-    public function prepareFile(ExportRequest $exportRequest, bool $flushFile = true): File;
+    public function prepareFile(ExportRequest $exportRequest, bool $flushFile = true, ?FileFolderEnum $folder = FileFolderEnum::DOCUMENTS): File;
 
     /**
      * Construit le modèle de données qui servira au render du template.