refactor: database types (#19624)

server/test/fixtures/asset.stub.ts

@@ -35,6 +35,7 @@ export const stackStub = (stackId: string, assets: (MapAsset & { exifInfo: Exif
     primaryAssetId: assets[0].id,
     createdAt: new Date('2023-02-23T05:06:29.716Z'),
     updatedAt: new Date('2023-02-23T05:06:29.716Z'),
+    updateId: 'uuid-v7',
   };
 };
 

server/test/medium.factory.ts

@@ -4,7 +4,6 @@ import { DateTime } from 'luxon';
 import { createHash, randomBytes } from 'node:crypto';
 import { Writable } from 'node:stream';
 import { AssetFace } from 'src/database';
-import { Albums, AssetJobStatus, Assets, DB, Exif, FaceSearch, Memories, Person, Sessions } from 'src/db';
 import { AuthDto, LoginResponseDto } from 'src/dtos/auth.dto';
 import { AlbumUserRole, AssetType, AssetVisibility, MemoryType, SourceType, SyncRequestType } from 'src/enum';
 import { AccessRepository } from 'src/repositories/access.repository';
@@ -32,6 +31,15 @@ import { SyncRepository } from 'src/repositories/sync.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { UserRepository } from 'src/repositories/user.repository';
 import { VersionHistoryRepository } from 'src/repositories/version-history.repository';
+import { DB } from 'src/schema';
+import { AlbumTable } from 'src/schema/tables/album.table';
+import { AssetJobStatusTable } from 'src/schema/tables/asset-job-status.table';
+import { AssetTable } from 'src/schema/tables/asset.table';
+import { ExifTable } from 'src/schema/tables/exif.table';
+import { FaceSearchTable } from 'src/schema/tables/face-search.table';
+import { MemoryTable } from 'src/schema/tables/memory.table';
+import { PersonTable } from 'src/schema/tables/person.table';
+import { SessionTable } from 'src/schema/tables/session.table';
 import { UserTable } from 'src/schema/tables/user.table';
 import { BASE_SERVICE_DEPENDENCIES, BaseService } from 'src/services/base.service';
 import { SyncService } from 'src/services/sync.service';
@@ -125,13 +133,13 @@ export class MediumTestContext<S extends BaseService = BaseService> {
     return { partner, result };
   }
 
-  async newAsset(dto: Partial<Insertable<Assets>> = {}) {
+  async newAsset(dto: Partial<Insertable<AssetTable>> = {}) {
     const asset = mediumFactory.assetInsert(dto);
     const result = await this.get(AssetRepository).create(asset);
     return { asset, result };
   }
 
-  async newMemory(dto: Partial<Insertable<Memories>> = {}) {
+  async newMemory(dto: Partial<Insertable<MemoryTable>> = {}) {
     const memory = mediumFactory.memoryInsert(dto);
     const result = await this.get(MemoryRepository).create(memory, new Set<string>());
     return { memory, result };
@@ -142,12 +150,12 @@ export class MediumTestContext<S extends BaseService = BaseService> {
     return { memoryAsset: dto, result };
   }
 
-  async newExif(dto: Insertable<Exif>) {
+  async newExif(dto: Insertable<ExifTable>) {
     const result = await this.get(AssetRepository).upsertExif(dto);
     return { result };
   }
 
-  async newAlbum(dto: Insertable<Albums>) {
+  async newAlbum(dto: Insertable<AlbumTable>) {
     const album = mediumFactory.albumInsert(dto);
     const result = await this.get(AlbumRepository).create(album, [], []);
     return { album, result };
@@ -164,19 +172,19 @@ export class MediumTestContext<S extends BaseService = BaseService> {
     return { albumUser: { albumId, userId, role }, result };
   }
 
-  async newJobStatus(dto: Partial<Insertable<AssetJobStatus>> & { assetId: string }) {
+  async newJobStatus(dto: Partial<Insertable<AssetJobStatusTable>> & { assetId: string }) {
     const jobStatus = mediumFactory.assetJobStatusInsert({ assetId: dto.assetId });
     const result = await this.get(AssetRepository).upsertJobStatus(jobStatus);
     return { jobStatus, result };
   }
 
-  async newPerson(dto: Partial<Insertable<Person>> & { ownerId: string }) {
+  async newPerson(dto: Partial<Insertable<PersonTable>> & { ownerId: string }) {
     const person = mediumFactory.personInsert(dto);
     const result = await this.get(PersonRepository).create(person);
     return { person, result };
   }
 
-  async newSession(dto: Partial<Insertable<Sessions>> & { userId: string }) {
+  async newSession(dto: Partial<Insertable<SessionTable>> & { userId: string }) {
     const session = mediumFactory.sessionInsert(dto);
     const result = await this.get(SessionRepository).create(session);
     return { session, result };
@@ -338,10 +346,10 @@ const newMockRepository = <T>(key: ClassConstructor<T>) => {
   }
 };
 
-const assetInsert = (asset: Partial<Insertable<Assets>> = {}) => {
+const assetInsert = (asset: Partial<Insertable<AssetTable>> = {}) => {
   const id = asset.id || newUuid();
   const now = newDate();
-  const defaults: Insertable<Assets> = {
+  const defaults: Insertable<AssetTable> = {
     deviceAssetId: '',
     deviceId: '',
     originalFileName: '',
@@ -363,9 +371,9 @@ const assetInsert = (asset: Partial<Insertable<Assets>> = {}) => {
   };
 };
 
-const albumInsert = (album: Partial<Insertable<Albums>> & { ownerId: string }) => {
+const albumInsert = (album: Partial<Insertable<AlbumTable>> & { ownerId: string }) => {
   const id = album.id || newUuid();
-  const defaults: Omit<Insertable<Albums>, 'ownerId'> = {
+  const defaults: Omit<Insertable<AlbumTable>, 'ownerId'> = {
     albumName: 'Album',
   };
 
@@ -376,7 +384,7 @@ const albumInsert = (album: Partial<Insertable<Albums>> & { ownerId: string }) =
   };
 };
 
-const faceInsert = (face: Partial<Insertable<FaceSearch>> & { faceId: string }) => {
+const faceInsert = (face: Partial<Insertable<FaceSearchTable>> & { faceId: string }) => {
   const defaults = {
     faceId: face.faceId,
     embedding: face.embedding || newEmbedding(),
@@ -409,10 +417,10 @@ const assetFaceInsert = (assetFace: Partial<AssetFace> & { assetId: string }) =>
 };
 
 const assetJobStatusInsert = (
-  job: Partial<Insertable<AssetJobStatus>> & { assetId: string },
-): Insertable<AssetJobStatus> => {
+  job: Partial<Insertable<AssetJobStatusTable>> & { assetId: string },
+): Insertable<AssetJobStatusTable> => {
   const date = DateTime.now().minus({ days: 15 }).toISO();
-  const defaults: Omit<Insertable<AssetJobStatus>, 'assetId'> = {
+  const defaults: Omit<Insertable<AssetJobStatusTable>, 'assetId'> = {
     duplicatesDetectedAt: date,
     facesRecognizedAt: date,
     metadataExtractedAt: date,
@@ -426,7 +434,7 @@ const assetJobStatusInsert = (
   };
 };
 
-const personInsert = (person: Partial<Insertable<Person>> & { ownerId: string }) => {
+const personInsert = (person: Partial<Insertable<PersonTable>> & { ownerId: string }) => {
   const defaults = {
     birthDate: person.birthDate || null,
     color: person.color || null,
@@ -449,8 +457,12 @@ const personInsert = (person: Partial<Insertable<Person>> & { ownerId: string })
 
 const sha256 = (value: string) => createHash('sha256').update(value).digest('base64');
 
-const sessionInsert = ({ id = newUuid(), userId, ...session }: Partial<Insertable<Sessions>> & { userId: string }) => {
-  const defaults: Insertable<Sessions> = {
+const sessionInsert = ({
+  id = newUuid(),
+  userId,
+  ...session
+}: Partial<Insertable<SessionTable>> & { userId: string }) => {
+  const defaults: Insertable<SessionTable> = {
     id,
     userId,
     token: sha256(id),
@@ -478,11 +490,11 @@ const userInsert = (user: Partial<Insertable<UserTable>> = {}) => {
   return { ...defaults, ...user, id };
 };
 
-const memoryInsert = (memory: Partial<Insertable<Memories>> = {}) => {
+const memoryInsert = (memory: Partial<Insertable<MemoryTable>> = {}) => {
   const id = memory.id || newUuid();
   const date = newDate();
 
-  const defaults: Insertable<Memories> = {
+  const defaults: Insertable<MemoryTable> = {
     id,
     createdAt: date,
     updatedAt: date,

server/test/medium/globalSetup.ts

@@ -1,8 +1,8 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { DatabaseRepository } from 'src/repositories/database.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
+import { DB } from 'src/schema';
 import { getKyselyConfig } from 'src/utils/database';
 import { GenericContainer, Wait } from 'testcontainers';
 

server/test/medium/specs/services/asset.service.spec.ts

@@ -1,7 +1,7 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AssetRepository } from 'src/repositories/asset.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
+import { DB } from 'src/schema';
 import { AssetService } from 'src/services/asset.service';
 import { newMediumService } from 'test/medium.factory';
 import { factory } from 'test/small.factory';

server/test/medium/specs/services/auth.service.spec.ts

@@ -1,7 +1,6 @@
 import { BadRequestException } from '@nestjs/common';
 import { hash } from 'bcrypt';
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AuthType } from 'src/enum';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { ConfigRepository } from 'src/repositories/config.repository';
@@ -13,6 +12,7 @@ import { SessionRepository } from 'src/repositories/session.repository';
 import { StorageRepository } from 'src/repositories/storage.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
 import { AuthService } from 'src/services/auth.service';
 import { mediumFactory, newMediumService } from 'test/medium.factory';
 import { factory } from 'test/small.factory';

server/test/medium/specs/services/memory.service.spec.ts

@@ -1,6 +1,5 @@
 import { Kysely } from 'kysely';
 import { DateTime } from 'luxon';
-import { DB } from 'src/db';
 import { AssetFileType, MemoryType } from 'src/enum';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { AssetRepository } from 'src/repositories/asset.repository';
@@ -10,6 +9,7 @@ import { MemoryRepository } from 'src/repositories/memory.repository';
 import { PartnerRepository } from 'src/repositories/partner.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
 import { MemoryService } from 'src/services/memory.service';
 import { newMediumService } from 'test/medium.factory';
 import { factory } from 'test/small.factory';

server/test/medium/specs/services/person.service.spec.ts

@@ -1,10 +1,10 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { DatabaseRepository } from 'src/repositories/database.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { PersonRepository } from 'src/repositories/person.repository';
 import { StorageRepository } from 'src/repositories/storage.repository';
+import { DB } from 'src/schema';
 import { PersonService } from 'src/services/person.service';
 import { newMediumService } from 'test/medium.factory';
 import { factory } from 'test/small.factory';

server/test/medium/specs/services/user.service.spec.ts

@@ -1,6 +1,5 @@
 import { Kysely } from 'kysely';
 import { DateTime } from 'luxon';
-import { DB } from 'src/db';
 import { ImmichEnvironment, JobName, JobStatus } from 'src/enum';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { CryptoRepository } from 'src/repositories/crypto.repository';
@@ -8,6 +7,7 @@ import { JobRepository } from 'src/repositories/job.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
 import { UserService } from 'src/services/user.service';
 import { mediumFactory, newMediumService } from 'test/medium.factory';
 import { factory } from 'test/small.factory';

server/test/medium/specs/services/version.service.spec.ts

@@ -1,11 +1,11 @@
 import { Kysely } from 'kysely';
 import { serverVersion } from 'src/constants';
-import { DB } from 'src/db';
 import { JobName } from 'src/enum';
 import { DatabaseRepository } from 'src/repositories/database.repository';
 import { JobRepository } from 'src/repositories/job.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { VersionHistoryRepository } from 'src/repositories/version-history.repository';
+import { DB } from 'src/schema';
 import { VersionService } from 'src/services/version.service';
 import { newMediumService } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';

server/test/medium/specs/sync/sync-album-asset-exif.spec.ts

@@ -1,6 +1,6 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB, wait } from 'test/utils';

server/test/medium/specs/sync/sync-album-asset.spec.ts

@@ -1,6 +1,6 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB, wait } from 'test/utils';

server/test/medium/specs/sync/sync-album-to-asset.spec.ts

@@ -1,8 +1,8 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
 import { AlbumRepository } from 'src/repositories/album.repository';
 import { AssetRepository } from 'src/repositories/asset.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB, wait } from 'test/utils';
 

server/test/medium/specs/sync/sync-album-user.spec.ts

@@ -1,7 +1,7 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
 import { AlbumUserRepository } from 'src/repositories/album-user.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB, wait } from 'test/utils';
 

server/test/medium/specs/sync/sync-album.spec.ts

@@ -1,8 +1,8 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
 import { AlbumUserRepository } from 'src/repositories/album-user.repository';
 import { AlbumRepository } from 'src/repositories/album.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 

server/test/medium/specs/sync/sync-asset-exif.spec.ts

@@ -1,6 +1,6 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB } from 'test/utils';

server/test/medium/specs/sync/sync-asset.spec.ts

@@ -1,7 +1,7 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
 import { AssetRepository } from 'src/repositories/asset.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB } from 'test/utils';

server/test/medium/specs/sync/sync-memory-asset.spec.ts

@@ -1,7 +1,7 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
 import { MemoryRepository } from 'src/repositories/memory.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 

server/test/medium/specs/sync/sync-memory.spec.ts

@@ -1,7 +1,7 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
 import { MemoryRepository } from 'src/repositories/memory.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 

server/test/medium/specs/sync/sync-partner-asset-exif.spec.ts

@@ -1,6 +1,6 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB, wait } from 'test/utils';

server/test/medium/specs/sync/sync-partner-asset.spec.ts

@@ -1,9 +1,9 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
 import { AssetRepository } from 'src/repositories/asset.repository';
 import { PartnerRepository } from 'src/repositories/partner.repository';
 import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB, wait } from 'test/utils';

server/test/medium/specs/sync/sync-partner.spec.ts

@@ -1,8 +1,8 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
 import { PartnerRepository } from 'src/repositories/partner.repository';
 import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 

server/test/medium/specs/sync/sync-user.spec.ts

@@ -1,7 +1,7 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
 import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 

server/test/utils.ts

@@ -7,7 +7,6 @@ import { ChildProcessWithoutNullStreams } from 'node:child_process';
 import { Writable } from 'node:stream';
 import { PNG } from 'pngjs';
 import postgres from 'postgres';
-import { DB } from 'src/db';
 import { AssetUploadInterceptor } from 'src/middleware/asset-upload.interceptor';
 import { AuthGuard } from 'src/middleware/auth.guard';
 import { FileUploadInterceptor } from 'src/middleware/file-upload.interceptor';
@@ -56,6 +55,7 @@ import { TrashRepository } from 'src/repositories/trash.repository';
 import { UserRepository } from 'src/repositories/user.repository';
 import { VersionHistoryRepository } from 'src/repositories/version-history.repository';
 import { ViewRepository } from 'src/repositories/view-repository';
+import { DB } from 'src/schema';
 import { AuthService } from 'src/services/auth.service';
 import { BaseService } from 'src/services/base.service';
 import { RepositoryInterface } from 'src/types';