From 6a3267911b0ea181d68b82a580ab062da85ea918 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Sun, 26 Jan 2025 21:41:36 -0600 Subject: [PATCH 1/2] fix(server): do not return year with weird timezone info i.e before 1850 --- server/src/repositories/asset.repository.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts index b39781209eade..6781b83aed13f 100644 --- a/server/src/repositories/asset.repository.ts +++ b/server/src/repositories/asset.repository.ts @@ -137,6 +137,7 @@ export class AssetRepository implements IAssetRepository { ), ) .select((eb) => eb.fn.jsonAgg(eb.table('res')).as('assets')) + .where('localDateTime', '>=', new Date('1850-01-01')) .groupBy(sql`("localDateTime" at time zone 'UTC')::date`) .orderBy(sql`("localDateTime" at time zone 'UTC')::date`, 'desc') .limit(10) @@ -585,6 +586,7 @@ export class AssetRepository implements IAssetRepository { .$if(!!options.isTrashed, (qb) => qb.where('assets.status', '!=', AssetStatus.DELETED)) .where('assets.deletedAt', options.isTrashed ? 'is not' : 'is', null) .where('assets.isVisible', '=', true) + .where('assets.localDateTime', '>=', new Date('1850-01-01')) .$if(!!options.albumId, (qb) => qb .innerJoin('albums_assets_assets', 'assets.id', 'albums_assets_assets.assetsId') From 8c24bb7014bd9b2c1daa8ee77af0099f5db29f7e Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Sun, 26 Jan 2025 21:43:39 -0600 Subject: [PATCH 2/2] sql --- server/src/queries/asset.repository.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/queries/asset.repository.sql b/server/src/queries/asset.repository.sql index 948f7dd1143fa..6a5c8f2c2006f 100644 --- a/server/src/queries/asset.repository.sql +++ b/server/src/queries/asset.repository.sql @@ -59,12 +59,14 @@ select json_agg("res") as "assets" from "res" +where + "localDateTime" >= $8 group by ("localDateTime" at time zone 'UTC')::date order by ("localDateTime" at time zone 'UTC')::date desc limit - $8 + $9 -- AssetRepository.getByIds select @@ -258,6 +260,7 @@ with where "assets"."deletedAt" is null and "assets"."isVisible" = $2 + and "assets"."localDateTime" >= $3 ) select "timeBucket",