wip

immich-app · Jan 28, 2025 · e213a74 · e213a74
1 parent 41800d6
commit e213a74
Show file tree

Hide file tree

Showing 24 changed files with 207 additions and 16 deletions.
diff --git a/e2e/src/api/specs/library.e2e-spec.ts b/e2e/src/api/specs/library.e2e-spec.ts
@@ -298,6 +298,7 @@ describe('/libraries', () => {
       expect(status).toBe(204);
 
       await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
 
       const { assets } = await utils.searchAssets(admin.accessToken, {
         originalPath: `${testAssetDirInternal}/temp/directoryA/assetA.png`,

diff --git a/server/src/dtos/asset-response.dto.ts b/server/src/dtos/asset-response.dto.ts
@@ -113,6 +113,14 @@ const hexOrBufferToBase64 = (encoded: string | Buffer) => {
 export function mapAsset(entity: AssetEntity, options: AssetMapOptions = {}): AssetResponseDto {
   const { stripMetadata = false, withStack = false } = options;
 
+  if (!entity.localDateTime) {
+    throw new Error('Asset localDateTime is missing');
+  } else if (!entity.fileCreatedAt) {
+    throw new Error('Asset fileCreatedAt is missing');
+  } else if (!entity.fileModifiedAt) {
+    throw new Error('Asset fileModifiedAt is missing');
+  }
+
   if (stripMetadata) {
     const sanitizedAssetResponse: SanitizedAssetResponseDto = {
       id: entity.id,

diff --git a/server/src/entities/asset.entity.ts b/server/src/entities/asset.entity.ts
@@ -399,5 +399,8 @@ export function searchAssetBuilder(kysely: Kysely<DB>, options: AssetSearchBuild
     )
     .$if(!!options.withExif, withExifInner)
     .$if(!!(options.withFaces || options.withPeople || options.personIds), (qb) => qb.select(withFacesAndPeople))
-    .$if(!options.withDeleted, (qb) => qb.where('assets.deletedAt', 'is', null));
+    .$if(!options.withDeleted, (qb) => qb.where('assets.deletedAt', 'is', null))
+    .$if(!options.withNullFileModifiedAt, (qb) => qb.where('assets.fileModifiedAt', 'is not', null))
+    .$if(!options.withNullFileCreatedAt, (qb) => qb.where('assets.fileCreatedAt', 'is not', null))
+    .$if(!options.withNullLocalDateTime, (qb) => qb.where('assets.localDateTime', 'is not', null));
 }
diff --git a/server/src/interfaces/search.interface.ts b/server/src/interfaces/search.interface.ts
@@ -63,6 +63,9 @@ export interface SearchStatusOptions {
   status?: AssetStatus;
   withArchived?: boolean;
   withDeleted?: boolean;
+  withNullLocalDateTime?: boolean;
+  withNullFileCreatedAt?: boolean;
+  withNullFileModifiedAt?: boolean;
 }
 
 export interface SearchOneToOneRelationOptions {

diff --git a/server/src/queries/access.repository.sql b/server/src/queries/access.repository.sql
@@ -79,6 +79,9 @@ from
   inner join "albums_assets_assets" as "albumAssets" on "albums"."id" = "albumAssets"."albumsId"
   inner join "assets" on "assets"."id" = "albumAssets"."assetsId"
   and "assets"."deletedAt" is null
+  and "assets"."fileCreatedAt" is not null
+  and "assets"."fileModifiedAt" is not null
+  and "assets"."localDateTime" is not null
   left join "albums_shared_users_users" as "albumUsers" on "albumUsers"."albumsId" = "albums"."id"
   left join "users" on "users"."id" = "albumUsers"."usersId"
   and "users"."deletedAt" is null
@@ -108,6 +111,9 @@ from
   and "sharedBy"."deletedAt" is null
   inner join "assets" on "assets"."ownerId" = "sharedBy"."id"
   and "assets"."deletedAt" is null
+  and "assets"."fileCreatedAt" is not null
+  and "assets"."fileModifiedAt" is not null
+  and "assets"."localDateTime" is not null
 where
   "partner"."sharedWithId" = $1
   and "assets"."isArchived" = $2
@@ -126,6 +132,9 @@ from
   left join "shared_link__asset" on "shared_link__asset"."sharedLinksId" = "shared_links"."id"
   left join "assets" on "assets"."id" = "shared_link__asset"."assetsId"
   and "assets"."deletedAt" is null
+  and "assets"."fileCreatedAt" is not null
+  and "assets"."fileModifiedAt" is not null
+  and "assets"."localDateTime" is not null
   left join "albums_assets_assets" on "albums_assets_assets"."albumsId" = "albums"."id"
   left join "assets" as "albumAssets" on "albumAssets"."id" = "albums_assets_assets"."assetsId"
   and "albumAssets"."deletedAt" is null
@@ -173,6 +182,9 @@ from
   "asset_faces"
   left join "assets" on "assets"."id" = "asset_faces"."assetId"
   and "assets"."deletedAt" is null
+  and "assets"."fileCreatedAt" is not null
+  and "assets"."fileModifiedAt" is not null
+  and "assets"."localDateTime" is not null
 where
   "asset_faces"."id" in ($1)
   and "assets"."ownerId" = $2

diff --git a/server/src/queries/activity.repository.sql b/server/src/queries/activity.repository.sql
@@ -25,6 +25,9 @@ from
   "activity"
   left join "assets" on "assets"."id" = "activity"."assetId"
   and "assets"."deletedAt" is null
+  and "assets"."fileCreatedAt" is not null
+  and "assets"."fileModifiedAt" is not null
+  and "assets"."localDateTime" is not null
 where
   "activity"."albumId" = $1
 order by
@@ -43,3 +46,6 @@ where
   and "activity"."albumId" = $2
   and "activity"."isLiked" = $3
   and "assets"."deletedAt" is null
+  and "assets"."fileCreatedAt" is not null
+  and "assets"."fileModifiedAt" is not null
+  and "assets"."localDateTime" is not null
diff --git a/server/src/queries/album.repository.sql b/server/src/queries/album.repository.sql
@@ -98,6 +98,9 @@ select
         where
           "albums_assets_assets"."albumsId" = "albums"."id"
           and "assets"."deletedAt" is null
+          and "assets"."fileCreatedAt" is not null
+          and "assets"."fileModifiedAt" is not null
+          and "assets"."localDateTime" is not null
         order by
           "assets"."fileCreatedAt" desc
       ) as "asset"
@@ -212,6 +215,9 @@ from
 where
   "albums"."id" in ($1)
   and "assets"."deletedAt" is null
+  and "assets"."fileCreatedAt" is not null
+  and "assets"."fileModifiedAt" is not null
+  and "assets"."localDateTime" is not null
 group by
   "albums"."id"
 

diff --git a/server/src/queries/asset.repository.sql b/server/src/queries/asset.repository.sql
@@ -37,8 +37,6 @@ with
           and (assets."localDateTime" at time zone 'UTC')::date = today.date
           and "assets"."ownerId" = any ($3::uuid[])
           and "assets"."isVisible" = $4
-          and "assets"."fileCreatedAt" is not null
-          and "assets"."fileModifiedAt" is not null
           and "assets"."isArchived" = $5
           and exists (
             select
@@ -49,6 +47,9 @@ with
               and "asset_files"."type" = $6
           )
           and "assets"."deletedAt" is null
+          and "assets"."fileCreatedAt" is not null
+          and "assets"."fileModifiedAt" is not null
+          and "assets"."localDateTime" is not null
         limit
           $7
       ) as "a" on true
@@ -266,6 +267,7 @@ with
       and "assets"."isVisible" = $2
       and "assets"."fileCreatedAt" is not null
       and "assets"."fileModifiedAt" is not null
+      and "assets"."localDateTime" is not null
   )
 select
   "timeBucket",
@@ -308,6 +310,7 @@ where
   and "assets"."isVisible" = $2
   and "assets"."fileCreatedAt" is not null
   and "assets"."fileModifiedAt" is not null
+  and "assets"."localDateTime" is not null
   and date_trunc($3, "localDateTime" at time zone 'UTC') at time zone 'UTC' = $4
 order by
   "assets"."localDateTime" desc
@@ -336,6 +339,7 @@ with
       and "assets"."isVisible" = $2
       and "assets"."fileCreatedAt" is not null
       and "assets"."fileModifiedAt" is not null
+      and "assets"."localDateTime" is not null
     group by
       "assets"."duplicateId"
   ),

diff --git a/server/src/queries/memory.repository.sql b/server/src/queries/memory.repository.sql
@@ -26,6 +26,9 @@ select
         where
           "memories_assets_assets"."memoriesId" = "memories"."id"
           and "assets"."deletedAt" is null
+          and "assets"."fileCreatedAt" is not null
+          and "assets"."fileModifiedAt" is not null
+          and "assets"."localDateTime" is not null
       ) as agg
   ) as "assets"
 from
@@ -56,6 +59,9 @@ select
         where
           "memories_assets_assets"."memoriesId" = "memories"."id"
           and "assets"."deletedAt" is null
+          and "assets"."fileCreatedAt" is not null
+          and "assets"."fileModifiedAt" is not null
+          and "assets"."localDateTime" is not null
       ) as agg
   ) as "assets"
 from

diff --git a/server/src/queries/person.repository.sql b/server/src/queries/person.repository.sql
@@ -169,6 +169,9 @@ from
   and "asset_faces"."personId" = $1
   and "assets"."isArchived" = $2
   and "assets"."deletedAt" is null
+  and "assets"."fileCreatedAt" is not null
+  and "assets"."fileModifiedAt" is not null
+  and "assets"."localDateTime" is not null
   and "assets"."livePhotoVideoId" is null
 
 -- PersonRepository.getNumberOfPeople
@@ -183,6 +186,9 @@ from
   inner join "asset_faces" on "asset_faces"."personId" = "person"."id"
   inner join "assets" on "assets"."id" = "asset_faces"."assetId"
   and "assets"."deletedAt" is null
+  and "assets"."fileCreatedAt" is not null
+  and "assets"."fileModifiedAt" is not null
+  and "assets"."localDateTime" is not null
   and "assets"."isArchived" = $2
 where
   "person"."ownerId" = $3

diff --git a/server/src/queries/search.repository.sql b/server/src/queries/search.repository.sql
@@ -13,6 +13,9 @@ where
   and "assets"."isFavorite" = $4
   and "assets"."isArchived" = $5
   and "assets"."deletedAt" is null
+  and "assets"."fileModifiedAt" is not null
+  and "assets"."fileCreatedAt" is not null
+  and "assets"."localDateTime" is not null
 order by
   "assets"."fileCreatedAt" desc
 limit
@@ -34,6 +37,9 @@ offset
     and "assets"."isFavorite" = $4
     and "assets"."isArchived" = $5
     and "assets"."deletedAt" is null
+    and "assets"."fileModifiedAt" is not null
+    and "assets"."fileCreatedAt" is not null
+    and "assets"."localDateTime" is not null
     and "assets"."id" < $6
   order by
     random()
@@ -54,6 +60,9 @@ union all
     and "assets"."isFavorite" = $11
     and "assets"."isArchived" = $12
     and "assets"."deletedAt" is null
+    and "assets"."fileModifiedAt" is not null
+    and "assets"."fileCreatedAt" is not null
+    and "assets"."localDateTime" is not null
     and "assets"."id" > $13
   order by
     random()
@@ -77,6 +86,9 @@ where
   and "assets"."isFavorite" = $4
   and "assets"."isArchived" = $5
   and "assets"."deletedAt" is null
+  and "assets"."fileModifiedAt" is not null
+  and "assets"."fileCreatedAt" is not null
+  and "assets"."localDateTime" is not null
 order by
   smart_search.embedding <=> $6
 limit
@@ -98,6 +110,9 @@ with
       "assets"."ownerId" = any ($2::uuid[])
       and "assets"."deletedAt" is null
       and "assets"."isVisible" = $3
+      and "assets"."fileCreatedAt" is not null
+      and "assets"."fileModifiedAt" is not null
+      and "assets"."localDateTime" is not null
       and "assets"."type" = $4
       and "assets"."id" != $5::uuid
     order by
@@ -126,6 +141,9 @@ with
     where
       "assets"."ownerId" = any ($2::uuid[])
       and "assets"."deletedAt" is null
+      and "assets"."fileCreatedAt" is not null
+      and "assets"."fileModifiedAt" is not null
+      and "assets"."localDateTime" is not null
     order by
       face_search.embedding <=> $3
     limit
@@ -178,6 +196,9 @@ with recursive
         and "assets"."isArchived" = $3
         and "assets"."type" = $4
         and "assets"."deletedAt" is null
+        and "assets"."fileCreatedAt" is not null
+        and "assets"."fileModifiedAt" is not null
+        and "assets"."localDateTime" is not null
       order by
         "city"
       limit
@@ -203,6 +224,9 @@ with recursive
             and "assets"."isArchived" = $8
             and "assets"."type" = $9
             and "assets"."deletedAt" is null
+            and "assets"."fileCreatedAt" is not null
+            and "assets"."fileModifiedAt" is not null
+            and "assets"."localDateTime" is not null
             and "exif"."city" > "cte"."city"
           order by
             "city"

diff --git a/server/src/queries/shared.link.repository.sql b/server/src/queries/shared.link.repository.sql
@@ -31,6 +31,9 @@ from
     where
       "shared_links"."id" = "shared_link__asset"."sharedLinksId"
       and "assets"."deletedAt" is null
+      and "assets"."fileCreatedAt" is not null
+      and "assets"."fileModifiedAt" is not null
+      and "assets"."localDateTime" is not null
     order by
       "assets"."fileCreatedAt" asc
   ) as "a" on true
@@ -65,6 +68,9 @@ from
         where
           "albums_assets_assets"."assetsId" = "assets"."id"
           and "assets"."deletedAt" is null
+          and "assets"."fileCreatedAt" is not null
+          and "assets"."fileModifiedAt" is not null
+          and "assets"."localDateTime" is not null
         order by
           "assets"."fileCreatedAt" asc
       ) as "assets" on true
@@ -112,6 +118,9 @@ from
     where
       "assets"."id" = "shared_link__asset"."assetsId"
       and "assets"."deletedAt" is null
+      and "assets"."fileCreatedAt" is not null
+      and "assets"."fileModifiedAt" is not null
+      and "assets"."localDateTime" is not null
   ) as "assets" on true
   left join lateral (
     select

diff --git a/server/src/queries/stack.repository.sql b/server/src/queries/stack.repository.sql
@@ -23,6 +23,9 @@ select
           ) as "exifInfo" on true
         where
           "assets"."deletedAt" is null
+          and "assets"."fileCreatedAt" is not null
+          and "assets"."fileModifiedAt" is not null
+          and "assets"."localDateTime" is not null
           and "assets"."stackId" = "asset_stack"."id"
       ) as agg
   ) as "assets"
@@ -68,6 +71,9 @@ select
           ) as "exifInfo" on true
         where
           "assets"."deletedAt" is null
+          and "assets"."fileCreatedAt" is not null
+          and "assets"."fileModifiedAt" is not null
+          and "assets"."localDateTime" is not null
           and "assets"."stackId" = "asset_stack"."id"
       ) as agg
   ) as "assets"
@@ -113,6 +119,9 @@ select
           ) as "exifInfo" on true
         where
           "assets"."deletedAt" is null
+          and "assets"."fileCreatedAt" is not null
+          and "assets"."fileModifiedAt" is not null
+          and "assets"."localDateTime" is not null
           and "assets"."stackId" = "asset_stack"."id"
       ) as agg
   ) as "assets"

diff --git a/server/src/repositories/access.repository.ts b/server/src/repositories/access.repository.ts
@@ -138,7 +138,12 @@ class AssetAccess {
       .selectFrom('albums')
       .innerJoin('albums_assets_assets as albumAssets', 'albums.id', 'albumAssets.albumsId')
       .innerJoin('assets', (join) =>
-        join.onRef('assets.id', '=', 'albumAssets.assetsId').on('assets.deletedAt', 'is', null),
+        join
+          .onRef('assets.id', '=', 'albumAssets.assetsId')
+          .on('assets.deletedAt', 'is', null)
+          .on('assets.fileCreatedAt', 'is not', null)
+          .on('assets.fileModifiedAt', 'is not', null)
+          .on('assets.localDateTime', 'is not', null),
       )
       .leftJoin('albums_shared_users_users as albumUsers', 'albumUsers.albumsId', 'albums.id')
       .leftJoin('users', (join) => join.onRef('users.id', '=', 'albumUsers.usersId').on('users.deletedAt', 'is', null))
@@ -194,7 +199,12 @@ class AssetAccess {
         join.onRef('sharedBy.id', '=', 'partner.sharedById').on('sharedBy.deletedAt', 'is', null),
       )
       .innerJoin('assets', (join) =>
-        join.onRef('assets.ownerId', '=', 'sharedBy.id').on('assets.deletedAt', 'is', null),
+        join
+          .onRef('assets.ownerId', '=', 'sharedBy.id')
+          .on('assets.deletedAt', 'is', null)
+          .on('assets.fileCreatedAt', 'is not', null)
+          .on('assets.fileModifiedAt', 'is not', null)
+          .on('assets.localDateTime', 'is not', null),
       )
       .select('assets.id')
       .where('partner.sharedWithId', '=', userId)
@@ -218,7 +228,12 @@ class AssetAccess {
       )
       .leftJoin('shared_link__asset', 'shared_link__asset.sharedLinksId', 'shared_links.id')
       .leftJoin('assets', (join) =>
-        join.onRef('assets.id', '=', 'shared_link__asset.assetsId').on('assets.deletedAt', 'is', null),
+        join
+          .onRef('assets.id', '=', 'shared_link__asset.assetsId')
+          .on('assets.deletedAt', 'is', null)
+          .on('assets.fileCreatedAt', 'is not', null)
+          .on('assets.fileModifiedAt', 'is not', null)
+          .on('assets.localDateTime', 'is not', null),
       )
       .leftJoin('albums_assets_assets', 'albums_assets_assets.albumsId', 'albums.id')
       .leftJoin('assets as albumAssets', (join) =>
@@ -369,7 +384,12 @@ class PersonAccess {
       .selectFrom('asset_faces')
       .select('asset_faces.id')
       .leftJoin('assets', (join) =>
-        join.onRef('assets.id', '=', 'asset_faces.assetId').on('assets.deletedAt', 'is', null),
+        join
+          .onRef('assets.id', '=', 'asset_faces.assetId')
+          .on('assets.deletedAt', 'is', null)
+          .on('assets.fileCreatedAt', 'is not', null)
+          .on('assets.fileModifiedAt', 'is not', null)
+          .on('assets.localDateTime', 'is not', null),
       )
       .where('asset_faces.id', 'in', [...assetFaceIds])
       .where('assets.ownerId', '=', userId)