IBX-7579:Richtext: Rows are added to ezurl_object_link on every save

ezsystems · Feb 13, 2024 · e6f6d4e · e6f6d4e
1 parent 314fd1f
commit e6f6d4e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/src/lib/eZ/FieldType/RichText/RichTextStorage.php b/src/lib/eZ/FieldType/RichText/RichTextStorage.php
@@ -83,7 +83,10 @@ public function storeFieldData(VersionInfo $versionInfo, Field $field, array $co
 
         $urlIdMap = $this->gateway->getUrlIdMap(array_keys($urlSet));
         $contentIds = $this->gateway->getContentIds(array_keys($remoteIdSet));
-        $urlLinkSet = [];
+        $urlLinkSet = $this->gateway->getUrlsFromUrlLink(
+            $field->id,
+            $versionInfo->versionNo
+        );
 
         foreach ($links as $index => $link) {
             list(, $scheme, $url, $fragment) = $linksInfo[$index];

diff --git a/src/lib/eZ/FieldType/RichText/RichTextStorage/Gateway.php b/src/lib/eZ/FieldType/RichText/RichTextStorage/Gateway.php
@@ -78,6 +78,16 @@ public function insertUrl($url)
         return $this->urlGateway->insertUrl($url);
     }
 
+    /**
+     * Return a list of URLs used by the given field and version.
+     *
+     * @return bool[] An array of URLs, with urls as keys
+     */
+    public function getUrlsFromUrlLink(int $fieldId, int $versionNo): array
+    {
+        return $this->urlGateway->getUrlsFromUrlLink($fieldId, $versionNo);
+    }
+
     /**
      * Creates link to URL with $urlId for field with $fieldId in $versionNo.
      *

diff --git a/tests/lib/eZ/FieldType/RichText/RichTextStorageTest.php b/tests/lib/eZ/FieldType/RichText/RichTextStorageTest.php
@@ -325,6 +325,13 @@ public function testStoreFieldDataThrowsNotFoundException(
             ->method('getContentIds')
             ->with($this->equalTo($remoteIds))
             ->willReturn($contentIds);
+
+        $gateway
+            ->expects($this->once())
+            ->method('getUrlsFromUrlLink')
+            ->with($this->equalTo(42), $this->equalTo(1))
+            ->willReturn([]);
+
         $gateway->expects($this->never())->method('getIdUrlMap');
         if (empty($insertLinks)) {
             $gateway->expects($this->never())->method('insertUrl');
@@ -338,9 +345,12 @@ public function testStoreFieldDataThrowsNotFoundException(
                 ->willReturn($linkMap['id']);
         }
 
-        $versionInfo = new VersionInfo();
+        $versionInfo = new VersionInfo(['versionNo' => 1]);
         $value = new FieldValue(['data' => $xmlString]);
-        $field = new Field(['value' => $value]);
+        $field = new Field([
+            'value' => $value,
+            'id' => 42,
+        ]);
 
         $storage = $this->getPartlyMockedStorage($gateway);
         $storage->storeFieldData(