IBX-2823: Added loadRelation method

src/contracts/Persistence/Content/Handler.php

@@ -261,6 +261,15 @@ public function copy($contentId, $versionNo = null, $newOwnerId = null);
      */
     public function addRelation(RelationCreateStruct $createStruct);
 
+    /**
+     * Load a relation by $relationId.
+     *
+     * @param int $relationId Relation ID
+     *
+     * @return \Ibexa\Contracts\Core\Persistence\Content\Relation
+     */
+    public function loadRelation(int $relationId): Relation;
+
     /**
      * Removes a relation by relation Id.
      *
@@ -272,7 +281,7 @@ public function addRelation(RelationCreateStruct $createStruct);
      *                 \Ibexa\Contracts\Core\Repository\Values\Content\Relation::LINK,
      *                 \Ibexa\Contracts\Core\Repository\Values\Content\Relation::FIELD}
      */
-    public function removeRelation($relationId, $type);
+    public function removeRelation($relationId, $type, ?int $destinationContentId = null);
 
     /**
      * Loads relations from $sourceContentId. Optionally, loads only those with $type and $sourceContentVersionNo.

src/lib/Persistence/Cache/ContentHandler.php

@@ -11,6 +11,7 @@
 use Ibexa\Contracts\Core\Persistence\Content\CreateStruct;
 use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandlerInterface;
 use Ibexa\Contracts\Core\Persistence\Content\MetadataUpdateStruct;
+use Ibexa\Contracts\Core\Persistence\Content\Relation;
 use Ibexa\Contracts\Core\Persistence\Content\Relation\CreateStruct as RelationCreateStruct;
 use Ibexa\Contracts\Core\Persistence\Content\UpdateStruct;
 use Ibexa\Contracts\Core\Persistence\Content\VersionInfo;
@@ -30,6 +31,8 @@ class ContentHandler extends AbstractInMemoryPersistenceHandler implements Conte
     private const CONTENT_VERSION_LIST_IDENTIFIER = 'content_version_list';
     private const CONTENT_VERSION_INFO_IDENTIFIER = 'content_version_info';
     private const CONTENT_VERSION_IDENTIFIER = 'content_version';
+    private const CONTENT_REVERSE_RELATIONS_COUNT_IDENTIFIER = 'content_reverse_relations_count';
+    private const RELATION_IDENTIFIER = 'relation';
 
     public const ALL_TRANSLATIONS_KEY = '0';
 
@@ -433,16 +436,64 @@ public function addRelation(RelationCreateStruct $relation)
     {
         $this->logger->logCall(__METHOD__, ['struct' => $relation]);
 
+        $this->cache->invalidateTags([
+            $this->cacheIdentifierGenerator->generateTag(
+                self::CONTENT_IDENTIFIER,
+                [$relation->destinationContentId]
+            ),
+        ]);
+
         return $this->persistenceHandler->contentHandler()->addRelation($relation);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function removeRelation($relationId, $type)
+    public function removeRelation($relationId, $type, ?int $destinationContentId = null)
     {
         $this->logger->logCall(__METHOD__, ['relation' => $relationId, 'type' => $type]);
-        $this->persistenceHandler->contentHandler()->removeRelation($relationId, $type);
+
+        $this->cache->invalidateTags([
+            $this->cacheIdentifierGenerator->generateTag(
+                self::CONTENT_IDENTIFIER,
+                [$destinationContentId ?? $this->loadRelation($relationId)->destinationContentId]
+            ),
+            $this->cacheIdentifierGenerator->generateTag(
+                self::RELATION_IDENTIFIER,
+                [$relationId]
+            ),
+        ]);
+
+        $this->persistenceHandler->contentHandler()->removeRelation($relationId, $type, $destinationContentId);
+    }
+
+    public function loadRelation(int $relationId): Relation
+    {
+        $cacheItem = $this->cache->getItem(
+            $this->cacheIdentifierGenerator->generateKey(
+                self::RELATION_IDENTIFIER,
+                [$relationId],
+                true
+            )
+        );
+
+        if ($cacheItem->isHit()) {
+            $this->logger->logCacheHit(['relationId' => $relationId]);
+
+            return $cacheItem->get();
+        }
+
+        $this->logger->logCacheMiss(['relationId' => $relationId]);
+        $relation = $this->persistenceHandler->contentHandler()->loadRelation($relationId);
+        $cacheItem->set($relation);
+        $tags = [
+            $this->cacheIdentifierGenerator->generateTag(self::RELATION_IDENTIFIER, [$relationId]),
+        ];
+
+        $cacheItem->tag($tags);
+        $this->cache->save($cacheItem);
+
+        return $relation;
     }
 
     /**
@@ -467,9 +518,31 @@ public function loadRelations($sourceContentId, $sourceContentVersionNo = null,
      */
     public function countReverseRelations(int $destinationContentId, ?int $type = null): int
     {
-        $this->logger->logCall(__METHOD__, ['content' => $destinationContentId, 'type' => $type]);
+        $cacheItem = $this->cache->getItem(
+            $this->cacheIdentifierGenerator->generateKey(
+                self::CONTENT_REVERSE_RELATIONS_COUNT_IDENTIFIER,
+                [$destinationContentId],
+                true
+            )
+        );
+
+        if ($cacheItem->isHit()) {
+            $this->logger->logCacheHit(['content' => $destinationContentId]);
+
+            return $cacheItem->get();
+        }
+
+        $this->logger->logCacheMiss(['content' => $destinationContentId]);
+        $reverseRelationsCount = $this->persistenceHandler->contentHandler()->countReverseRelations($destinationContentId, $type);
+        $cacheItem->set($reverseRelationsCount);
+        $tags = [
+            $this->cacheIdentifierGenerator->generateTag(self::CONTENT_IDENTIFIER, [$destinationContentId]),
+        ];
+
+        $cacheItem->tag($tags);
+        $this->cache->save($cacheItem);
 
-        return $this->persistenceHandler->contentHandler()->countReverseRelations($destinationContentId, $type);
+        return $reverseRelationsCount;
     }
 
     /**

src/lib/Persistence/Legacy/Content/Gateway.php

@@ -13,6 +13,7 @@
 use Ibexa\Contracts\Core\Persistence\Content\Relation\CreateStruct as RelationCreateStruct;
 use Ibexa\Contracts\Core\Persistence\Content\UpdateStruct;
 use Ibexa\Contracts\Core\Persistence\Content\VersionInfo;
+use Ibexa\Contracts\Core\Repository\Values\Content\Relation;
 
 /**
  * Base class for content gateways.
@@ -395,6 +396,13 @@ abstract public function deleteRelation(int $relationId, int $type): void;
      */
     abstract public function insertRelation(RelationCreateStruct $createStruct): int;
 
+    /**
+     * Load Relation object.
+     *
+     * @see \Ibexa\Contracts\Core\Persistence\Content\Relation
+     */
+    abstract public function loadRelation(int $relationId): array;
+
     /**
      * Return all Content IDs for the given $contentTypeId.
      *

src/lib/Persistence/Legacy/Content/Gateway/DoctrineDatabase.php

@@ -1609,6 +1609,20 @@ public function insertRelation(RelationCreateStruct $createStruct): int
         return (int)$this->connection->lastInsertId(self::CONTENT_RELATION_SEQ);
     }
 
+    public function loadRelation(int $relationId): array
+    {
+        $query = $this->queryBuilder->createRelationFindQueryBuilder();
+        $expr = $query->expr();
+
+        $query
+            ->where(
+                $expr->eq('id', ':relationId')
+            )
+            ->setParameter('relationId', $relationId, ParameterType::INTEGER);
+
+        return $query->execute()->fetchAllAssociative();
+    }
+
     public function deleteRelation(int $relationId, int $type): void
     {
         // Legacy Storage stores COMMON, LINK and EMBED types using bitmask, therefore first load

src/lib/Persistence/Legacy/Content/Gateway/ExceptionConversion.php

@@ -446,6 +446,15 @@ public function insertRelation(RelationCreateStruct $struct): int
         }
     }
 
+    public function loadRelation(int $relationId): array
+    {
+        try {
+            return $this->innerGateway->loadRelation($relationId);
+        } catch (DBALException | PDOException $e) {
+            throw DatabaseException::wrap($e);
+        }
+    }
+
     public function getContentIdsByContentTypeId($contentTypeId): array
     {
         try {

src/lib/Persistence/Legacy/Content/Handler.php

@@ -12,6 +12,7 @@
 use Ibexa\Contracts\Core\Persistence\Content\Field;
 use Ibexa\Contracts\Core\Persistence\Content\Handler as BaseContentHandler;
 use Ibexa\Contracts\Core\Persistence\Content\MetadataUpdateStruct;
+use Ibexa\Contracts\Core\Persistence\Content\Relation;
 use Ibexa\Contracts\Core\Persistence\Content\Relation\CreateStruct as RelationCreateStruct;
 use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler;
 use Ibexa\Contracts\Core\Persistence\Content\UpdateStruct;
@@ -776,6 +777,17 @@ public function addRelation(RelationCreateStruct $createStruct)
         return $relation;
     }
 
+    public function loadRelation(int $relationId): Relation
+    {
+        $rows = $this->contentGateway->loadRelation($relationId);
+
+        if (empty($rows)) {
+            throw new NotFound('relation', "relationId: $relationId");
+        }
+
+        return current($this->mapper->extractRelationsFromRows($rows));
+    }
+
     /**
      * Removes a relation by relation Id.
      *
@@ -787,7 +799,7 @@ public function addRelation(RelationCreateStruct $createStruct)
      *                 \Ibexa\Contracts\Core\Repository\Values\Content\Relation::LINK,
      *                 \Ibexa\Contracts\Core\Repository\Values\Content\Relation::FIELD}
      */
-    public function removeRelation($relationId, $type)
+    public function removeRelation($relationId, $type, ?int $destinationContentId = null)
     {
         $this->contentGateway->deleteRelation($relationId, $type);
     }

src/lib/Repository/ContentService.php

@@ -2128,7 +2128,8 @@ public function deleteRelation(APIVersionInfo $sourceVersion, ContentInfo $desti
                 if ($spiRelation->destinationContentId == $destinationContent->id) {
                     $this->persistenceHandler->contentHandler()->removeRelation(
                         $spiRelation->id,
-                        APIRelation::COMMON
+                        APIRelation::COMMON,
+                        $spiRelation->destinationContentId
                     );
                 }
             }

src/lib/Repository/Helper/RelationProcessor.php

@@ -192,15 +192,17 @@ public function processFieldRelations(
                         foreach ($relationEntry as $relation) {
                             $this->persistenceHandler->contentHandler()->removeRelation(
                                 $relation->id,
-                                $relationType
+                                $relationType,
+                                $relation->destinationContentInfo->id
                             );
                         }
                         break;
                     case Relation::LINK:
                     case Relation::EMBED:
                         $this->persistenceHandler->contentHandler()->removeRelation(
                             $relationEntry->id,
-                            $relationType
+                            $relationType,
+                            $relationEntry->destinationContentInfo->id
                         );
                 }
             }

src/lib/Resources/settings/storage_engines/cache.yml

@@ -47,6 +47,7 @@ parameters:
         notification_count: 'nc-%s'
         notification_pending_count: 'npc-%s'
         policy: 'p-%s'
+        relation: 're-%s'
         role: 'r-%s'
         role_assignment: 'ra-%s'
         role_assignment_group_list: 'ragl-%s'
@@ -114,6 +115,7 @@ parameters:
         content_info: 'ci-%s'
         content_info_by_remote_id: 'cibri-%s'
         content_locations: 'cl-%s'
+        content_reverse_relations_count: 'crrc-%s'
         content_version_info: 'cvi-%s'
         content_version_list: 'c-%s-vl'
         content_version: 'c-%%s-v-%%s'
@@ -141,6 +143,7 @@ parameters:
         notification_count: 'nc-%s'
         notification_pending_count: 'npc-%s'
         policy: 'p-%s'
+        relation: 're-%s'
         role: 'r-%s'
         role_assignment: 'ra-%s'
         role_assignment_group_list: 'ragl-%s'

tests/lib/Persistence/Cache/ContentHandlerTest.php

@@ -50,8 +50,8 @@ public function providerForUnCachedMethods(): array
             ['updateContent', [2, 1, new UpdateStruct()], [['content_version', [2, 1], false]], null, ['c-2-v-1']],
             //['deleteContent', [2]], own tests for relations complexity
             ['deleteVersion', [2, 1], [['content_version', [2, 1], false]], null, ['c-2-v-1']],
-            ['addRelation', [new RelationCreateStruct()]],
-            ['removeRelation', [66, APIRelation::COMMON]],
+            ['addRelation', [new RelationCreateStruct(['destinationContentId' => 2])], [['content', [2], false]], null, ['c-2']],
+            ['removeRelation', [66, APIRelation::COMMON, 2], [['content', [2], false], ['relation', [66], false]], null, ['c-2', 're-66']],
             ['loadRelations', [2, 1, 3]],
             ['loadReverseRelations', [2, 3]],
             ['publish', [2, 3, new MetadataUpdateStruct()], [['content', [2], false]], null, ['c-2']],
@@ -85,6 +85,7 @@ public function providerForCachedLoadMethodsHit(): array
 
         // string $method, array $arguments, string $key, array? $tagGeneratingArguments, array? $tagGeneratingResults, array? $keyGeneratingArguments, array? $keyGeneratingResults, mixed? $data, bool $multi = false, array $additionalCalls
         return [
+            ['countReverseRelations', [2], 'ibx-crrc-2', null, null, [['content_reverse_relations_count', [2], true]], ['ibx-crrc-2'], 10],
             ['load', [2, 1], 'ibx-c-2-1-' . ContentHandler::ALL_TRANSLATIONS_KEY, null, null, [['content', [], true]], ['ibx-c'], $content],
             ['load', [2, 1, ['eng-GB', 'eng-US']], 'ibx-c-2-1-eng-GB|eng-US', null, null, [['content', [], true]], ['ibx-c'], $content],
             ['load', [2], 'ibx-c-2-' . ContentHandler::ALL_TRANSLATIONS_KEY, null, null, [['content', [], true]], ['ibx-c'], $content],
@@ -94,6 +95,7 @@ public function providerForCachedLoadMethodsHit(): array
             ['loadContentInfo', [2], 'ibx-ci-2', null, null, [['content_info', [], true]], ['ibx-ci'], $info],
             ['loadContentInfoList', [[2]], 'ibx-ci-2', null, null, [['content_info', [], true]], ['ibx-ci'], [2 => $info], true],
             ['loadContentInfoByRemoteId', ['3d8jrj'], 'ibx-cibri-3d8jrj', null, null, [['content_info_by_remote_id', [], true]], ['ibx-cibri'], $info],
+            ['loadRelation', [66], 'ibx-re-66', null, null, [['relation', [66], true]], ['ibx-re-66'], new SPIRelation()],
             ['loadVersionInfo', [2, 1], 'ibx-cvi-2-1', null, null, [['content_version_info', [2], true]], ['ibx-cvi-2'], $version],
             ['loadVersionInfo', [2], 'ibx-cvi-2', null, null, [['content_version_info', [2], true]], ['ibx-cvi-2'], $version],
             ['listVersions', [2], 'ibx-c-2-vl', null, null, [['content_version_list', [2], true]], ['ibx-c-2-vl'], [$version]],
@@ -114,6 +116,20 @@ public function providerForCachedLoadMethodsMiss(): array
 
         // string $method, array $arguments, string $key, array? $tagGeneratingArguments, array? $tagGeneratingResults, array? $keyGeneratingArguments, array? $keyGeneratingResults, mixed? $data, bool $multi = false, array $additionalCalls
         return [
+            [
+                'countReverseRelations',
+                [2],
+                'ibx-crrc-2',
+                [
+                    ['content', [2], false],
+                ],
+                ['c-2'],
+                [
+                    ['content_reverse_relations_count', [2], true],
+                ],
+                ['ibx-crrc-2'],
+                10,
+            ],
             [
                 'load',
                 [2, 1],
@@ -300,6 +316,20 @@ public function providerForCachedLoadMethodsMiss(): array
                 ['ibx-c-2-vl'],
                 [$version],
             ],
+            [
+                'loadRelation',
+                [66],
+                'ibx-re-66',
+                [
+                    ['relation', [66], false],
+                ],
+                ['re-66'],
+                [
+                    ['relation', [66], true],
+                ],
+                ['ibx-re-66'],
+                new SPIRelation(),
+            ],
         ];
     }