ENGCOM-7196: {ASI} :- Image size is not passed to image-uploader when inserting an image from new media gallery #27388

Author: slavvka

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

@@ -24,6 +24,7 @@ class Asset extends AbstractExtensibleModel implements AssetInterface
     private const CONTENT_TYPE = 'content_type';
     private const WIDTH = 'width';
     private const HEIGHT = 'height';
+    private const SIZE = 'size';
     private const CREATED_AT = 'created_at';
     private const UPDATED_AT = 'updated_at';
 
@@ -89,6 +90,14 @@ public function getHeight(): int
         return (int) $this->getData(self::HEIGHT);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getSize(): int
+    {
+        return (int) $this->getData(self::SIZE);
+    }
+
     /**
      * @inheritdoc
      */

app/code/Magento/MediaGallery/Test/Unit/Model/DataExtractorTest.php

@@ -9,10 +9,9 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\MediaGallery\Model\Asset;
+use Magento\MediaGallery\Model\DataExtractor;
 use Magento\MediaGallery\Model\Keyword;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
-use Magento\MediaGallery\Model\DataExtractor;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -54,22 +53,41 @@ public function testExtractData(string $class, $interfaceClass, array $expectedD
                 'data' => $data,
             ]
         );
-        $receivedData = $this->dataExtractor->extract($model, $interfaceClass);
-        $this->checkValues($expectedData, $receivedData, $model);
+        if ($interfaceClass) {
+            $receivedData = $this->dataExtractor->extract($model, $interfaceClass);
+            $this->checkAssetValues($expectedData, $receivedData, $model);
+        } else {
+            $receivedData = $this->dataExtractor->extract($model);
+            $this->checkKeyWordValues($expectedData, $receivedData, $model);
+        }
+    }
+
+    /**
+     * @param array $expectedData
+     * @param array $data
+     * @param object $model
+     */
+    private function checkAssetValues(array $expectedData, array $data, $model)
+    {
+        foreach ($expectedData as $expectedDataKey => $expectedDataItem) {
+            $this->assertEquals($data[$expectedDataKey] ?? null, $model->{$expectedDataItem['method']}());
+            $this->assertEquals($data[$expectedDataKey] ?? null, $expectedDataItem['value']);
+        }
+        $this->assertEquals(array_keys($expectedData), array_keys($data));
     }
 
     /**
      * @param array $expectedData
      * @param array $data
      * @param object $model
      */
-    protected function checkValues(array $expectedData, array $data, $model)
+    private function checkKeyWordValues(array $expectedData, array $data, $model)
     {
         foreach ($expectedData as $expectedDataKey => $expectedDataItem) {
             $this->assertEquals($data[$expectedDataKey] ?? null, $model->{$expectedDataItem['method']}());
             $this->assertEquals($data[$expectedDataKey] ?? null, $expectedDataItem['value']);
         }
-        $this->assertEquals(array_keys($expectedData), array_keys($expectedData));
+        $this->assertEquals(array_keys($expectedData), array_keys(array_slice($data, 0, 2)));
     }
 
     /**
@@ -102,13 +120,17 @@ public function assetProvider()
                         'value' => 'content_type',
                         'method' => 'getContentType',
                     ],
+                    'height' => [
+                        'value' => 4,
+                        'method' => 'getHeight',
+                    ],
                     'width' => [
                         'value' => 3,
                         'method' => 'getWidth',
                     ],
-                    'height' => [
-                        'value' => 4,
-                        'method' => 'getHeight',
+                    'size' => [
+                        'value' => 300,
+                        'method' => 'getSize',
                     ],
                     'created_at' => [
                         'value' => '2019-11-28 10:40:09',
@@ -122,7 +144,7 @@ public function assetProvider()
             ],
             'Keyword conversion without interface' => [
                 Keyword::class,
-                null,
+                '',
                 [
                     'id' => [
                         'value' => 2,

app/code/Magento/MediaGallery/etc/db_schema.xml

@@ -14,6 +14,7 @@
         <column xsi:type="varchar" name="content_type" length="255" nullable="true" comment="Content Type"/>
         <column xsi:type="int" name="width" padding="10" unsigned="true" nullable="false" identity="false" default="0" comment="Width"/>
         <column xsi:type="int" name="height" padding="10" unsigned="true" nullable="false" identity="false" default="0" comment="Height"/>
+        <column xsi:type="int" name="size" padding="10" unsigned="true" nullable="false" identity="false" comment="Asset file size in bytes"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP" comment="Created At"/>
         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP" comment="Updated At"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">

app/code/Magento/MediaGallery/etc/db_schema_whitelist.json

@@ -8,6 +8,7 @@
             "content_type": true,
             "width": true,
             "height": true,
+            "size": true,
             "created_at": true,
             "updated_at": true
         },
@@ -53,4 +54,4 @@
             "MEDIA_GALLERY_ASSET_KEYWORD_ASSET_ID_MEDIA_GALLERY_ASSET_ID": true
         }
     }
-}
+}

app/code/Magento/MediaGalleryApi/Api/Data/AssetInterface.php

@@ -65,6 +65,13 @@ public function getHeight(): int;
      */
     public function getWidth(): int;
 
+    /**
+     * Retrieve asset file size in bytes
+     *
+     * @return int
+     */
+    public function getSize(): int;
+
     /**
      * Get created at
      *