refactor: last repository (#16042)

server/src/repositories/config.repository.ts

@@ -13,9 +13,16 @@ import { Notice } from 'postgres';
 import { citiesFile, excludePaths, IWorker } from 'src/constants';
 import { Telemetry } from 'src/decorators';
 import { EnvDto } from 'src/dtos/env.dto';
-import { DatabaseExtension, ImmichEnvironment, ImmichHeader, ImmichTelemetry, ImmichWorker, LogLevel } from 'src/enum';
-import { QueueName } from 'src/interfaces/job.interface';
-import { DatabaseConnectionParams, VectorExtension } from 'src/repositories/database.repository';
+import {
+  DatabaseExtension,
+  ImmichEnvironment,
+  ImmichHeader,
+  ImmichTelemetry,
+  ImmichWorker,
+  LogLevel,
+  QueueName,
+} from 'src/enum';
+import { DatabaseConnectionParams, VectorExtension } from 'src/types';
 import { setDifference } from 'src/utils/set';
 import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions.js';
 

server/src/repositories/database.repository.ts

@@ -4,66 +4,16 @@ import AsyncLock from 'async-lock';
 import { Kysely, sql } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
 import semver from 'semver';
-import { POSTGRES_VERSION_RANGE, VECTOR_VERSION_RANGE, VECTORS_VERSION_RANGE } from 'src/constants';
+import { EXTENSION_NAMES, POSTGRES_VERSION_RANGE, VECTOR_VERSION_RANGE, VECTORS_VERSION_RANGE } from 'src/constants';
 import { DB } from 'src/db';
-import { DatabaseExtension } from 'src/enum';
+import { DatabaseExtension, DatabaseLock, VectorIndex } from 'src/enum';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
+import { ExtensionVersion, VectorExtension, VectorUpdateResult } from 'src/types';
 import { UPSERT_COLUMNS } from 'src/utils/database';
 import { isValidInteger } from 'src/validation';
 import { DataSource, EntityManager, EntityMetadata, QueryRunner } from 'typeorm';
 
-export type VectorExtension = DatabaseExtension.VECTOR | DatabaseExtension.VECTORS;
-
-export type DatabaseConnectionURL = {
-  connectionType: 'url';
-  url: string;
-};
-
-export type DatabaseConnectionParts = {
-  connectionType: 'parts';
-  host: string;
-  port: number;
-  username: string;
-  password: string;
-  database: string;
-};
-
-export type DatabaseConnectionParams = DatabaseConnectionURL | DatabaseConnectionParts;
-
-export enum VectorIndex {
-  CLIP = 'clip_index',
-  FACE = 'face_index',
-}
-
-export enum DatabaseLock {
-  GeodataImport = 100,
-  Migrations = 200,
-  SystemFileMounts = 300,
-  StorageTemplateMigration = 420,
-  VersionHistory = 500,
-  CLIPDimSize = 512,
-  Library = 1337,
-  GetSystemConfig = 69,
-  BackupDatabase = 42,
-}
-
-export const EXTENSION_NAMES: Record<DatabaseExtension, string> = {
-  cube: 'cube',
-  earthdistance: 'earthdistance',
-  vector: 'pgvector',
-  vectors: 'pgvecto.rs',
-} as const;
-
-export interface ExtensionVersion {
-  availableVersion: string | null;
-  installedVersion: string | null;
-}
-
-export interface VectorUpdateResult {
-  restartRequired: boolean;
-}
-
 @Injectable()
 export class DatabaseRepository {
   private vectorExtension: VectorExtension;

server/src/repositories/event.repository.ts

@@ -15,10 +15,10 @@ import { EventConfig } from 'src/decorators';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { ReleaseNotification, ServerVersionResponseDto } from 'src/dtos/server.dto';
-import { ImmichWorker, MetadataKey } from 'src/enum';
-import { JobItem, QueueName } from 'src/interfaces/job.interface';
+import { ImmichWorker, MetadataKey, QueueName } from 'src/enum';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
+import { JobItem } from 'src/types';
 import { handlePromiseError } from 'src/utils/misc';
 
 type EmitHandlers = Partial<{ [T in EmitEvent]: Array<EventItem<T>> }>;

server/src/repositories/index.ts

@@ -1,4 +1,3 @@
-import { IJobRepository } from 'src/interfaces/job.interface';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { ActivityRepository } from 'src/repositories/activity.repository';
 import { AlbumUserRepository } from 'src/repositories/album-user.repository';
@@ -52,6 +51,7 @@ export const repositories = [
   CryptoRepository,
   DatabaseRepository,
   EventRepository,
+  JobRepository,
   LibraryRepository,
   LoggingRepository,
   MachineLearningRepository,
@@ -79,5 +79,3 @@ export const repositories = [
   ViewRepository,
   VersionHistoryRepository,
 ];
-
-export const providers = [{ provide: IJobRepository, useClass: JobRepository }];

server/src/repositories/job.repository.ts

@@ -5,22 +5,11 @@ import { JobsOptions, Queue, Worker } from 'bullmq';
 import { ClassConstructor } from 'class-transformer';
 import { setTimeout } from 'node:timers/promises';
 import { JobConfig } from 'src/decorators';
-import { MetadataKey } from 'src/enum';
-import {
-  IEntityJob,
-  IJobRepository,
-  JobCounts,
-  JobItem,
-  JobName,
-  JobOf,
-  JobStatus,
-  QueueCleanType,
-  QueueName,
-  QueueStatus,
-} from 'src/interfaces/job.interface';
+import { JobName, JobStatus, MetadataKey, QueueCleanType, QueueName } from 'src/enum';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { EventRepository } from 'src/repositories/event.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
+import { IEntityJob, JobCounts, JobItem, JobOf, QueueStatus } from 'src/types';
 import { getKeyByValue, getMethodNames, ImmichStartupError } from 'src/utils/misc';
 
 type JobMapItem = {
@@ -31,7 +20,7 @@ type JobMapItem = {
 };
 
 @Injectable()
-export class JobRepository implements IJobRepository {
+export class JobRepository {
   private workers: Partial<Record<QueueName, Worker>> = {};
   private handlers: Partial<Record<JobName, JobMapItem>> = {};
 

server/src/repositories/memory.repository.ts

@@ -4,7 +4,7 @@ import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { InjectKysely } from 'nestjs-kysely';
 import { DB, Memories } from 'src/db';
 import { Chunked, ChunkedSet, DummyValue, GenerateSql } from 'src/decorators';
-import { IBulkAsset } from 'src/utils/asset.util';
+import { IBulkAsset } from 'src/types';
 
 @Injectable()
 export class MemoryRepository implements IBulkAsset {

server/src/repositories/notification.repository.ts

@@ -7,12 +7,7 @@ import { AlbumUpdateEmail } from 'src/emails/album-update.email';
 import { TestEmail } from 'src/emails/test.email';
 import { WelcomeEmail } from 'src/emails/welcome.email';
 import { LoggingRepository } from 'src/repositories/logging.repository';
-
-export type EmailImageAttachment = {
-  filename: string;
-  path: string;
-  cid: string;
-};
+import { EmailImageAttachment } from 'src/types';
 
 export type SendEmailOptions = {
   from: string;