magento/adobe-stock-integration#1391: SaveAssetsKeywordsInterface to delete obsolete keywords - Allow empty keywords to execute saveAssetLinks, added condition to integration test for empty keywords

Author: jmonteros422

app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php

@@ -93,19 +93,17 @@ private function saveAssetKeywords(array $keywords, int $assetId): void
             $data[] = $keyword->getKeyword();
         }
 
-        if (empty($data)) {
-            return;
+        if (!empty($data)) {
+            /** @var Mysql $connection */
+            $connection = $this->resourceConnection->getConnection();
+            $connection->insertArray(
+                $this->resourceConnection->getTableName(self::TABLE_KEYWORD),
+                [self::KEYWORD],
+                $data,
+                AdapterInterface::INSERT_IGNORE
+            );
         }
 
-        /** @var Mysql $connection */
-        $connection = $this->resourceConnection->getConnection();
-        $connection->insertArray(
-            $this->resourceConnection->getTableName(self::TABLE_KEYWORD),
-            [self::KEYWORD],
-            $data,
-            AdapterInterface::INSERT_IGNORE
-        );
-
         $this->saveAssetLinks->execute($assetId, $this->getKeywordIds($data));
     }
 

dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php

@@ -70,24 +70,23 @@ protected function setUp(): void
      * @param string[] $updatedKeywords
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function testSaveAndGetKeywords(array $keywords = [], array $updatedKeywords = []): void
+    public function testSaveAndGetKeywords(array $keywords, array $updatedKeywords): void
     {
         $loadedAssets = $this->getAssetsByPath->execute([self::FIXTURE_ASSET_PATH]);
         $this->assertCount(1, $loadedAssets);
         $loadedAsset = current($loadedAssets);
 
         $this->updateAssetKeywords($loadedAsset->getId(), $keywords);
-        $this->updateAssetKeywords($loadedAsset->getId(), $updatedKeywords, $keywords);
+        $this->updateAssetKeywords($loadedAsset->getId(), $updatedKeywords);
     }
 
     /**
      * Update Asset keywords
      *
      * @param int $assetId
      * @param string[] $keywords
-     * @param string[] $currentKeywords
      */
-    private function updateAssetKeywords(int $assetId, array $keywords = [], array $currentKeywords = []): void
+    private function updateAssetKeywords(int $assetId, array $keywords): void
     {
         $assetKeywords = $this->assetsKeywordsFactory->create(
             [
@@ -99,28 +98,28 @@ private function updateAssetKeywords(int $assetId, array $keywords = [], array $
         $this->saveAssetsKeywords->execute([$assetKeywords]);
         $loadedAssetKeywords = $this->getAssetsKeywords->execute([$assetId]);
 
-        $currentKeywords = empty($keywords) ? $currentKeywords : $keywords;
-        $expectedCount = !empty($currentKeywords) ? 1 : 0;
+        if (empty($keywords)) {
+            $this->assertEmpty($loadedAssetKeywords);
+            return;
+        }
 
-        $this->assertCount($expectedCount, $loadedAssetKeywords);
+        $this->assertCount(1, $loadedAssetKeywords);
         /** @var AssetKeywordsInterface $loadedAssetKeyword */
         $loadedAssetKeyword = current($loadedAssetKeywords);
 
-        $loadedKeywords = !empty($loadedAssetKeyword) ? $loadedAssetKeyword->getKeywords() : [];
+        $loadedKeywords = $loadedAssetKeyword->getKeywords();
 
-        $this->assertEquals(count($currentKeywords), count($loadedKeywords));
+        $this->assertEquals(count($keywords), count($loadedKeywords));
 
         $loadedKeywordStrings = [];
-        if (!empty($loadedKeywords)) {
-            foreach ($loadedKeywords as $loadedKeywordObject) {
-                $loadedKeywordStrings[] = $loadedKeywordObject->getKeyword();
-            }
+        foreach ($loadedKeywords as $loadedKeywordObject) {
+            $loadedKeywordStrings[] = $loadedKeywordObject->getKeyword();
         }
 
         sort($loadedKeywordStrings);
-        sort($currentKeywords);
+        sort($keywords);
 
-        $this->assertEquals($currentKeywords, $loadedKeywordStrings);
+        $this->assertEquals($keywords, $loadedKeywordStrings);
     }
 
     /**