[WIP] IBX-9379 Added Grace Period for archived versions

phpstan-baseline.neon

@@ -23353,7 +23353,7 @@ parameters:
 			path: src/lib/Persistence/Legacy/User/Handler.php
 
 		-
-			message: '#^Cannot access offset mixed on non\-empty\-array\|Ibexa\\Contracts\\Core\\Persistence\\User\\RoleAssignment\.$#'
+			message: '#^Cannot access offset mixed on non\-empty\-array\<non\-empty\-array\<int, Ibexa\\Contracts\\Core\\Persistence\\User\\RoleAssignment\>\>\|Ibexa\\Contracts\\Core\\Persistence\\User\\RoleAssignment\.$#'
 			identifier: offsetAccess.nonOffsetAccessible
 			count: 1
 			path: src/lib/Persistence/Legacy/User/Mapper.php
@@ -42335,6 +42335,7 @@ parameters:
 			identifier: argument.type
 			count: 1
 			path: tests/integration/Core/Repository/LocationServiceTest.php
+
 		-
 			message: '#^Parameter \#1 \$expectedLocations of method Ibexa\\Tests\\Integration\\Core\\Repository\\LocationServiceTest\:\:assertContentHasExpectedLocations\(\) expects array\<Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Location\>, array\<int, Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Location\|null\> given\.$#'
 			identifier: argument.type
@@ -67344,7 +67345,7 @@ parameters:
 			path: tests/lib/Persistence/Legacy/SharedGateway/GatewayFactoryTest.php
 
 		-
-			message: '#^PHPDoc tag @var with type Doctrine\\DBAL\\Platforms\\AbstractPlatform is not subtype of native type Doctrine\\DBAL\\Platforms\\MySqlPlatform\|Doctrine\\DBAL\\Platforms\\PostgreSqlPlatform\|Doctrine\\DBAL\\Platforms\\SqlitePlatform\.$#'
+			message: '#^PHPDoc tag @var with type Doctrine\\DBAL\\Platforms\\AbstractPlatform is not subtype of native type Doctrine\\DBAL\\Platforms\\MySQL80Platform\|Doctrine\\DBAL\\Platforms\\MySqlPlatform\|Doctrine\\DBAL\\Platforms\\PostgreSqlPlatform\|Doctrine\\DBAL\\Platforms\\SqlitePlatform\.$#'
 			identifier: varTag.nativeType
 			count: 1
 			path: tests/lib/Persistence/Legacy/SharedGateway/GatewayFactoryTest.php
@@ -70841,12 +70842,6 @@ parameters:
 			count: 1
 			path: tests/lib/Repository/Service/Mock/ContentTest.php
 
-		-
-			message: '#^Method Ibexa\\Tests\\Core\\Repository\\Service\\Mock\\ContentTest\:\:getPartlyMockedContentService\(\) invoked with 2 parameters, 0\-1 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: tests/lib/Repository/Service/Mock/ContentTest.php
-
 		-
 			message: '#^Method Ibexa\\Tests\\Core\\Repository\\Service\\Mock\\ContentTest\:\:getPartlyMockedContentService\(\) should return Ibexa\\Core\\Repository\\ContentService&PHPUnit\\Framework\\MockObject\\MockObject but returns Ibexa\\Core\\Repository\\ContentService\.$#'
 			identifier: return.type

src/contracts/Persistence/Content/Handler.php

@@ -131,6 +131,13 @@ public function loadContentInfoByRemoteId($remoteId);
      */
     public function loadVersionInfo($contentId, $versionNo = null);
 
+    /**
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     *
+     * @return int[]
+     */
+    public function loadVersionNoArchivedWithin(int $contentId, int $seconds): array;
+
     /**
      * Returns the number of versions with draft status created by the given $userId.
      *

src/lib/Persistence/Cache/ContentHandler.php

@@ -266,6 +266,20 @@ public function loadVersionInfo($contentId, $versionNo = null)
         return $versionInfo;
     }
 
+    /**
+     * @return int[]
+     */
+    public function loadVersionNoArchivedWithin(int $contentId, int $seconds): array
+    {
+        $versionNos = $this->persistenceHandler->contentHandler()->loadVersionNoArchivedWithin($contentId, $seconds);
+
+        $this->cache->invalidateTags([
+            $this->cacheIdentifierGenerator->generateTag(self::CONTENT_IDENTIFIER, [$contentId]),
+        ]);
+
+        return $versionNos;
+    }
+
     public function countDraftsForUser(int $userId): int
     {
         $this->logger->logCall(__METHOD__, ['user' => $userId]);

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

@@ -212,6 +212,11 @@ abstract public function loadContentInfoList(array $contentIds): array;
      */
     abstract public function loadVersionInfo(int $contentId, ?int $versionNo = null): array;
 
+    /**
+     * @return array<mixed>
+     */
+    abstract public function loadVersionNoArchivedWithin(int $contentId, int $seconds): array;
+
     /**
      * Return the number of all versions with given status created by the given $userId.
      */

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

@@ -910,6 +910,51 @@ public function loadVersionInfo(int $contentId, ?int $versionNo = null): array
         return $queryBuilder->execute()->fetchAll(FetchMode::ASSOCIATIVE);
     }
 
+    /**
+     * @return array<mixed>
+     */
+    public function loadVersionNoArchivedWithin(int $contentId, int $seconds): array
+    {
+        $cutoffTimestamp = strtotime(sprintf('-%d seconds', $seconds));
+        if (false === $cutoffTimestamp) {
+            return [];
+        }
+        $queryBuilder = $this->queryBuilder->createVersionInfoFindQueryBuilder();
+        $expr = $queryBuilder->expr();
+
+        $queryBuilder
+            ->andWhere(
+                $expr->eq(
+                    'v.contentobject_id',
+                    $queryBuilder->createNamedParameter(
+                        $contentId,
+                        ParameterType::INTEGER,
+                        ':content_id'
+                    )
+                )
+            )->andWhere(
+                $expr->eq(
+                    'v.status',
+                    $queryBuilder->createNamedParameter(
+                        VersionInfo::STATUS_ARCHIVED,
+                        ParameterType::INTEGER,
+                        ':status'
+                    )
+                )
+            )->andWhere(
+                $expr->gt(
+                    'v.modified',
+                    $queryBuilder->createNamedParameter(
+                        $cutoffTimestamp,
+                        ParameterType::INTEGER,
+                        ':modified'
+                    )
+                )
+            )->orderBy('v.modified', 'DESC');
+
+        return $queryBuilder->execute()->fetchAllAssociative();
+    }
+
     public function countVersionsForUser(int $userId, int $status = VersionInfo::STATUS_DRAFT): int
     {
         $query = $this->connection->createQueryBuilder();

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

@@ -217,6 +217,18 @@ public function loadVersionInfo(int $contentId, ?int $versionNo = null): array
         }
     }
 
+    /**
+     * @return int[]
+     */
+    public function loadVersionNoArchivedWithin(int $contentId, int $seconds): array
+    {
+        try {
+            return $this->innerGateway->loadVersionNoArchivedWithin($contentId, $seconds);
+        } catch (DBALException | PDOException $e) {
+            throw DatabaseException::wrap($e);
+        }
+    }
+
     public function countVersionsForUser(int $userId, int $status = VersionInfo::STATUS_DRAFT): int
     {
         try {

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

@@ -483,6 +483,21 @@ public function loadVersionInfo($contentId, $versionNo = null)
         return reset($versionInfo);
     }
 
+    public function loadVersionNoArchivedWithin(int $contentId, int $seconds): array
+    {
+        $rows = $this->contentGateway->loadVersionNoArchivedWithin($contentId, $seconds);
+        if (empty($rows)) {
+            throw new NotFound('content', $contentId);
+        }
+
+        $archivedVersionNos = [];
+        foreach ($rows as $row) {
+            $archivedVersionNos[] = $row['ezcontentobject_version_version'];
+        }
+
+        return $archivedVersionNos;
+    }
+
     public function countDraftsForUser(int $userId): int
     {
         return $this->contentGateway->countVersionsForUser($userId, VersionInfo::STATUS_DRAFT);

src/lib/Repository/ContentService.php

@@ -129,6 +129,7 @@ public function __construct(
             // Version archive limit (0-50), only enforced on publish, not on un-publish.
             'default_version_archive_limit' => 5,
             'remove_archived_versions_on_publish' => true,
+            'grace_period_in_seconds' => 30,
         ];
         $this->contentFilteringHandler = $contentFilteringHandler;
         $this->permissionResolver = $permissionService;
@@ -381,20 +382,39 @@ public function loadContentByVersionInfo(APIVersionInfo $versionInfo, array $lan
     public function loadContent(int $contentId, array $languages = null, ?int $versionNo = null, bool $useAlwaysAvailable = true): APIContent
     {
         $content = $this->internalLoadContentById($contentId, $languages, $versionNo, $useAlwaysAvailable);
-
         if (!$this->permissionResolver->canUser('content', 'read', $content)) {
             throw new UnauthorizedException('content', 'read', ['contentId' => $contentId]);
         }
         if (
             !$content->getVersionInfo()->isPublished()
             && !$this->permissionResolver->canUser('content', 'versionread', $content)
         ) {
-            throw new UnauthorizedException('content', 'versionread', ['contentId' => $contentId, 'versionNo' => $versionNo]);
+            if (!$this->isInGracePeriod($content, $this->settings['grace_period_in_seconds'], $versionNo)) {
+                throw new UnauthorizedException('content', 'versionread', ['contentId' => $contentId, 'versionNo' => $versionNo]);
+            }
         }
 
         return $content;
     }
 
+    private function isInGracePeriod(APIContent $content, int $graceSeconds, ?int $versionNo): bool
+    {
+        if ($graceSeconds <= 0 || $versionNo === null) {
+            return false;
+        }
+
+        try {
+            $lastArchivedVersionNos = $this->persistenceHandler->contentHandler()->loadVersionNoArchivedWithin(
+                $content->getId(),
+                $graceSeconds
+            );
+        } catch (APINotFoundException $e) {
+            return false;
+        }
+
+        return in_array($versionNo, $lastArchivedVersionNos, true);
+    }
+
     public function internalLoadContentById(
         int $id,
         ?array $languages = null,

tests/lib/Repository/Service/Mock/ContentTest.php

@@ -491,9 +491,11 @@ public function testLoadContentUnauthorized()
         $contentService->loadContent($contentId);
     }
 
-    public function testLoadContentNotPublishedStatusUnauthorized()
+    public function testLoadContentNotPublishedStatusUnauthorized(bool $expectException = true)
     {
-        $this->expectException(UnauthorizedException::class);
+        if ($expectException) {
+            $this->expectException(UnauthorizedException::class);
+        }
 
         $permissionResolver = $this->getPermissionResolverMock();
         $contentService = $this->getPartlyMockedContentService(['internalLoadContentById']);
@@ -3317,8 +3319,7 @@ protected function assertForTestUpdateContentNonRedundantFieldSet(
             ->expects($this->once())
             ->method('getCurrentUserReference')
             ->willReturn(new UserReference(169));
-        $mockedService = $this->getPartlyMockedContentService(['internalLoadContentById'], $permissionResolverMock);
-        $permissionResolverMock = $this->getPermissionResolverMock();
+        $mockedService = $this->getPartlyMockedContentService(['internalLoadContentById']);
         /** @var \PHPUnit\Framework\MockObject\MockObject $contentHandlerMock */
         $contentHandlerMock = $this->getPersistenceMock()->contentHandler();
         /** @var \PHPUnit\Framework\MockObject\MockObject $languageHandlerMock */
@@ -6271,7 +6272,7 @@ protected function getLocationServiceMock()
      *
      * @return \Ibexa\Core\Repository\ContentService|\PHPUnit\Framework\MockObject\MockObject
      */
-    protected function getPartlyMockedContentService(array $methods = null)
+    protected function getPartlyMockedContentService(array $methods = null, int $gracePeriodInSeconds = 0)
     {
         if (!isset($this->partlyMockedContentService)) {
             $this->partlyMockedContentService = $this->getMockBuilder(ContentService::class)
@@ -6288,7 +6289,9 @@ protected function getPartlyMockedContentService(array $methods = null)
                         $this->getContentMapper(),
                         $this->getContentValidatorStrategy(),
                         $this->getContentFilteringHandlerMock(),
-                        [],
+                        [
+                            'grace_period_in_seconds' => $gracePeriodInSeconds,
+                        ],
                     ]
                 )
                 ->getMock();