From 4ef7eb56a301c25c2f868351add8c7f2b07c7fe8 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 25 Feb 2025 19:10:52 -0600
Subject: [PATCH] fix(server): memory assets order (#16325)

---
 server/src/queries/memory.repository.sql     | 8 ++++++++
 server/src/repositories/memory.repository.ts | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/server/src/queries/memory.repository.sql b/server/src/queries/memory.repository.sql
index 3b1526f487..d44d017045 100644
--- a/server/src/queries/memory.repository.sql
+++ b/server/src/queries/memory.repository.sql
@@ -22,6 +22,8 @@ select
         where
           "memories_assets_assets"."memoriesId" = "memories"."id"
           and "assets"."deletedAt" is null
+        order by
+          "assets"."fileCreatedAt" asc
       ) as agg
   ) as "assets"
 from
@@ -48,6 +50,8 @@ select
         where
           "memories_assets_assets"."memoriesId" = "memories"."id"
           and "assets"."deletedAt" is null
+        order by
+          "assets"."fileCreatedAt" asc
       ) as agg
   ) as "assets"
 from
@@ -82,6 +86,8 @@ select
         where
           "memories_assets_assets"."memoriesId" = "memories"."id"
           and "assets"."deletedAt" is null
+        order by
+          "assets"."fileCreatedAt" asc
       ) as agg
   ) as "assets"
 from
@@ -112,6 +118,8 @@ select
         where
           "memories_assets_assets"."memoriesId" = "memories"."id"
           and "assets"."deletedAt" is null
+        order by
+          "assets"."fileCreatedAt" asc
       ) as agg
   ) as "assets"
 from
diff --git a/server/src/repositories/memory.repository.ts b/server/src/repositories/memory.repository.ts
index 356acf53db..44c7c30857 100644
--- a/server/src/repositories/memory.repository.ts
+++ b/server/src/repositories/memory.repository.ts
@@ -36,6 +36,7 @@ export class MemoryRepository implements IBulkAsset {
             .selectAll('assets')
             .innerJoin('memories_assets_assets', 'assets.id', 'memories_assets_assets.assetsId')
             .whereRef('memories_assets_assets.memoriesId', '=', 'memories.id')
+            .orderBy('assets.fileCreatedAt', 'asc')
             .where('assets.deletedAt', 'is', null),
         ).as('assets'),
       )
@@ -137,6 +138,7 @@ export class MemoryRepository implements IBulkAsset {
             .selectAll('assets')
             .innerJoin('memories_assets_assets', 'assets.id', 'memories_assets_assets.assetsId')
             .whereRef('memories_assets_assets.memoriesId', '=', 'memories.id')
+            .orderBy('assets.fileCreatedAt', 'asc')
             .where('assets.deletedAt', 'is', null),
         ).as('assets'),
       )