From 9d8072b994982d9389da703969f3786331c7c1ab Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 24 Jan 2025 11:54:53 -0600
Subject: [PATCH] fix(server): failed to get albums with archived assets
(#15611)
* fix(mobile): failed to get albums with archived assets
* sql
---
server/src/queries/album.repository.sql | 3 +--
server/src/repositories/album.repository.ts | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/server/src/queries/album.repository.sql b/server/src/queries/album.repository.sql
index 8f17146633..48dc4dda4e 100644
--- a/server/src/queries/album.repository.sql
+++ b/server/src/queries/album.repository.sql
@@ -98,7 +98,6 @@ select
where
"albums_assets_assets"."albumsId" = "albums"."id"
and "assets"."deletedAt" is null
- and "assets"."isArchived" = $1
order by
"assets"."fileCreatedAt" desc
) as "asset"
@@ -106,7 +105,7 @@ select
from
"albums"
where
- "albums"."id" = $2
+ "albums"."id" = $1
and "albums"."deletedAt" is null
-- AlbumRepository.getByAssetId
diff --git a/server/src/repositories/album.repository.ts b/server/src/repositories/album.repository.ts
index e32a53e82d..d3b696169b 100644
--- a/server/src/repositories/album.repository.ts
+++ b/server/src/repositories/album.repository.ts
@@ -63,7 +63,6 @@ const withAssets = (eb: ExpressionBuilder<DB, 'albums'>) => {
.innerJoin('albums_assets_assets', 'albums_assets_assets.assetsId', 'assets.id')
.whereRef('albums_assets_assets.albumsId', '=', 'albums.id')
.where('assets.deletedAt', 'is', null)
- .where('assets.isArchived', '=', false)
.orderBy('assets.fileCreatedAt', 'desc')
.as('asset'),
)