[C0-3455] Правки после код ревью

Author: Andrey Erdikov

src/EventListener/MediaFileUpdatedListener.php renamed to src/Application/EventListener/MediaFileUpdatedListener.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Skyeng\MarketingCmsBundle\EventListener;
+namespace Skyeng\MarketingCmsBundle\Application\EventListener;
 
 use Doctrine\Persistence\Event\LifecycleEventArgs;
 use Skyeng\MarketingCmsBundle\Application\Cms\MediaFile\Service\MediaFileTypeResolver;

src/Domain/Repository/MediaCatalogRepository/MediaCatalogRepositoryInterface.php

@@ -6,6 +6,7 @@
 
 use Skyeng\MarketingCmsBundle\Domain\Entity\MediaCatalog;
 use Skyeng\MarketingCmsBundle\Domain\Entity\ValueObject\Id;
+use Skyeng\MarketingCmsBundle\Domain\Repository\MediaCatalogRepository\Exception\MediaCatalogNotFoundException;
 use Skyeng\MarketingCmsBundle\Domain\Repository\MediaCatalogRepository\Exception\MediaCatalogRepositoryException;
 
 interface MediaCatalogRepositoryInterface
@@ -20,6 +21,7 @@ public function getAll(): array;
 
     /**
      * @throws MediaCatalogRepositoryException
+     * @throws MediaCatalogNotFoundException
      */
-    public function getFirst(): ?MediaCatalog;
+    public function getFirst(): MediaCatalog;
 }

src/Infrastructure/Doctrine/Entity/mapping/MediaFile.orm.xml

@@ -14,8 +14,8 @@
         </many-to-one>
         <field name="title"/>
         <field name="name" unique="true"/>
-        <field name="type" type="media_file_type"/>
-        <field name="storage" type="media_file_storage"/>
+        <field name="type" type="cms_media_file_type"/>
+        <field name="storage" type="cms_media_file_storage"/>
         <field name="originalName"/>
     </entity>
 

src/Infrastructure/Doctrine/Repository/MediaCatalogRepository.php

@@ -10,6 +10,7 @@
 use Ramsey\Uuid\Uuid;
 use Skyeng\MarketingCmsBundle\Domain\Entity\MediaCatalog;
 use Skyeng\MarketingCmsBundle\Domain\Entity\ValueObject\Id;
+use Skyeng\MarketingCmsBundle\Domain\Repository\MediaCatalogRepository\Exception\MediaCatalogNotFoundException;
 use Skyeng\MarketingCmsBundle\Domain\Repository\MediaCatalogRepository\Exception\MediaCatalogRepositoryException;
 use Skyeng\MarketingCmsBundle\Domain\Repository\MediaCatalogRepository\MediaCatalogRepositoryInterface;
 
@@ -35,10 +36,18 @@ public function getAll(): array
         }
     }
 
-    public function getFirst(): ?MediaCatalog
+    public function getFirst(): MediaCatalog
     {
         try {
-            return $this->findOneBy([], ['id' => 'desc']);
+            $catalog = $this->findOneBy([], ['id' => 'desc']);
+
+            if ($catalog === null) {
+                throw new MediaCatalogNotFoundException();
+            }
+
+            return $catalog;
+        } catch (MediaCatalogNotFoundException $e) {
+            throw $e;
         } catch (Exception $e) {
             throw new MediaCatalogRepositoryException($e->getMessage(), $e->getCode(), $e);
         }

src/Infrastructure/Doctrine/Type/MediaFileStorageType.php

@@ -23,6 +23,6 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
 
     public function getName(): string
     {
-        return 'media_file_storage';
+        return 'cms_media_file_storage';
     }
 }

src/Infrastructure/Doctrine/Type/MediaFileType.php

@@ -23,6 +23,6 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
 
     public function getName(): string
     {
-        return 'media_file_type';
+        return 'cms_media_file_type';
     }
 }

src/Resources/config/packages/doctrine.yaml

@@ -7,8 +7,8 @@ doctrine:
       cms_content_type: 'Skyeng\MarketingCmsBundle\Infrastructure\Doctrine\Type\ContentType'
       cms_cache_time: 'Skyeng\MarketingCmsBundle\Infrastructure\Doctrine\Type\CacheTimeType'
       page_component_name: 'Skyeng\MarketingCmsBundle\Infrastructure\Doctrine\Type\PageComponentNameType'
-      media_file_storage: 'Skyeng\MarketingCmsBundle\Infrastructure\Doctrine\Type\MediaFileStorageType'
-      media_file_type: 'Skyeng\MarketingCmsBundle\Infrastructure\Doctrine\Type\MediaFileType'
+      cms_media_file_storage: 'Skyeng\MarketingCmsBundle\Infrastructure\Doctrine\Type\MediaFileStorageType'
+      cms_media_file_type: 'Skyeng\MarketingCmsBundle\Infrastructure\Doctrine\Type\MediaFileType'
 
   orm:
     entity_managers:

src/Resources/config/services.yaml

@@ -13,7 +13,7 @@ services:
       - '../../Domain/{Exception,Traits,Entity,Event}/**/*.php'
 
   marketing_cms_bundle.listener.media_file_updated_listener:
-    class: Skyeng\MarketingCmsBundle\EventListener\MediaFileUpdatedListener
+    class: Skyeng\MarketingCmsBundle\Application\EventListener\MediaFileUpdatedListener
     tags:
       - { name: doctrine.event_listener, event: preUpdate, method: preUpdate }
       - { name: doctrine.event_listener, event: prePersist, method: prePersist }

src/UI/Controller/Admin/MediaFileCrudController.php

@@ -19,6 +19,7 @@
 use Skyeng\MarketingCmsBundle\Domain\Entity\MediaFile;
 use Skyeng\MarketingCmsBundle\Domain\Entity\ValueObject\MediaFileStorage;
 use Skyeng\MarketingCmsBundle\Domain\Entity\ValueObject\MediaFileType;
+use Skyeng\MarketingCmsBundle\Domain\Repository\MediaCatalogRepository\Exception\MediaCatalogNotFoundException;
 use Skyeng\MarketingCmsBundle\Domain\Repository\MediaCatalogRepository\MediaCatalogRepositoryInterface;
 use Skyeng\MarketingCmsBundle\Domain\Repository\MediaFileRepository\MediaFileRepositoryInterface;
 use Skyeng\MarketingCmsBundle\Infrastructure\Symfony\Form\Fields\VichFileField;
@@ -98,7 +99,9 @@ public function configureActions(Actions $actions): Actions
         $actions->add(Crud::PAGE_INDEX, $getFileLink);
         $actions->add(Crud::PAGE_INDEX, $getFileHtml);
 
-        if ($this->mediaCatalogRepository->getFirst() === null) {
+        try {
+            $this->mediaCatalogRepository->getFirst();
+        } catch (MediaCatalogNotFoundException $e) {
             $actions->remove(Crud::PAGE_INDEX, Action::NEW);
         }