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

fix(server): memory assets order (#16325)

Browse Source
This commit is contained in:
Alex 2025-02-25 19:10:52 -06:00 committed by GitHub
parent 8ecc67a364
commit 4ef7eb56a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/queries/memory.repository.sql
View File

@ -22,6 +22,8 @@ select
where where
"memories_assets_assets"."memoriesId" = "memories"."id" "memories_assets_assets"."memoriesId" = "memories"."id"
and "assets"."deletedAt" is null and "assets"."deletedAt" is null
order by
"assets"."fileCreatedAt" asc
) as agg ) as agg
) as "assets" ) as "assets"
from from
@ -48,6 +50,8 @@ select
where where
"memories_assets_assets"."memoriesId" = "memories"."id" "memories_assets_assets"."memoriesId" = "memories"."id"
and "assets"."deletedAt" is null and "assets"."deletedAt" is null
order by
"assets"."fileCreatedAt" asc
) as agg ) as agg
) as "assets" ) as "assets"
from from
@ -82,6 +86,8 @@ select
where where
"memories_assets_assets"."memoriesId" = "memories"."id" "memories_assets_assets"."memoriesId" = "memories"."id"
and "assets"."deletedAt" is null and "assets"."deletedAt" is null
order by
"assets"."fileCreatedAt" asc
) as agg ) as agg
) as "assets" ) as "assets"
from from
@ -112,6 +118,8 @@ select
where where
"memories_assets_assets"."memoriesId" = "memories"."id" "memories_assets_assets"."memoriesId" = "memories"."id"
and "assets"."deletedAt" is null and "assets"."deletedAt" is null
order by
"assets"."fileCreatedAt" asc
) as agg ) as agg
) as "assets" ) as "assets"
from from

2
server/src/repositories/memory.repository.ts
View File

@ -36,6 +36,7 @@ export class MemoryRepository implements IBulkAsset {
.selectAll('assets') .selectAll('assets')
.innerJoin('memories_assets_assets', 'assets.id', 'memories_assets_assets.assetsId') .innerJoin('memories_assets_assets', 'assets.id', 'memories_assets_assets.assetsId')
.whereRef('memories_assets_assets.memoriesId', '=', 'memories.id') .whereRef('memories_assets_assets.memoriesId', '=', 'memories.id')
.orderBy('assets.fileCreatedAt', 'asc')
.where('assets.deletedAt', 'is', null), .where('assets.deletedAt', 'is', null),
).as('assets'), ).as('assets'),
) )
@ -137,6 +138,7 @@ export class MemoryRepository implements IBulkAsset {
.selectAll('assets') .selectAll('assets')
.innerJoin('memories_assets_assets', 'assets.id', 'memories_assets_assets.assetsId') .innerJoin('memories_assets_assets', 'assets.id', 'memories_assets_assets.assetsId')
.whereRef('memories_assets_assets.memoriesId', '=', 'memories.id') .whereRef('memories_assets_assets.memoriesId', '=', 'memories.id')
.orderBy('assets.fileCreatedAt', 'asc')
.where('assets.deletedAt', 'is', null), .where('assets.deletedAt', 'is', null),
).as('assets'), ).as('assets'),
) )