High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
refactor: enums (#12988)
Jason Rasmussen12da25002877
diff --git a/server/src/config.ts b/server/src/config.tsindex 03ea3f111b..1522371487 100644--- a/server/src/config.ts+++ b/server/src/config.ts@@ -7,83 +7,20 @@ import { RedisOptions } from 'ioredis';import Joi, { Root } from 'joi';import { CLS_ID, ClsModuleOptions } from 'nestjs-cls';import { ImmichHeader } from 'src/dtos/auth.dto';+import {+ AudioCodec,+ Colorspace,+ CQMode,+ ImageFormat,+ LogLevel,+ ToneMapping,+ TranscodeHWAccel,+ TranscodePolicy,+ VideoCodec,+ VideoContainer,+} from 'src/enum';import { ConcurrentQueueName, QueueName } from 'src/interfaces/job.interface';-export enum TranscodePolicy {- ALL = 'all',- OPTIMAL = 'optimal',- BITRATE = 'bitrate',- REQUIRED = 'required',- DISABLED = 'disabled',-}--export enum TranscodeTarget {- NONE,- AUDIO,- VIDEO,- ALL,-}--export enum VideoCodec {- H264 = 'h264',- HEVC = 'hevc',- VP9 = 'vp9',- AV1 = 'av1',-}--export enum AudioCodec {- MP3 = 'mp3',- AAC = 'aac',- LIBOPUS = 'libopus',-}--export enum VideoContainer {- MOV = 'mov',- MP4 = 'mp4',- OGG = 'ogg',- WEBM = 'webm',-}--export enum TranscodeHWAccel {- NVENC = 'nvenc',- QSV = 'qsv',- VAAPI = 'vaapi',- RKMPP = 'rkmpp',- DISABLED = 'disabled',-}--export enum ToneMapping {- HABLE = 'hable',- MOBIUS = 'mobius',- REINHARD = 'reinhard',- DISABLED = 'disabled',-}--export enum CQMode {- AUTO = 'auto',- CQP = 'cqp',- ICQ = 'icq',-}--export enum Colorspace {- SRGB = 'srgb',- P3 = 'p3',-}--export enum ImageFormat {- JPEG = 'jpeg',- WEBP = 'webp',-}--export enum LogLevel {- VERBOSE = 'verbose',- DEBUG = 'debug',- LOG = 'log',- WARN = 'warn',- ERROR = 'error',- FATAL = 'fatal',-}-export interface SystemConfig {ffmpeg: {crf: number;diff --git a/server/src/constants.ts b/server/src/constants.tsindex 6cfcc41d89..e0a4fe8cef 100644--- a/server/src/constants.ts+++ b/server/src/constants.ts@@ -54,11 +54,6 @@ export const resourcePaths = {export const MOBILE_REDIRECT = 'app.immich:///oauth-callback';export const LOGIN_URL = '/auth/login?autoLaunch=0';-export enum AuthType {- PASSWORD = 'password',- OAUTH = 'oauth',-}-export const excludePaths = ['/.well-known/immich', '/custom.css', '/favicon.ico'];export const FACE_THUMBNAIL_SIZE = 250;diff --git a/server/src/controllers/asset-media.controller.ts b/server/src/controllers/asset-media.controller.tsindex fb5ec58f25..b2d3933be4 100644--- a/server/src/controllers/asset-media.controller.ts+++ b/server/src/controllers/asset-media.controller.ts@@ -33,16 +33,17 @@ import {UploadFieldName,} from 'src/dtos/asset-media.dto';import { AuthDto, ImmichHeader } from 'src/dtos/auth.dto';+import { RouteKey } from 'src/enum';import { ILoggerRepository } from 'src/interfaces/logger.interface';import { AssetUploadInterceptor } from 'src/middleware/asset-upload.interceptor';import { Auth, Authenticated, FileResponse } from 'src/middleware/auth.guard';-import { FileUploadInterceptor, Route, UploadFiles, getFiles } from 'src/middleware/file-upload.interceptor';+import { FileUploadInterceptor, UploadFiles, getFiles } from 'src/middleware/file-upload.interceptor';import { AssetMediaService } from 'src/services/asset-media.service';import { sendFile } from 'src/utils/file';import { FileNotEmptyValidator, UUIDParamDto } from 'src/validation';@ApiTags('Assets')-@Controller(Route.ASSET)+@Controller(RouteKey.ASSET)export class AssetMediaController {constructor(@Inject(ILoggerRepository) private logger: ILoggerRepository,diff --git a/server/src/controllers/asset.controller.ts b/server/src/controllers/asset.controller.tsindex 9d3d230657..8a5b5fb0b6 100644--- a/server/src/controllers/asset.controller.ts+++ b/server/src/controllers/asset.controller.ts@@ -14,13 +14,13 @@ import {} from 'src/dtos/asset.dto';import { AuthDto } from 'src/dtos/auth.dto';import { MemoryLaneDto } from 'src/dtos/search.dto';+import { RouteKey } from 'src/enum';import { Auth, Authenticated } from 'src/middleware/auth.guard';-import { Route } from 'src/middleware/file-upload.interceptor';import { AssetService } from 'src/services/asset.service';import { UUIDParamDto } from 'src/validation';@ApiTags('Assets')-@Controller(Route.ASSET)+@Controller(RouteKey.ASSET)export class AssetController {constructor(private service: AssetService) {}diff --git a/server/src/controllers/auth.controller.ts b/server/src/controllers/auth.controller.tsindex 7dcef9df5f..04250f5300 100644--- a/server/src/controllers/auth.controller.ts+++ b/server/src/controllers/auth.controller.ts@@ -1,7 +1,6 @@import { Body, Controller, HttpCode, HttpStatus, Post, Req, Res } from '@nestjs/common';import { ApiTags } from '@nestjs/swagger';import { Request, Response } from 'express';-import { AuthType } from 'src/constants';import {AuthDto,ChangePasswordDto,@@ -13,6 +12,7 @@ import {ValidateAccessTokenResponseDto,} from 'src/dtos/auth.dto';import { UserAdminResponseDto } from 'src/dtos/user.dto';+import { AuthType } from 'src/enum';import { Auth, Authenticated, GetLoginDetails } from 'src/middleware/auth.guard';import { AuthService, LoginDetails } from 'src/services/auth.service';import { respondWithCookie, respondWithoutCookie } from 'src/utils/response';diff --git a/server/src/controllers/oauth.controller.ts b/server/src/controllers/oauth.controller.tsindex b733dc612b..4e626b10f0 100644--- a/server/src/controllers/oauth.controller.ts+++ b/server/src/controllers/oauth.controller.ts@@ -1,7 +1,6 @@import { Body, Controller, Get, HttpCode, HttpStatus, Post, Redirect, Req, Res } from '@nestjs/common';import { ApiTags } from '@nestjs/swagger';import { Request, Response } from 'express';-import { AuthType } from 'src/constants';import {AuthDto,ImmichCookie,@@ -11,6 +10,7 @@ import {OAuthConfigDto,} from 'src/dtos/auth.dto';import { UserAdminResponseDto } from 'src/dtos/user.dto';+import { AuthType } from 'src/enum';import { Auth, Authenticated, GetLoginDetails } from 'src/middleware/auth.guard';import { AuthService, LoginDetails } from 'src/services/auth.service';import { respondWithCookie } from 'src/utils/response';diff --git a/server/src/controllers/user.controller.ts b/server/src/controllers/user.controller.tsindex 01b2258390..10076098d6 100644--- a/server/src/controllers/user.controller.ts+++ b/server/src/controllers/user.controller.ts@@ -21,15 +21,16 @@ import { LicenseKeyDto, LicenseResponseDto } from 'src/dtos/license.dto';import { UserPreferencesResponseDto, UserPreferencesUpdateDto } from 'src/dtos/user-preferences.dto';import { CreateProfileImageDto, CreateProfileImageResponseDto } from 'src/dtos/user-profile.dto';import { UserAdminResponseDto, UserResponseDto, UserUpdateMeDto } from 'src/dtos/user.dto';+import { RouteKey } from 'src/enum';import { ILoggerRepository } from 'src/interfaces/logger.interface';import { Auth, Authenticated, FileResponse } from 'src/middleware/auth.guard';-import { FileUploadInterceptor, Route } from 'src/middleware/file-upload.interceptor';+import { FileUploadInterceptor } from 'src/middleware/file-upload.interceptor';import { UserService } from 'src/services/user.service';import { sendFile } from 'src/utils/file';import { UUIDParamDto } from 'src/validation';@ApiTags('Users')-@Controller(Route.USER)+@Controller(RouteKey.USER)export class UserController {constructor(private service: UserService,diff --git a/server/src/cores/storage.core.ts b/server/src/cores/storage.core.tsindex e20a0c658d..8ce8f6b67a 100644--- a/server/src/cores/storage.core.ts+++ b/server/src/cores/storage.core.ts@@ -1,12 +1,10 @@import { randomUUID } from 'node:crypto';import { dirname, join, resolve } from 'node:path';-import { ImageFormat } from 'src/config';import { APP_MEDIA_LOCATION } from 'src/constants';import { SystemConfigCore } from 'src/cores/system-config.core';import { AssetEntity } from 'src/entities/asset.entity';-import { AssetPathType, PathType, PersonPathType } from 'src/entities/move.entity';import { PersonEntity } from 'src/entities/person.entity';-import { AssetFileType } from 'src/enum';+import { AssetFileType, AssetPathType, ImageFormat, PathType, PersonPathType, StorageFolder } from 'src/enum';import { IAssetRepository } from 'src/interfaces/asset.interface';import { ICryptoRepository } from 'src/interfaces/crypto.interface';import { ILoggerRepository } from 'src/interfaces/logger.interface';@@ -16,14 +14,6 @@ import { IStorageRepository } from 'src/interfaces/storage.interface';import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';import { getAssetFiles } from 'src/utils/asset.util';-export enum StorageFolder {- ENCODED_VIDEO = 'encoded-video',- LIBRARY = 'library',- UPLOAD = 'upload',- PROFILE = 'profile',- THUMBNAILS = 'thumbs',-}-export const THUMBNAIL_DIR = resolve(join(APP_MEDIA_LOCATION, StorageFolder.THUMBNAILS));export const ENCODED_VIDEO_DIR = resolve(join(APP_MEDIA_LOCATION, StorageFolder.ENCODED_VIDEO));diff --git a/server/src/decorators.ts b/server/src/decorators.tsindex 2316e114e8..9b6910391a 100644--- a/server/src/decorators.ts+++ b/server/src/decorators.ts@@ -4,8 +4,8 @@ import { OnEventOptions } from '@nestjs/event-emitter/dist/interfaces';import { ApiExtension, ApiOperation, ApiProperty, ApiTags } from '@nestjs/swagger';import _ from 'lodash';import { ADDED_IN_PREFIX, DEPRECATED_IN_PREFIX, LIFECYCLE_EXTENSION } from 'src/constants';+import { MetadataKey } from 'src/enum';import { EmitEvent, ServerEvent } from 'src/interfaces/event.interface';-import { Metadata } from 'src/middleware/auth.guard';import { setUnion } from 'src/utils/set';// PostgreSQL uses a 16-bit integer to indicate the number of bound parameters. This means that the@@ -141,7 +141,7 @@ export type EmitConfig = {/** lower value has higher priority, defaults to 0 */priority?: number;};-export const OnEmit = (config: EmitConfig) => SetMetadata(Metadata.ON_EMIT_CONFIG, config);+export const OnEmit = (config: EmitConfig) => SetMetadata(MetadataKey.ON_EMIT_CONFIG, config);type LifecycleRelease = 'NEXT_RELEASE' | string;type LifecycleMetadata = {diff --git a/server/src/dtos/audit.dto.ts b/server/src/dtos/audit.dto.tsindex dcace5a551..434da46eba 100644--- a/server/src/dtos/audit.dto.ts+++ b/server/src/dtos/audit.dto.ts@@ -1,8 +1,7 @@import { ApiProperty } from '@nestjs/swagger';import { Type } from 'class-transformer';import { IsArray, IsEnum, IsString, IsUUID, ValidateNested } from 'class-validator';-import { AssetPathType, PathType, PersonPathType, UserPathType } from 'src/entities/move.entity';-import { EntityType } from 'src/enum';+import { AssetPathType, EntityType, PathType, PersonPathType, UserPathType } from 'src/enum';import { Optional, ValidateDate, ValidateUUID } from 'src/validation';const PathEnum = Object.values({ ...AssetPathType, ...PersonPathType, ...UserPathType });diff --git a/server/src/dtos/system-config.dto.ts b/server/src/dtos/system-config.dto.tsindex 336f50f39b..4a3ca37691 100644--- a/server/src/dtos/system-config.dto.ts+++ b/server/src/dtos/system-config.dto.ts@@ -18,20 +18,20 @@ import {ValidatorConstraint,ValidatorConstraintInterface,} from 'class-validator';+import { SystemConfig } from 'src/config';+import { CLIPConfig, DuplicateDetectionConfig, FacialRecognitionConfig } from 'src/dtos/model-config.dto';import {AudioCodec,CQMode,Colorspace,ImageFormat,LogLevel,- SystemConfig,ToneMapping,TranscodeHWAccel,TranscodePolicy,VideoCodec,VideoContainer,-} from 'src/config';-import { CLIPConfig, DuplicateDetectionConfig, FacialRecognitionConfig } from 'src/dtos/model-config.dto';+} from 'src/enum';import { ConcurrentQueueName, QueueName } from 'src/interfaces/job.interface';import { ValidateBoolean, validateCronExpression } from 'src/validation';diff --git a/server/src/entities/move.entity.ts b/server/src/entities/move.entity.tsindex f3dad6b280..5cdef5d22e 100644--- a/server/src/entities/move.entity.ts+++ b/server/src/entities/move.entity.ts@@ -1,3 +1,4 @@+import { PathType } from 'src/enum';import { Column, Entity, PrimaryGeneratedColumn, Unique } from 'typeorm';@Entity('move_history')@@ -21,21 +22,3 @@ export class MoveEntity {@Column({ type: 'varchar' })newPath!: string;}--export enum AssetPathType {- ORIGINAL = 'original',- PREVIEW = 'preview',- THUMBNAIL = 'thumbnail',- ENCODED_VIDEO = 'encoded_video',- SIDECAR = 'sidecar',-}--export enum PersonPathType {- FACE = 'face',-}--export enum UserPathType {- PROFILE = 'profile',-}--export type PathType = AssetPathType | PersonPathType | UserPathType;diff --git a/server/src/enum.ts b/server/src/enum.tsindex 027b3160a7..e0c1e27859 100644--- a/server/src/enum.ts+++ b/server/src/enum.ts@@ -1,3 +1,8 @@+export enum AuthType {+ PASSWORD = 'password',+ OAUTH = 'oauth',+}+export enum AssetType {IMAGE = 'IMAGE',VIDEO = 'VIDEO',@@ -148,6 +153,14 @@ export enum SharedLinkType {INDIVIDUAL = 'INDIVIDUAL',}+export enum StorageFolder {+ ENCODED_VIDEO = 'encoded-video',+ LIBRARY = 'library',+ UPLOAD = 'upload',+ PROFILE = 'profile',+ THUMBNAILS = 'thumbs',+}+export enum SystemMetadataKey {REVERSE_GEOCODING_STATE = 'reverse-geocoding-state',FACIAL_RECOGNITION_STATE = 'facial-recognition-state',@@ -198,3 +211,120 @@ export enum ManualJobName {TAG_CLEANUP = 'tag-cleanup',USER_CLEANUP = 'user-cleanup',}++export enum AssetPathType {+ ORIGINAL = 'original',+ PREVIEW = 'preview',+ THUMBNAIL = 'thumbnail',+ ENCODED_VIDEO = 'encoded_video',+ SIDECAR = 'sidecar',+}++export enum PersonPathType {+ FACE = 'face',+}++export enum UserPathType {+ PROFILE = 'profile',+}++export type PathType = AssetPathType | PersonPathType | UserPathType;++export enum TranscodePolicy {+ ALL = 'all',+ OPTIMAL = 'optimal',+ BITRATE = 'bitrate',+ REQUIRED = 'required',+ DISABLED = 'disabled',+}++export enum TranscodeTarget {+ NONE,+ AUDIO,+ VIDEO,+ ALL,+}++export enum VideoCodec {+ H264 = 'h264',+ HEVC = 'hevc',+ VP9 = 'vp9',+ AV1 = 'av1',+}++export enum AudioCodec {+ MP3 = 'mp3',+ AAC = 'aac',+ LIBOPUS = 'libopus',+}++export enum VideoContainer {+ MOV = 'mov',+ MP4 = 'mp4',+ OGG = 'ogg',+ WEBM = 'webm',+}++export enum TranscodeHWAccel {+ NVENC = 'nvenc',+ QSV = 'qsv',+ VAAPI = 'vaapi',+ RKMPP = 'rkmpp',+ DISABLED = 'disabled',+}++export enum ToneMapping {+ HABLE = 'hable',+ MOBIUS = 'mobius',+ REINHARD = 'reinhard',+ DISABLED = 'disabled',+}++export enum CQMode {+ AUTO = 'auto',+ CQP = 'cqp',+ ICQ = 'icq',+}++export enum Colorspace {+ SRGB = 'srgb',+ P3 = 'p3',+}++export enum ImageFormat {+ JPEG = 'jpeg',+ WEBP = 'webp',+}++export enum LogLevel {+ VERBOSE = 'verbose',+ DEBUG = 'debug',+ LOG = 'log',+ WARN = 'warn',+ ERROR = 'error',+ FATAL = 'fatal',+}++export enum MetadataKey {+ AUTH_ROUTE = 'auth_route',+ ADMIN_ROUTE = 'admin_route',+ SHARED_ROUTE = 'shared_route',+ API_KEY_SECURITY = 'api_key',+ ON_EMIT_CONFIG = 'on_emit_config',+}++export enum RouteKey {+ ASSET = 'assets',+ USER = 'users',+}++export enum CacheControl {+ PRIVATE_WITH_CACHE = 'private_with_cache',+ PRIVATE_WITHOUT_CACHE = 'private_without_cache',+ NONE = 'none',+}++export enum PaginationMode {+ LIMIT_OFFSET = 'limit-offset',+ SKIP_TAKE = 'skip-take',+}diff --git a/server/src/interfaces/logger.interface.ts b/server/src/interfaces/logger.interface.tsindex f0afdce2a5..ce9a8e64fe 100644--- a/server/src/interfaces/logger.interface.ts+++ b/server/src/interfaces/logger.interface.ts@@ -1,4 +1,4 @@-import { LogLevel } from 'src/config';+import { LogLevel } from 'src/enum';export const ILoggerRepository = 'ILoggerRepository';diff --git a/server/src/interfaces/media.interface.ts b/server/src/interfaces/media.interface.tsindex f7389d3d06..459e33fc36 100644--- a/server/src/interfaces/media.interface.ts+++ b/server/src/interfaces/media.interface.ts@@ -1,5 +1,5 @@import { Writable } from 'node:stream';-import { ImageFormat, TranscodeTarget, VideoCodec } from 'src/config';+import { ImageFormat, TranscodeTarget, VideoCodec } from 'src/enum';export const IMediaRepository = 'IMediaRepository';diff --git a/server/src/interfaces/move.interface.ts b/server/src/interfaces/move.interface.tsindex c9d39e78cf..0e79cfcadc 100644--- a/server/src/interfaces/move.interface.ts+++ b/server/src/interfaces/move.interface.ts@@ -1,4 +1,5 @@-import { MoveEntity, PathType } from 'src/entities/move.entity';+import { MoveEntity } from 'src/entities/move.entity';+import { PathType } from 'src/enum';export const IMoveRepository = 'IMoveRepository';diff --git a/server/src/main.ts b/server/src/main.tsindex e32c3e43ac..48ce179e88 100644--- a/server/src/main.ts+++ b/server/src/main.ts@@ -2,7 +2,7 @@ import { CommandFactory } from 'nest-commander';import { fork } from 'node:child_process';import { Worker } from 'node:worker_threads';import { ImmichAdminModule } from 'src/app.module';-import { LogLevel } from 'src/config';+import { LogLevel } from 'src/enum';import { getWorkers } from 'src/utils/workers';const immichApp = process.argv[2] || process.env.IMMICH_APP;diff --git a/server/src/middleware/auth.guard.ts b/server/src/middleware/auth.guard.tsindex d6138f2d3a..7bc4f41b21 100644--- a/server/src/middleware/auth.guard.ts+++ b/server/src/middleware/auth.guard.ts@@ -11,19 +11,11 @@ import { Reflector } from '@nestjs/core';import { ApiBearerAuth, ApiCookieAuth, ApiOkResponse, ApiQuery, ApiSecurity } from '@nestjs/swagger';import { Request } from 'express';import { AuthDto, ImmichQuery } from 'src/dtos/auth.dto';-import { Permission } from 'src/enum';+import { MetadataKey, Permission } from 'src/enum';import { ILoggerRepository } from 'src/interfaces/logger.interface';import { AuthService, LoginDetails } from 'src/services/auth.service';import { UAParser } from 'ua-parser-js';-export enum Metadata {- AUTH_ROUTE = 'auth_route',- ADMIN_ROUTE = 'admin_route',- SHARED_ROUTE = 'shared_route',- API_KEY_SECURITY = 'api_key',- ON_EMIT_CONFIG = 'on_emit_config',-}-type AdminRoute = { admin?: true };type SharedLinkRoute = { sharedLink?: true };type AuthenticatedOptions = { permission?: Permission } & (AdminRoute | SharedLinkRoute);@@ -32,8 +24,8 @@ export const Authenticated = (options?: AuthenticatedOptions): MethodDecorator =const decorators: MethodDecorator[] = [ApiBearerAuth(),ApiCookieAuth(),- ApiSecurity(Metadata.API_KEY_SECURITY),- SetMetadata(Metadata.AUTH_ROUTE, options || {}),+ ApiSecurity(MetadataKey.API_KEY_SECURITY),+ SetMetadata(MetadataKey.AUTH_ROUTE, options || {}),];if ((options as SharedLinkRoute)?.sharedLink) {@@ -85,7 +77,7 @@ export class AuthGuard implements CanActivate {async canActivate(context: ExecutionContext): Promise<boolean> {const targets = [context.getHandler()];- const options = this.reflector.getAllAndOverride<AuthenticatedOptions | undefined>(Metadata.AUTH_ROUTE, targets);+ const options = this.reflector.getAllAndOverride<AuthenticatedOptions | undefined>(MetadataKey.AUTH_ROUTE, targets);if (!options) {return true;}diff --git a/server/src/middleware/file-upload.interceptor.ts b/server/src/middleware/file-upload.interceptor.tsindex 6ec8b401ef..075a7f5046 100644--- a/server/src/middleware/file-upload.interceptor.ts+++ b/server/src/middleware/file-upload.interceptor.ts@@ -7,6 +7,7 @@ import multer, { StorageEngine, diskStorage } from 'multer';import { createHash, randomUUID } from 'node:crypto';import { Observable } from 'rxjs';import { UploadFieldName } from 'src/dtos/asset-media.dto';+import { RouteKey } from 'src/enum';import { ILoggerRepository } from 'src/interfaces/logger.interface';import { AuthRequest } from 'src/middleware/auth.guard';import { AssetMediaService, UploadFile } from 'src/services/asset-media.service';@@ -28,11 +29,6 @@ export function getFiles(files: UploadFiles) {};}-export enum Route {- ASSET = 'assets',- USER = 'users',-}-export interface ImmichFile extends Express.Multer.File {/** sha1 hash of file */uuid: string;@@ -115,7 +111,7 @@ export class FileUploadInterceptor implements NestInterceptor {const context_ = context.switchToHttp();const route = this.reflect.get<string>(PATH_METADATA, context.getClass());- const handler: RequestHandler | null = this.getHandler(route as Route);+ const handler: RequestHandler | null = this.getHandler(route as RouteKey);if (handler) {await new Promise<void>((resolve, reject) => {const next: NextFunction = (error) => (error ? reject(transformException(error)) : resolve());@@ -176,13 +172,13 @@ export class FileUploadInterceptor implements NestInterceptor {return false;}- private getHandler(route: Route) {+ private getHandler(route: RouteKey) {switch (route) {- case Route.ASSET: {+ case RouteKey.ASSET: {return this.handlers.assetUpload;}- case Route.USER: {+ case RouteKey.USER: {return this.handlers.userProfile;}diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.tsindex 43e765d00b..0ec347ed77 100644--- a/server/src/repositories/asset.repository.ts+++ b/server/src/repositories/asset.repository.ts@@ -6,7 +6,7 @@ import { AssetJobStatusEntity } from 'src/entities/asset-job-status.entity';import { AssetEntity } from 'src/entities/asset.entity';import { ExifEntity } from 'src/entities/exif.entity';import { SmartInfoEntity } from 'src/entities/smart-info.entity';-import { AssetFileType, AssetOrder, AssetStatus, AssetType } from 'src/enum';+import { AssetFileType, AssetOrder, AssetStatus, AssetType, PaginationMode } from 'src/enum';import {AssetBuilderOptions,AssetCreate,@@ -30,7 +30,7 @@ import {import { AssetSearchOptions, SearchExploreItem } from 'src/interfaces/search.interface';import { searchAssetBuilder } from 'src/utils/database';import { Instrumentation } from 'src/utils/instrumentation';-import { Paginated, PaginationMode, PaginationOptions, paginate, paginatedBuilder } from 'src/utils/pagination';+import { Paginated, PaginationOptions, paginate, paginatedBuilder } from 'src/utils/pagination';import {Brackets,FindOptionsOrder,diff --git a/server/src/repositories/logger.repository.ts b/server/src/repositories/logger.repository.tsindex 1e0c7b74d9..1d7e734e73 100644--- a/server/src/repositories/logger.repository.ts+++ b/server/src/repositories/logger.repository.ts@@ -1,7 +1,7 @@import { ConsoleLogger, Injectable, Scope } from '@nestjs/common';import { isLogLevelEnabled } from '@nestjs/common/services/utils/is-log-level-enabled.util';import { ClsService } from 'nestjs-cls';-import { LogLevel } from 'src/config';+import { LogLevel } from 'src/enum';import { ILoggerRepository } from 'src/interfaces/logger.interface';import { LogColor } from 'src/utils/logger';diff --git a/server/src/repositories/media.repository.ts b/server/src/repositories/media.repository.tsindex a84ef6f596..5d1aced5eb 100644--- a/server/src/repositories/media.repository.ts+++ b/server/src/repositories/media.repository.ts@@ -5,7 +5,7 @@ import fs from 'node:fs/promises';import { Writable } from 'node:stream';import { promisify } from 'node:util';import sharp from 'sharp';-import { Colorspace } from 'src/config';+import { Colorspace } from 'src/enum';import { ILoggerRepository } from 'src/interfaces/logger.interface';import {IMediaRepository,diff --git a/server/src/repositories/move.repository.ts b/server/src/repositories/move.repository.tsindex a8416ff0ac..45fd446526 100644--- a/server/src/repositories/move.repository.ts+++ b/server/src/repositories/move.repository.ts@@ -1,7 +1,8 @@import { Injectable } from '@nestjs/common';import { InjectRepository } from '@nestjs/typeorm';import { DummyValue, GenerateSql } from 'src/decorators';-import { MoveEntity, PathType } from 'src/entities/move.entity';+import { MoveEntity } from 'src/entities/move.entity';+import { PathType } from 'src/enum';import { IMoveRepository, MoveCreate } from 'src/interfaces/move.interface';import { Instrumentation } from 'src/utils/instrumentation';import { Repository } from 'typeorm';diff --git a/server/src/repositories/person.repository.ts b/server/src/repositories/person.repository.tsindex 2247195cc3..2607d2a9ec 100644--- a/server/src/repositories/person.repository.ts+++ b/server/src/repositories/person.repository.ts@@ -6,7 +6,7 @@ import { AssetFaceEntity } from 'src/entities/asset-face.entity';import { AssetJobStatusEntity } from 'src/entities/asset-job-status.entity';import { AssetEntity } from 'src/entities/asset.entity';import { PersonEntity } from 'src/entities/person.entity';-import { SourceType } from 'src/enum';+import { PaginationMode, SourceType } from 'src/enum';import {AssetFaceId,DeleteAllFacesOptions,@@ -19,7 +19,7 @@ import {UpdateFacesData,} from 'src/interfaces/person.interface';import { Instrumentation } from 'src/utils/instrumentation';-import { Paginated, PaginationMode, PaginationOptions, paginate, paginatedBuilder } from 'src/utils/pagination';+import { Paginated, PaginationOptions, paginate, paginatedBuilder } from 'src/utils/pagination';import { DataSource, FindManyOptions, FindOptionsRelations, FindOptionsSelect, In, Repository } from 'typeorm';@Instrumentation()diff --git a/server/src/repositories/search.repository.ts b/server/src/repositories/search.repository.tsindex 8115c72cf6..60694b6bfe 100644--- a/server/src/repositories/search.repository.ts+++ b/server/src/repositories/search.repository.ts@@ -8,7 +8,7 @@ import { ExifEntity } from 'src/entities/exif.entity';import { GeodataPlacesEntity } from 'src/entities/geodata-places.entity';import { SmartInfoEntity } from 'src/entities/smart-info.entity';import { SmartSearchEntity } from 'src/entities/smart-search.entity';-import { AssetType } from 'src/enum';+import { AssetType, PaginationMode } from 'src/enum';import { DatabaseExtension } from 'src/interfaces/database.interface';import { ILoggerRepository } from 'src/interfaces/logger.interface';import {@@ -23,7 +23,7 @@ import {} from 'src/interfaces/search.interface';import { asVector, searchAssetBuilder } from 'src/utils/database';import { Instrumentation } from 'src/utils/instrumentation';-import { Paginated, PaginationMode, PaginationResult, paginatedBuilder } from 'src/utils/pagination';+import { Paginated, PaginationResult, paginatedBuilder } from 'src/utils/pagination';import { isValidInteger } from 'src/validation';import { Repository, SelectQueryBuilder } from 'typeorm';diff --git a/server/src/services/asset-media.service.spec.ts b/server/src/services/asset-media.service.spec.tsindex d7f0c6da0f..c03c974b2c 100644--- a/server/src/services/asset-media.service.spec.ts+++ b/server/src/services/asset-media.service.spec.ts@@ -4,7 +4,7 @@ import { AssetMediaStatus, AssetRejectReason, AssetUploadAction } from 'src/dtosimport { AssetMediaCreateDto, AssetMediaReplaceDto, UploadFieldName } from 'src/dtos/asset-media.dto';import { AssetFileEntity } from 'src/entities/asset-files.entity';import { ASSET_CHECKSUM_CONSTRAINT, AssetEntity } from 'src/entities/asset.entity';-import { AssetStatus, AssetType } from 'src/enum';+import { AssetStatus, AssetType, CacheControl } from 'src/enum';import { IAssetRepository } from 'src/interfaces/asset.interface';import { IEventRepository } from 'src/interfaces/event.interface';import { IJobRepository, JobName } from 'src/interfaces/job.interface';@@ -12,7 +12,7 @@ import { ILoggerRepository } from 'src/interfaces/logger.interface';import { IStorageRepository } from 'src/interfaces/storage.interface';import { IUserRepository } from 'src/interfaces/user.interface';import { AssetMediaService } from 'src/services/asset-media.service';-import { CacheControl, ImmichFileResponse } from 'src/utils/file';+import { ImmichFileResponse } from 'src/utils/file';import { assetStub } from 'test/fixtures/asset.stub';import { authStub } from 'test/fixtures/auth.stub';import { fileStub } from 'test/fixtures/file.stub';diff --git a/server/src/services/asset-media.service.ts b/server/src/services/asset-media.service.tsindex d3dce323f0..e1b30e891f 100644--- a/server/src/services/asset-media.service.ts+++ b/server/src/services/asset-media.service.ts@@ -7,7 +7,7 @@ import {} from '@nestjs/common';import { extname } from 'node:path';import sanitize from 'sanitize-filename';-import { StorageCore, StorageFolder } from 'src/cores/storage.core';+import { StorageCore } from 'src/cores/storage.core';import {AssetBulkUploadCheckResponseDto,AssetMediaResponseDto,@@ -27,7 +27,7 @@ import {} from 'src/dtos/asset-media.dto';import { AuthDto } from 'src/dtos/auth.dto';import { ASSET_CHECKSUM_CONSTRAINT, AssetEntity } from 'src/entities/asset.entity';-import { AssetStatus, AssetType, Permission } from 'src/enum';+import { AssetStatus, AssetType, CacheControl, Permission, StorageFolder } from 'src/enum';import { IAccessRepository } from 'src/interfaces/access.interface';import { IAssetRepository } from 'src/interfaces/asset.interface';import { IEventRepository } from 'src/interfaces/event.interface';@@ -37,7 +37,7 @@ import { IStorageRepository } from 'src/interfaces/storage.interface';import { IUserRepository } from 'src/interfaces/user.interface';import { requireAccess, requireUploadAccess } from 'src/utils/access';import { getAssetFiles, onBeforeLink } from 'src/utils/asset.util';-import { CacheControl, ImmichFileResponse } from 'src/utils/file';+import { ImmichFileResponse } from 'src/utils/file';import { mimeTypes } from 'src/utils/mime-types';import { fromChecksum } from 'src/utils/request';import { QueryFailedError } from 'typeorm';diff --git a/server/src/services/audit.service.ts b/server/src/services/audit.service.tsindex 72db2b6eb5..ced0f49c63 100644--- a/server/src/services/audit.service.ts+++ b/server/src/services/audit.service.ts@@ -2,7 +2,7 @@ import { BadRequestException, Inject, Injectable } from '@nestjs/common';import { DateTime } from 'luxon';import { resolve } from 'node:path';import { AUDIT_LOG_MAX_DURATION } from 'src/constants';-import { StorageCore, StorageFolder } from 'src/cores/storage.core';+import { StorageCore } from 'src/cores/storage.core';import {AuditDeletesDto,AuditDeletesResponseDto,@@ -12,8 +12,15 @@ import {PathEntityType,} from 'src/dtos/audit.dto';import { AuthDto } from 'src/dtos/auth.dto';-import { AssetPathType, PersonPathType, UserPathType } from 'src/entities/move.entity';-import { AssetFileType, DatabaseAction, Permission } from 'src/enum';+import {+ AssetFileType,+ AssetPathType,+ DatabaseAction,+ Permission,+ PersonPathType,+ StorageFolder,+ UserPathType,+} from 'src/enum';import { IAccessRepository } from 'src/interfaces/access.interface';import { IAssetRepository } from 'src/interfaces/asset.interface';import { IAuditRepository } from 'src/interfaces/audit.interface';diff --git a/server/src/services/auth.service.spec.ts b/server/src/services/auth.service.spec.tsindex acc2d3459c..d22a3b3634 100644--- a/server/src/services/auth.service.spec.ts+++ b/server/src/services/auth.service.spec.ts@@ -1,9 +1,9 @@import { BadRequestException, ForbiddenException, UnauthorizedException } from '@nestjs/common';import { Issuer, generators } from 'openid-client';-import { AuthType } from 'src/constants';import { AuthDto, SignUpDto } from 'src/dtos/auth.dto';import { UserMetadataEntity } from 'src/entities/user-metadata.entity';import { UserEntity } from 'src/entities/user.entity';+import { AuthType } from 'src/enum';import { IKeyRepository } from 'src/interfaces/api-key.interface';import { ICryptoRepository } from 'src/interfaces/crypto.interface';import { IEventRepository } from 'src/interfaces/event.interface';diff --git a/server/src/services/auth.service.ts b/server/src/services/auth.service.tsindex 6eaf755d0e..6b1e4c512f 100644--- a/server/src/services/auth.service.ts+++ b/server/src/services/auth.service.ts@@ -12,7 +12,7 @@ import { DateTime } from 'luxon';import { IncomingHttpHeaders } from 'node:http';import { Issuer, UserinfoResponse, custom, generators } from 'openid-client';import { SystemConfig } from 'src/config';-import { AuthType, LOGIN_URL, MOBILE_REDIRECT, SALT_ROUNDS } from 'src/constants';+import { LOGIN_URL, MOBILE_REDIRECT, SALT_ROUNDS } from 'src/constants';import { SystemConfigCore } from 'src/cores/system-config.core';import { UserCore } from 'src/cores/user.core';import {@@ -31,7 +31,7 @@ import {} from 'src/dtos/auth.dto';import { UserAdminResponseDto, mapUserAdmin } from 'src/dtos/user.dto';import { UserEntity } from 'src/entities/user.entity';-import { Permission } from 'src/enum';+import { AuthType, Permission } from 'src/enum';import { IKeyRepository } from 'src/interfaces/api-key.interface';import { ICryptoRepository } from 'src/interfaces/crypto.interface';import { IEventRepository } from 'src/interfaces/event.interface';diff --git a/server/src/services/media.service.spec.ts b/server/src/services/media.service.spec.tsindex bf493de0f3..ce6168408f 100644--- a/server/src/services/media.service.spec.ts+++ b/server/src/services/media.service.spec.ts@@ -1,5 +1,8 @@import { Stats } from 'node:fs';+import { ExifEntity } from 'src/entities/exif.entity';import {+ AssetFileType,+ AssetType,AudioCodec,Colorspace,ImageFormat,@@ -7,9 +10,7 @@ import {TranscodeHWAccel,TranscodePolicy,VideoCodec,-} from 'src/config';-import { ExifEntity } from 'src/entities/exif.entity';-import { AssetFileType, AssetType } from 'src/enum';+} from 'src/enum';import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';import { ICryptoRepository } from 'src/interfaces/crypto.interface';import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';diff --git a/server/src/services/media.service.ts b/server/src/services/media.service.tsindex e74335bdc3..55a4ee0157 100644--- a/server/src/services/media.service.ts+++ b/server/src/services/media.service.ts@@ -1,21 +1,23 @@import { Inject, Injectable, UnsupportedMediaTypeException } from '@nestjs/common';import { dirname } from 'node:path';+import { GeneratedImageType, StorageCore } from 'src/cores/storage.core';+import { SystemConfigCore } from 'src/cores/system-config.core';+import { SystemConfigFFmpegDto } from 'src/dtos/system-config.dto';+import { AssetEntity } from 'src/entities/asset.entity';import {+ AssetFileType,+ AssetPathType,+ AssetType,AudioCodec,Colorspace,ImageFormat,+ StorageFolder,TranscodeHWAccel,TranscodePolicy,TranscodeTarget,VideoCodec,VideoContainer,-} from 'src/config';-import { GeneratedImageType, StorageCore, StorageFolder } from 'src/cores/storage.core';-import { SystemConfigCore } from 'src/cores/system-config.core';-import { SystemConfigFFmpegDto } from 'src/dtos/system-config.dto';-import { AssetEntity } from 'src/entities/asset.entity';-import { AssetPathType } from 'src/entities/move.entity';-import { AssetFileType, AssetType } from 'src/enum';+} from 'src/enum';import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';import { ICryptoRepository } from 'src/interfaces/crypto.interface';import {diff --git a/server/src/services/person.service.spec.ts b/server/src/services/person.service.spec.tsindex 2b111706f1..03da110ac6 100644--- a/server/src/services/person.service.spec.ts+++ b/server/src/services/person.service.spec.ts@@ -1,9 +1,8 @@import { BadRequestException, NotFoundException } from '@nestjs/common';-import { Colorspace } from 'src/config';import { BulkIdErrorReason } from 'src/dtos/asset-ids.response.dto';import { PersonResponseDto, mapFaces, mapPerson } from 'src/dtos/person.dto';import { AssetFaceEntity } from 'src/entities/asset-face.entity';-import { SourceType, SystemMetadataKey } from 'src/enum';+import { CacheControl, Colorspace, SourceType, SystemMetadataKey } from 'src/enum';import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';import { ICryptoRepository } from 'src/interfaces/crypto.interface';import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';@@ -16,7 +15,7 @@ import { FaceSearchResult, ISearchRepository } from 'src/interfaces/search.interimport { IStorageRepository } from 'src/interfaces/storage.interface';import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';import { PersonService } from 'src/services/person.service';-import { CacheControl, ImmichFileResponse } from 'src/utils/file';+import { ImmichFileResponse } from 'src/utils/file';import { assetStub } from 'test/fixtures/asset.stub';import { authStub } from 'test/fixtures/auth.stub';import { faceStub } from 'test/fixtures/face.stub';diff --git a/server/src/services/person.service.ts b/server/src/services/person.service.tsindex dd4a4cecf2..7cb76d1a71 100644--- a/server/src/services/person.service.ts+++ b/server/src/services/person.service.ts@@ -1,5 +1,4 @@import { BadRequestException, Inject, Injectable, NotFoundException } from '@nestjs/common';-import { ImageFormat } from 'src/config';import { FACE_THUMBNAIL_SIZE } from 'src/constants';import { StorageCore } from 'src/cores/storage.core';import { SystemConfigCore } from 'src/cores/system-config.core';@@ -23,9 +22,16 @@ import {} from 'src/dtos/person.dto';import { AssetFaceEntity } from 'src/entities/asset-face.entity';import { AssetEntity } from 'src/entities/asset.entity';-import { PersonPathType } from 'src/entities/move.entity';import { PersonEntity } from 'src/entities/person.entity';-import { AssetType, Permission, SourceType, SystemMetadataKey } from 'src/enum';+import {+ AssetType,+ CacheControl,+ ImageFormat,+ Permission,+ PersonPathType,+ SourceType,+ SystemMetadataKey,+} from 'src/enum';import { IAccessRepository } from 'src/interfaces/access.interface';import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';import { ICryptoRepository } from 'src/interfaces/crypto.interface';@@ -51,7 +57,7 @@ import { IStorageRepository } from 'src/interfaces/storage.interface';import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';import { checkAccess, requireAccess } from 'src/utils/access';import { getAssetFiles } from 'src/utils/asset.util';-import { CacheControl, ImmichFileResponse } from 'src/utils/file';+import { ImmichFileResponse } from 'src/utils/file';import { mimeTypes } from 'src/utils/mime-types';import { isFaceImportEnabled, isFacialRecognitionEnabled } from 'src/utils/misc';import { usePagination } from 'src/utils/pagination';diff --git a/server/src/services/server.service.ts b/server/src/services/server.service.tsindex 9db90e41b3..a192c2f308 100644--- a/server/src/services/server.service.ts+++ b/server/src/services/server.service.ts@@ -1,7 +1,7 @@import { BadRequestException, Inject, Injectable, NotFoundException } from '@nestjs/common';import { getBuildMetadata, getServerLicensePublicKey } from 'src/config';import { serverVersion } from 'src/constants';-import { StorageCore, StorageFolder } from 'src/cores/storage.core';+import { StorageCore } from 'src/cores/storage.core';import { SystemConfigCore } from 'src/cores/system-config.core';import { OnEmit } from 'src/decorators';import { LicenseKeyDto, LicenseResponseDto } from 'src/dtos/license.dto';@@ -15,7 +15,7 @@ import {ServerStorageResponseDto,UsageByUserDto,} from 'src/dtos/server.dto';-import { SystemMetadataKey } from 'src/enum';+import { StorageFolder, SystemMetadataKey } from 'src/enum';import { ICryptoRepository } from 'src/interfaces/crypto.interface';import { ILoggerRepository } from 'src/interfaces/logger.interface';import { IServerInfoRepository } from 'src/interfaces/server-info.interface';diff --git a/server/src/services/storage-template.service.spec.ts b/server/src/services/storage-template.service.spec.tsindex 093cc5b2ff..e8e222c7b2 100644--- a/server/src/services/storage-template.service.spec.ts+++ b/server/src/services/storage-template.service.spec.ts@@ -2,7 +2,7 @@ import { Stats } from 'node:fs';import { SystemConfig, defaults } from 'src/config';import { SystemConfigCore } from 'src/cores/system-config.core';import { AssetEntity } from 'src/entities/asset.entity';-import { AssetPathType } from 'src/entities/move.entity';+import { AssetPathType } from 'src/enum';import { IAlbumRepository } from 'src/interfaces/album.interface';import { IAssetRepository } from 'src/interfaces/asset.interface';import { ICryptoRepository } from 'src/interfaces/crypto.interface';diff --git a/server/src/services/storage-template.service.ts b/server/src/services/storage-template.service.tsindex 9836ad40ac..30d0eb575f 100644--- a/server/src/services/storage-template.service.ts+++ b/server/src/services/storage-template.service.ts@@ -13,12 +13,11 @@ import {supportedWeekTokens,supportedYearTokens,} from 'src/constants';-import { StorageCore, StorageFolder } from 'src/cores/storage.core';+import { StorageCore } from 'src/cores/storage.core';import { SystemConfigCore } from 'src/cores/system-config.core';import { OnEmit } from 'src/decorators';import { AssetEntity } from 'src/entities/asset.entity';-import { AssetPathType } from 'src/entities/move.entity';-import { AssetType } from 'src/enum';+import { AssetPathType, AssetType, StorageFolder } from 'src/enum';import { IAlbumRepository } from 'src/interfaces/album.interface';import { IAssetRepository } from 'src/interfaces/asset.interface';import { ICryptoRepository } from 'src/interfaces/crypto.interface';diff --git a/server/src/services/storage.service.ts b/server/src/services/storage.service.tsindex 1591149dc2..6d15f097d3 100644--- a/server/src/services/storage.service.ts+++ b/server/src/services/storage.service.ts@@ -1,8 +1,8 @@import { Inject, Injectable } from '@nestjs/common';import { join } from 'node:path';-import { StorageCore, StorageFolder } from 'src/cores/storage.core';+import { StorageCore } from 'src/cores/storage.core';import { OnEmit } from 'src/decorators';-import { SystemMetadataKey } from 'src/enum';+import { StorageFolder, SystemMetadataKey } from 'src/enum';import { DatabaseLock, IDatabaseRepository } from 'src/interfaces/database.interface';import { IDeleteFilesJob, JobStatus } from 'src/interfaces/job.interface';import { ILoggerRepository } from 'src/interfaces/logger.interface';diff --git a/server/src/services/system-config.service.spec.ts b/server/src/services/system-config.service.spec.tsindex 52ad6d276b..8b4fb0bc2f 100644--- a/server/src/services/system-config.service.spec.ts+++ b/server/src/services/system-config.service.spec.ts@@ -1,19 +1,18 @@import { BadRequestException } from '@nestjs/common';+import { defaults, SystemConfig } from 'src/config';import {AudioCodec,- CQMode,Colorspace,+ CQMode,ImageFormat,LogLevel,- SystemConfig,+ SystemMetadataKey,ToneMapping,TranscodeHWAccel,TranscodePolicy,VideoCodec,VideoContainer,- defaults,-} from 'src/config';-import { SystemMetadataKey } from 'src/enum';+} from 'src/enum';import { IEventRepository, ServerEvent } from 'src/interfaces/event.interface';import { QueueName } from 'src/interfaces/job.interface';import { ILoggerRepository } from 'src/interfaces/logger.interface';diff --git a/server/src/services/system-config.service.ts b/server/src/services/system-config.service.tsindex 5ec9ab7a5d..8a7f9123e0 100644--- a/server/src/services/system-config.service.ts+++ b/server/src/services/system-config.service.ts@@ -1,7 +1,7 @@import { BadRequestException, Inject, Injectable } from '@nestjs/common';import { instanceToPlain } from 'class-transformer';import _ from 'lodash';-import { LogLevel, SystemConfig, defaults } from 'src/config';+import { SystemConfig, defaults } from 'src/config';import {supportedDayTokens,supportedHourTokens,@@ -15,6 +15,7 @@ import {import { SystemConfigCore } from 'src/cores/system-config.core';import { OnEmit, OnServerEvent } from 'src/decorators';import { SystemConfigDto, SystemConfigTemplateStorageOptionDto, mapConfig } from 'src/dtos/system-config.dto';+import { LogLevel } from 'src/enum';import { ArgOf, ClientEvent, IEventRepository, ServerEvent } from 'src/interfaces/event.interface';import { ILoggerRepository } from 'src/interfaces/logger.interface';import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';diff --git a/server/src/services/user.service.spec.ts b/server/src/services/user.service.spec.tsindex 0ac0ea6dbc..f5b564e86f 100644--- a/server/src/services/user.service.spec.ts+++ b/server/src/services/user.service.spec.ts@@ -1,6 +1,6 @@import { BadRequestException, InternalServerErrorException, NotFoundException } from '@nestjs/common';import { UserEntity } from 'src/entities/user.entity';-import { UserMetadataKey } from 'src/enum';+import { CacheControl, UserMetadataKey } from 'src/enum';import { IAlbumRepository } from 'src/interfaces/album.interface';import { ICryptoRepository } from 'src/interfaces/crypto.interface';import { IJobRepository, JobName } from 'src/interfaces/job.interface';@@ -9,7 +9,7 @@ import { IStorageRepository } from 'src/interfaces/storage.interface';import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';import { IUserRepository } from 'src/interfaces/user.interface';import { UserService } from 'src/services/user.service';-import { CacheControl, ImmichFileResponse } from 'src/utils/file';+import { ImmichFileResponse } from 'src/utils/file';import { authStub } from 'test/fixtures/auth.stub';import { systemConfigStub } from 'test/fixtures/system-config.stub';import { userStub } from 'test/fixtures/user.stub';diff --git a/server/src/services/user.service.ts b/server/src/services/user.service.tsindex cf918198ab..dca893aa82 100644--- a/server/src/services/user.service.ts+++ b/server/src/services/user.service.ts@@ -2,7 +2,7 @@ import { BadRequestException, Inject, Injectable, NotFoundException } from '@nesimport { DateTime } from 'luxon';import { getClientLicensePublicKey, getServerLicensePublicKey } from 'src/config';import { SALT_ROUNDS } from 'src/constants';-import { StorageCore, StorageFolder } from 'src/cores/storage.core';+import { StorageCore } from 'src/cores/storage.core';import { SystemConfigCore } from 'src/cores/system-config.core';import { AuthDto } from 'src/dtos/auth.dto';import { LicenseKeyDto, LicenseResponseDto } from 'src/dtos/license.dto';@@ -11,7 +11,7 @@ import { CreateProfileImageResponseDto } from 'src/dtos/user-profile.dto';import { UserAdminResponseDto, UserResponseDto, UserUpdateMeDto, mapUser, mapUserAdmin } from 'src/dtos/user.dto';import { UserMetadataEntity } from 'src/entities/user-metadata.entity';import { UserEntity } from 'src/entities/user.entity';-import { UserMetadataKey } from 'src/enum';+import { CacheControl, StorageFolder, UserMetadataKey } from 'src/enum';import { IAlbumRepository } from 'src/interfaces/album.interface';import { ICryptoRepository } from 'src/interfaces/crypto.interface';import { IEntityJob, IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';@@ -19,7 +19,7 @@ import { ILoggerRepository } from 'src/interfaces/logger.interface';import { IStorageRepository } from 'src/interfaces/storage.interface';import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';import { IUserRepository, UserFindOptions } from 'src/interfaces/user.interface';-import { CacheControl, ImmichFileResponse } from 'src/utils/file';+import { ImmichFileResponse } from 'src/utils/file';import { getPreferences, getPreferencesPartial, mergePreferences } from 'src/utils/preferences';@Injectable()diff --git a/server/src/utils/events.ts b/server/src/utils/events.tsindex 064c9f7507..f5b079dea4 100644--- a/server/src/utils/events.ts+++ b/server/src/utils/events.ts@@ -1,8 +1,8 @@import { ModuleRef, Reflector } from '@nestjs/core';import _ from 'lodash';import { EmitConfig } from 'src/decorators';+import { MetadataKey } from 'src/enum';import { EmitEvent, EmitHandler, IEventRepository } from 'src/interfaces/event.interface';-import { Metadata } from 'src/middleware/auth.guard';import { services } from 'src/services';type Item<T extends EmitEvent> = {@@ -35,7 +35,7 @@ export const setupEventHandlers = (moduleRef: ModuleRef) => {continue;}- const options = reflector.get<EmitConfig>(Metadata.ON_EMIT_CONFIG, handler);+ const options = reflector.get<EmitConfig>(MetadataKey.ON_EMIT_CONFIG, handler);if (!options) {continue;}diff --git a/server/src/utils/file.ts b/server/src/utils/file.tsindex 53a4d571dc..3b26c3e1ba 100644--- a/server/src/utils/file.ts+++ b/server/src/utils/file.ts@@ -3,6 +3,7 @@ import { NextFunction, Response } from 'express';import { access, constants } from 'node:fs/promises';import { basename, extname, isAbsolute } from 'node:path';import { promisify } from 'node:util';+import { CacheControl } from 'src/enum';import { ILoggerRepository } from 'src/interfaces/logger.interface';import { ImmichReadStream } from 'src/interfaces/storage.interface';import { isConnectionAborted } from 'src/utils/misc';@@ -19,12 +20,6 @@ export function getLivePhotoMotionFilename(stillName: string, motionName: stringreturn getFileNameWithoutExtension(stillName) + extname(motionName);}-export enum CacheControl {- PRIVATE_WITH_CACHE = 'private_with_cache',- PRIVATE_WITHOUT_CACHE = 'private_without_cache',- NONE = 'none',-}-export class ImmichFileResponse {public readonly path!: string;public readonly contentType!: string;diff --git a/server/src/utils/media.ts b/server/src/utils/media.tsindex 8068f4a5e6..d80651eece 100644--- a/server/src/utils/media.ts+++ b/server/src/utils/media.ts@@ -1,5 +1,5 @@-import { CQMode, ToneMapping, TranscodeHWAccel, TranscodeTarget, VideoCodec } from 'src/config';import { SystemConfigFFmpegDto } from 'src/dtos/system-config.dto';+import { CQMode, ToneMapping, TranscodeHWAccel, TranscodeTarget, VideoCodec } from 'src/enum';import {AudioStreamInfo,BitrateDistribution,diff --git a/server/src/utils/misc.ts b/server/src/utils/misc.tsindex 47f3f552c4..2cef33d4f5 100644--- a/server/src/utils/misc.ts+++ b/server/src/utils/misc.ts@@ -13,8 +13,8 @@ import path from 'node:path';import { SystemConfig } from 'src/config';import { CLIP_MODEL_INFO, isDev, serverVersion } from 'src/constants';import { ImmichCookie, ImmichHeader } from 'src/dtos/auth.dto';+import { MetadataKey } from 'src/enum';import { ILoggerRepository } from 'src/interfaces/logger.interface';-import { Metadata } from 'src/middleware/auth.guard';/*** @returns a list of strings representing the keys of the object in dot notation@@ -210,7 +210,7 @@ export const useSwagger = (app: INestApplication, force = false) => {in: 'header',name: ImmichHeader.API_KEY,},- Metadata.API_KEY_SECURITY,+ MetadataKey.API_KEY_SECURITY,).addServer('/api').build();diff --git a/server/src/utils/pagination.ts b/server/src/utils/pagination.tsindex dec1a9de0c..4009f219c1 100644--- a/server/src/utils/pagination.ts+++ b/server/src/utils/pagination.ts@@ -1,4 +1,5 @@import _ from 'lodash';+import { PaginationMode } from 'src/enum';import { FindManyOptions, ObjectLiteral, Repository, SelectQueryBuilder } from 'typeorm';export interface PaginationOptions {@@ -6,11 +7,6 @@ export interface PaginationOptions {skip?: number;}-export enum PaginationMode {- LIMIT_OFFSET = 'limit-offset',- SKIP_TAKE = 'skip-take',-}-export interface PaginatedBuilderOptions {take: number;skip?: number;