From c5e61704b20586ca8f5717c4d923aaf97ab9ca08 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Tue, 13 Feb 2024 11:58:53 +0100 Subject: [PATCH] IBX-7579:Richtext: Rows are added to ezurl_object_link on every save --- .../Tests/Url/Gateway/DoctrineStorageTest.php | 23 ++++++++++ .../Core/FieldType/Url/UrlStorage/Gateway.php | 7 ++++ .../UrlStorage/Gateway/DoctrineStorage.php | 42 +++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/eZ/Publish/Core/FieldType/Tests/Url/Gateway/DoctrineStorageTest.php b/eZ/Publish/Core/FieldType/Tests/Url/Gateway/DoctrineStorageTest.php index 793f9d0dc7..1a281224e2 100644 --- a/eZ/Publish/Core/FieldType/Tests/Url/Gateway/DoctrineStorageTest.php +++ b/eZ/Publish/Core/FieldType/Tests/Url/Gateway/DoctrineStorageTest.php @@ -194,6 +194,29 @@ public function testUnlinkUrl() $this->assertEquals($expected, $result); } + /** + * @covers \eZ\Publish\Core\FieldType\Url\UrlStorage\Gateway\DoctrineStorage::getUrlsFromUrlLink + */ + public function testGetUrlsFromUrlLink() + { + $gateway = $this->getStorageGateway(); + + $urlIds = []; + $urlIds[] = $gateway->insertUrl('https://ibexa.co/example1'); + $urlIds[] = $gateway->insertUrl('https://ibexa.co/example2'); + $urlIds[] = $gateway->insertUrl('https://ibexa.co/example3'); + + $gateway->linkUrl($urlIds[0], 10, 1); + $gateway->linkUrl($urlIds[1], 10, 1); + $gateway->linkUrl($urlIds[1], 12, 2); + $gateway->linkUrl($urlIds[2], 14, 1); + + self::assertEquals(['https://ibexa.co/example1' => true, 'https://ibexa.co/example2' => true], $gateway->getUrlsFromUrlLink(10, 1), 'Did not get expected urlS for field 10'); + self::assertEquals(['https://ibexa.co/example2' => true], $gateway->getUrlsFromUrlLink(12, 2), 'Did not get expected url for field 12'); + self::assertEquals(['https://ibexa.co/example3' => true], $gateway->getUrlsFromUrlLink(14, 1), 'Did not get expected url for field 14'); + self::assertEquals([], $gateway->getUrlsFromUrlLink(15, 1), 'Expected no urls for field 15'); + } + protected function getStorageGateway(): Gateway { if (!isset($this->storageGateway)) { diff --git a/eZ/Publish/Core/FieldType/Url/UrlStorage/Gateway.php b/eZ/Publish/Core/FieldType/Url/UrlStorage/Gateway.php index abb0e96a7f..a492c618d1 100644 --- a/eZ/Publish/Core/FieldType/Url/UrlStorage/Gateway.php +++ b/eZ/Publish/Core/FieldType/Url/UrlStorage/Gateway.php @@ -45,6 +45,13 @@ abstract public function getUrlIdMap(array $urls); */ abstract public function insertUrl($url); + /** + * Return a list of URLs used by the given field and version. + * + * @return bool[] An array of URLs, with urls as keys + */ + abstract public function getUrlsFromUrlLink(int $fieldId, int $versionNo): array; + /** * Creates link to URL with $urlId for field with $fieldId in $versionNo. * diff --git a/eZ/Publish/Core/FieldType/Url/UrlStorage/Gateway/DoctrineStorage.php b/eZ/Publish/Core/FieldType/Url/UrlStorage/Gateway/DoctrineStorage.php index 4629095095..6f40586fb1 100644 --- a/eZ/Publish/Core/FieldType/Url/UrlStorage/Gateway/DoctrineStorage.php +++ b/eZ/Publish/Core/FieldType/Url/UrlStorage/Gateway/DoctrineStorage.php @@ -129,6 +129,48 @@ public function 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 + { + $selectQuery = $this->connection->createQueryBuilder(); + $selectQuery + ->select($this->connection->quoteIdentifier('url.url')) + ->from($this->connection->quoteIdentifier(self::URL_TABLE), 'url') + ->leftJoin( + 'url', + $this->connection->quoteIdentifier(self::URL_LINK_TABLE), + 'link', + 'url.id = link.url_id' + ) + ->where( + $selectQuery->expr()->eq( + 'link.contentobject_attribute_id', + ':contentobject_attribute_id' + ) + ) + ->andWhere( + $selectQuery->expr()->eq( + 'link.contentobject_attribute_version', + ':contentobject_attribute_version' + ) + ) + ->setParameter(':contentobject_attribute_id', $fieldId, ParameterType::INTEGER) + ->setParameter(':contentobject_attribute_version', $versionNo, ParameterType::INTEGER); + + $statement = $selectQuery->execute(); + $rows = $statement->fetchAllAssociativeIndexed(); + $result = []; + foreach ($rows as $url => $item) { + $result[$url] = true; + } + + return $result; + } + /** * Create link to URL with $urlId for field with $fieldId in $versionNo. *