[C0-3455] Убрал параметр upload_destination, добавил получение маппинга в листенер

Author: Andrey Erdikov

src/Domain/Entity/ValueObject/MediaFileStorage.php

@@ -19,13 +19,6 @@ class MediaFileStorage
 
     use ValueObjectTrait;
 
-    protected function checkValue(string $value): void
-    {
-        if (!in_array($value, self::AVAILABLE_STORAGES)) {
-            throw new IncorrectValueObjectException('This media file storage is not supported');
-        }
-    }
-
     public function isS3(): bool
     {
         return $this->value === self::S3_STORAGE;

src/EventListener/MediaFileUpdatedListener.php

@@ -8,6 +8,7 @@
 use Skyeng\MarketingCmsBundle\Application\Cms\MediaFile\Service\MediaFileTypeResolver;
 use Skyeng\MarketingCmsBundle\Domain\Entity\MediaFile;
 use Skyeng\MarketingCmsBundle\Domain\Entity\ValueObject\MediaFileStorage;
+use Vich\UploaderBundle\Mapping\PropertyMappingFactory;
 
 class MediaFileUpdatedListener
 {
@@ -17,14 +18,14 @@ class MediaFileUpdatedListener
     private $mediaFileTypeResolver;
 
     /**
-     * @var string
+     * @var PropertyMappingFactory
      */
-    private $mediaUploadDestination;
+    private $fileMappingFactory;
 
-    public function __construct(MediaFileTypeResolver $mediaFileTypeResolver, string $mediaUploadDestination)
+    public function __construct(MediaFileTypeResolver $mediaFileTypeResolver, PropertyMappingFactory $fileMappingFactory)
     {
         $this->mediaFileTypeResolver = $mediaFileTypeResolver;
-        $this->mediaUploadDestination = $mediaUploadDestination;
+        $this->fileMappingFactory = $fileMappingFactory;
     }
 
     public function postUpdate(LifecycleEventArgs $args): void
@@ -46,6 +47,8 @@ private function handleEventArgs(LifecycleEventArgs $args): void
         }
 
         $object->setType($this->mediaFileTypeResolver->getMediaFileTypeByFile($object->getFile()));
-        $object->setStorage(new MediaFileStorage($this->mediaUploadDestination));
+
+        $mapping = $this->fileMappingFactory->fromField($object, 'file');
+        $object->setStorage(new MediaFileStorage($mapping->getUploadDestination()));
     }
 }

src/Resources/config/services.yaml

@@ -1,6 +1,3 @@
-parameters:
-  media_upload_destination: '%vich_uploader.mappings.media_files.upload_destination%'
-
 services:
   _defaults:
     autowire: true

src/UI/Controller/Admin/MediaFileCrudController.php

@@ -27,19 +27,12 @@ class MediaFileCrudController extends AbstractCrudController
      */
     private $mediaCatalogRepository;
 
-    /**
-     * @var string
-     */
-    private $mediaUploadDestination;
-
     public function __construct(
         MediaFileRepositoryInterface $mediaFileRepository,
-        MediaCatalogRepositoryInterface $mediaCatalogRepository,
-        string $mediaUploadDestination
+        MediaCatalogRepositoryInterface $mediaCatalogRepository
     ) {
         $this->mediaFileRepository = $mediaFileRepository;
         $this->mediaCatalogRepository = $mediaCatalogRepository;
-        $this->mediaUploadDestination = $mediaUploadDestination;
     }
 
     public static function getEntityFqcn(): string
@@ -78,7 +71,7 @@ public function createEntity(string $entityFqcn): MediaFile
             '',
             new MediaFileType(MediaFileType::IMAGE_TYPE),
             '',
-            new MediaFileStorage($this->mediaUploadDestination),
+            new MediaFileStorage(MediaFileStorage::NFS_STORAGE),
         );
     }
 }