Merge pull request #63290 from nextcloud/backport/63251/stable34

[stable34] fix(preview): delete version metadata by preview ID

Author: solracsf

lib/private/Preview/Db/Preview.php

@@ -47,7 +47,8 @@
  * @method string getEtag() Get the etag of the preview.
  * @method void setEtag(string $etag)
  * @method string|null getVersion() Get the version for files_versions_s3
- * @method void setVersionId(string $versionId)
+ * @method string|null getVersionId() Get the ID of the version metadata row.
+ * @method void setVersionId(string $versionId) Set the ID of the version metadata row.
  * @method bool|null getIs() Get the version for files_versions_s3
  * @method bool isEncrypted() Get whether the preview is encrypted. At the moment every preview is unencrypted.
  * @method void setEncrypted(bool $encrypted)

lib/private/Preview/Db/PreviewMapper.php

@@ -84,11 +84,15 @@ public function update(Entity $entity): Entity {
 	public function delete(Entity $entity): Entity {
 		/** @var Preview $preview */
 		$preview = $entity;
-		if ($preview->getVersion() !== null && $preview->getVersion() !== '') {
+
+		$versionId = $preview->getVersionId();
+		if ($versionId !== null && $versionId !== '' && $versionId !== '-1') {
 			$qb = $this->db->getQueryBuilder();
 			$qb->delete(self::VERSION_TABLE_NAME)
-				->where($qb->expr()->eq('file_id', $qb->createNamedParameter($preview->getFileId())))
-				->andWhere($qb->expr()->eq('version', $qb->createNamedParameter($preview->getVersion())))
+				->where($qb->expr()->eq(
+					'id',
+					$qb->createNamedParameter($versionId),
+				))
 				->executeStatement();
 		}