From efcb1129ceb14dcbf3218b7325fce67820579d19 Mon Sep 17 00:00:00 2001
From: Jonathan Jogenfors <jonathan@jogenfors.se>
Date: Mon, 31 Mar 2025 16:16:53 +0200
Subject: [PATCH] fix(server): don't sync null date assets (#17247)

---
 server/src/queries/asset.repository.sql     | 6 ++++++
 server/src/repositories/asset.repository.ts | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/server/src/queries/asset.repository.sql b/server/src/queries/asset.repository.sql
index e812b33f78..b2fdf976df 100644
--- a/server/src/queries/asset.repository.sql
+++ b/server/src/queries/asset.repository.sql
@@ -426,6 +426,9 @@ from
 where
   "assets"."ownerId" = $1::uuid
   and "assets"."isVisible" = $2
+  and "assets"."fileCreatedAt" is not null
+  and "assets"."fileModifiedAt" is not null
+  and "assets"."localDateTime" is not null
   and "assets"."updatedAt" <= $3
   and "assets"."id" > $4
 order by
@@ -456,6 +459,9 @@ from
 where
   "assets"."ownerId" = any ($1::uuid[])
   and "assets"."isVisible" = $2
+  and "assets"."fileCreatedAt" is not null
+  and "assets"."fileModifiedAt" is not null
+  and "assets"."localDateTime" is not null
   and "assets"."updatedAt" > $3
 limit
   $4
diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
index 35a5ab21a9..e2e1bd9a6f 100644
--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -967,6 +967,9 @@ export class AssetRepository {
       .select((eb) => eb.fn.toJson(eb.table('stacked_assets')).as('stack'))
       .where('assets.ownerId', '=', asUuid(ownerId))
       .where('assets.isVisible', '=', true)
+      .where('assets.fileCreatedAt', 'is not', null)
+      .where('assets.fileModifiedAt', 'is not', null)
+      .where('assets.localDateTime', 'is not', null)
       .where('assets.updatedAt', '<=', updatedUntil)
       .$if(!!lastId, (qb) => qb.where('assets.id', '>', lastId!))
       .orderBy('assets.id')
@@ -995,6 +998,9 @@ export class AssetRepository {
       .select((eb) => eb.fn.toJson(eb.table('stacked_assets')).as('stack'))
       .where('assets.ownerId', '=', anyUuid(options.userIds))
       .where('assets.isVisible', '=', true)
+      .where('assets.fileCreatedAt', 'is not', null)
+      .where('assets.fileModifiedAt', 'is not', null)
+      .where('assets.localDateTime', 'is not', null)
       .where('assets.updatedAt', '>', options.updatedAfter)
       .limit(options.limit)
       .execute() as any as Promise<AssetEntity[]>;