refactor: dedicated queries for asset jobs (#17652)

server/test/fixtures/asset.stub.ts

@@ -157,7 +157,7 @@ export const assetStub = {
     isOffline: false,
   }),
 
-  primaryImage: Object.freeze<AssetEntity>({
+  primaryImage: Object.freeze({
     id: 'primary-asset-id',
     status: AssetStatus.ACTIVE,
     deviceAssetId: 'device-asset-id',
@@ -200,9 +200,10 @@ export const assetStub = {
     ]),
     duplicateId: null,
     isOffline: false,
+    libraryId: null,
   }),
 
-  image: Object.freeze<AssetEntity>({
+  image: Object.freeze({
     id: 'asset-id',
     status: AssetStatus.ACTIVE,
     deviceAssetId: 'device-asset-id',
@@ -239,6 +240,7 @@ export const assetStub = {
     } as Exif,
     duplicateId: null,
     isOffline: false,
+    libraryId: null,
   }),
 
   trashed: Object.freeze<AssetEntity>({
@@ -470,7 +472,7 @@ export const assetStub = {
     isOffline: false,
   }),
 
-  video: Object.freeze<AssetEntity>({
+  video: Object.freeze({
     id: 'asset-id',
     status: AssetStatus.ACTIVE,
     originalFileName: 'asset-id.ext',
@@ -507,6 +509,7 @@ export const assetStub = {
     deletedAt: null,
     duplicateId: null,
     isOffline: false,
+    libraryId: null,
   }),
 
   livePhotoMotionAsset: Object.freeze({
@@ -522,7 +525,8 @@ export const assetStub = {
       fileSizeInByte: 100_000,
       timeZone: `America/New_York`,
     },
-  } as AssetEntity),
+    libraryId: null,
+  } as AssetEntity & { libraryId: string | null; files: AssetFile[]; exifInfo: Exif }),
 
   livePhotoStillAsset: Object.freeze({
     id: 'live-photo-still-asset',
@@ -539,7 +543,7 @@ export const assetStub = {
       timeZone: `America/New_York`,
     },
     files,
-  } as AssetEntity),
+  } as AssetEntity & { libraryId: string | null }),
 
   livePhotoWithOriginalFileName: Object.freeze({
     id: 'live-photo-still-asset',
@@ -556,9 +560,10 @@ export const assetStub = {
       fileSizeInByte: 25_000,
       timeZone: `America/New_York`,
     },
-  } as AssetEntity),
+    libraryId: null,
+  } as AssetEntity & { libraryId: string | null }),
 
-  withLocation: Object.freeze<AssetEntity>({
+  withLocation: Object.freeze({
     id: 'asset-with-favorite-id',
     status: AssetStatus.ACTIVE,
     deviceAssetId: 'device-asset-id',
@@ -598,9 +603,10 @@ export const assetStub = {
     deletedAt: null,
     duplicateId: null,
     isOffline: false,
+    libraryId: null,
   }),
 
-  sidecar: Object.freeze<AssetEntity>({
+  sidecar: Object.freeze({
     id: 'asset-id',
     status: AssetStatus.ACTIVE,
     deviceAssetId: 'device-asset-id',
@@ -632,6 +638,7 @@ export const assetStub = {
     deletedAt: null,
     duplicateId: null,
     isOffline: false,
+    libraryId: null,
   }),
 
   sidecarWithoutExt: Object.freeze<AssetEntity>({
@@ -743,7 +750,7 @@ export const assetStub = {
     isOffline: false,
   }),
 
-  imageDng: Object.freeze<AssetEntity>({
+  imageDng: Object.freeze({
     id: 'asset-id',
     status: AssetStatus.ACTIVE,
     deviceAssetId: 'device-asset-id',
@@ -782,7 +789,7 @@ export const assetStub = {
     isOffline: false,
   }),
 
-  imageHif: Object.freeze<AssetEntity>({
+  imageHif: Object.freeze({
     id: 'asset-id',
     status: AssetStatus.ACTIVE,
     deviceAssetId: 'device-asset-id',

server/test/fixtures/shared-link.stub.ts

@@ -116,6 +116,8 @@ export const sharedLinkStub = {
     album: undefined,
     description: null,
     assets: [assetStub.image],
+    password: 'password',
+    albumId: null,
   } as SharedLinkEntity),
   valid: Object.freeze({
     id: '123',

server/test/medium/specs/metadata.service.spec.ts

@@ -2,7 +2,6 @@ import { Stats } from 'node:fs';
 import { writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { AssetEntity } from 'src/entities/asset.entity';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { MetadataRepository } from 'src/repositories/metadata.repository';
 import { MetadataService } from 'src/services/metadata.service';
@@ -119,7 +118,7 @@ describe(MetadataService.name, () => {
       process.env.TZ = serverTimeZone ?? undefined;
 
       const { filePath } = await createTestFile(exifData);
-      mocks.asset.getByIds.mockResolvedValue([{ id: 'asset-1', originalPath: filePath } as AssetEntity]);
+      mocks.assetJob.getForMetadataExtraction.mockResolvedValue({ id: 'asset-1', originalPath: filePath } as never);
 
       await sut.handleMetadataExtraction({ id: 'asset-1' });