Skip to content

High performance self-hosted photo and video management solution.

fix(server): Sort stacked assets by creation date (#24033)

Timon3c279983bc2d
diff --git a/server/src/queries/stack.repository.sql b/server/src/queries/stack.repository.sql
index b5f1dc7d18..88e21d653e 100644
--- a/server/src/queries/stack.repository.sql
+++ b/server/src/queries/stack.repository.sql
@@ -54,6 +54,8 @@ select
"asset"."deletedAt" is null
and "asset"."stackId" = "stack"."id"
and "asset"."visibility" in ('archive', 'timeline')
+ order by
+ "asset"."fileCreatedAt" asc
) as agg
) as "assets"
from
@@ -139,6 +141,8 @@ select
"asset"."deletedAt" is null
and "asset"."stackId" = "stack"."id"
and "asset"."visibility" in ('archive', 'timeline')
+ order by
+ "asset"."fileCreatedAt" asc
) as agg
) as "assets"
from
diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
index b3f23399cf..5c3d4addce 100644
--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -594,10 +594,10 @@ export class AssetRepository {
eb
.selectFrom('asset as stacked')
.selectAll('stack')
- .select((eb) =>
- eb
- .fn<ShallowDehydrateObject<Selectable<AssetTable>>>('array_agg', [eb.table('stacked')])
- .as('assets'),
+ .select(
+ sql<
+ ShallowDehydrateObject<Selectable<AssetTable>>[]
+ >`array_agg(to_json(stacked) ORDER BY stacked."fileCreatedAt" ASC)`.as('assets'),
)
.whereRef('stacked.stackId', '=', 'stack.id')
.whereRef('stacked.id', '!=', 'stack.primaryAssetId')
diff --git a/server/src/repositories/stack.repository.ts b/server/src/repositories/stack.repository.ts
index d313d682bd..1cb0b33fce 100644
--- a/server/src/repositories/stack.repository.ts
+++ b/server/src/repositories/stack.repository.ts
@@ -41,7 +41,8 @@ const withAssets = (eb: ExpressionBuilder<DB, 'stack'>, withTags = false) => {
.select((eb) => eb.fn.toJson('exifInfo').as('exifInfo'))
.where('asset.deletedAt', 'is', null)
.whereRef('asset.stackId', '=', 'stack.id')
- .$call(withDefaultVisibility),
+ .$call(withDefaultVisibility)
+ .orderBy('asset.fileCreatedAt', 'asc'),
).as('assets');
};