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