Cleanup versions entity in during versions:clean command

Signed-off-by: Louis Chemineau <[email protected]>

Author: artonge

apps/files_versions/lib/Command/CleanUp.php

@@ -122,7 +122,7 @@ protected function deleteVersions(string $user, ?string $path = null): void {
 		\OC_Util::setupFS($user);
 
 		$fullPath = '/' . $user . '/files_versions' . ($path ? '/' . $path : '');
-		$this->versionMapper->deleteAllVersionsForUser($user);
+		$this->versionMapper->deleteAllVersionsForUser($user, $path);
 		if ($this->rootFolder->nodeExists($fullPath)) {
 			$this->rootFolder->get($fullPath)->delete();
 		}

apps/files_versions/lib/Db/VersionsMapper.php

@@ -85,13 +85,13 @@ public function deleteAllVersionsForFileId(int $fileId): int {
 			 ->executeStatement();
 	}
 
-	public function deleteAllVersionsForUser(string $userId): int {
+	public function deleteAllVersionsForUser(string $userId, string $path = null): int {
 		$deleteQuery = $this->db->getQueryBuilder();
 		$filesVersionSelect = $this->db->getQueryBuilder();
 		$filesVersionSelect->select('fileid')
 			->from('filecache', 'f')
 			->join('f', 'mounts', 'm', $filesVersionSelect->expr()->eq('f.storage', 'm.storage_id'))
-			->where($filesVersionSelect->expr()->like('f.path', $deleteQuery->createNamedParameter('files/%', IQueryBuilder::PARAM_STR)))
+			->where($filesVersionSelect->expr()->like('f.path', $deleteQuery->createNamedParameter('files'.($path ? '/' . $path : '').'/%', IQueryBuilder::PARAM_STR)))
 			->andWhere($filesVersionSelect->expr()->eq('m.user_id', $deleteQuery->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
 			->andWhere($filesVersionSelect->expr()->eq('m.mount_point', $deleteQuery->createNamedParameter("/$userId/", IQueryBuilder::PARAM_STR)));
 

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);
 	}