tbelway/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-11-04 03:39:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): library refresh not checking trashed assets (#10495)

Browse Source 
* set `withDeleted`

* update sql
This commit is contained in:
Mert 2024-06-19 16:42:55 -04:00 committed by GitHub
parent 7ea0278b32
commit 1191978d50
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/queries/asset.repository.sql
View File

@ -320,17 +320,11 @@ FROM
FROM FROM
"assets" "AssetEntity" "assets" "AssetEntity"
LEFT JOIN "libraries" "AssetEntity__AssetEntity_library" ON "AssetEntity__AssetEntity_library"."id" = "AssetEntity"."libraryId" LEFT JOIN "libraries" "AssetEntity__AssetEntity_library" ON "AssetEntity__AssetEntity_library"."id" = "AssetEntity"."libraryId"
AND (
"AssetEntity__AssetEntity_library"."deletedAt" IS NULL
)
WHERE WHERE
( (
( ((("AssetEntity__AssetEntity_library"."id" = $1)))
((("AssetEntity__AssetEntity_library"."id" = $1))) AND ("AssetEntity"."originalPath" = $2)
AND ("AssetEntity"."originalPath" = $2)
)
) )
AND ("AssetEntity"."deletedAt" IS NULL)
) "distinctAlias" ) "distinctAlias"
ORDER BY ORDER BY
"AssetEntity_id" ASC "AssetEntity_id" ASC

3
server/src/repositories/asset.repository.ts
View File

@ -188,7 +188,8 @@ export class AssetRepository implements IAssetRepository {
@GenerateSql({ params: [DummyValue.UUID, DummyValue.STRING] }) @GenerateSql({ params: [DummyValue.UUID, DummyValue.STRING] })
getByLibraryIdAndOriginalPath(libraryId: string, originalPath: string): Promise<AssetEntity | null> { getByLibraryIdAndOriginalPath(libraryId: string, originalPath: string): Promise<AssetEntity | null> {
return this.repository.findOne({ return this.repository.findOne({
where: { library: { id: libraryId }, originalPath: originalPath }, where: { library: { id: libraryId }, originalPath },
withDeleted: true,
}); });
} }