High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(server): library refresh not checking trashed assets (#10495)
Mert1191978d50a5
diff --git a/server/src/queries/asset.repository.sql b/server/src/queries/asset.repository.sqlindex 6968a2b8f5..29d98b9c6f 100644--- a/server/src/queries/asset.repository.sql+++ b/server/src/queries/asset.repository.sql@@ -320,17 +320,11 @@ FROMFROM"assets" "AssetEntity"LEFT JOIN "libraries" "AssetEntity__AssetEntity_library" ON "AssetEntity__AssetEntity_library"."id" = "AssetEntity"."libraryId"- AND (- "AssetEntity__AssetEntity_library"."deletedAt" IS NULL- )WHERE(- (- ((("AssetEntity__AssetEntity_library"."id" = $1)))- AND ("AssetEntity"."originalPath" = $2)- )+ ((("AssetEntity__AssetEntity_library"."id" = $1)))+ AND ("AssetEntity"."originalPath" = $2))- AND ("AssetEntity"."deletedAt" IS NULL)) "distinctAlias"ORDER BY"AssetEntity_id" ASCdiff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.tsindex ee7a97004a..358d7e2bbf 100644--- a/server/src/repositories/asset.repository.ts+++ b/server/src/repositories/asset.repository.ts@@ -188,7 +188,8 @@ export class AssetRepository implements IAssetRepository {@GenerateSql({ params: [DummyValue.UUID, DummyValue.STRING] })getByLibraryIdAndOriginalPath(libraryId: string, originalPath: string): Promise<AssetEntity | null> {return this.repository.findOne({- where: { library: { id: libraryId }, originalPath: originalPath },+ where: { library: { id: libraryId }, originalPath },+ withDeleted: true,});}