High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: do not use trashed assets as album covers (#12905)
Jason Rasmussen05d8c4c132b0
diff --git a/server/src/queries/album.repository.sql b/server/src/queries/album.repository.sqlindex cc052e9de6..c4f6fbdd32 100644--- a/server/src/queries/album.repository.sql+++ b/server/src/queries/album.repository.sql@@ -483,16 +483,13 @@ UPDATE "albums"SET"albumThumbnailAssetId" = (SELECT- "albums_assets2"."assetsId"+ "album_assets"."assetsId"FROM- "assets" "assets",- "albums_assets_assets" "albums_assets2"+ "albums_assets_assets" "album_assets"+ INNER JOIN "assets" "assets" ON "album_assets"."assetsId" = "assets"."id"+ AND "assets"."deletedAt" IS NULLWHERE- (- "albums_assets2"."assetsId" = "assets"."id"- AND "albums_assets2"."albumsId" = "albums"."id"- )- AND ("assets"."deletedAt" IS NULL)+ "album_assets"."albumsId" = "albums"."id"ORDER BY"assets"."fileCreatedAt" DESCLIMIT@@ -505,17 +502,21 @@ WHERESELECT1FROM- "albums_assets_assets" "albums_assets"+ "albums_assets_assets" "album_assets"+ INNER JOIN "assets" "assets" ON "album_assets"."assetsId" = "assets"."id"+ AND "assets"."deletedAt" IS NULLWHERE- "albums"."id" = "albums_assets"."albumsId"+ "album_assets"."albumsId" = "albums"."id")OR "albums"."albumThumbnailAssetId" IS NOT NULLAND NOT EXISTS (SELECT1FROM- "albums_assets_assets" "albums_assets"+ "albums_assets_assets" "album_assets"+ INNER JOIN "assets" "assets" ON "album_assets"."assetsId" = "assets"."id"+ AND "assets"."deletedAt" IS NULLWHERE- "albums"."id" = "albums_assets"."albumsId"- AND "albums"."albumThumbnailAssetId" = "albums_assets"."assetsId"+ "album_assets"."albumsId" = "albums"."id"+ AND "albums"."albumThumbnailAssetId" = "album_assets"."assetsId")diff --git a/server/src/repositories/album.repository.ts b/server/src/repositories/album.repository.tsindex 4101d78c8e..f7b4cb44aa 100644--- a/server/src/repositories/album.repository.ts+++ b/server/src/repositories/album.repository.ts@@ -277,32 +277,26 @@ export class AlbumRepository implements IAlbumRepository {@GenerateSql()async updateThumbnails(): Promise<number | undefined> {// Subquery for getting a new thumbnail.- const newThumbnail = this.assetRepository- .createQueryBuilder('assets')- .select('albums_assets2.assetsId')- .addFrom('albums_assets_assets', 'albums_assets2')- .where('albums_assets2.assetsId = assets.id')- .andWhere('albums_assets2.albumsId = "albums"."id"') // Reference to albums.id outside this query- .orderBy('assets.fileCreatedAt', 'DESC')- .limit(1);- // Using dataSource, because there is no direct access to albums_assets_assets.- const albumHasAssets = this.dataSource- .createQueryBuilder()- .select('1')- .from('albums_assets_assets', 'albums_assets')- .where('"albums"."id" = "albums_assets"."albumsId"');+ const builder = this.dataSource+ .createQueryBuilder('albums_assets_assets', 'album_assets')+ .innerJoin('assets', 'assets', '"album_assets"."assetsId" = "assets"."id"')+ .where('"album_assets"."albumsId" = "albums"."id"');- const albumContainsThumbnail = albumHasAssets+ const newThumbnail = builder.clone()- .andWhere('"albums"."albumThumbnailAssetId" = "albums_assets"."assetsId"');+ .select('"album_assets"."assetsId"')+ .orderBy('"assets"."fileCreatedAt"', 'DESC')+ .limit(1);+ const hasAssets = builder.clone().select('1');+ const hasInvalidAsset = hasAssets.clone().andWhere('"albums"."albumThumbnailAssetId" = "album_assets"."assetsId"');const updateAlbums = this.repository.createQueryBuilder('albums').update(AlbumEntity).set({ albumThumbnailAssetId: () => `(${newThumbnail.getQuery()})` })- .where(`"albums"."albumThumbnailAssetId" IS NULL AND EXISTS (${albumHasAssets.getQuery()})`)- .orWhere(`"albums"."albumThumbnailAssetId" IS NOT NULL AND NOT EXISTS (${albumContainsThumbnail.getQuery()})`);+ .where(`"albums"."albumThumbnailAssetId" IS NULL AND EXISTS (${hasAssets.getQuery()})`)+ .orWhere(`"albums"."albumThumbnailAssetId" IS NOT NULL AND NOT EXISTS (${hasInvalidAsset.getQuery()})`);const result = await updateAlbums.execute();