Add placeholder type

immich-app · Feb 6, 2025 · 7034792 · 7034792
1 parent acc87e8
commit 7034792
Show file tree

Hide file tree

Showing 27 changed files with 59 additions and 264 deletions.
diff --git a/server/src/db.d.ts b/server/src/db.d.ts
@@ -3,21 +3,16 @@
  * Please do not edit it manually.
  */
 
-import type { ColumnType } from "kysely";
+import type { ColumnType } from 'kysely';
 
-export type ArrayType<T> = ArrayTypeImpl<T> extends (infer U)[]
-  ? U[]
-  : ArrayTypeImpl<T>;
+export type ArrayType<T> = ArrayTypeImpl<T> extends (infer U)[] ? U[] : ArrayTypeImpl<T>;
 
-export type ArrayTypeImpl<T> = T extends ColumnType<infer S, infer I, infer U>
-  ? ColumnType<S[], I[], U[]>
-  : T[];
+export type ArrayTypeImpl<T> = T extends ColumnType<infer S, infer I, infer U> ? ColumnType<S[], I[], U[]> : T[];
 
-export type AssetsStatusEnum = "active" | "deleted" | "trashed";
+export type AssetsStatusEnum = 'active' | 'deleted' | 'trashed';
 
-export type Generated<T> = T extends ColumnType<infer S, infer I, infer U>
-  ? ColumnType<S, I | undefined, U>
-  : ColumnType<T, T | undefined, T>;
+export type Generated<T> =
+  T extends ColumnType<infer S, infer I, infer U> ? ColumnType<S, I | undefined, U> : ColumnType<T, T | undefined, T>;
 
 export type Int8 = ColumnType<string, bigint | number | string, bigint | number | string>;
 
@@ -33,7 +28,7 @@ export type JsonPrimitive = boolean | number | string | null;
 
 export type JsonValue = JsonArray | JsonObject | JsonPrimitive;
 
-export type Sourcetype = "exif" | "machine-learning";
+export type Sourcetype = 'exif' | 'machine-learning';
 
 export type Timestamp = ColumnType<Date, Date | string, Date | string>;
 
@@ -214,20 +209,6 @@ export interface GeodataPlaces {
   name: string;
 }
 
-export interface GeodataPlacesTmp {
-  admin1Code: string | null;
-  admin1Name: string | null;
-  admin2Code: string | null;
-  admin2Name: string | null;
-  alternateNames: string | null;
-  countryCode: string;
-  id: number;
-  latitude: number;
-  longitude: number;
-  modificationDate: Timestamp;
-  name: string;
-}
-
 export interface Libraries {
   createdAt: Generated<Timestamp>;
   deletedAt: Timestamp | null;
@@ -280,14 +261,6 @@ export interface NaturalearthCountries {
   type: string;
 }
 
-export interface NaturalearthCountriesTmp {
-  admin: string;
-  admin_a3: string;
-  coordinates: string;
-  id: Generated<number>;
-  type: string;
-}
-
 export interface Partners {
   createdAt: Generated<Timestamp>;
   inTimeline: Generated<boolean>;
@@ -445,14 +418,12 @@ export interface DB {
   exif: Exif;
   face_search: FaceSearch;
   geodata_places: GeodataPlaces;
-  geodata_places_tmp: GeodataPlacesTmp;
   libraries: Libraries;
   memories: Memories;
   memories_assets_assets: MemoriesAssetsAssets;
   migrations: Migrations;
   move_history: MoveHistory;
   naturalearth_countries: NaturalearthCountries;
-  naturalearth_countries_tmp: NaturalearthCountriesTmp;
   partners: Partners;
   person: Person;
   sessions: Sessions;
@@ -467,6 +438,6 @@ export interface DB {
   typeorm_metadata: TypeormMetadata;
   user_metadata: UserMetadata;
   users: Users;
-  "vectors.pg_vector_index_stat": VectorsPgVectorIndexStat;
+  'vectors.pg_vector_index_stat': VectorsPgVectorIndexStat;
   version_history: VersionHistory;
 }
diff --git a/server/src/dtos/album.dto.ts b/server/src/dtos/album.dto.ts
@@ -164,8 +164,8 @@ export const mapAlbum = (entity: AlbumEntity, withAssets: boolean, auth?: AuthDt
   const hasSharedLink = entity.sharedLinks?.length > 0;
   const hasSharedUser = sharedUsers.length > 0;
 
-  let startDate = assets.at(0)?.localDateTime || undefined;
-  let endDate = assets.at(-1)?.localDateTime || undefined;
+  let startDate = assets.at(0)?.localDateTime;
+  let endDate = assets.at(-1)?.localDateTime;
   // Swap dates if start date is greater than end date.
   if (startDate && endDate && startDate > endDate) {
     [startDate, endDate] = [endDate, startDate];

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

diff --git a/server/src/dtos/asset.dto.ts b/server/src/dtos/asset.dto.ts
@@ -126,13 +126,6 @@ export class AssetStatsResponseDto {
   total!: number;
 }
 
-export class AssetDatesDto {
-  dateTimeOriginal!: Date;
-  timeZone!: string | null;
-  localDateTime!: Date;
-  modifyDate!: Date;
-}
-
 export const mapStats = (stats: AssetStats): AssetStatsResponseDto => {
   return {
     images: stats[AssetType.IMAGE],

diff --git a/server/src/entities/asset.entity.ts b/server/src/entities/asset.entity.ts
@@ -101,13 +101,13 @@ export class AssetEntity {
 
   @Index('idx_asset_file_created_at')
   @Column({ type: 'timestamptz', nullable: true, default: null })
-  fileCreatedAt!: Date | null;
+  fileCreatedAt!: Date;
 
   @Column({ type: 'timestamptz', nullable: true, default: null })
-  localDateTime!: Date | null;
+  localDateTime!: Date;
 
   @Column({ type: 'timestamptz', nullable: true, default: null })
-  fileModifiedAt!: Date | null;
+  fileModifiedAt!: Date;
 
   @Column({ type: 'boolean', default: false })
   isFavorite!: boolean;
@@ -180,6 +180,12 @@ export class AssetEntity {
   duplicateId!: string | null;
 }
 
+export type AssetEntityPlaceholder = AssetEntity & {
+  fileCreatedAt: Date | null;
+  fileModifiedAt: Date | null;
+  localDateTime: Date | null;
+};
+
 export function withExif<O>(qb: SelectQueryBuilder<DB, 'assets', O>) {
   return qb.leftJoin('exif', 'assets.id', 'exif.assetId').select((eb) => eb.fn.toJson(eb.table('exif')).as('exifInfo'));
 }

diff --git a/server/src/queries/activity.repository.sql b/server/src/queries/activity.repository.sql
@@ -25,9 +25,6 @@ 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

diff --git a/server/src/queries/album.repository.sql b/server/src/queries/album.repository.sql
@@ -98,9 +98,6 @@ 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"
@@ -215,9 +212,6 @@ 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
@@ -47,9 +47,6 @@ 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
         order by
           (assets."localDateTime" at time zone 'UTC')::date desc
         limit
@@ -164,6 +161,7 @@ where
   and "isVisible" = $3
   and "assets"."fileCreatedAt" is not null
   and "assets"."fileModifiedAt" is not null
+  and "assets"."localDateTime" is not null
   and "deletedAt" is null
 
 -- AssetRepository.getLivePhotoCount
@@ -246,8 +244,6 @@ where
     "assets"."sidecarPath" = $1
     or "assets"."sidecarPath" is null
   )
-  and "assets"."fileCreatedAt" is not null
-  and "assets"."fileModifiedAt" is not null
   and "assets"."isVisible" = $2
   and "deletedAt" is null
 order by
@@ -267,9 +263,6 @@ with
     where
       "assets"."deletedAt" is null
       and "assets"."isVisible" = $2
-      and "assets"."fileCreatedAt" is not null
-      and "assets"."fileModifiedAt" is not null
-      and "assets"."localDateTime" is not null
   )
 select
   "timeBucket",
@@ -310,9 +303,6 @@ where
   )
   and "assets"."deletedAt" is null
   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
@@ -339,9 +329,6 @@ with
       and "assets"."duplicateId" is not null
       and "assets"."deletedAt" is null
       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"
   ),
@@ -399,8 +386,6 @@ from
 where
   "ownerId" = $2::uuid
   and "isVisible" = $3
-  and "assets"."fileCreatedAt" is not null
-  and "assets"."fileModifiedAt" is not null
   and "isArchived" = $4
   and "type" = $5
   and "deletedAt" is null
@@ -430,8 +415,6 @@ from
 where
   "assets"."ownerId" = $1::uuid
   and "isVisible" = $2
-  and "assets"."fileCreatedAt" is not null
-  and "assets"."fileModifiedAt" is not null
   and "updatedAt" <= $3
   and "assets"."id" > $4
 order by
@@ -462,8 +445,6 @@ from
 where
   "assets"."ownerId" = any ($1::uuid[])
   and "isVisible" = $2
-  and "assets"."fileCreatedAt" is not null
-  and "assets"."fileModifiedAt" is not null
   and "updatedAt" > $3
 limit
   $4
diff --git a/server/src/queries/memory.repository.sql b/server/src/queries/memory.repository.sql
@@ -26,9 +26,6 @@ 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
@@ -59,9 +56,6 @@ 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,9 +169,6 @@ 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
@@ -186,9 +183,6 @@ 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
@@ -110,9 +110,6 @@ 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
@@ -141,9 +138,6 @@ 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
@@ -196,9 +190,6 @@ 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
@@ -224,9 +215,6 @@ 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,9 +31,6 @@ 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
@@ -68,9 +65,6 @@ 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
@@ -119,9 +113,6 @@ 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