Services convered with integration tests

sivaschenko · sivaschenko · commit 28717cf7fbcc · 2020-04-07T16:03:54.000+01:00
diff --git a/app/code/Magento/MediaContent/Model/AssignAssets.php b/app/code/Magento/MediaContent/Model/AssignAssets.php
@@ -20,7 +20,7 @@ class AssignAssets implements AssignAssetsInterface
 {
     private const MEDIA_CONTENT_ASSET_TABLE_NAME = 'media_content_asset';
     private const ASSET_ID = 'asset_id';
-    private const TYPE = 'type';
+    private const ENTITY_TYPE = 'entity_type';
     private const ENTITY_ID = 'entity_id';
     private const FIELD = 'field';
 
@@ -56,16 +56,17 @@ public function execute(ContentIdentityInterface $contentIdentity, array $assetI
             foreach ($assetIds as $assetId) {
                 $data[] = [
                     self::ASSET_ID => $assetId,
-                    self::TYPE => $contentIdentity->getEntityType(),
+                    self::ENTITY_TYPE => $contentIdentity->getEntityType(),
                     self::ENTITY_ID => $contentIdentity->getEntityId(),
                     self::FIELD => $contentIdentity->getField()
                 ];
             }
             $connection->insertMultiple($tableName, $data);
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
-            $message = __('An error occurred while saving relation between media asset and media content.');
-            throw new CouldNotSaveException($message);
+            throw new CouldNotSaveException(
+                __('An error occurred while saving relation between media asset and media content.')
+            );
         }
     }
 }
diff --git a/app/code/Magento/MediaContent/Model/ContentIdentity.php b/app/code/Magento/MediaContent/Model/ContentIdentity.php
@@ -15,7 +15,7 @@
  */
 class ContentIdentity extends AbstractExtensibleModel implements ContentIdentityInterface
 {
-    private const TYPE = 'entity_type';
+    private const ENTITY_TYPE = 'entity_type';
     private const ENTITY_ID = 'entity_id';
     private const FIELD = 'field';
 
@@ -24,7 +24,7 @@ class ContentIdentity extends AbstractExtensibleModel implements ContentIdentity
      */
     public function getEntityType(): string
     {
-        return (string) $this->getData(self::TYPE);
+        return (string) $this->getData(self::ENTITY_TYPE);
     }
 
     /**
diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdsUsedInContent.php b/app/code/Magento/MediaContent/Model/GetAssetIdsUsedInContent.php
@@ -20,7 +20,7 @@ class GetAssetIdsUsedInContent implements GetAssetIdsUsedInContentInterface
 {
     private const MEDIA_CONTENT_ASSET_TABLE_NAME = 'media_content_asset';
     private const ASSET_ID = 'asset_id';
-    private const TYPE = 'type';
+    private const ENTITY_TYPE = 'entity_type';
     private const ENTITY_ID = 'entity_id';
     private const FIELD = 'field';
 
@@ -58,7 +58,7 @@ public function execute(ContentIdentityInterface $contentIdentity): array
                     $this->resourceConnection->getTableName(self::MEDIA_CONTENT_ASSET_TABLE_NAME),
                     self::ASSET_ID
                 )->where(
-                    self::TYPE . ' = ?',
+                    self::ENTITY_TYPE . ' = ?',
                     $contentIdentity->getEntityType()
                 )->where(
                     self::ENTITY_ID . '= ?',
@@ -68,7 +68,7 @@ public function execute(ContentIdentityInterface $contentIdentity): array
                     $contentIdentity->getField()
                 );
 
-            return $connection->fetchAssoc($select);
+            return array_keys($connection->fetchAssoc($select));
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
             $message = __('An error occurred at getting asset used in content information.');
diff --git a/app/code/Magento/MediaContent/Model/GetContentWithAssets.php b/app/code/Magento/MediaContent/Model/GetContentWithAssets.php
@@ -20,6 +20,9 @@ class GetContentWithAssets implements GetContentWithAssetsInterface
 {
     private const MEDIA_CONTENT_ASSET_TABLE_NAME = 'media_content_asset';
     private const ASSET_ID = 'asset_id';
+    private const ENTITY_TYPE = 'entity_type';
+    private const ENTITY_ID = 'entity_id';
+    private const FIELD = 'field';
 
     /**
      * @var ResourceConnection
@@ -59,8 +62,12 @@ public function execute(array $assetIds): array
         try {
             $connection = $this->resourceConnection->getConnection();
             $select = $connection->select()
-                ->from($this->resourceConnection->getTableName(self::MEDIA_CONTENT_ASSET_TABLE_NAME))
-                ->where(self::ASSET_ID . 'IN (?)', $assetIds);
+                ->distinct()
+                ->from(
+                    $this->resourceConnection->getTableName(self::MEDIA_CONTENT_ASSET_TABLE_NAME),
+                    [self::ENTITY_TYPE, self::ENTITY_ID, self::FIELD]
+                )
+                ->where(self::ASSET_ID . ' IN (?)', $assetIds);
 
             $contentIdentities = [];
             foreach ($connection->fetchAssoc($select) as $contentIdentityData) {
diff --git a/app/code/Magento/MediaContent/Model/UnassignAssets.php b/app/code/Magento/MediaContent/Model/UnassignAssets.php
@@ -20,7 +20,7 @@ class UnassignAssets implements UnassignAssetsInterface
 {
     private const MEDIA_CONTENT_ASSET_TABLE_NAME = 'media_content_asset';
     private const ASSET_ID = 'asset_id';
-    private const TYPE = 'type';
+    private const ENTITY_TYPE = 'entity_type';
     private const ENTITY_ID = 'entity_id';
     private const FIELD = 'field';
 
@@ -58,7 +58,7 @@ public function execute(ContentIdentityInterface $contentIdentity, array $assetI
                 $tableName,
                 [
                     self::ASSET_ID . ' IN (?)' => $assetIds,
-                    self::TYPE . ' = ?' => $contentIdentity->getEntityType(),
+                    self::ENTITY_TYPE . ' = ?' => $contentIdentity->getEntityType(),
                     self::ENTITY_ID . ' = ?' => $contentIdentity->getEntityId(),
                     self::FIELD . ' = ?' => $contentIdentity->getField()
                 ]
diff --git a/app/code/Magento/MediaContent/Test/Unit/Model/AssignAssetsTest.php b/app/code/Magento/MediaContent/Test/Unit/Model/AssignAssetsTest.php
@@ -41,7 +41,7 @@ class AssignAssetsTest extends TestCase
     /**
      * Media content type
      */
-    private const TYPE = 'type';
+    private const ENTITY_TYPE = 'entity_type';
 
     /**
      * Media entity id
@@ -120,7 +120,7 @@ public function testSuccessfulExecute(
     ): void {
         $saveData = [
             self::ASSET_ID => $assetId,
-            self::TYPE => $contentType,
+            self::ENTITY_TYPE => $contentType,
             self::ENTITY_ID => $contentEntityId,
             self::FIELD => $contentField
         ];
diff --git a/app/code/Magento/MediaContent/Test/Unit/Model/GetAssetsusedInContentTest.php b/app/code/Magento/MediaContent/Test/Unit/Model/GetAssetsusedInContentTest.php
@@ -143,7 +143,7 @@ public function getAssetsListRelatedToContent(): array
         return [
             [
                 [
-                    'type' => 'cms_page',
+                    'entity_type' => 'cms_page',
                     'entity_id' => '1',
                     'field' => 'content'
                 ],
diff --git a/app/code/Magento/MediaContent/etc/db_schema.xml b/app/code/Magento/MediaContent/etc/db_schema.xml
@@ -8,13 +8,14 @@
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="media_content_asset" resource="default" engine="innodb" comment="Relation between media content and media asset">
         <column xsi:type="int" padding="10" name="asset_id" unsigned="true" nullable="false" identity="true" comment="Entity ID"/>
-        <column xsi:type="varchar" length="255" name="type" nullable="false" comment="Content type"/>
+        <column xsi:type="varchar" length="255" name="entity_type" nullable="false" comment="Content type"/>
         <column xsi:type="varchar" length="255" name="entity_id" nullable="false" comment="Content entity id"/>
         <column xsi:type="varchar" length="255" name="field" nullable="false" comment="Content field"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="asset_id"/>
-            <column name="type"/>
+            <column name="entity_type"/>
             <column name="field"/>
+            <column name="entity_id"/>
         </constraint>
     </table>
 </schema>
diff --git a/app/code/Magento/MediaContent/etc/db_schema_whitelist.json b/app/code/Magento/MediaContent/etc/db_schema_whitelist.json
@@ -2,7 +2,7 @@
     "media_content_asset": {
         "column": {
             "asset_id": true,
-            "type": true,
+            "entity_type": true,
             "entity_id": true,
             "field": true
         },
diff --git a/app/code/Magento/MediaContent/etc/di.xml b/app/code/Magento/MediaContent/etc/di.xml
@@ -12,7 +12,7 @@
     <preference for="Magento\MediaContentApi\Api\GetContentWithAssetsInterface" type="Magento\MediaContent\Model\GetContentWithAssets"/>
     <preference for="Magento\MediaContentApi\Api\ExtractAssetsFromContentInterface" type="Magento\MediaContent\Model\ExtractAssetsFromContent"/>
     <preference for="Magento\MediaContentApi\Api\UpdateRelationsInterface" type="Magento\MediaContent\Model\UpdateRelations"/>
-    <preference for="Magento\MediaContentApi\Api\Data\ContentIdentityInterface" type="Magento\MediaContent\Model\Content"/>
+    <preference for="Magento\MediaContentApi\Api\Data\ContentIdentityInterface" type="Magento\MediaContent\Model\ContentIdentity"/>
     <type name="Magento\MediaGalleryApi\Model\Asset\Command\DeleteByPathInterface">
         <plugin name="remove_media_content_after_asset_is_removed_by_path" type="Magento\MediaContent\Model\Plugin\MediaGalleryAssetDeleteByPath" />
     </type>
@@ -26,7 +26,7 @@
             <argument name="schemaLocator" xsi:type="object">Magento\MediaContent\Model\Content\Config\SchemaLocator</argument>
         </arguments>
     </type>
-    <virtualType name="Magento\MediaContent\Model\Directory\Config\Data" type="Magento\Framework\Config\Data">
+    <virtualType name="Magento\MediaContent\Model\Content\Config\Data" type="Magento\Framework\Config\Data">
         <arguments>
             <argument name="reader" xsi:type="object">Magento\MediaContent\Model\Content\Config\Reader</argument>
             <argument name="cacheId" xsi:type="string">Media_Content_Patterns_CacheId</argument>
diff --git a/dev/tests/integration/testsuite/Magento/MediaStorage/AssignGetUnassignTest.php b/dev/tests/integration/testsuite/Magento/MediaStorage/AssignGetUnassignTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ *
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContent\Model;
+
+use Magento\MediaContentApi\Api\AssignAssetsInterface;
+use Magento\MediaContentApi\Api\Data\ContentIdentityInterface;
+use Magento\MediaContentApi\Api\GetAssetIdsUsedInContentInterface;
+use Magento\MediaContentApi\Api\GetContentWithAssetsInterface;
+use Magento\MediaContentApi\Api\UnassignAssetsInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for AssignAssets service
+ */
+class AssignGetUnassignTest extends TestCase
+{
+    /**
+     * @var AssignAssetsInterface
+     */
+    private $assign;
+
+    /**
+     * @var GetAssetIdsUsedInContentInterface
+     */
+    private $getAssetIds;
+
+    /**
+     * @var GetContentWithAssetsInterface
+     */
+    private $getContent;
+
+    /**
+     * @var UnassignAssetsInterface
+     */
+    private $unassign;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp()
+    {
+        $this->assign = Bootstrap::getObjectManager()->create(AssignAssetsInterface::class);
+        $this->getAssetIds = Bootstrap::getObjectManager()->create(GetAssetIdsUsedInContentInterface::class);
+        $this->getContent = Bootstrap::getObjectManager()->create(GetContentWithAssetsInterface::class);
+        $this->unassign = Bootstrap::getObjectManager()->create(UnassignAssetsInterface::class);
+    }
+
+    /**
+     * Assing assets to content, retrieve the data, then unassign assets from content
+     */
+    public function testAssignRetrieveAndUnassign()
+    {
+        $contentIdentity = Bootstrap::getObjectManager()->create(
+            ContentIdentityInterface::class,
+            [
+                'data' => [
+                    'entity_type' => 'catalog_product',
+                    'entity_id' => '42',
+                    'field' => 'description'
+                ]
+            ]
+        );
+        $assetIds = [56, 78];
+
+        $this->assign->execute($contentIdentity, $assetIds);
+
+        $retrievedAssetIds = $this->getAssetIds->execute($contentIdentity);
+        $this->assertEquals($assetIds, $retrievedAssetIds);
+
+
+        $retrievedContentIdentities = $this->getContent->execute($assetIds);
+
+        $this->assertEquals(count($retrievedContentIdentities), 1);
+
+        $identity = $retrievedContentIdentities[0];
+        $this->assertEquals('catalog_product', $identity->getEntityType());
+        $this->assertEquals('42', $identity->getEntityId());
+        $this->assertEquals('description', $identity->getField());
+
+        $this->unassign->execute($contentIdentity, $assetIds);
+
+        $this->assertEmpty($this->getContent->execute($assetIds));
+        $this->assertEmpty($this->getAssetIds->execute($contentIdentity));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class AssignAssets implements AssignAssetsInterface`
`20`	`20`	`{`
`21`	`21`	`private const MEDIA_CONTENT_ASSET_TABLE_NAME = 'media_content_asset';`
`22`	`22`	`private const ASSET_ID = 'asset_id';`
`23`		`- private const TYPE = 'type';`
	`23`	`+ private const ENTITY_TYPE = 'entity_type';`
`24`	`24`	`private const ENTITY_ID = 'entity_id';`
`25`	`25`	`private const FIELD = 'field';`
`26`	`26`
`@@ -56,16 +56,17 @@ public function execute(ContentIdentityInterface $contentIdentity, array $assetI`
`56`	`56`	`foreach ($assetIds as $assetId) {`
`57`	`57`	`$data[] = [`
`58`	`58`	`self::ASSET_ID => $assetId,`
`59`		`- self::TYPE => $contentIdentity->getEntityType(),`
	`59`	`+ self::ENTITY_TYPE => $contentIdentity->getEntityType(),`
`60`	`60`	`self::ENTITY_ID => $contentIdentity->getEntityId(),`
`61`	`61`	`self::FIELD => $contentIdentity->getField()`
`62`	`62`	`];`
`63`	`63`	`}`
`64`	`64`	`$connection->insertMultiple($tableName, $data);`
`65`	`65`	`} catch (\Exception $exception) {`
`66`	`66`	`$this->logger->critical($exception);`
`67`		`- $message = __('An error occurred while saving relation between media asset and media content.');`
`68`		`- throw new CouldNotSaveException($message);`
	`67`	`+ throw new CouldNotSaveException(`
	`68`	`+ __('An error occurred while saving relation between media asset and media content.')`
	`69`	`+ );`
`69`	`70`	`}`
`70`	`71`	`}`
`71`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`	`class ContentIdentity extends AbstractExtensibleModel implements ContentIdentityInterface`
`17`	`17`	`{`
`18`		`- private const TYPE = 'entity_type';`
	`18`	`+ private const ENTITY_TYPE = 'entity_type';`
`19`	`19`	`private const ENTITY_ID = 'entity_id';`
`20`	`20`	`private const FIELD = 'field';`
`21`	`21`
`@@ -24,7 +24,7 @@ class ContentIdentity extends AbstractExtensibleModel implements ContentIdentity`
`24`	`24`	`*/`
`25`	`25`	`public function getEntityType(): string`
`26`	`26`	`{`
`27`		`- return (string) $this->getData(self::TYPE);`
	`27`	`+ return (string) $this->getData(self::ENTITY_TYPE);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class UnassignAssets implements UnassignAssetsInterface`
`20`	`20`	`{`
`21`	`21`	`private const MEDIA_CONTENT_ASSET_TABLE_NAME = 'media_content_asset';`
`22`	`22`	`private const ASSET_ID = 'asset_id';`
`23`		`- private const TYPE = 'type';`
	`23`	`+ private const ENTITY_TYPE = 'entity_type';`
`24`	`24`	`private const ENTITY_ID = 'entity_id';`
`25`	`25`	`private const FIELD = 'field';`
`26`	`26`
`@@ -58,7 +58,7 @@ public function execute(ContentIdentityInterface $contentIdentity, array $assetI`
`58`	`58`	`$tableName,`
`59`	`59`	`[`
`60`	`60`	`self::ASSET_ID . ' IN (?)' => $assetIds,`
`61`		`- self::TYPE . ' = ?' => $contentIdentity->getEntityType(),`
	`61`	`+ self::ENTITY_TYPE . ' = ?' => $contentIdentity->getEntityType(),`
`62`	`62`	`self::ENTITY_ID . ' = ?' => $contentIdentity->getEntityId(),`
`63`	`63`	`self::FIELD . ' = ?' => $contentIdentity->getField()`
`64`	`64`	`]`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public function getAssetsListRelatedToContent(): array`
`143`	`143`	`return [`
`144`	`144`	`[`
`145`	`145`	`[`
`146`		`- 'type' => 'cms_page',`
	`146`	`+ 'entity_type' => 'cms_page',`
`147`	`147`	`'entity_id' => '1',`
`148`	`148`	`'field' => 'content'`
`149`	`149`	`],`