From 2b046fa178810009a414da9138804514aad8703d Mon Sep 17 00:00:00 2001 From: sai80082 Date: Wed, 4 Mar 2026 14:20:26 +0530 Subject: [PATCH] fix: geo-heatmap query by conditionally joining album and person tables. --- src/pages/api/assets/geo-heatmap.ts | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/pages/api/assets/geo-heatmap.ts b/src/pages/api/assets/geo-heatmap.ts index 2b22317..57828d9 100644 --- a/src/pages/api/assets/geo-heatmap.ts +++ b/src/pages/api/assets/geo-heatmap.ts @@ -14,17 +14,27 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) return res.status(401).json({ message: 'Unauthorized' }); } - -const dbAssets = await db.select({ + let query = db.select({ assetId: assets.id, latitude: exif.latitude, longitude: exif.longitude, }).from(assets) - .innerJoin(exif, eq(assets.id, exif.assetId)) - .innerJoin(albumsAssetsAssets, eq(assets.id, albumsAssetsAssets.assetId)) - .innerJoin(assetFaces, eq(albumsAssetsAssets.assetId, assetFaces.assetId)) - .innerJoin(person, eq(assetFaces.personId, person.id)) - .where( + .innerJoin(exif, eq(assets.id, exif.assetId)) + .$dynamic(); + + // Only join album tables when albumIds filter is provided + if (albumIds?.length > 0) { + query = query.innerJoin(albumsAssetsAssets, eq(assets.id, albumsAssetsAssets.assetId)); + } + + // Only join person/face tables when peopleIds filter is provided + if (peopleIds?.length > 0) { + query = query + .innerJoin(assetFaces, eq(assets.id, assetFaces.assetId)) + .innerJoin(person, eq(assetFaces.personId, person.id)); + } + + const dbAssets = await query.where( and( eq(assets.ownerId, currentUser.id), isNotNull(exif.latitude),