[C0-3455] Поменял неймер при загрузке файлов, доработал логику работы с репозиторием каталога

Author: Andrey Erdikov

src/Domain/Entity/MediaFile.php

@@ -32,7 +32,7 @@ class MediaFile
     private $type;
 
     /**
-     * @var string
+     * @var string|null
      */
     private $name;
 
@@ -56,7 +56,7 @@ public function __construct(
         MediaCatalog $catalog,
         string $title,
         MediaFileType $type,
-        string $name,
+        ?string $name,
         MediaFileStorage $storage,
         string $originalName
     ) {
@@ -109,7 +109,7 @@ public function getName(): string
         return $this->name;
     }
 
-    public function setName(string $name): void
+    public function setName(?string $name): void
     {
         $this->name = $name;
     }

src/Domain/Repository/MediaCatalogRepository/MediaCatalogRepositoryInterface.php

@@ -6,15 +6,20 @@
 
 use Skyeng\MarketingCmsBundle\Domain\Entity\MediaCatalog;
 use Skyeng\MarketingCmsBundle\Domain\Entity\ValueObject\Id;
-use Skyeng\MarketingCmsBundle\Domain\Repository\MediaCatalogRepository\Exception\MediaFileRepositoryException;
+use Skyeng\MarketingCmsBundle\Domain\Repository\MediaCatalogRepository\Exception\MediaCatalogRepositoryException;
 
 interface MediaCatalogRepositoryInterface
 {
     public function getNextIdentity(): Id;
 
     /**
      * @return MediaCatalog[]
-     * @throws MediaFileRepositoryException
+     * @throws MediaCatalogRepositoryException
      */
     public function getAll(): array;
+
+    /**
+     * @throws MediaCatalogRepositoryException
+     */
+    public function getFirst(): ?MediaCatalog;
 }

src/Infrastructure/Doctrine/Repository/MediaCatalogRepository.php

@@ -34,4 +34,13 @@ public function getAll(): array
             throw new MediaCatalogRepositoryException($e->getMessage(), $e->getCode(), $e);
         }
     }
+
+    public function getFirst(): ?MediaCatalog
+    {
+        try {
+            return $this->findOneBy([], ['id' => 'desc']);
+        } catch (Exception $e) {
+            throw new MediaCatalogRepositoryException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
 }

src/Resources/config/packages/vich_uploader.yaml

@@ -6,4 +6,4 @@ vich_uploader:
         media_files:
             uri_prefix: '%app.uploads_base_url%'
             upload_destination: 'uploads.nfs'
-            namer: Vich\UploaderBundle\Naming\OrignameNamer
+            namer: Vich\UploaderBundle\Naming\SmartUniqueNamer

src/UI/Controller/Admin/MediaFileCrudController.php

@@ -14,6 +14,7 @@
 use EasyCorp\Bundle\EasyAdminBundle\Field\AssociationField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 use EasyCorp\Bundle\EasyAdminBundle\Filter\ChoiceFilter;
+use EasyCorp\Bundle\EasyAdminBundle\Filter\EntityFilter;
 use Skyeng\MarketingCmsBundle\Application\Cms\MediaFile\Service\MediaFilePathResolver;
 use Skyeng\MarketingCmsBundle\Domain\Entity\MediaFile;
 use Skyeng\MarketingCmsBundle\Domain\Entity\ValueObject\MediaFileStorage;
@@ -57,7 +58,6 @@ public static function getEntityFqcn(): string
     public function configureFilters(Filters $filters): Filters
     {
         return $filters
-//            ->add(EntityFilter::new('catalog', 'Каталог')) TODO Fix
             ->add(
                 ChoiceFilter::new('type', 'Тип файла')->setChoices([MediaFileType::AVAILABLE_TYPES])
             );
@@ -98,7 +98,7 @@ public function configureActions(Actions $actions): Actions
         $actions->add(Crud::PAGE_INDEX, $getFileLink);
         $actions->add(Crud::PAGE_INDEX, $getFileHtml);
 
-        if (count($this->mediaCatalogRepository->getAll()) === 0) {
+        if ($this->mediaCatalogRepository->getFirst() === null) {
             $actions->remove(Crud::PAGE_INDEX, Action::NEW);
         }
 
@@ -130,7 +130,7 @@ public function createEntity(string $entityFqcn): MediaFile
     {
         return new MediaFile(
             $this->mediaFileRepository->getNextIdentity(),
-            $this->mediaCatalogRepository->getAll()[0],
+            $this->mediaCatalogRepository->getFirst(),
             '',
             new MediaFileType(MediaFileType::IMAGE_TYPE),
             '',