Change the GetById command execution logic and cover with tests

Author: coderimus

app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php

@@ -7,12 +7,12 @@
 
 namespace Magento\MediaGallery\Model\Asset\Command;
 
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
-use Magento\MediaGalleryApi\Model\Asset\Command\GetByIdInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\IntegrationException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use Magento\MediaGalleryApi\Model\Asset\Command\GetByIdInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -71,20 +71,29 @@ public function execute(int $mediaAssetId): AssetInterface
             $select = $connection->select()
                 ->from(['amg' => $mediaAssetTable])
                 ->where('amg.id = ?', $mediaAssetId);
-            $data = $connection->query($select)->fetch();
+            $mediaAssetData = $connection->query($select)->fetch();
+        } catch (\Exception $exception) {
+            $message = __(
+                'En error occurred during get media asset data by id %id: %error',
+                ['id' => $mediaAssetId, 'error' => $exception->getMessage()]
+            );
+            $this->logger->critical($message);
+            throw new IntegrationException($message, $exception);
+        }
 
-            if (empty($data)) {
-                $message = __('There is no such media asset with id "%1"', $mediaAssetId);
-                throw new NoSuchEntityException($message);
-            }
+        if (empty($mediaAssetData)) {
+            $message = __('There is no such media asset with id "%1"', $mediaAssetId);
+            throw new NoSuchEntityException($message);
+        }
 
-            return $this->assetFactory->create(['data' => $data]);
+        try {
+            return $this->assetFactory->create(['data' => $mediaAssetData]);
         } catch (\Exception $exception) {
+            $this->logger->critical($exception->getMessage());
             $message = __(
-                'En error occurred during get media asset with id %id: %error',
+                'En error occurred during initialize media asset with id %id: %error',
                 ['id' => $mediaAssetId, 'error' => $exception->getMessage()]
             );
-            $this->logger->critical($message);
             throw new IntegrationException($message, $exception);
         }
     }

app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdTest.php

@@ -11,6 +11,7 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Exception\IntegrationException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\MediaGallery\Model\Asset\Command\GetById;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
@@ -22,6 +23,7 @@
 
 /**
  * Test the GetById command model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GetByIdTest extends TestCase
 {
@@ -98,6 +100,22 @@ public function testSuccessfulGetByIdExecution(): void
         $mediaAssetStub = $this->getMockBuilder(AssetInterface::class)->getMock();
         $this->assetFactory->expects($this->once())->method('create')->willReturn($mediaAssetStub);
 
+        $this->assertEquals(
+            $mediaAssetStub,
+            $this->getMediaAssetById->execute(self::MEDIA_ASSET_STUB_ID)
+        );
+    }
+
+    /**
+     * Test an exception during the get asset data query.
+     */
+    public function testExceptionDuringGetMediaAssetData(): void
+    {
+        $this->statementMock->method('fetch')->willReturn(self::MEDIA_ASSET_DATA);
+        $this->adapter->method('query')->willThrowException(new \Exception());
+
+        $this->expectException(IntegrationException::class);
+
         $this->getMediaAssetById->execute(self::MEDIA_ASSET_STUB_ID);
     }
 
@@ -109,8 +127,23 @@ public function testNotFoundMediaAssetException(): void
         $this->statementMock->method('fetch')->willReturn([]);
         $this->adapter->method('query')->willReturn($this->statementMock);
 
+        $this->expectException(NoSuchEntityException::class);
+
+        $this->getMediaAssetById->execute(self::MEDIA_ASSET_STUB_ID);
+    }
+
+    /**
+     * Test case when a problem occurred during asset initialization from received data.
+     */
+    public function testErrorDuringMediaAssetInitializationException(): void
+    {
+        $this->statementMock->method('fetch')->willReturn(self::MEDIA_ASSET_DATA);
+        $this->adapter->method('query')->willReturn($this->statementMock);
+
+        $this->assetFactory->expects($this->once())->method('create')->willThrowException(new \Exception());
+
         $this->expectException(IntegrationException::class);
-        $this->logger->expects($this->once())
+        $this->logger->expects($this->any())
             ->method('critical')
             ->willReturnSelf();