chore: upgrade to kysely 0.28.11 (#26744)

server/test/factories/shared-link.factory.ts

@@ -51,12 +51,14 @@ export class SharedLinkFactory {
 
   album(dto: AlbumLike = {}, builder?: FactoryBuilder<AlbumFactory>) {
     this.#album = build(AlbumFactory.from(dto), builder);
+    this.value.type = SharedLinkType.Album;
     return this;
   }
 
   asset(dto: AssetLike = {}, builder?: FactoryBuilder<AssetFactory>) {
     const asset = build(AssetFactory.from(dto), builder);
     this.#assets.push(asset);
+    this.value.type = SharedLinkType.Individual;
     return this;
   }
 

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

@@ -1,7 +1,6 @@
-import { UserAdmin } from 'src/database';
 import { MapAsset } from 'src/dtos/asset-response.dto';
 import { SharedLinkResponseDto } from 'src/dtos/shared-link.dto';
-import { AssetStatus, AssetType, AssetVisibility, SharedLinkType } from 'src/enum';
+import { SharedLinkType } from 'src/enum';
 import { AssetFactory } from 'test/factories/asset.factory';
 import { authStub } from 'test/fixtures/auth.stub';
 import { userStub } from 'test/fixtures/user.stub';
@@ -83,86 +82,7 @@ export const sharedLinkStub = {
     showExif: false,
     description: null,
     password: null,
-    assets: [
-      {
-        id: 'id_1',
-        status: AssetStatus.Active,
-        owner: undefined as unknown as UserAdmin,
-        ownerId: 'user_id_1',
-        deviceAssetId: 'device_asset_id_1',
-        deviceId: 'device_id_1',
-        type: AssetType.Video,
-        originalPath: 'fake_path/jpeg',
-        checksum: Buffer.from('file hash', 'utf8'),
-        fileModifiedAt: today,
-        fileCreatedAt: today,
-        localDateTime: today,
-        createdAt: today,
-        updatedAt: today,
-        isFavorite: false,
-        isArchived: false,
-        isExternal: false,
-        isOffline: false,
-        files: [],
-        thumbhash: null,
-        encodedVideoPath: '',
-        duration: null,
-        livePhotoVideo: null,
-        livePhotoVideoId: null,
-        originalFileName: 'asset_1.jpeg',
-        exifInfo: {
-          projectionType: null,
-          livePhotoCID: null,
-          assetId: 'id_1',
-          description: 'description',
-          exifImageWidth: 500,
-          exifImageHeight: 500,
-          fileSizeInByte: 100,
-          orientation: 'orientation',
-          dateTimeOriginal: today,
-          modifyDate: today,
-          timeZone: 'America/Los_Angeles',
-          latitude: 100,
-          longitude: 100,
-          city: 'city',
-          state: 'state',
-          country: 'country',
-          make: 'camera-make',
-          model: 'camera-model',
-          lensModel: 'fancy',
-          fNumber: 100,
-          focalLength: 100,
-          iso: 100,
-          exposureTime: '1/16',
-          fps: 100,
-          profileDescription: 'sRGB',
-          bitsPerSample: 8,
-          colorspace: 'sRGB',
-          autoStackId: null,
-          rating: 3,
-          updatedAt: today,
-          updateId: '42',
-          libraryId: null,
-          stackId: null,
-          visibility: AssetVisibility.Timeline,
-          width: 500,
-          height: 500,
-          tags: [],
-        },
-        sharedLinks: [],
-        faces: [],
-        sidecarPath: null,
-        deletedAt: null,
-        duplicateId: null,
-        updateId: '42',
-        libraryId: null,
-        stackId: null,
-        visibility: AssetVisibility.Timeline,
-        width: 500,
-        height: 500,
-        isEdited: false,
-      },
-    ],
+    assets: [],
     albumId: null,
     album: null,
     slug: null,

server/test/fixtures/tag.stub.ts

@@ -55,15 +55,15 @@ export const tagStub = {
 export const tagResponseStub = {
   tag1: Object.freeze<TagResponseDto>({
     id: 'tag-1',
-    createdAt: new Date('2021-01-01T00:00:00Z'),
-    updatedAt: new Date('2021-01-01T00:00:00Z'),
+    createdAt: '2021-01-01T00:00:00.000Z',
+    updatedAt: '2021-01-01T00:00:00.000Z',
     name: 'Tag1',
     value: 'Tag1',
   }),
   color1: Object.freeze<TagResponseDto>({
     id: 'tag-1',
-    createdAt: new Date('2021-01-01T00:00:00Z'),
-    updatedAt: new Date('2021-01-01T00:00:00Z'),
+    createdAt: '2021-01-01T00:00:00.000Z',
+    updatedAt: '2021-01-01T00:00:00.000Z',
     color: '#000000',
     name: 'Tag1',
     value: 'Tag1',

server/test/mappers.ts

@@ -1,7 +1,15 @@
-import { Selectable } from 'kysely';
+import { Selectable, ShallowDehydrateObject } from 'kysely';
+import { AssetEditActionItem } from 'src/dtos/editing.dto';
+import { ActivityTable } from 'src/schema/tables/activity.table';
 import { AssetTable } from 'src/schema/tables/asset.table';
+import { PartnerTable } from 'src/schema/tables/partner.table';
+import { AlbumFactory } from 'test/factories/album.factory';
 import { AssetFaceFactory } from 'test/factories/asset-face.factory';
 import { AssetFactory } from 'test/factories/asset.factory';
+import { MemoryFactory } from 'test/factories/memory.factory';
+import { SharedLinkFactory } from 'test/factories/shared-link.factory';
+import { StackFactory } from 'test/factories/stack.factory';
+import { UserFactory } from 'test/factories/user.factory';
 
 export const getForStorageTemplate = (asset: ReturnType<AssetFactory['build']>) => {
   return {
@@ -47,6 +55,171 @@ export const getForFacialRecognitionJob = (
   asset: Pick<Selectable<AssetTable>, 'ownerId' | 'visibility' | 'fileCreatedAt'> | null,
 ) => ({
   ...face,
-  asset,
+  asset: asset
+    ? { ownerId: asset.ownerId, visibility: asset.visibility, fileCreatedAt: asset.fileCreatedAt.toISOString() }
+    : null,
   faceSearch: { faceId: face.id, embedding: '[1, 2, 3, 4]' },
 });
+
+export const getDehydrated = <T extends Record<string, unknown>>(entity: T) => {
+  const copiedEntity = structuredClone(entity);
+  for (const [key, value] of Object.entries(copiedEntity)) {
+    if (value instanceof Date) {
+      Object.assign(copiedEntity, { [key]: value.toISOString() });
+      continue;
+    }
+  }
+
+  return copiedEntity as ShallowDehydrateObject<T>;
+};
+
+export const getForAlbum = (album: ReturnType<AlbumFactory['build']>) => ({
+  ...album,
+  assets: album.assets.map((asset) =>
+    getDehydrated({ ...getForAsset(asset), exifInfo: getDehydrated(asset.exifInfo) }),
+  ),
+  albumUsers: album.albumUsers.map((albumUser) => ({
+    ...albumUser,
+    createdAt: albumUser.createdAt.toISOString(),
+    user: getDehydrated(albumUser.user),
+  })),
+  owner: getDehydrated(album.owner),
+  sharedLinks: album.sharedLinks.map((sharedLink) => getDehydrated(sharedLink)),
+});
+
+export const getForActivity = (activity: Selectable<ActivityTable> & { user: ReturnType<UserFactory['build']> }) => ({
+  ...activity,
+  user: getDehydrated(activity.user),
+});
+
+export const getForAsset = (asset: ReturnType<AssetFactory['build']>) => {
+  return {
+    ...asset,
+    faces: asset.faces.map((face) => ({
+      ...getDehydrated(face),
+      person: face.person ? getDehydrated(face.person) : null,
+    })),
+    owner: getDehydrated(asset.owner),
+    stack: asset.stack
+      ? { ...getDehydrated(asset.stack), assets: asset.stack.assets.map((asset) => getDehydrated(asset)) }
+      : null,
+    files: asset.files.map((file) => getDehydrated(file)),
+    exifInfo: asset.exifInfo ? getDehydrated(asset.exifInfo) : null,
+    edits: asset.edits.map(({ action, parameters }) => ({ action, parameters })) as AssetEditActionItem[],
+  };
+};
+
+export const getForPartner = (
+  partner: Selectable<PartnerTable> & Record<'sharedWith' | 'sharedBy', ReturnType<UserFactory['build']>>,
+) => ({
+  ...partner,
+  sharedBy: getDehydrated(partner.sharedBy),
+  sharedWith: getDehydrated(partner.sharedWith),
+});
+
+export const getForMemory = (memory: ReturnType<MemoryFactory['build']>) => ({
+  ...memory,
+  assets: memory.assets.map((asset) => getDehydrated(asset)),
+});
+
+export const getForMetadataExtraction = (asset: ReturnType<AssetFactory['build']>) => ({
+  id: asset.id,
+  checksum: asset.checksum,
+  deviceAssetId: asset.deviceAssetId,
+  deviceId: asset.deviceId,
+  fileCreatedAt: asset.fileCreatedAt,
+  fileModifiedAt: asset.fileModifiedAt,
+  isExternal: asset.isExternal,
+  visibility: asset.visibility,
+  libraryId: asset.libraryId,
+  livePhotoVideoId: asset.livePhotoVideoId,
+  localDateTime: asset.localDateTime,
+  originalFileName: asset.originalFileName,
+  originalPath: asset.originalPath,
+  ownerId: asset.ownerId,
+  type: asset.type,
+  width: asset.width,
+  height: asset.height,
+  faces: asset.faces.map((face) => getDehydrated(face)),
+  files: asset.files.map((file) => getDehydrated(file)),
+});
+
+export const getForGenerateThumbnail = (asset: ReturnType<AssetFactory['build']>) => ({
+  id: asset.id,
+  visibility: asset.visibility,
+  originalFileName: asset.originalFileName,
+  originalPath: asset.originalPath,
+  ownerId: asset.ownerId,
+  thumbhash: asset.thumbhash,
+  type: asset.type,
+  files: asset.files.map((file) => getDehydrated(file)),
+  exifInfo: getDehydrated(asset.exifInfo),
+  edits: asset.edits.map(({ action, parameters }) => ({ action, parameters })) as AssetEditActionItem[],
+});
+
+export const getForAssetFace = (face: ReturnType<AssetFaceFactory['build']>) => ({
+  ...face,
+  person: face.person ? getDehydrated(face.person) : null,
+});
+
+export const getForDetectedFaces = (asset: ReturnType<AssetFactory['build']>) => ({
+  id: asset.id,
+  visibility: asset.visibility,
+  exifInfo: getDehydrated(asset.exifInfo),
+  faces: asset.faces.map((face) => getDehydrated(face)),
+  files: asset.files.map((file) => getDehydrated(file)),
+});
+
+export const getForSidecarWrite = (asset: ReturnType<AssetFactory['build']>) => ({
+  id: asset.id,
+  originalPath: asset.originalPath,
+  files: asset.files.map((file) => getDehydrated(file)),
+  exifInfo: getDehydrated(asset.exifInfo),
+});
+
+export const getForAssetDeletion = (asset: ReturnType<AssetFactory['build']>) => ({
+  id: asset.id,
+  visibility: asset.visibility,
+  libraryId: asset.libraryId,
+  ownerId: asset.ownerId,
+  livePhotoVideoId: asset.livePhotoVideoId,
+  encodedVideoPath: asset.encodedVideoPath,
+  originalPath: asset.originalPath,
+  isOffline: asset.isOffline,
+  exifInfo: asset.exifInfo ? getDehydrated(asset.exifInfo) : null,
+  files: asset.files.map((file) => getDehydrated(file)),
+  stack: asset.stack
+    ? {
+        ...getDehydrated(asset.stack),
+        assets: asset.stack.assets.filter(({ id }) => id !== asset.stack?.primaryAssetId).map(({ id }) => ({ id })),
+      }
+    : null,
+});
+
+export const getForStack = (stack: ReturnType<StackFactory['build']>) => ({
+  ...stack,
+  assets: stack.assets.map((asset) => ({
+    ...getDehydrated(asset),
+    exifInfo: getDehydrated(asset.exifInfo),
+  })),
+});
+
+export const getForDuplicate = (asset: ReturnType<AssetFactory['build']>) => ({
+  ...getDehydrated(asset),
+  exifInfo: getDehydrated(asset.exifInfo),
+});
+
+export const getForSharedLink = (sharedLink: ReturnType<SharedLinkFactory['build']>) => ({
+  ...sharedLink,
+  assets: sharedLink.assets.map((asset) => ({
+    ...getDehydrated({ ...getForAsset(asset) }),
+    exifInfo: getDehydrated(asset.exifInfo),
+  })),
+  album: sharedLink.album
+    ? {
+        ...getDehydrated(sharedLink.album),
+        owner: getDehydrated(sharedLink.album.owner),
+        assets: sharedLink.album.assets.map((asset) => getDehydrated(asset)),
+      }
+    : null,
+});

server/test/small.factory.ts

@@ -1,3 +1,4 @@
+import { ShallowDehydrateObject } from 'kysely';
 import {
   Activity,
   Album,
@@ -113,8 +114,12 @@ const partnerFactory = ({
   sharedWith: sharedWithProvided,
   ...partner
 }: Partial<Partner> = {}) => {
-  const sharedBy = UserFactory.create(sharedByProvided ?? {});
-  const sharedWith = UserFactory.create(sharedWithProvided ?? {});
+  const hydrateUser = (user: Partial<ShallowDehydrateObject<User>>) => ({
+    ...user,
+    profileChangedAt: user.profileChangedAt ? new Date(user.profileChangedAt) : undefined,
+  });
+  const sharedBy = UserFactory.create(sharedByProvided ? hydrateUser(sharedByProvided) : {});
+  const sharedWith = UserFactory.create(sharedWithProvided ? hydrateUser(sharedWithProvided) : {});
 
   return {
     sharedById: sharedBy.id,
@@ -214,7 +219,7 @@ const userAdminFactory = (user: Partial<UserAdmin> = {}) => {
   };
 };
 
-const activityFactory = (activity: Partial<Activity> = {}) => {
+const activityFactory = (activity: Omit<Partial<Activity>, 'user'> = {}) => {
   const userId = activity.userId || newUuid();
   return {
     id: newUuid(),