fix(files_versions): Cleanup versions entity in during versions:clean command

Signed-off-by: Louis Chemineau <louis@chmn.me>

Author: artonge

apps/files_versions/lib/Command/CleanUp.php

@@ -24,6 +24,7 @@
  */
 namespace OCA\Files_Versions\Command;
 
+use OCA\Files_Versions\Db\VersionsMapper;
 use OCP\Files\IRootFolder;
 use OCP\IUserBackend;
 use OCP\IUserManager;
@@ -37,6 +38,7 @@ class CleanUp extends Command {
 	public function __construct(
 		protected IRootFolder $rootFolder,
 		protected IUserManager $userManager,
+		protected VersionsMapper $versionMapper,
 	) {
 		parent::__construct();
 	}
@@ -119,6 +121,9 @@ protected function deleteVersions(string $user, ?string $path = null): void {
 		\OC_Util::tearDownFS();
 		\OC_Util::setupFS($user);
 
+		$userHomeStorageId = $this->rootFolder->getUserFolder($user)->getStorage()->getCache()->getNumericStorageId();
+		$this->versionMapper->deleteAllVersionsForUser($userHomeStorageId, $path);
+
 		$fullPath = '/' . $user . '/files_versions' . ($path ? '/' . $path : '');
 		if ($this->rootFolder->nodeExists($fullPath)) {
 			$this->rootFolder->get($fullPath)->delete();

apps/files_versions/lib/Db/VersionsMapper.php

@@ -27,6 +27,7 @@
 namespace OCA\Files_Versions\Db;
 
 use OCP\AppFramework\Db\QBMapper;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 /**
@@ -83,4 +84,31 @@ public function deleteAllVersionsForFileId(int $fileId): int {
 			 ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId)))
 			 ->executeStatement();
 	}
+
+	public function deleteAllVersionsForUser(int $storageId, string $path = null): void {
+		$filesIdsSelect = $this->db->getQueryBuilder();
+		$filesIdsSelect->selectDistinct('file_id')
+			->from('files_versions', 'v')
+			->join('v', 'filecache', 'f', $filesIdsSelect->expr()->eq('v.file_id', 'f.fileid'))
+			->where($filesIdsSelect->expr()->eq('f.storage', $filesIdsSelect->createNamedParameter($storageId, IQueryBuilder::PARAM_STR)))
+			->andWhere($filesIdsSelect->expr()->like('f.path', $filesIdsSelect->createNamedParameter('files' . ($path ? '/' . $this->db->escapeLikeParameter($path) : '') . '/%', IQueryBuilder::PARAM_STR)))
+			->setFirstResult(0)
+			->setMaxResults(1000);
+
+		$versionEntitiesDeleteQuery = $this->db->getQueryBuilder();
+		$versionEntitiesDeleteQuery->delete($this->getTableName())
+			->where($versionEntitiesDeleteQuery->expr()->in('file_id', $versionEntitiesDeleteQuery->createParameter('file_ids')));
+
+		$offset = 0;
+		do {
+			$filesIdsSelect->setFirstResult($offset);
+			$result = $filesIdsSelect->executeQuery();
+			$count = $result->rowCount();
+			$rows = $result->fetchAll();
+			$offset += $count;
+
+			$versionEntitiesDeleteQuery->setParameter('file_ids', array_map(fn ($row) => $row['fileid'], $rows), IQueryBuilder::PARAM_INT_ARRAY);
+			$versionEntitiesDeleteQuery->executeStatement();
+		} while ($result->rowCount() !== 0);
+	}
 }

apps/files_versions/tests/Command/CleanupTest.php

@@ -27,7 +27,10 @@
 
 use OC\User\Manager;
 use OCA\Files_Versions\Command\CleanUp;
+use OCP\Files\Cache\ICache;
+use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
+use OCP\Files\Storage\IStorage;
 use Test\TestCase;
 
 /**
@@ -48,16 +51,20 @@ class CleanupTest extends TestCase {
 	/** @var \PHPUnit\Framework\MockObject\MockObject | IRootFolder */
 	protected $rootFolder;
 
+	/** @var \PHPUnit\Framework\MockObject\MockObject | VersionsMapper */
+	protected $versionMapper;
+
 	protected function setUp(): void {
 		parent::setUp();
 
 		$this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder')
 			->disableOriginalConstructor()->getMock();
 		$this->userManager = $this->getMockBuilder('OC\User\Manager')
 			->disableOriginalConstructor()->getMock();
+		$this->versionMapper = $this->getMockBuilder('OCA\Files_Versions\Db\VersionsMapper')
+			->disableOriginalConstructor()->getMock();
 
-
-		$this->cleanup = new CleanUp($this->rootFolder, $this->userManager);
+		$this->cleanup = new CleanUp($this->rootFolder, $this->userManager, $this->versionMapper);
 	}
 
 	/**
@@ -70,8 +77,24 @@ public function testDeleteVersions($nodeExists) {
 			->with('/testUser/files_versions')
 			->willReturn($nodeExists);
 
-
-		if ($nodeExists) {
+		$userFolder = $this->createMock(Folder::class);
+		$userHomeStorage = $this->createMock(IStorage::class);
+		$userHomeStorageCache = $this->createMock(ICache::class);
+		$this->rootFolder->expects($this->once())
+			->method('getUserFolder')
+			->with('testUser')
+			->willReturn($userFolder);
+		$userFolder->expects($this->once())
+			->method('getStorage')
+			->willReturn($userHomeStorage);
+		$userHomeStorage->expects($this->once())
+			->method('getCache')
+			->willReturn($userHomeStorageCache);
+		$userHomeStorageCache->expects($this->once())
+			->method('getNumericStorageId')
+			->willReturn(1);
+
+			if ($nodeExists) {
 			$this->rootFolder->expects($this->once())
 				->method('get')
 				->with('/testUser/files_versions')
@@ -104,7 +127,7 @@ public function testExecuteDeleteListOfUsers() {
 
 		$instance = $this->getMockBuilder('OCA\Files_Versions\Command\CleanUp')
 			->setMethods(['deleteVersions'])
-			->setConstructorArgs([$this->rootFolder, $this->userManager])
+			->setConstructorArgs([$this->rootFolder, $this->userManager, $this->versionMapper])
 			->getMock();
 		$instance->expects($this->exactly(count($userIds)))
 			->method('deleteVersions')
@@ -136,7 +159,7 @@ public function testExecuteAllUsers() {
 
 		$instance = $this->getMockBuilder('OCA\Files_Versions\Command\CleanUp')
 			->setMethods(['deleteVersions'])
-			->setConstructorArgs([$this->rootFolder, $this->userManager])
+			->setConstructorArgs([$this->rootFolder, $this->userManager, $this->versionMapper])
 			->getMock();
 
 		$backend = $this->getMockBuilder(\OCP\UserInterface::class)

tests/Core/Command/TwoFactorAuth/CleanupTest.php

@@ -27,6 +27,7 @@
 namespace Core\Command\TwoFactorAuth;
 
 use OC\Core\Command\TwoFactorAuth\Cleanup;
+use OCA\Files_Versions\Db\VersionsMapper;
 use OCP\Authentication\TwoFactorAuth\IRegistry;
 use OCP\IUserManager;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -40,6 +41,9 @@ class CleanupTest extends TestCase {
 	/** @var IUserManager|MockObject */
 	private $userManager;
 
+	/** @var VersionsMapper|MockObject */
+	private $versionMapper;
+
 	/** @var CommandTester */
 	private $cmd;
 
@@ -48,8 +52,9 @@ protected function setUp(): void {
 
 		$this->registry = $this->createMock(IRegistry::class);
 		$this->userManager = $this->createMock(IUserManager::class);
+		$this->versionMapper = $this->createMock(VersionsMapper::class);
 
-		$cmd = new Cleanup($this->registry, $this->userManager);
+		$cmd = new Cleanup($this->registry, $this->userManager, $this->versionMapper);
 		$this->cmd = new CommandTester($cmd);
 	}