refactor(server): AssetRepository.deleteFiles with Kysely

immich-app · Jan 23, 2025 · c7914c2 · c7914c2
1 parent 4dff398
commit c7914c2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/server/src/interfaces/asset.interface.ts b/server/src/interfaces/asset.interface.ts
@@ -1,4 +1,4 @@
-import { Insertable, Updateable } from 'kysely';
+import { Insertable, Selectable, Updateable } from 'kysely';
 import { AssetFiles, AssetJobStatus, Assets, Exif } from 'src/db';
 import { AssetEntity } from 'src/entities/asset.entity';
 import { AssetFileType, AssetOrder, AssetStatus, AssetType } from 'src/enum';
@@ -156,7 +156,6 @@ export interface IAssetRepository {
   update(asset: Updateable<Assets> & { id: string }): Promise<AssetEntity>;
   remove(asset: AssetEntity): Promise<void>;
   findLivePhotoMatch(options: LivePhotoSearchOptions): Promise<AssetEntity | undefined>;
-  removeAssetFile(path: string): Promise<void>;
   getStatistics(ownerId: string, options: AssetStatsOptions): Promise<AssetStats>;
   getTimeBuckets(options: TimeBucketOptions): Promise<TimeBucketItem[]>;
   getTimeBucket(timeBucket: string, options: TimeBucketOptions): Promise<AssetEntity[]>;
@@ -168,5 +167,5 @@ export interface IAssetRepository {
   getChangedDeltaSync(options: AssetDeltaSyncOptions): Promise<AssetEntity[]>;
   upsertFile(options: Insertable<AssetFiles>): Promise<void>;
   upsertFiles(options: Insertable<AssetFiles>[]): Promise<void>;
-  deleteFiles(assetIds: string | string[]): Promise<void>;
+  deleteFiles(options: Selectable<AssetFiles>[]): Promise<void>;
 }
diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { Insertable, Kysely, Updateable, sql } from 'kysely';
+import { Insertable, Kysely, Selectable, Updateable, sql } from 'kysely';
 import { isEmpty, isUndefined, omitBy } from 'lodash';
 import { InjectKysely } from 'nestjs-kysely';
 import { ASSET_FILE_CONFLICT_KEYS, EXIF_CONFLICT_KEYS, JOB_STATUS_CONFLICT_KEYS } from 'src/constants';
@@ -832,8 +832,14 @@ export class AssetRepository implements IAssetRepository {
       .execute();
   }
 
-  @GenerateSql({ params: [[DummyValue.UUID, DummyValue.UUID]] })
-  async deleteFiles(assetIds: string | string[]): Promise<void> {
-    await this.fileRepository.delete(assetIds);
+  async deleteFiles(files: Pick<Selectable<AssetFiles>, 'id'>[]): Promise<void> {
+    if (files.length === 0) {
+      return;
+    }
+
+    await this.db
+      .deleteFrom('asset_files')
+      .where('id', '=', anyUuid(files.map((file) => file.id)))
+      .execute();
   }
 }
diff --git a/server/src/repositories/media.repository.ts b/server/src/repositories/media.repository.ts
@@ -14,7 +14,6 @@ import {
   GenerateThumbhashOptions,
   GenerateThumbnailOptions,
   ImageDimensions,
-  IMediaRepository,
   ProbeOptions,
   TranscodeCommand,
   VideoInfo,

diff --git a/server/src/services/media.service.ts b/server/src/services/media.service.ts
@@ -205,7 +205,7 @@ export class MediaService extends BaseService {
       pathsToDelete.push(fullsizeFile.path);
       if (!generated.fullsizePath) {
         // did not generate a new fullsize image, delete the existing record
-        await this.assetRepository.deleteFiles(fullsizeFile.id);
+        await this.assetRepository.deleteFiles([fullsizeFile]);
       }
     }