Merge branch 'main' of https://github.com/immich-app/immich into feat/offline-files-job

server/src/app.module.ts

@@ -0,0 +1,284 @@
+import { BullModule } from '@nestjs/bullmq';
+import { Module, OnModuleInit, Provider, ValidationPipe } from '@nestjs/common';
+import { ConfigModule } from '@nestjs/config';
+import { APP_GUARD, APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
+import { EventEmitterModule } from '@nestjs/event-emitter';
+import { ScheduleModule, SchedulerRegistry } from '@nestjs/schedule';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { OpenTelemetryModule } from 'nestjs-otel';
+import { ListUsersCommand } from 'src/commands/list-users.command';
+import { DisableOAuthLogin, EnableOAuthLogin } from 'src/commands/oauth-login';
+import { DisablePasswordLoginCommand, EnablePasswordLoginCommand } from 'src/commands/password-login';
+import { PromptPasswordQuestions, ResetAdminPasswordCommand } from 'src/commands/reset-admin-password.command';
+import { bullConfig, bullQueues, immichAppConfig } from 'src/config';
+import { ActivityController } from 'src/controllers/activity.controller';
+import { AlbumController } from 'src/controllers/album.controller';
+import { APIKeyController } from 'src/controllers/api-key.controller';
+import { AppController } from 'src/controllers/app.controller';
+import { AssetControllerV1 } from 'src/controllers/asset-v1.controller';
+import { AssetController, AssetsController } from 'src/controllers/asset.controller';
+import { AuditController } from 'src/controllers/audit.controller';
+import { AuthController } from 'src/controllers/auth.controller';
+import { DownloadController } from 'src/controllers/download.controller';
+import { FaceController } from 'src/controllers/face.controller';
+import { JobController } from 'src/controllers/job.controller';
+import { LibraryController } from 'src/controllers/library.controller';
+import { OAuthController } from 'src/controllers/oauth.controller';
+import { PartnerController } from 'src/controllers/partner.controller';
+import { PersonController } from 'src/controllers/person.controller';
+import { SearchController } from 'src/controllers/search.controller';
+import { ServerInfoController } from 'src/controllers/server-info.controller';
+import { SharedLinkController } from 'src/controllers/shared-link.controller';
+import { SystemConfigController } from 'src/controllers/system-config.controller';
+import { TagController } from 'src/controllers/tag.controller';
+import { TrashController } from 'src/controllers/trash.controller';
+import { UserController } from 'src/controllers/user.controller';
+import { databaseConfig } from 'src/database.config';
+import { databaseEntities } from 'src/entities';
+import { IAccessRepository } from 'src/interfaces/access.interface';
+import { IActivityRepository } from 'src/interfaces/activity.interface';
+import { IAlbumRepository } from 'src/interfaces/album.interface';
+import { IKeyRepository } from 'src/interfaces/api-key.interface';
+import { IAssetStackRepository } from 'src/interfaces/asset-stack.interface';
+import { IAssetRepositoryV1 } from 'src/interfaces/asset-v1.interface';
+import { IAssetRepository } from 'src/interfaces/asset.interface';
+import { IAuditRepository } from 'src/interfaces/audit.interface';
+import { ICommunicationRepository } from 'src/interfaces/communication.interface';
+import { ICryptoRepository } from 'src/interfaces/crypto.interface';
+import { IDatabaseRepository } from 'src/interfaces/database.interface';
+import { IJobRepository } from 'src/interfaces/job.interface';
+import { ILibraryRepository } from 'src/interfaces/library.interface';
+import { IMachineLearningRepository } from 'src/interfaces/machine-learning.interface';
+import { IMediaRepository } from 'src/interfaces/media.interface';
+import { IMetadataRepository } from 'src/interfaces/metadata.interface';
+import { IMoveRepository } from 'src/interfaces/move.interface';
+import { IPartnerRepository } from 'src/interfaces/partner.interface';
+import { IPersonRepository } from 'src/interfaces/person.interface';
+import { ISearchRepository } from 'src/interfaces/search.interface';
+import { IServerInfoRepository } from 'src/interfaces/server-info.interface';
+import { ISharedLinkRepository } from 'src/interfaces/shared-link.interface';
+import { IStorageRepository } from 'src/interfaces/storage.interface';
+import { ISystemConfigRepository } from 'src/interfaces/system-config.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
+import { ITagRepository } from 'src/interfaces/tag.interface';
+import { IUserTokenRepository } from 'src/interfaces/user-token.interface';
+import { IUserRepository } from 'src/interfaces/user.interface';
+import { AuthGuard } from 'src/middleware/auth.guard';
+import { ErrorInterceptor } from 'src/middleware/error.interceptor';
+import { FileUploadInterceptor } from 'src/middleware/file-upload.interceptor';
+import { AccessRepository } from 'src/repositories/access.repository';
+import { ActivityRepository } from 'src/repositories/activity.repository';
+import { AlbumRepository } from 'src/repositories/album.repository';
+import { ApiKeyRepository } from 'src/repositories/api-key.repository';
+import { AssetStackRepository } from 'src/repositories/asset-stack.repository';
+import { AssetRepositoryV1 } from 'src/repositories/asset-v1.repository';
+import { AssetRepository } from 'src/repositories/asset.repository';
+import { AuditRepository } from 'src/repositories/audit.repository';
+import { CommunicationRepository } from 'src/repositories/communication.repository';
+import { CryptoRepository } from 'src/repositories/crypto.repository';
+import { DatabaseRepository } from 'src/repositories/database.repository';
+import { FilesystemProvider } from 'src/repositories/filesystem.provider';
+import { JobRepository } from 'src/repositories/job.repository';
+import { LibraryRepository } from 'src/repositories/library.repository';
+import { MachineLearningRepository } from 'src/repositories/machine-learning.repository';
+import { MediaRepository } from 'src/repositories/media.repository';
+import { MetadataRepository } from 'src/repositories/metadata.repository';
+import { MoveRepository } from 'src/repositories/move.repository';
+import { PartnerRepository } from 'src/repositories/partner.repository';
+import { PersonRepository } from 'src/repositories/person.repository';
+import { SearchRepository } from 'src/repositories/search.repository';
+import { ServerInfoRepository } from 'src/repositories/server-info.repository';
+import { SharedLinkRepository } from 'src/repositories/shared-link.repository';
+import { SystemConfigRepository } from 'src/repositories/system-config.repository';
+import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
+import { TagRepository } from 'src/repositories/tag.repository';
+import { UserTokenRepository } from 'src/repositories/user-token.repository';
+import { UserRepository } from 'src/repositories/user.repository';
+import { ActivityService } from 'src/services/activity.service';
+import { AlbumService } from 'src/services/album.service';
+import { APIKeyService } from 'src/services/api-key.service';
+import { ApiService } from 'src/services/api.service';
+import { AssetServiceV1 } from 'src/services/asset-v1.service';
+import { AssetService } from 'src/services/asset.service';
+import { AuditService } from 'src/services/audit.service';
+import { AuthService } from 'src/services/auth.service';
+import { DatabaseService } from 'src/services/database.service';
+import { DownloadService } from 'src/services/download.service';
+import { JobService } from 'src/services/job.service';
+import { LibraryService } from 'src/services/library.service';
+import { MediaService } from 'src/services/media.service';
+import { MetadataService } from 'src/services/metadata.service';
+import { MicroservicesService } from 'src/services/microservices.service';
+import { PartnerService } from 'src/services/partner.service';
+import { PersonService } from 'src/services/person.service';
+import { SearchService } from 'src/services/search.service';
+import { ServerInfoService } from 'src/services/server-info.service';
+import { SharedLinkService } from 'src/services/shared-link.service';
+import { SmartInfoService } from 'src/services/smart-info.service';
+import { StorageTemplateService } from 'src/services/storage-template.service';
+import { StorageService } from 'src/services/storage.service';
+import { SystemConfigService } from 'src/services/system-config.service';
+import { TagService } from 'src/services/tag.service';
+import { TrashService } from 'src/services/trash.service';
+import { UserService } from 'src/services/user.service';
+import { otelConfig } from 'src/utils/instrumentation';
+import { ImmichLogger } from 'src/utils/logger';
+
+const commands = [
+  ResetAdminPasswordCommand,
+  PromptPasswordQuestions,
+  EnablePasswordLoginCommand,
+  DisablePasswordLoginCommand,
+  EnableOAuthLogin,
+  DisableOAuthLogin,
+  ListUsersCommand,
+];
+
+const controllers = [
+  ActivityController,
+  AssetsController,
+  AssetControllerV1,
+  AssetController,
+  AppController,
+  AlbumController,
+  APIKeyController,
+  AuditController,
+  AuthController,
+  DownloadController,
+  FaceController,
+  JobController,
+  LibraryController,
+  OAuthController,
+  PartnerController,
+  SearchController,
+  ServerInfoController,
+  SharedLinkController,
+  SystemConfigController,
+  TagController,
+  TrashController,
+  UserController,
+  PersonController,
+];
+
+const services: Provider[] = [
+  ApiService,
+  MicroservicesService,
+
+  APIKeyService,
+  ActivityService,
+  AlbumService,
+  AssetService,
+  AssetServiceV1,
+  AuditService,
+  AuthService,
+  DatabaseService,
+  DownloadService,
+  ImmichLogger,
+  JobService,
+  LibraryService,
+  MediaService,
+  MetadataService,
+  PartnerService,
+  PersonService,
+  SearchService,
+  ServerInfoService,
+  SharedLinkService,
+  SmartInfoService,
+  StorageService,
+  StorageTemplateService,
+  SystemConfigService,
+  TagService,
+  TrashService,
+  UserService,
+];
+
+const repositories: Provider[] = [
+  { provide: IActivityRepository, useClass: ActivityRepository },
+  { provide: IAccessRepository, useClass: AccessRepository },
+  { provide: IAlbumRepository, useClass: AlbumRepository },
+  { provide: IAssetRepository, useClass: AssetRepository },
+  { provide: IAssetRepositoryV1, useClass: AssetRepositoryV1 },
+  { provide: IAssetStackRepository, useClass: AssetStackRepository },
+  { provide: IAuditRepository, useClass: AuditRepository },
+  { provide: ICommunicationRepository, useClass: CommunicationRepository },
+  { provide: ICryptoRepository, useClass: CryptoRepository },
+  { provide: IDatabaseRepository, useClass: DatabaseRepository },
+  { provide: IJobRepository, useClass: JobRepository },
+  { provide: ILibraryRepository, useClass: LibraryRepository },
+  { provide: IKeyRepository, useClass: ApiKeyRepository },
+  { provide: IMachineLearningRepository, useClass: MachineLearningRepository },
+  { provide: IMetadataRepository, useClass: MetadataRepository },
+  { provide: IMoveRepository, useClass: MoveRepository },
+  { provide: IPartnerRepository, useClass: PartnerRepository },
+  { provide: IPersonRepository, useClass: PersonRepository },
+  { provide: IServerInfoRepository, useClass: ServerInfoRepository },
+  { provide: ISharedLinkRepository, useClass: SharedLinkRepository },
+  { provide: ISearchRepository, useClass: SearchRepository },
+  { provide: IStorageRepository, useClass: FilesystemProvider },
+  { provide: ISystemConfigRepository, useClass: SystemConfigRepository },
+  { provide: ISystemMetadataRepository, useClass: SystemMetadataRepository },
+  { provide: ITagRepository, useClass: TagRepository },
+  { provide: IMediaRepository, useClass: MediaRepository },
+  { provide: IUserRepository, useClass: UserRepository },
+  { provide: IUserTokenRepository, useClass: UserTokenRepository },
+];
+
+const middleware = [
+  FileUploadInterceptor,
+  { provide: APP_PIPE, useValue: new ValidationPipe({ transform: true, whitelist: true }) },
+  { provide: APP_INTERCEPTOR, useClass: ErrorInterceptor },
+  { provide: APP_GUARD, useClass: AuthGuard },
+];
+
+const imports = [
+  BullModule.forRoot(bullConfig),
+  BullModule.registerQueue(...bullQueues),
+  ConfigModule.forRoot(immichAppConfig),
+  EventEmitterModule.forRoot(),
+  OpenTelemetryModule.forRoot(otelConfig),
+  TypeOrmModule.forRoot(databaseConfig),
+  TypeOrmModule.forFeature(databaseEntities),
+];
+
+@Module({
+  imports: [...imports, ScheduleModule.forRoot()],
+  controllers: [...controllers],
+  providers: [...services, ...repositories, ...middleware],
+})
+export class ApiModule implements OnModuleInit {
+  constructor(private service: ApiService) {}
+
+  async onModuleInit() {
+    await this.service.init();
+  }
+}
+
+@Module({
+  imports: [...imports],
+  providers: [...services, ...repositories, SchedulerRegistry],
+})
+export class MicroservicesModule implements OnModuleInit {
+  constructor(private service: MicroservicesService) {}
+
+  async onModuleInit() {
+    await this.service.init();
+  }
+}
+
+@Module({
+  imports: [...imports],
+  providers: [...services, ...repositories, ...commands, SchedulerRegistry],
+})
+export class ImmichAdminModule {}
+
+@Module({
+  imports: [
+    ConfigModule.forRoot(immichAppConfig),
+    EventEmitterModule.forRoot(),
+    TypeOrmModule.forRoot(databaseConfig),
+    TypeOrmModule.forFeature(databaseEntities),
+  ],
+  controllers: [...controllers],
+  providers: [...services, ...repositories, ...middleware, SchedulerRegistry],
+})
+export class AppTestModule {}

server/src/apps/api.main.ts

@@ -1,57 +0,0 @@
-import { NestFactory } from '@nestjs/core';
-import { NestExpressApplication } from '@nestjs/platform-express';
-import { json } from 'body-parser';
-import cookieParser from 'cookie-parser';
-import { existsSync } from 'node:fs';
-import sirv from 'sirv';
-import { ApiModule } from 'src/apps/api.module';
-import { ApiService } from 'src/apps/api.service';
-import { excludePaths } from 'src/config';
-import { WEB_ROOT, envName, isDev, serverVersion } from 'src/domain/domain.constant';
-import { useSwagger } from 'src/immich/app.utils';
-import { otelSDK } from 'src/infra/instrumentation';
-import { ImmichLogger } from 'src/infra/logger';
-import { WebSocketAdapter } from 'src/infra/websocket.adapter';
-
-const logger = new ImmichLogger('ImmichServer');
-const port = Number(process.env.SERVER_PORT) || 3001;
-
-export async function bootstrapApi() {
-  otelSDK.start();
-  const app = await NestFactory.create<NestExpressApplication>(ApiModule, { bufferLogs: true });
-
-  app.useLogger(app.get(ImmichLogger));
-  app.set('trust proxy', ['loopback', 'linklocal', 'uniquelocal']);
-  app.set('etag', 'strong');
-  app.use(cookieParser());
-  app.use(json({ limit: '10mb' }));
-  if (isDev) {
-    app.enableCors();
-  }
-  app.useWebSocketAdapter(new WebSocketAdapter(app));
-  useSwagger(app, isDev);
-
-  app.setGlobalPrefix('api', { exclude: excludePaths });
-  if (existsSync(WEB_ROOT)) {
-    // copied from https://github.com/sveltejs/kit/blob/679b5989fe62e3964b9a73b712d7b41831aa1f07/packages/adapter-node/src/handler.js#L46
-    // provides serving of precompressed assets and caching of immutable assets
-    app.use(
-      sirv(WEB_ROOT, {
-        etag: true,
-        gzip: true,
-        brotli: true,
-        setHeaders: (res, pathname) => {
-          if (pathname.startsWith(`/_app/immutable`) && res.statusCode === 200) {
-            res.setHeader('cache-control', 'public,max-age=31536000,immutable');
-          }
-        },
-      }),
-    );
-  }
-  app.use(app.get(ApiService).ssr(excludePaths));
-
-  const server = await app.listen(port);
-  server.requestTimeout = 30 * 60 * 1000;
-
-  logger.log(`Immich Server is listening on ${await app.getUrl()} [v${serverVersion}] [${envName}] `);
-}

server/src/apps/api.module.ts

@@ -1,87 +0,0 @@
-import { Module, OnModuleInit, ValidationPipe } from '@nestjs/common';
-import { APP_GUARD, APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
-import { ScheduleModule } from '@nestjs/schedule';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { ApiService } from 'src/apps/api.service';
-import { ActivityController } from 'src/controllers/activity.controller';
-import { AlbumController } from 'src/controllers/album.controller';
-import { APIKeyController } from 'src/controllers/api-key.controller';
-import { AppController } from 'src/controllers/app.controller';
-import { AssetController, AssetsController } from 'src/controllers/asset.controller';
-import { AuditController } from 'src/controllers/audit.controller';
-import { AuthController } from 'src/controllers/auth.controller';
-import { DownloadController } from 'src/controllers/download.controller';
-import { FaceController } from 'src/controllers/face.controller';
-import { JobController } from 'src/controllers/job.controller';
-import { LibraryController } from 'src/controllers/library.controller';
-import { OAuthController } from 'src/controllers/oauth.controller';
-import { PartnerController } from 'src/controllers/partner.controller';
-import { PersonController } from 'src/controllers/person.controller';
-import { SearchController } from 'src/controllers/search.controller';
-import { ServerInfoController } from 'src/controllers/server-info.controller';
-import { SharedLinkController } from 'src/controllers/shared-link.controller';
-import { SystemConfigController } from 'src/controllers/system-config.controller';
-import { TagController } from 'src/controllers/tag.controller';
-import { TrashController } from 'src/controllers/trash.controller';
-import { UserController } from 'src/controllers/user.controller';
-import { DomainModule } from 'src/domain/domain.module';
-import { AssetEntity } from 'src/entities/asset.entity';
-import { ExifEntity } from 'src/entities/exif.entity';
-import { AssetRepositoryV1, IAssetRepositoryV1 } from 'src/immich/api-v1/asset/asset-repository';
-import { AssetController as AssetControllerV1 } from 'src/immich/api-v1/asset/asset.controller';
-import { AssetService as AssetServiceV1 } from 'src/immich/api-v1/asset/asset.service';
-import { InfraModule } from 'src/infra/infra.module';
-import { AuthGuard } from 'src/middleware/auth.guard';
-import { ErrorInterceptor } from 'src/middleware/error.interceptor';
-import { FileUploadInterceptor } from 'src/middleware/file-upload.interceptor';
-
-@Module({
-  imports: [
-    //
-    InfraModule,
-    DomainModule,
-    ScheduleModule.forRoot(),
-    TypeOrmModule.forFeature([AssetEntity, ExifEntity]),
-  ],
-  controllers: [
-    ActivityController,
-    AssetsController,
-    AssetControllerV1,
-    AssetController,
-    AppController,
-    AlbumController,
-    APIKeyController,
-    AuditController,
-    AuthController,
-    DownloadController,
-    FaceController,
-    JobController,
-    LibraryController,
-    OAuthController,
-    PartnerController,
-    SearchController,
-    ServerInfoController,
-    SharedLinkController,
-    SystemConfigController,
-    TagController,
-    TrashController,
-    UserController,
-    PersonController,
-  ],
-  providers: [
-    { provide: APP_PIPE, useValue: new ValidationPipe({ transform: true, whitelist: true }) },
-    { provide: APP_INTERCEPTOR, useClass: ErrorInterceptor },
-    { provide: APP_GUARD, useClass: AuthGuard },
-    { provide: IAssetRepositoryV1, useClass: AssetRepositoryV1 },
-    ApiService,
-    AssetServiceV1,
-    FileUploadInterceptor,
-  ],
-})
-export class ApiModule implements OnModuleInit {
-  constructor(private appService: ApiService) {}
-
-  async onModuleInit() {
-    await this.appService.init();
-  }
-}

server/src/apps/immich-admin.main.ts

@@ -1,8 +0,0 @@
-import { CommandFactory } from 'nest-commander';
-import { ImmichAdminModule } from 'src/apps/immich-admin.module';
-import { LogLevel } from 'src/entities/system-config.entity';
-
-export async function bootstrapImmichAdmin() {
-  process.env.LOG_LEVEL = LogLevel.WARN;
-  await CommandFactory.run(ImmichAdminModule);
-}

server/src/apps/immich-admin.module.ts

@@ -1,21 +0,0 @@
-import { Module } from '@nestjs/common';
-import { ListUsersCommand } from 'src/commands/list-users.command';
-import { DisableOAuthLogin, EnableOAuthLogin } from 'src/commands/oauth-login';
-import { DisablePasswordLoginCommand, EnablePasswordLoginCommand } from 'src/commands/password-login';
-import { PromptPasswordQuestions, ResetAdminPasswordCommand } from 'src/commands/reset-admin-password.command';
-import { DomainModule } from 'src/domain/domain.module';
-import { InfraModule } from 'src/infra/infra.module';
-
-@Module({
-  imports: [InfraModule, DomainModule],
-  providers: [
-    ResetAdminPasswordCommand,
-    PromptPasswordQuestions,
-    EnablePasswordLoginCommand,
-    DisablePasswordLoginCommand,
-    EnableOAuthLogin,
-    DisableOAuthLogin,
-    ListUsersCommand,
-  ],
-})
-export class ImmichAdminModule {}

server/src/apps/microservices.main.ts

@@ -1,20 +0,0 @@
-import { NestFactory } from '@nestjs/core';
-import { MicroservicesModule } from 'src/apps/microservices.module';
-import { envName, serverVersion } from 'src/domain/domain.constant';
-import { otelSDK } from 'src/infra/instrumentation';
-import { ImmichLogger } from 'src/infra/logger';
-import { WebSocketAdapter } from 'src/infra/websocket.adapter';
-
-const logger = new ImmichLogger('ImmichMicroservice');
-const port = Number(process.env.MICROSERVICES_PORT) || 3002;
-
-export async function bootstrapMicroservices() {
-  otelSDK.start();
-  const app = await NestFactory.create(MicroservicesModule, { bufferLogs: true });
-  app.useLogger(app.get(ImmichLogger));
-  app.useWebSocketAdapter(new WebSocketAdapter(app));
-
-  await app.listen(port);
-
-  logger.log(`Immich Microservices is listening on ${await app.getUrl()} [v${serverVersion}] [${envName}] `);
-}

server/src/apps/microservices.module.ts

@@ -1,16 +0,0 @@
-import { Module, OnModuleInit } from '@nestjs/common';
-import { MicroservicesService } from 'src/apps/microservices.service';
-import { DomainModule } from 'src/domain/domain.module';
-import { InfraModule } from 'src/infra/infra.module';
-
-@Module({
-  imports: [InfraModule, DomainModule],
-  providers: [MicroservicesService],
-})
-export class MicroservicesModule implements OnModuleInit {
-  constructor(private appService: MicroservicesService) {}
-
-  async onModuleInit() {
-    await this.appService.init();
-  }
-}

server/src/commands/list-users.command.ts

@@ -1,6 +1,6 @@
 import { Command, CommandRunner } from 'nest-commander';
-import { UserService } from 'src/domain/user/user.service';
 import { UserEntity } from 'src/entities/user.entity';
+import { UserService } from 'src/services/user.service';
 
 @Command({
   name: 'list-users',

server/src/commands/oauth-login.ts

@@ -1,5 +1,5 @@
 import { Command, CommandRunner } from 'nest-commander';
-import { SystemConfigService } from 'src/domain/system-config/system-config.service';
+import { SystemConfigService } from 'src/services/system-config.service';
 
 @Command({
   name: 'enable-oauth-login',

server/src/commands/password-login.ts

@@ -1,5 +1,5 @@
 import { Command, CommandRunner } from 'nest-commander';
-import { SystemConfigService } from 'src/domain/system-config/system-config.service';
+import { SystemConfigService } from 'src/services/system-config.service';
 
 @Command({
   name: 'enable-password-login',

server/src/commands/reset-admin-password.command.ts

@@ -1,6 +1,6 @@
 import { Command, CommandRunner, InquirerService, Question, QuestionSet } from 'nest-commander';
-import { UserResponseDto } from 'src/domain/user/response-dto/user-response.dto';
-import { UserService } from 'src/domain/user/user.service';
+import { UserResponseDto } from 'src/dtos/user.dto';
+import { UserService } from 'src/services/user.service';
 
 @Command({
   name: 'reset-admin-password',

server/src/config.ts

@@ -3,8 +3,8 @@ import { ConfigModuleOptions } from '@nestjs/config';
 import { QueueOptions } from 'bullmq';
 import { RedisOptions } from 'ioredis';
 import Joi from 'joi';
-import { QueueName } from 'src/domain/job/job.constants';
 import { LogLevel } from 'src/entities/system-config.entity';
+import { QueueName } from 'src/interfaces/job.interface';
 
 const WHEN_DB_URL_SET = Joi.when('DB_URL', {
   is: Joi.exist(),
@@ -69,5 +69,3 @@ export const bullConfig: QueueOptions = {
 };
 
 export const bullQueues: RegisterQueueOptions[] = Object.values(QueueName).map((name) => ({ name }));
-
-export const excludePaths = ['/.well-known/immich', '/custom.css', '/favicon.ico'];

server/src/constants.ts

@@ -0,0 +1,107 @@
+import { Duration } from 'luxon';
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { Version } from 'src/utils/version';
+
+const { version } = JSON.parse(readFileSync('./package.json', 'utf8'));
+export const serverVersion = Version.fromString(version);
+
+export const AUDIT_LOG_MAX_DURATION = Duration.fromObject({ days: 100 });
+export const ONE_HOUR = Duration.fromObject({ hours: 1 });
+
+export const envName = (process.env.NODE_ENV || 'development').toUpperCase();
+export const isDev = process.env.NODE_ENV === 'development';
+export const APP_MEDIA_LOCATION = process.env.IMMICH_MEDIA_LOCATION || './upload';
+export const WEB_ROOT = process.env.IMMICH_WEB_ROOT || '/usr/src/app/www';
+
+const GEODATA_ROOT_PATH = process.env.IMMICH_REVERSE_GEOCODING_ROOT || '/usr/src/resources';
+
+export const citiesFile = 'cities500.txt';
+export const geodataDatePath = join(GEODATA_ROOT_PATH, 'geodata-date.txt');
+export const geodataAdmin1Path = join(GEODATA_ROOT_PATH, 'admin1CodesASCII.txt');
+export const geodataAdmin2Path = join(GEODATA_ROOT_PATH, 'admin2Codes.txt');
+export const geodataCities500Path = join(GEODATA_ROOT_PATH, citiesFile);
+
+export const MOBILE_REDIRECT = 'app.immich:/';
+export const LOGIN_URL = '/auth/login?autoLaunch=0';
+export const IMMICH_ACCESS_COOKIE = 'immich_access_token';
+export const IMMICH_IS_AUTHENTICATED = 'immich_is_authenticated';
+export const IMMICH_AUTH_TYPE_COOKIE = 'immich_auth_type';
+export const IMMICH_API_KEY_NAME = 'api_key';
+export const IMMICH_API_KEY_HEADER = 'x-api-key';
+export const IMMICH_SHARED_LINK_ACCESS_COOKIE = 'immich_shared_link_token';
+export enum AuthType {
+  PASSWORD = 'password',
+  OAUTH = 'oauth',
+}
+
+export const excludePaths = ['/.well-known/immich', '/custom.css', '/favicon.ico'];
+
+export const FACE_THUMBNAIL_SIZE = 250;
+
+export const supportedYearTokens = ['y', 'yy'];
+export const supportedMonthTokens = ['M', 'MM', 'MMM', 'MMMM'];
+export const supportedWeekTokens = ['W', 'WW'];
+export const supportedDayTokens = ['d', 'dd'];
+export const supportedHourTokens = ['h', 'hh', 'H', 'HH'];
+export const supportedMinuteTokens = ['m', 'mm'];
+export const supportedSecondTokens = ['s', 'ss', 'SSS'];
+export const supportedPresetTokens = [
+  '{{y}}/{{y}}-{{MM}}-{{dd}}/{{filename}}',
+  '{{y}}/{{MM}}-{{dd}}/{{filename}}',
+  '{{y}}/{{MMMM}}-{{dd}}/{{filename}}',
+  '{{y}}/{{MM}}/{{filename}}',
+  '{{y}}/{{MMM}}/{{filename}}',
+  '{{y}}/{{MMMM}}/{{filename}}',
+  '{{y}}/{{MM}}/{{dd}}/{{filename}}',
+  '{{y}}/{{MMMM}}/{{dd}}/{{filename}}',
+  '{{y}}/{{y}}-{{MM}}/{{y}}-{{MM}}-{{dd}}/{{filename}}',
+  '{{y}}-{{MM}}-{{dd}}/{{filename}}',
+  '{{y}}-{{MMM}}-{{dd}}/{{filename}}',
+  '{{y}}-{{MMMM}}-{{dd}}/{{filename}}',
+  '{{y}}/{{y}}-{{MM}}/{{filename}}',
+  '{{y}}/{{y}}-{{WW}}/{{filename}}',
+  '{{y}}/{{y}}-{{MM}}-{{dd}}/{{assetId}}',
+  '{{y}}/{{y}}-{{MM}}/{{assetId}}',
+  '{{y}}/{{y}}-{{WW}}/{{assetId}}',
+  '{{album}}/{{filename}}',
+];
+
+type ModelInfo = { dimSize: number };
+export const CLIP_MODEL_INFO: Record<string, ModelInfo> = {
+  RN50__openai: { dimSize: 1024 },
+  RN50__yfcc15m: { dimSize: 1024 },
+  RN50__cc12m: { dimSize: 1024 },
+  RN101__openai: { dimSize: 512 },
+  RN101__yfcc15m: { dimSize: 512 },
+  RN50x4__openai: { dimSize: 640 },
+  RN50x16__openai: { dimSize: 768 },
+  RN50x64__openai: { dimSize: 1024 },
+  'ViT-B-32__openai': { dimSize: 512 },
+  'ViT-B-32__laion2b_e16': { dimSize: 512 },
+  'ViT-B-32__laion400m_e31': { dimSize: 512 },
+  'ViT-B-32__laion400m_e32': { dimSize: 512 },
+  'ViT-B-32__laion2b-s34b-b79k': { dimSize: 512 },
+  'ViT-B-16__openai': { dimSize: 512 },
+  'ViT-B-16__laion400m_e31': { dimSize: 512 },
+  'ViT-B-16__laion400m_e32': { dimSize: 512 },
+  'ViT-B-16-plus-240__laion400m_e31': { dimSize: 640 },
+  'ViT-B-16-plus-240__laion400m_e32': { dimSize: 640 },
+  'ViT-L-14__openai': { dimSize: 768 },
+  'ViT-L-14__laion400m_e31': { dimSize: 768 },
+  'ViT-L-14__laion400m_e32': { dimSize: 768 },
+  'ViT-L-14__laion2b-s32b-b82k': { dimSize: 768 },
+  'ViT-L-14-336__openai': { dimSize: 768 },
+  'ViT-L-14-quickgelu__dfn2b': { dimSize: 768 },
+  'ViT-H-14__laion2b-s32b-b79k': { dimSize: 1024 },
+  'ViT-H-14-quickgelu__dfn5b': { dimSize: 1024 },
+  'ViT-H-14-378-quickgelu__dfn5b': { dimSize: 1024 },
+  'ViT-g-14__laion2b-s12b-b42k': { dimSize: 1024 },
+  'LABSE-Vit-L-14': { dimSize: 768 },
+  'XLM-Roberta-Large-Vit-B-32': { dimSize: 512 },
+  'XLM-Roberta-Large-Vit-B-16Plus': { dimSize: 640 },
+  'XLM-Roberta-Large-Vit-L-14': { dimSize: 768 },
+  'XLM-Roberta-Large-ViT-H-14__frozen_laion5b_s13b_b90k': { dimSize: 1024 },
+  'nllb-clip-base-siglip__v1': { dimSize: 768 },
+  'nllb-clip-large-siglip__v1': { dimSize: 1152 },
+};

server/src/controllers/activity.controller.ts

@@ -7,10 +7,10 @@ import {
   ActivityResponseDto,
   ActivitySearchDto,
   ActivityStatisticsResponseDto,
-} from 'src/domain/activity/activity.dto';
-import { ActivityService } from 'src/domain/activity/activity.service';
-import { AuthDto } from 'src/domain/auth/auth.dto';
+} from 'src/dtos/activity.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
+import { ActivityService } from 'src/services/activity.service';
 import { UUIDParamDto } from 'src/validation';
 
 @ApiTags('Activity')

server/src/controllers/album.controller.ts

@@ -1,15 +1,18 @@
 import { Body, Controller, Delete, Get, Param, Patch, Post, Put, Query } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { AlbumCountResponseDto, AlbumResponseDto } from 'src/domain/album/album-response.dto';
-import { AlbumService } from 'src/domain/album/album.service';
-import { AddUsersDto } from 'src/domain/album/dto/album-add-users.dto';
-import { CreateAlbumDto } from 'src/domain/album/dto/album-create.dto';
-import { UpdateAlbumDto } from 'src/domain/album/dto/album-update.dto';
-import { AlbumInfoDto } from 'src/domain/album/dto/album.dto';
-import { GetAlbumsDto } from 'src/domain/album/dto/get-albums.dto';
-import { BulkIdResponseDto, BulkIdsDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
+import {
+  AddUsersDto,
+  AlbumCountResponseDto,
+  AlbumInfoDto,
+  AlbumResponseDto,
+  CreateAlbumDto,
+  GetAlbumsDto,
+  UpdateAlbumDto,
+} from 'src/dtos/album.dto';
+import { BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import { Auth, Authenticated, SharedLinkRoute } from 'src/middleware/auth.guard';
+import { AlbumService } from 'src/services/album.service';
 import { ParseMeUUIDPipe, UUIDParamDto } from 'src/validation';
 
 @ApiTags('Album')

server/src/controllers/api-key.controller.ts

@@ -1,14 +1,9 @@
 import { Body, Controller, Delete, Get, Param, Post, Put } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import {
-  APIKeyCreateDto,
-  APIKeyCreateResponseDto,
-  APIKeyResponseDto,
-  APIKeyUpdateDto,
-} from 'src/domain/api-key/api-key.dto';
-import { APIKeyService } from 'src/domain/api-key/api-key.service';
-import { AuthDto } from 'src/domain/auth/auth.dto';
+import { APIKeyCreateDto, APIKeyCreateResponseDto, APIKeyResponseDto, APIKeyUpdateDto } from 'src/dtos/api-key.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
+import { APIKeyService } from 'src/services/api-key.service';
 import { UUIDParamDto } from 'src/validation';
 
 @ApiTags('API Key')

server/src/controllers/app.controller.ts

@@ -1,7 +1,7 @@
 import { Controller, Get, Header } from '@nestjs/common';
 import { ApiExcludeEndpoint } from '@nestjs/swagger';
-import { SystemConfigService } from 'src/domain/system-config/system-config.service';
 import { PublicRoute } from 'src/middleware/auth.guard';
+import { SystemConfigService } from 'src/services/system-config.service';
 
 @Controller()
 export class AppController {

server/src/controllers/asset-v1.controller.ts

@@ -15,23 +15,27 @@ import {
 } from '@nestjs/common';
 import { ApiBody, ApiConsumes, ApiHeader, ApiTags } from '@nestjs/swagger';
 import { NextFunction, Response } from 'express';
-import { AssetResponseDto } from 'src/domain/asset/response-dto/asset-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { AssetService as AssetServiceV1 } from 'src/immich/api-v1/asset/asset.service';
-import { AssetBulkUploadCheckDto } from 'src/immich/api-v1/asset/dto/asset-check.dto';
-import { AssetSearchDto } from 'src/immich/api-v1/asset/dto/asset-search.dto';
-import { CheckExistingAssetsDto } from 'src/immich/api-v1/asset/dto/check-existing-assets.dto';
-import { CreateAssetDto } from 'src/immich/api-v1/asset/dto/create-asset.dto';
-import { GetAssetThumbnailDto } from 'src/immich/api-v1/asset/dto/get-asset-thumbnail.dto';
-import { ServeFileDto } from 'src/immich/api-v1/asset/dto/serve-file.dto';
-import { AssetBulkUploadCheckResponseDto } from 'src/immich/api-v1/asset/response-dto/asset-check-response.dto';
-import { AssetFileUploadResponseDto } from 'src/immich/api-v1/asset/response-dto/asset-file-upload-response.dto';
-import { CheckExistingAssetsResponseDto } from 'src/immich/api-v1/asset/response-dto/check-existing-assets-response.dto';
-import { CuratedLocationsResponseDto } from 'src/immich/api-v1/asset/response-dto/curated-locations-response.dto';
-import { CuratedObjectsResponseDto } from 'src/immich/api-v1/asset/response-dto/curated-objects-response.dto';
-import { sendFile } from 'src/immich/app.utils';
+import { AssetResponseDto } from 'src/dtos/asset-response.dto';
+import {
+  AssetBulkUploadCheckResponseDto,
+  AssetFileUploadResponseDto,
+  CheckExistingAssetsResponseDto,
+  CuratedLocationsResponseDto,
+  CuratedObjectsResponseDto,
+} from 'src/dtos/asset-v1-response.dto';
+import {
+  AssetBulkUploadCheckDto,
+  AssetSearchDto,
+  CheckExistingAssetsDto,
+  CreateAssetDto,
+  GetAssetThumbnailDto,
+  ServeFileDto,
+} from 'src/dtos/asset-v1.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import { Auth, Authenticated, FileResponse, SharedLinkRoute } from 'src/middleware/auth.guard';
 import { FileUploadInterceptor, ImmichFile, Route, mapToUploadFile } from 'src/middleware/file-upload.interceptor';
+import { AssetServiceV1 } from 'src/services/asset-v1.service';
+import { sendFile } from 'src/utils/file';
 import { FileNotEmptyValidator, UUIDParamDto } from 'src/validation';
 
 interface UploadFiles {
@@ -43,8 +47,8 @@ interface UploadFiles {
 @ApiTags('Asset')
 @Controller(Route.ASSET)
 @Authenticated()
-export class AssetController {
-  constructor(private serviceV1: AssetServiceV1) {}
+export class AssetControllerV1 {
+  constructor(private service: AssetServiceV1) {}
 
   @SharedLinkRoute()
   @Post('upload')
@@ -73,7 +77,7 @@ export class AssetController {
       sidecarFile = mapToUploadFile(_sidecarFile);
     }
 
-    const responseDto = await this.serviceV1.uploadFile(auth, dto, file, livePhotoFile, sidecarFile);
+    const responseDto = await this.service.uploadFile(auth, dto, file, livePhotoFile, sidecarFile);
     if (responseDto.duplicate) {
       res.status(HttpStatus.OK);
     }
@@ -91,7 +95,7 @@ export class AssetController {
     @Param() { id }: UUIDParamDto,
     @Query() dto: ServeFileDto,
   ) {
-    await sendFile(res, next, () => this.serviceV1.serveFile(auth, id, dto));
+    await sendFile(res, next, () => this.service.serveFile(auth, id, dto));
   }
 
   @SharedLinkRoute()
@@ -104,22 +108,22 @@ export class AssetController {
     @Param() { id }: UUIDParamDto,
     @Query() dto: GetAssetThumbnailDto,
   ) {
-    await sendFile(res, next, () => this.serviceV1.serveThumbnail(auth, id, dto));
+    await sendFile(res, next, () => this.service.serveThumbnail(auth, id, dto));
   }
 
   @Get('/curated-objects')
   getCuratedObjects(@Auth() auth: AuthDto): Promise<CuratedObjectsResponseDto[]> {
-    return this.serviceV1.getCuratedObject(auth);
+    return this.service.getCuratedObject(auth);
   }
 
   @Get('/curated-locations')
   getCuratedLocations(@Auth() auth: AuthDto): Promise<CuratedLocationsResponseDto[]> {
-    return this.serviceV1.getCuratedLocation(auth);
+    return this.service.getCuratedLocation(auth);
   }
 
   @Get('/search-terms')
   getAssetSearchTerms(@Auth() auth: AuthDto): Promise<string[]> {
-    return this.serviceV1.getAssetSearchTerm(auth);
+    return this.service.getAssetSearchTerm(auth);
   }
 
   /**
@@ -133,7 +137,7 @@ export class AssetController {
     schema: { type: 'string' },
   })
   getAllAssets(@Auth() auth: AuthDto, @Query() dto: AssetSearchDto): Promise<AssetResponseDto[]> {
-    return this.serviceV1.getAllAssets(auth, dto);
+    return this.service.getAllAssets(auth, dto);
   }
 
   /**
@@ -145,7 +149,7 @@ export class AssetController {
     @Auth() auth: AuthDto,
     @Body() dto: CheckExistingAssetsDto,
   ): Promise<CheckExistingAssetsResponseDto> {
-    return this.serviceV1.checkExistingAssets(auth, dto);
+    return this.service.checkExistingAssets(auth, dto);
   }
 
   /**
@@ -157,6 +161,6 @@ export class AssetController {
     @Auth() auth: AuthDto,
     @Body() dto: AssetBulkUploadCheckDto,
   ): Promise<AssetBulkUploadCheckResponseDto> {
-    return this.serviceV1.bulkUploadCheck(auth, dto);
+    return this.service.bulkUploadCheck(auth, dto);
   }
 }

server/src/controllers/asset.controller.ts

@@ -1,27 +1,24 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
-import { AssetService } from 'src/domain/asset/asset.service';
-import { AssetJobsDto } from 'src/domain/asset/dto/asset-ids.dto';
-import { UpdateStackParentDto } from 'src/domain/asset/dto/asset-stack.dto';
-import { AssetStatsDto, AssetStatsResponseDto } from 'src/domain/asset/dto/asset-statistics.dto';
+import { AssetResponseDto, MemoryLaneResponseDto } from 'src/dtos/asset-response.dto';
 import {
   AssetBulkDeleteDto,
   AssetBulkUpdateDto,
+  AssetJobsDto,
+  AssetStatsDto,
+  AssetStatsResponseDto,
   DeviceIdDto,
   RandomAssetsDto,
   UpdateAssetDto,
-} from 'src/domain/asset/dto/asset.dto';
-import { MapMarkerDto } from 'src/domain/asset/dto/map-marker.dto';
-import { MemoryLaneDto } from 'src/domain/asset/dto/memory-lane.dto';
-import { TimeBucketAssetDto, TimeBucketDto } from 'src/domain/asset/dto/time-bucket.dto';
-import { AssetResponseDto, MemoryLaneResponseDto } from 'src/domain/asset/response-dto/asset-response.dto';
-import { MapMarkerResponseDto } from 'src/domain/asset/response-dto/map-marker-response.dto';
-import { TimeBucketResponseDto } from 'src/domain/asset/response-dto/time-bucket-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { MetadataSearchDto } from 'src/domain/search/dto/search.dto';
-import { SearchService } from 'src/domain/search/search.service';
+} from 'src/dtos/asset.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { MapMarkerDto, MapMarkerResponseDto, MemoryLaneDto, MetadataSearchDto } from 'src/dtos/search.dto';
+import { UpdateStackParentDto } from 'src/dtos/stack.dto';
+import { TimeBucketAssetDto, TimeBucketDto, TimeBucketResponseDto } from 'src/dtos/time-bucket.dto';
 import { Auth, Authenticated, SharedLinkRoute } from 'src/middleware/auth.guard';
 import { Route } from 'src/middleware/file-upload.interceptor';
+import { AssetService } from 'src/services/asset.service';
+import { SearchService } from 'src/services/search.service';
 import { UUIDParamDto } from 'src/validation';
 
 @ApiTags('Asset')

server/src/controllers/audit.controller.ts

@@ -7,10 +7,10 @@ import {
   FileChecksumResponseDto,
   FileReportDto,
   FileReportFixDto,
-} from 'src/domain/audit/audit.dto';
-import { AuditService } from 'src/domain/audit/audit.service';
-import { AuthDto } from 'src/domain/auth/auth.dto';
+} from 'src/dtos/audit.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import { AdminRoute, Auth, Authenticated } from 'src/middleware/auth.guard';
+import { AuditService } from 'src/services/audit.service';
 
 @ApiTags('Audit')
 @Controller('audit')

server/src/controllers/auth.controller.ts

@@ -1,7 +1,7 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Req, Res } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { Request, Response } from 'express';
-import { IMMICH_ACCESS_COOKIE, IMMICH_AUTH_TYPE_COOKIE, IMMICH_IS_AUTHENTICATED } from 'src/domain/auth/auth.constant';
+import { IMMICH_ACCESS_COOKIE, IMMICH_AUTH_TYPE_COOKIE, IMMICH_IS_AUTHENTICATED } from 'src/constants';
 import {
   AuthDeviceResponseDto,
   AuthDto,
@@ -11,10 +11,10 @@ import {
   LogoutResponseDto,
   SignUpDto,
   ValidateAccessTokenResponseDto,
-} from 'src/domain/auth/auth.dto';
-import { AuthService, LoginDetails } from 'src/domain/auth/auth.service';
-import { UserResponseDto, mapUser } from 'src/domain/user/response-dto/user-response.dto';
+} from 'src/dtos/auth.dto';
+import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
 import { Auth, Authenticated, GetLoginDetails, PublicRoute } from 'src/middleware/auth.guard';
+import { AuthService, LoginDetails } from 'src/services/auth.service';
 import { UUIDParamDto } from 'src/validation';
 
 @ApiTags('Authentication')

server/src/controllers/download.controller.ts

@@ -1,12 +1,12 @@
 import { Body, Controller, HttpCode, HttpStatus, Next, Param, Post, Res, StreamableFile } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { NextFunction, Response } from 'express';
-import { AssetIdsDto } from 'src/domain/asset/dto/asset-ids.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { DownloadInfoDto, DownloadResponseDto } from 'src/domain/download/download.dto';
-import { DownloadService } from 'src/domain/download/download.service';
-import { asStreamableFile, sendFile } from 'src/immich/app.utils';
+import { AssetIdsDto } from 'src/dtos/asset.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { DownloadInfoDto, DownloadResponseDto } from 'src/dtos/download.dto';
 import { Auth, Authenticated, FileResponse, SharedLinkRoute } from 'src/middleware/auth.guard';
+import { DownloadService } from 'src/services/download.service';
+import { asStreamableFile, sendFile } from 'src/utils/file';
 import { UUIDParamDto } from 'src/validation';
 
 @ApiTags('Download')

server/src/controllers/face.controller.ts

@@ -1,9 +1,9 @@
 import { Body, Controller, Get, Param, Put, Query } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { AssetFaceResponseDto, FaceDto, PersonResponseDto } from 'src/domain/person/person.dto';
-import { PersonService } from 'src/domain/person/person.service';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { AssetFaceResponseDto, FaceDto, PersonResponseDto } from 'src/dtos/person.dto';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
+import { PersonService } from 'src/services/person.service';
 import { UUIDParamDto } from 'src/validation';
 
 @ApiTags('Face')

server/src/controllers/job.controller.ts

@@ -1,8 +1,8 @@
 import { Body, Controller, Get, Param, Put } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { AllJobStatusResponseDto, JobCommandDto, JobIdParamDto, JobStatusDto } from 'src/domain/job/job.dto';
-import { JobService } from 'src/domain/job/job.service';
+import { AllJobStatusResponseDto, JobCommandDto, JobIdParamDto, JobStatusDto } from 'src/dtos/job.dto';
 import { Authenticated } from 'src/middleware/auth.guard';
+import { JobService } from 'src/services/job.service';
 
 @ApiTags('Job')
 @Controller('jobs')

server/src/controllers/library.controller.ts

@@ -9,9 +9,9 @@ import {
   UpdateLibraryDto,
   ValidateLibraryDto,
   ValidateLibraryResponseDto,
-} from 'src/domain/library/library.dto';
-import { LibraryService } from 'src/domain/library/library.service';
+} from 'src/dtos/library.dto';
 import { AdminRoute, Authenticated } from 'src/middleware/auth.guard';
+import { LibraryService } from 'src/services/library.service';
 import { UUIDParamDto } from 'src/validation';
 
 @ApiTags('Library')

server/src/controllers/oauth.controller.ts

@@ -7,10 +7,10 @@ import {
   OAuthAuthorizeResponseDto,
   OAuthCallbackDto,
   OAuthConfigDto,
-} from 'src/domain/auth/auth.dto';
-import { AuthService, LoginDetails } from 'src/domain/auth/auth.service';
-import { UserResponseDto } from 'src/domain/user/response-dto/user-response.dto';
+} from 'src/dtos/auth.dto';
+import { UserResponseDto } from 'src/dtos/user.dto';
 import { Auth, Authenticated, GetLoginDetails, PublicRoute } from 'src/middleware/auth.guard';
+import { AuthService, LoginDetails } from 'src/services/auth.service';
 
 @ApiTags('OAuth')
 @Controller('oauth')

server/src/controllers/partner.controller.ts

@@ -1,10 +1,10 @@
 import { Body, Controller, Delete, Get, Param, Post, Put, Query } from '@nestjs/common';
 import { ApiQuery, ApiTags } from '@nestjs/swagger';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { PartnerResponseDto, UpdatePartnerDto } from 'src/domain/partner/partner.dto';
-import { PartnerService } from 'src/domain/partner/partner.service';
-import { PartnerDirection } from 'src/interfaces/partner.repository';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { PartnerResponseDto, UpdatePartnerDto } from 'src/dtos/partner.dto';
+import { PartnerDirection } from 'src/interfaces/partner.interface';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
+import { PartnerService } from 'src/services/partner.service';
 import { UUIDParamDto } from 'src/validation';
 
 @ApiTags('Partner')

server/src/controllers/person.controller.ts

@@ -1,9 +1,9 @@
 import { Body, Controller, Get, Next, Param, Post, Put, Query, Res } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { NextFunction, Response } from 'express';
-import { BulkIdResponseDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
-import { AssetResponseDto } from 'src/domain/asset/response-dto/asset-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
+import { BulkIdResponseDto } from 'src/dtos/asset-ids.response.dto';
+import { AssetResponseDto } from 'src/dtos/asset-response.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import {
   AssetFaceUpdateDto,
   MergePersonDto,
@@ -14,10 +14,10 @@ import {
   PersonSearchDto,
   PersonStatisticsResponseDto,
   PersonUpdateDto,
-} from 'src/domain/person/person.dto';
-import { PersonService } from 'src/domain/person/person.service';
-import { sendFile } from 'src/immich/app.utils';
+} from 'src/dtos/person.dto';
 import { Auth, Authenticated, FileResponse } from 'src/middleware/auth.guard';
+import { PersonService } from 'src/services/person.service';
+import { sendFile } from 'src/utils/file';
 import { UUIDParamDto } from 'src/validation';
 
 @ApiTags('Person')

server/src/controllers/search.controller.ts

@@ -1,21 +1,21 @@
 import { Body, Controller, Get, HttpCode, HttpStatus, Post, Query } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
-import { AssetResponseDto } from 'src/domain/asset/response-dto/asset-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { PersonResponseDto } from 'src/domain/person/person.dto';
-import { SearchSuggestionRequestDto } from 'src/domain/search/dto/search-suggestion.dto';
+import { AssetResponseDto } from 'src/dtos/asset-response.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { PersonResponseDto } from 'src/dtos/person.dto';
 import {
   MetadataSearchDto,
   PlacesResponseDto,
   SearchDto,
+  SearchExploreResponseDto,
   SearchPeopleDto,
   SearchPlacesDto,
+  SearchResponseDto,
+  SearchSuggestionRequestDto,
   SmartSearchDto,
-} from 'src/domain/search/dto/search.dto';
-import { SearchExploreResponseDto } from 'src/domain/search/response-dto/search-explore.response.dto';
-import { SearchResponseDto } from 'src/domain/search/response-dto/search-response.dto';
-import { SearchService } from 'src/domain/search/search.service';
+} from 'src/dtos/search.dto';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
+import { SearchService } from 'src/services/search.service';
 
 @ApiTags('Search')
 @Controller('search')

server/src/controllers/server-info.controller.ts

@@ -9,9 +9,9 @@ import {
   ServerStatsResponseDto,
   ServerThemeDto,
   ServerVersionResponseDto,
-} from 'src/domain/server-info/server-info.dto';
-import { ServerInfoService } from 'src/domain/server-info/server-info.service';
+} from 'src/dtos/server-info.dto';
 import { AdminRoute, Authenticated, PublicRoute } from 'src/middleware/auth.guard';
+import { ServerInfoService } from 'src/services/server-info.service';
 
 @ApiTags('Server Info')
 @Controller('server-info')

server/src/controllers/shared-link.controller.ts

@@ -1,14 +1,18 @@
 import { Body, Controller, Delete, Get, Param, Patch, Post, Put, Query, Req, Res } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { Request, Response } from 'express';
-import { AssetIdsDto } from 'src/domain/asset/dto/asset-ids.dto';
-import { AssetIdsResponseDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
-import { IMMICH_SHARED_LINK_ACCESS_COOKIE } from 'src/domain/auth/auth.constant';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { SharedLinkResponseDto } from 'src/domain/shared-link/shared-link-response.dto';
-import { SharedLinkCreateDto, SharedLinkEditDto, SharedLinkPasswordDto } from 'src/domain/shared-link/shared-link.dto';
-import { SharedLinkService } from 'src/domain/shared-link/shared-link.service';
+import { IMMICH_SHARED_LINK_ACCESS_COOKIE } from 'src/constants';
+import { AssetIdsResponseDto } from 'src/dtos/asset-ids.response.dto';
+import { AssetIdsDto } from 'src/dtos/asset.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
+import {
+  SharedLinkCreateDto,
+  SharedLinkEditDto,
+  SharedLinkPasswordDto,
+  SharedLinkResponseDto,
+} from 'src/dtos/shared-link.dto';
 import { Auth, Authenticated, SharedLinkRoute } from 'src/middleware/auth.guard';
+import { SharedLinkService } from 'src/services/shared-link.service';
 import { UUIDParamDto } from 'src/validation';
 
 @ApiTags('Shared Link')

server/src/controllers/system-config.controller.ts

@@ -1,10 +1,8 @@
 import { Body, Controller, Get, Put, Query } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { SystemConfigDto } from 'src/domain/system-config/dto/system-config.dto';
-import { SystemConfigTemplateStorageOptionDto } from 'src/domain/system-config/response-dto/system-config-template-storage-option.dto';
-import { MapThemeDto } from 'src/domain/system-config/system-config-map-theme.dto';
-import { SystemConfigService } from 'src/domain/system-config/system-config.service';
+import { MapThemeDto, SystemConfigDto, SystemConfigTemplateStorageOptionDto } from 'src/dtos/system-config.dto';
 import { AdminRoute, Authenticated } from 'src/middleware/auth.guard';
+import { SystemConfigService } from 'src/services/system-config.service';
 
 @ApiTags('System Config')
 @Controller('system-config')

server/src/controllers/tag.controller.ts

@@ -1,13 +1,12 @@
 import { Body, Controller, Delete, Get, Param, Patch, Post, Put } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { AssetIdsDto } from 'src/domain/asset/dto/asset-ids.dto';
-import { AssetIdsResponseDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
-import { AssetResponseDto } from 'src/domain/asset/response-dto/asset-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { TagResponseDto } from 'src/domain/tag/tag-response.dto';
-import { CreateTagDto, UpdateTagDto } from 'src/domain/tag/tag.dto';
-import { TagService } from 'src/domain/tag/tag.service';
+import { AssetIdsResponseDto } from 'src/dtos/asset-ids.response.dto';
+import { AssetResponseDto } from 'src/dtos/asset-response.dto';
+import { AssetIdsDto } from 'src/dtos/asset.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { CreateTagDto, TagResponseDto, UpdateTagDto } from 'src/dtos/tag.dto';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
+import { TagService } from 'src/services/tag.service';
 import { UUIDParamDto } from 'src/validation';
 
 @ApiTags('Tag')

server/src/controllers/trash.controller.ts

@@ -1,9 +1,9 @@
 import { Body, Controller, HttpCode, HttpStatus, Post } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { BulkIdsDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { TrashService } from 'src/domain/trash/trash.service';
+import { BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
+import { TrashService } from 'src/services/trash.service';
 
 @ApiTags('Trash')
 @Controller('trash')

server/src/controllers/user.controller.ts

@@ -16,17 +16,13 @@ import {
 } from '@nestjs/common';
 import { ApiBody, ApiConsumes, ApiTags } from '@nestjs/swagger';
 import { NextFunction, Response } from 'express';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { CreateProfileImageDto } from 'src/domain/user/dto/create-profile-image.dto';
-import { CreateUserDto } from 'src/domain/user/dto/create-user.dto';
-import { DeleteUserDto } from 'src/domain/user/dto/delete-user.dto';
-import { UpdateUserDto } from 'src/domain/user/dto/update-user.dto';
-import { CreateProfileImageResponseDto } from 'src/domain/user/response-dto/create-profile-image-response.dto';
-import { UserResponseDto } from 'src/domain/user/response-dto/user-response.dto';
-import { UserService } from 'src/domain/user/user.service';
-import { sendFile } from 'src/immich/app.utils';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { CreateProfileImageDto, CreateProfileImageResponseDto } from 'src/dtos/user-profile.dto';
+import { CreateUserDto, DeleteUserDto, UpdateUserDto, UserResponseDto } from 'src/dtos/user.dto';
 import { AdminRoute, Auth, Authenticated, FileResponse } from 'src/middleware/auth.guard';
 import { FileUploadInterceptor, Route } 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('User')

server/src/cores/access.core.ts

@@ -1,8 +1,8 @@
 import { BadRequestException, UnauthorizedException } from '@nestjs/common';
-import { AuthDto } from 'src/domain/auth/auth.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import { SharedLinkEntity } from 'src/entities/shared-link.entity';
-import { IAccessRepository } from 'src/interfaces/access.repository';
-import { setDifference, setIsEqual, setUnion } from 'src/utils';
+import { IAccessRepository } from 'src/interfaces/access.interface';
+import { setDifference, setIsEqual, setUnion } from 'src/utils/set';
 
 export enum Permission {
   ACTIVITY_CREATE = 'activity.create',

server/src/cores/storage.core.ts

@@ -1,16 +1,16 @@
 import { dirname, join, resolve } from 'node:path';
+import { APP_MEDIA_LOCATION } from 'src/constants';
 import { SystemConfigCore } from 'src/cores/system-config.core';
-import { APP_MEDIA_LOCATION } from 'src/domain/domain.constant';
 import { AssetEntity } from 'src/entities/asset.entity';
 import { AssetPathType, PathType, PersonPathType } from 'src/entities/move.entity';
 import { PersonEntity } from 'src/entities/person.entity';
-import { ImmichLogger } from 'src/infra/logger';
-import { IAssetRepository } from 'src/interfaces/asset.repository';
-import { ICryptoRepository } from 'src/interfaces/crypto.repository';
-import { IMoveRepository } from 'src/interfaces/move.repository';
-import { IPersonRepository } from 'src/interfaces/person.repository';
-import { IStorageRepository } from 'src/interfaces/storage.repository';
-import { ISystemConfigRepository } from 'src/interfaces/system-config.repository';
+import { IAssetRepository } from 'src/interfaces/asset.interface';
+import { ICryptoRepository } from 'src/interfaces/crypto.interface';
+import { IMoveRepository } from 'src/interfaces/move.interface';
+import { IPersonRepository } from 'src/interfaces/person.interface';
+import { IStorageRepository } from 'src/interfaces/storage.interface';
+import { ISystemConfigRepository } from 'src/interfaces/system-config.interface';
+import { ImmichLogger } from 'src/utils/logger';
 
 export enum StorageFolder {
   ENCODED_VIDEO = 'encoded-video',

server/src/cores/system-config.core.ts

@@ -5,8 +5,7 @@ import { validate } from 'class-validator';
 import { load as loadYaml } from 'js-yaml';
 import * as _ from 'lodash';
 import { Subject } from 'rxjs';
-import { QueueName } from 'src/domain/job/job.constants';
-import { SystemConfigDto } from 'src/domain/system-config/dto/system-config.dto';
+import { SystemConfigDto } from 'src/dtos/system-config.dto';
 import {
   AudioCodec,
   CQMode,
@@ -21,8 +20,9 @@ import {
   TranscodePolicy,
   VideoCodec,
 } from 'src/entities/system-config.entity';
-import { ImmichLogger } from 'src/infra/logger';
-import { ISystemConfigRepository } from 'src/interfaces/system-config.repository';
+import { QueueName } from 'src/interfaces/job.interface';
+import { ISystemConfigRepository } from 'src/interfaces/system-config.interface';
+import { ImmichLogger } from 'src/utils/logger';
 
 export type SystemConfigValidator = (config: SystemConfig, newConfig: SystemConfig) => void | Promise<void>;
 

server/src/cores/user.core.ts

@@ -1,11 +1,11 @@
 import { BadRequestException, ForbiddenException } from '@nestjs/common';
 import sanitize from 'sanitize-filename';
-import { UserResponseDto } from 'src/domain/user/response-dto/user-response.dto';
+import { UserResponseDto } from 'src/dtos/user.dto';
 import { LibraryType } from 'src/entities/library.entity';
 import { UserEntity } from 'src/entities/user.entity';
-import { ICryptoRepository } from 'src/interfaces/crypto.repository';
-import { ILibraryRepository } from 'src/interfaces/library.repository';
-import { IUserRepository } from 'src/interfaces/user.repository';
+import { ICryptoRepository } from 'src/interfaces/crypto.interface';
+import { ILibraryRepository } from 'src/interfaces/library.interface';
+import { IUserRepository } from 'src/interfaces/user.interface';
 
 const SALT_ROUNDS = 10;
 

server/src/database.config.ts

@@ -1,4 +1,4 @@
-import { DatabaseExtension } from 'src/interfaces/database.repository';
+import { DatabaseExtension } from 'src/interfaces/database.interface';
 import { DataSource } from 'typeorm';
 import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions.js';
 
@@ -16,9 +16,9 @@ const urlOrParts = url
 /* eslint unicorn/prefer-module: "off" -- We can fix this when migrating to ESM*/
 export const databaseConfig: PostgresConnectionOptions = {
   type: 'postgres',
-  entities: [__dirname + '/../entities/*.entity.{js,ts}'],
-  migrations: [__dirname + '/../migrations/*.{js,ts}'],
-  subscribers: [__dirname + '/../subscribers/*.{js,ts}'],
+  entities: [__dirname + '/entities/*.entity.{js,ts}'],
+  migrations: [__dirname + '/migrations/*.{js,ts}'],
+  subscribers: [__dirname + '/subscribers/*.{js,ts}'],
   migrationsRun: false,
   synchronize: false,
   connectTimeoutMS: 10_000, // 10 seconds

server/src/decorators.ts

@@ -1,6 +1,8 @@
 import { SetMetadata } from '@nestjs/common';
+import { OnEvent, OnEventType } from '@nestjs/event-emitter';
+import { OnEventOptions } from '@nestjs/event-emitter/dist/interfaces';
 import _ from 'lodash';
-import { setUnion } from 'src/utils';
+import { setUnion } from 'src/utils/set';
 
 // PostgreSQL uses a 16-bit integer to indicate the number of bound parameters. This means that the
 // maximum number of parameters is 65535. Any query that tries to bind more than that (e.g. searching
@@ -122,3 +124,6 @@ export interface GenerateSqlQueries {
 
 /** Decorator to enable versioning/tracking of generated Sql */
 export const GenerateSql = (...options: GenerateSqlQueries[]) => SetMetadata(GENERATE_SQL_KEY, options);
+
+export const OnEventInternal = (event: OnEventType, options?: OnEventOptions) =>
+  OnEvent(event, { suppressErrors: false, ...options });

server/src/domain/album/dto/album-add-users.dto.ts

@@ -1,8 +0,0 @@
-import { ArrayNotEmpty } from 'class-validator';
-import { ValidateUUID } from 'src/validation';
-
-export class AddUsersDto {
-  @ValidateUUID({ each: true })
-  @ArrayNotEmpty()
-  sharedUserIds!: string[];
-}

server/src/domain/album/dto/album-create.dto.ts

@@ -1,19 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsString } from 'class-validator';
-import { Optional, ValidateUUID } from 'src/validation';
-
-export class CreateAlbumDto {
-  @IsString()
-  @ApiProperty()
-  albumName!: string;
-
-  @IsString()
-  @Optional()
-  description?: string;
-
-  @ValidateUUID({ optional: true, each: true })
-  sharedWithUserIds?: string[];
-
-  @ValidateUUID({ optional: true, each: true })
-  assetIds?: string[];
-}

server/src/domain/album/dto/album-update.dto.ts

@@ -1,25 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum, IsString } from 'class-validator';
-import { AssetOrder } from 'src/entities/album.entity';
-import { Optional, ValidateBoolean, ValidateUUID } from 'src/validation';
-
-export class UpdateAlbumDto {
-  @Optional()
-  @IsString()
-  albumName?: string;
-
-  @Optional()
-  @IsString()
-  description?: string;
-
-  @ValidateUUID({ optional: true })
-  albumThumbnailAssetId?: string;
-
-  @ValidateBoolean({ optional: true })
-  isActivityEnabled?: boolean;
-
-  @IsEnum(AssetOrder)
-  @Optional()
-  @ApiProperty({ enum: AssetOrder, enumName: 'AssetOrder' })
-  order?: AssetOrder;
-}

server/src/domain/album/dto/album.dto.ts

@@ -1,6 +0,0 @@
-import { ValidateBoolean } from 'src/validation';
-
-export class AlbumInfoDto {
-  @ValidateBoolean({ optional: true })
-  withoutAssets?: boolean;
-}

server/src/domain/album/dto/get-albums.dto.ts

@@ -1,19 +0,0 @@
-import { ValidateBoolean, ValidateUUID } from 'src/validation';
-
-export class GetAlbumsDto {
-  @ValidateBoolean({ optional: true })
-  /**
-   * true: only shared albums
-   * false: only non-shared own albums
-   * undefined: shared and owned albums
-   */
-  shared?: boolean;
-
-  /**
-   * Only returns albums that contain the asset
-   * Ignores the shared parameter
-   * undefined: get all albums
-   */
-  @ValidateUUID({ optional: true })
-  assetId?: string;
-}

server/src/domain/asset/dto/asset-ids.dto.ts

@@ -1,20 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum } from 'class-validator';
-import { ValidateUUID } from 'src/validation';
-
-export class AssetIdsDto {
-  @ValidateUUID({ each: true })
-  assetIds!: string[];
-}
-
-export enum AssetJobName {
-  REGENERATE_THUMBNAIL = 'regenerate-thumbnail',
-  REFRESH_METADATA = 'refresh-metadata',
-  TRANSCODE_VIDEO = 'transcode-video',
-}
-
-export class AssetJobsDto extends AssetIdsDto {
-  @ApiProperty({ enumName: 'AssetJobName', enum: AssetJobName })
-  @IsEnum(AssetJobName)
-  name!: AssetJobName;
-}

server/src/domain/asset/dto/asset-statistics.dto.ts

@@ -1,34 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { AssetType } from 'src/entities/asset.entity';
-import { AssetStats } from 'src/interfaces/asset.repository';
-import { ValidateBoolean } from 'src/validation';
-
-export class AssetStatsDto {
-  @ValidateBoolean({ optional: true })
-  isArchived?: boolean;
-
-  @ValidateBoolean({ optional: true })
-  isFavorite?: boolean;
-
-  @ValidateBoolean({ optional: true })
-  isTrashed?: boolean;
-}
-
-export class AssetStatsResponseDto {
-  @ApiProperty({ type: 'integer' })
-  images!: number;
-
-  @ApiProperty({ type: 'integer' })
-  videos!: number;
-
-  @ApiProperty({ type: 'integer' })
-  total!: number;
-}
-
-export const mapStats = (stats: AssetStats): AssetStatsResponseDto => {
-  return {
-    images: stats[AssetType.IMAGE],
-    videos: stats[AssetType.VIDEO],
-    total: Object.values(stats).reduce((total, value) => total + value, 0),
-  };
-};

server/src/domain/asset/dto/asset.dto.ts

@@ -1,75 +0,0 @@
-import { Type } from 'class-transformer';
-import {
-  IsDateString,
-  IsInt,
-  IsLatitude,
-  IsLongitude,
-  IsNotEmpty,
-  IsPositive,
-  IsString,
-  ValidateIf,
-} from 'class-validator';
-import { BulkIdsDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
-import { Optional, ValidateBoolean, ValidateUUID } from 'src/validation';
-
-export class DeviceIdDto {
-  @IsNotEmpty()
-  @IsString()
-  deviceId!: string;
-}
-
-const hasGPS = (o: { latitude: undefined; longitude: undefined }) =>
-  o.latitude !== undefined || o.longitude !== undefined;
-const ValidateGPS = () => ValidateIf(hasGPS);
-
-export class UpdateAssetBase {
-  @ValidateBoolean({ optional: true })
-  isFavorite?: boolean;
-
-  @ValidateBoolean({ optional: true })
-  isArchived?: boolean;
-
-  @Optional()
-  @IsDateString()
-  dateTimeOriginal?: string;
-
-  @ValidateGPS()
-  @IsLatitude()
-  @IsNotEmpty()
-  latitude?: number;
-
-  @ValidateGPS()
-  @IsLongitude()
-  @IsNotEmpty()
-  longitude?: number;
-}
-
-export class AssetBulkUpdateDto extends UpdateAssetBase {
-  @ValidateUUID({ each: true })
-  ids!: string[];
-
-  @ValidateUUID({ optional: true })
-  stackParentId?: string;
-
-  @ValidateBoolean({ optional: true })
-  removeParent?: boolean;
-}
-
-export class UpdateAssetDto extends UpdateAssetBase {
-  @Optional()
-  @IsString()
-  description?: string;
-}
-
-export class RandomAssetsDto {
-  @Optional()
-  @IsInt()
-  @IsPositive()
-  @Type(() => Number)
-  count?: number;
-}
-
-export class AssetBulkDeleteDto extends BulkIdsDto {
-  @ValidateBoolean({ optional: true })
-  force?: boolean;
-}

server/src/domain/asset/dto/map-marker.dto.ts

@@ -1,18 +0,0 @@
-import { ValidateBoolean, ValidateDate } from 'src/validation';
-
-export class MapMarkerDto {
-  @ValidateBoolean({ optional: true })
-  isArchived?: boolean;
-
-  @ValidateBoolean({ optional: true })
-  isFavorite?: boolean;
-
-  @ValidateDate({ optional: true })
-  fileCreatedAfter?: Date;
-
-  @ValidateDate({ optional: true })
-  fileCreatedBefore?: Date;
-
-  @ValidateBoolean({ optional: true })
-  withPartners?: boolean;
-}

server/src/domain/asset/dto/memory-lane.dto.ts

@@ -1,19 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
-import { IsInt, Max, Min } from 'class-validator';
-
-export class MemoryLaneDto {
-  @IsInt()
-  @Type(() => Number)
-  @Max(31)
-  @Min(1)
-  @ApiProperty({ type: 'integer' })
-  day!: number;
-
-  @IsInt()
-  @Type(() => Number)
-  @Max(12)
-  @Min(1)
-  @ApiProperty({ type: 'integer' })
-  month!: number;
-}

server/src/domain/asset/response-dto/map-marker-response.dto.ts

@@ -1,21 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-
-export class MapMarkerResponseDto {
-  @ApiProperty()
-  id!: string;
-
-  @ApiProperty({ format: 'double' })
-  lat!: number;
-
-  @ApiProperty({ format: 'double' })
-  lon!: number;
-
-  @ApiProperty()
-  city!: string | null;
-
-  @ApiProperty()
-  state!: string | null;
-
-  @ApiProperty()
-  country!: string | null;
-}

server/src/domain/asset/response-dto/smart-info-response.dto.ts

@@ -1,13 +0,0 @@
-import { SmartInfoEntity } from 'src/entities/smart-info.entity';
-
-export class SmartInfoResponseDto {
-  tags?: string[] | null;
-  objects?: string[] | null;
-}
-
-export function mapSmartInfo(entity: SmartInfoEntity): SmartInfoResponseDto {
-  return {
-    tags: entity.tags,
-    objects: entity.objects,
-  };
-}

server/src/domain/asset/response-dto/time-bucket-response.dto.ts

@@ -1,9 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-
-export class TimeBucketResponseDto {
-  @ApiProperty({ type: 'string' })
-  timeBucket!: string;
-
-  @ApiProperty({ type: 'integer' })
-  count!: number;
-}

server/src/domain/auth/auth.constant.ts

@@ -1,12 +0,0 @@
-export const MOBILE_REDIRECT = 'app.immich:/';
-export const LOGIN_URL = '/auth/login?autoLaunch=0';
-export const IMMICH_ACCESS_COOKIE = 'immich_access_token';
-export const IMMICH_IS_AUTHENTICATED = 'immich_is_authenticated';
-export const IMMICH_AUTH_TYPE_COOKIE = 'immich_auth_type';
-export const IMMICH_API_KEY_NAME = 'api_key';
-export const IMMICH_API_KEY_HEADER = 'x-api-key';
-export const IMMICH_SHARED_LINK_ACCESS_COOKIE = 'immich_shared_link_token';
-export enum AuthType {
-  PASSWORD = 'password',
-  OAUTH = 'oauth',
-}

server/src/domain/domain.module.ts

@@ -1,62 +0,0 @@
-import { Global, Module, Provider } from '@nestjs/common';
-import { ActivityService } from 'src/domain/activity/activity.service';
-import { AlbumService } from 'src/domain/album/album.service';
-import { APIKeyService } from 'src/domain/api-key/api-key.service';
-import { AssetService } from 'src/domain/asset/asset.service';
-import { AuditService } from 'src/domain/audit/audit.service';
-import { AuthService } from 'src/domain/auth/auth.service';
-import { DatabaseService } from 'src/domain/database/database.service';
-import { DownloadService } from 'src/domain/download/download.service';
-import { JobService } from 'src/domain/job/job.service';
-import { LibraryService } from 'src/domain/library/library.service';
-import { MediaService } from 'src/domain/media/media.service';
-import { MetadataService } from 'src/domain/metadata/metadata.service';
-import { PartnerService } from 'src/domain/partner/partner.service';
-import { PersonService } from 'src/domain/person/person.service';
-import { SearchService } from 'src/domain/search/search.service';
-import { ServerInfoService } from 'src/domain/server-info/server-info.service';
-import { SharedLinkService } from 'src/domain/shared-link/shared-link.service';
-import { SmartInfoService } from 'src/domain/smart-info/smart-info.service';
-import { StorageTemplateService } from 'src/domain/storage-template/storage-template.service';
-import { StorageService } from 'src/domain/storage/storage.service';
-import { SystemConfigService } from 'src/domain/system-config/system-config.service';
-import { TagService } from 'src/domain/tag/tag.service';
-import { TrashService } from 'src/domain/trash/trash.service';
-import { UserService } from 'src/domain/user/user.service';
-import { ImmichLogger } from 'src/infra/logger';
-
-const providers: Provider[] = [
-  APIKeyService,
-  ActivityService,
-  AlbumService,
-  AssetService,
-  AuditService,
-  AuthService,
-  DatabaseService,
-  DownloadService,
-  ImmichLogger,
-  JobService,
-  LibraryService,
-  MediaService,
-  MetadataService,
-  PartnerService,
-  PersonService,
-  SearchService,
-  ServerInfoService,
-  SharedLinkService,
-  SmartInfoService,
-  StorageService,
-  StorageTemplateService,
-  SystemConfigService,
-  TagService,
-  TrashService,
-  UserService,
-];
-
-@Global()
-@Module({
-  imports: [],
-  providers: [...providers],
-  exports: [...providers],
-})
-export class DomainModule {}

server/src/domain/job/job.constants.ts

@@ -1,157 +0,0 @@
-export enum QueueName {
-  THUMBNAIL_GENERATION = 'thumbnailGeneration',
-  METADATA_EXTRACTION = 'metadataExtraction',
-  VIDEO_CONVERSION = 'videoConversion',
-  FACE_DETECTION = 'faceDetection',
-  FACIAL_RECOGNITION = 'facialRecognition',
-  SMART_SEARCH = 'smartSearch',
-  BACKGROUND_TASK = 'backgroundTask',
-  STORAGE_TEMPLATE_MIGRATION = 'storageTemplateMigration',
-  MIGRATION = 'migration',
-  SEARCH = 'search',
-  SIDECAR = 'sidecar',
-  LIBRARY = 'library',
-}
-
-export type ConcurrentQueueName = Exclude<
-  QueueName,
-  QueueName.STORAGE_TEMPLATE_MIGRATION | QueueName.FACIAL_RECOGNITION
->;
-
-export enum JobCommand {
-  START = 'start',
-  PAUSE = 'pause',
-  RESUME = 'resume',
-  EMPTY = 'empty',
-  CLEAR_FAILED = 'clear-failed',
-}
-
-export enum JobName {
-  // conversion
-  QUEUE_VIDEO_CONVERSION = 'queue-video-conversion',
-  VIDEO_CONVERSION = 'video-conversion',
-
-  // thumbnails
-  QUEUE_GENERATE_THUMBNAILS = 'queue-generate-thumbnails',
-  GENERATE_JPEG_THUMBNAIL = 'generate-jpeg-thumbnail',
-  GENERATE_WEBP_THUMBNAIL = 'generate-webp-thumbnail',
-  GENERATE_THUMBHASH_THUMBNAIL = 'generate-thumbhash-thumbnail',
-  GENERATE_PERSON_THUMBNAIL = 'generate-person-thumbnail',
-
-  // metadata
-  QUEUE_METADATA_EXTRACTION = 'queue-metadata-extraction',
-  METADATA_EXTRACTION = 'metadata-extraction',
-  LINK_LIVE_PHOTOS = 'link-live-photos',
-
-  // user
-  USER_DELETION = 'user-deletion',
-  USER_DELETE_CHECK = 'user-delete-check',
-  USER_SYNC_USAGE = 'user-sync-usage',
-
-  // asset
-  ASSET_DELETION = 'asset-deletion',
-  ASSET_DELETION_CHECK = 'asset-deletion-check',
-
-  // storage template
-  STORAGE_TEMPLATE_MIGRATION = 'storage-template-migration',
-  STORAGE_TEMPLATE_MIGRATION_SINGLE = 'storage-template-migration-single',
-
-  // migration
-  QUEUE_MIGRATION = 'queue-migration',
-  MIGRATE_ASSET = 'migrate-asset',
-  MIGRATE_PERSON = 'migrate-person',
-
-  // facial recognition
-  PERSON_CLEANUP = 'person-cleanup',
-  QUEUE_FACE_DETECTION = 'queue-face-detection',
-  FACE_DETECTION = 'face-detection',
-  QUEUE_FACIAL_RECOGNITION = 'queue-facial-recognition',
-  FACIAL_RECOGNITION = 'facial-recognition',
-
-  // library managment
-  LIBRARY_SCAN = 'library-refresh',
-  LIBRARY_SCAN_ASSET = 'library-refresh-asset',
-  LIBRARY_DELETE = 'library-delete',
-  LIBRARY_QUEUE_SCAN_ALL = 'library-queue-all-refresh',
-  LIBRARY_QUEUE_CLEANUP = 'library-queue-cleanup',
-  LIBRARY_CHECK_OFFLINE = 'library-check-if-online',
-  LIBRARY_REMOVE_OFFLINE = 'library-remove-offline',
-
-  // cleanup
-  DELETE_FILES = 'delete-files',
-  CLEAN_OLD_AUDIT_LOGS = 'clean-old-audit-logs',
-
-  // smart search
-  QUEUE_SMART_SEARCH = 'queue-smart-search',
-  SMART_SEARCH = 'smart-search',
-
-  // XMP sidecars
-  QUEUE_SIDECAR = 'queue-sidecar',
-  SIDECAR_DISCOVERY = 'sidecar-discovery',
-  SIDECAR_SYNC = 'sidecar-sync',
-  SIDECAR_WRITE = 'sidecar-write',
-}
-
-export const JOBS_ASSET_PAGINATION_SIZE = 1000;
-
-export const JOBS_TO_QUEUE: Record<JobName, QueueName> = {
-  // misc
-  [JobName.ASSET_DELETION]: QueueName.BACKGROUND_TASK,
-  [JobName.ASSET_DELETION_CHECK]: QueueName.BACKGROUND_TASK,
-  [JobName.USER_DELETE_CHECK]: QueueName.BACKGROUND_TASK,
-  [JobName.USER_DELETION]: QueueName.BACKGROUND_TASK,
-  [JobName.DELETE_FILES]: QueueName.BACKGROUND_TASK,
-  [JobName.CLEAN_OLD_AUDIT_LOGS]: QueueName.BACKGROUND_TASK,
-  [JobName.PERSON_CLEANUP]: QueueName.BACKGROUND_TASK,
-  [JobName.USER_SYNC_USAGE]: QueueName.BACKGROUND_TASK,
-
-  // conversion
-  [JobName.QUEUE_VIDEO_CONVERSION]: QueueName.VIDEO_CONVERSION,
-  [JobName.VIDEO_CONVERSION]: QueueName.VIDEO_CONVERSION,
-
-  // thumbnails
-  [JobName.QUEUE_GENERATE_THUMBNAILS]: QueueName.THUMBNAIL_GENERATION,
-  [JobName.GENERATE_JPEG_THUMBNAIL]: QueueName.THUMBNAIL_GENERATION,
-  [JobName.GENERATE_WEBP_THUMBNAIL]: QueueName.THUMBNAIL_GENERATION,
-  [JobName.GENERATE_THUMBHASH_THUMBNAIL]: QueueName.THUMBNAIL_GENERATION,
-  [JobName.GENERATE_PERSON_THUMBNAIL]: QueueName.THUMBNAIL_GENERATION,
-
-  // metadata
-  [JobName.QUEUE_METADATA_EXTRACTION]: QueueName.METADATA_EXTRACTION,
-  [JobName.METADATA_EXTRACTION]: QueueName.METADATA_EXTRACTION,
-  [JobName.LINK_LIVE_PHOTOS]: QueueName.METADATA_EXTRACTION,
-
-  // storage template
-  [JobName.STORAGE_TEMPLATE_MIGRATION]: QueueName.STORAGE_TEMPLATE_MIGRATION,
-  [JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE]: QueueName.STORAGE_TEMPLATE_MIGRATION,
-
-  // migration
-  [JobName.QUEUE_MIGRATION]: QueueName.MIGRATION,
-  [JobName.MIGRATE_ASSET]: QueueName.MIGRATION,
-  [JobName.MIGRATE_PERSON]: QueueName.MIGRATION,
-
-  // facial recognition
-  [JobName.QUEUE_FACE_DETECTION]: QueueName.FACE_DETECTION,
-  [JobName.FACE_DETECTION]: QueueName.FACE_DETECTION,
-  [JobName.QUEUE_FACIAL_RECOGNITION]: QueueName.FACIAL_RECOGNITION,
-  [JobName.FACIAL_RECOGNITION]: QueueName.FACIAL_RECOGNITION,
-
-  // smart search
-  [JobName.QUEUE_SMART_SEARCH]: QueueName.SMART_SEARCH,
-  [JobName.SMART_SEARCH]: QueueName.SMART_SEARCH,
-
-  // XMP sidecars
-  [JobName.QUEUE_SIDECAR]: QueueName.SIDECAR,
-  [JobName.SIDECAR_DISCOVERY]: QueueName.SIDECAR,
-  [JobName.SIDECAR_SYNC]: QueueName.SIDECAR,
-  [JobName.SIDECAR_WRITE]: QueueName.SIDECAR,
-
-  // Library management
-  [JobName.LIBRARY_SCAN_ASSET]: QueueName.LIBRARY,
-  [JobName.LIBRARY_SCAN]: QueueName.LIBRARY,
-  [JobName.LIBRARY_DELETE]: QueueName.LIBRARY,
-  [JobName.LIBRARY_REMOVE_OFFLINE]: QueueName.LIBRARY,
-  [JobName.LIBRARY_CHECK_OFFLINE]: QueueName.LIBRARY,
-  [JobName.LIBRARY_QUEUE_SCAN_ALL]: QueueName.LIBRARY,
-  [JobName.LIBRARY_QUEUE_CLEANUP]: QueueName.LIBRARY,
-};

server/src/domain/job/job.interface.ts

@@ -1,45 +0,0 @@
-export interface IBaseJob {
-  force?: boolean;
-}
-
-export interface IEntityJob extends IBaseJob {
-  id: string;
-  source?: 'upload' | 'sidecar-write';
-}
-
-export interface IAssetDeletionJob extends IEntityJob {
-  fromExternal?: boolean;
-}
-
-export interface ILibraryFileJob extends IEntityJob {
-  ownerId: string;
-  assetPath: string;
-}
-
-export interface ILibraryRefreshJob extends IEntityJob {
-  refreshModifiedFiles: boolean;
-  refreshAllFiles: boolean;
-}
-
-export interface ILibraryOfflineJob extends IEntityJob {
-  importPaths: string[];
-}
-
-export interface IBulkEntityJob extends IBaseJob {
-  ids: string[];
-}
-
-export interface IDeleteFilesJob extends IBaseJob {
-  files: Array<string | null | undefined>;
-}
-
-export interface ISidecarWriteJob extends IEntityJob {
-  description?: string;
-  dateTimeOriginal?: string;
-  latitude?: number;
-  longitude?: number;
-}
-
-export interface IDeferrableJob extends IEntityJob {
-  deferred?: boolean;
-}

server/src/domain/media/media.constant.ts

@@ -1 +0,0 @@
-export const FACE_THUMBNAIL_SIZE = 250;

server/src/domain/search/dto/search-suggestion.dto.ts

@@ -1,34 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum, IsNotEmpty, IsString } from 'class-validator';
-import { Optional } from 'src/validation';
-
-export enum SearchSuggestionType {
-  COUNTRY = 'country',
-  STATE = 'state',
-  CITY = 'city',
-  CAMERA_MAKE = 'camera-make',
-  CAMERA_MODEL = 'camera-model',
-}
-
-export class SearchSuggestionRequestDto {
-  @IsEnum(SearchSuggestionType)
-  @IsNotEmpty()
-  @ApiProperty({ enumName: 'SearchSuggestionType', enum: SearchSuggestionType })
-  type!: SearchSuggestionType;
-
-  @IsString()
-  @Optional()
-  country?: string;
-
-  @IsString()
-  @Optional()
-  state?: string;
-
-  @IsString()
-  @Optional()
-  make?: string;
-
-  @IsString()
-  @Optional()
-  model?: string;
-}

server/src/domain/search/response-dto/search-explore.response.dto.ts

@@ -1,11 +0,0 @@
-import { AssetResponseDto } from 'src/domain/asset/response-dto/asset-response.dto';
-
-class SearchExploreItem {
-  value!: string;
-  data!: AssetResponseDto;
-}
-
-export class SearchExploreResponseDto {
-  fieldName!: string;
-  items!: SearchExploreItem[];
-}

server/src/domain/search/response-dto/search-response.dto.ts

@@ -1,38 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { AlbumResponseDto } from 'src/domain/album/album-response.dto';
-import { AssetResponseDto } from 'src/domain/asset/response-dto/asset-response.dto';
-
-class SearchFacetCountResponseDto {
-  @ApiProperty({ type: 'integer' })
-  count!: number;
-  value!: string;
-}
-
-class SearchFacetResponseDto {
-  fieldName!: string;
-  counts!: SearchFacetCountResponseDto[];
-}
-
-class SearchAlbumResponseDto {
-  @ApiProperty({ type: 'integer' })
-  total!: number;
-  @ApiProperty({ type: 'integer' })
-  count!: number;
-  items!: AlbumResponseDto[];
-  facets!: SearchFacetResponseDto[];
-}
-
-class SearchAssetResponseDto {
-  @ApiProperty({ type: 'integer' })
-  total!: number;
-  @ApiProperty({ type: 'integer' })
-  count!: number;
-  items!: AssetResponseDto[];
-  facets!: SearchFacetResponseDto[];
-  nextPage!: string | null;
-}
-
-export class SearchResponseDto {
-  albums!: SearchAlbumResponseDto;
-  assets!: SearchAssetResponseDto;
-}

server/src/domain/shared-link/shared-link.dto.ts

@@ -1,75 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum, IsString } from 'class-validator';
-import { SharedLinkType } from 'src/entities/shared-link.entity';
-import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
-
-export class SharedLinkCreateDto {
-  @IsEnum(SharedLinkType)
-  @ApiProperty({ enum: SharedLinkType, enumName: 'SharedLinkType' })
-  type!: SharedLinkType;
-
-  @ValidateUUID({ each: true, optional: true })
-  assetIds?: string[];
-
-  @ValidateUUID({ optional: true })
-  albumId?: string;
-
-  @IsString()
-  @Optional()
-  description?: string;
-
-  @IsString()
-  @Optional()
-  password?: string;
-
-  @ValidateDate({ optional: true, nullable: true })
-  expiresAt?: Date | null = null;
-
-  @ValidateBoolean({ optional: true })
-  allowUpload?: boolean;
-
-  @ValidateBoolean({ optional: true })
-  allowDownload?: boolean = true;
-
-  @ValidateBoolean({ optional: true })
-  showMetadata?: boolean = true;
-}
-
-export class SharedLinkEditDto {
-  @Optional()
-  description?: string;
-
-  @Optional()
-  password?: string;
-
-  @Optional({ nullable: true })
-  expiresAt?: Date | null;
-
-  @Optional()
-  allowUpload?: boolean;
-
-  @ValidateBoolean({ optional: true })
-  allowDownload?: boolean;
-
-  @ValidateBoolean({ optional: true })
-  showMetadata?: boolean;
-
-  /**
-   * Few clients cannot send null to set the expiryTime to never.
-   * Setting this flag and not sending expiryAt is considered as null instead.
-   * Clients that can send null values can ignore this.
-   */
-  @ValidateBoolean({ optional: true })
-  changeExpiryTime?: boolean;
-}
-
-export class SharedLinkPasswordDto {
-  @IsString()
-  @Optional()
-  @ApiProperty({ example: 'password' })
-  password?: string;
-
-  @IsString()
-  @Optional()
-  token?: string;
-}

server/src/domain/smart-info/smart-info.constant.ts

@@ -1,129 +0,0 @@
-export type ModelInfo = {
-  dimSize: number;
-};
-
-export const CLIP_MODEL_INFO: Record<string, ModelInfo> = {
-  RN50__openai: {
-    dimSize: 1024,
-  },
-  RN50__yfcc15m: {
-    dimSize: 1024,
-  },
-  RN50__cc12m: {
-    dimSize: 1024,
-  },
-  RN101__openai: {
-    dimSize: 512,
-  },
-  RN101__yfcc15m: {
-    dimSize: 512,
-  },
-  RN50x4__openai: {
-    dimSize: 640,
-  },
-  RN50x16__openai: {
-    dimSize: 768,
-  },
-  RN50x64__openai: {
-    dimSize: 1024,
-  },
-  'ViT-B-32__openai': {
-    dimSize: 512,
-  },
-  'ViT-B-32__laion2b_e16': {
-    dimSize: 512,
-  },
-  'ViT-B-32__laion400m_e31': {
-    dimSize: 512,
-  },
-  'ViT-B-32__laion400m_e32': {
-    dimSize: 512,
-  },
-  'ViT-B-32__laion2b-s34b-b79k': {
-    dimSize: 512,
-  },
-  'ViT-B-16__openai': {
-    dimSize: 512,
-  },
-  'ViT-B-16__laion400m_e31': {
-    dimSize: 512,
-  },
-  'ViT-B-16__laion400m_e32': {
-    dimSize: 512,
-  },
-  'ViT-B-16-plus-240__laion400m_e31': {
-    dimSize: 640,
-  },
-  'ViT-B-16-plus-240__laion400m_e32': {
-    dimSize: 640,
-  },
-  'ViT-L-14__openai': {
-    dimSize: 768,
-  },
-  'ViT-L-14__laion400m_e31': {
-    dimSize: 768,
-  },
-  'ViT-L-14__laion400m_e32': {
-    dimSize: 768,
-  },
-  'ViT-L-14__laion2b-s32b-b82k': {
-    dimSize: 768,
-  },
-  'ViT-L-14-336__openai': {
-    dimSize: 768,
-  },
-  'ViT-L-14-quickgelu__dfn2b': {
-    dimSize: 768,
-  },
-  'ViT-H-14__laion2b-s32b-b79k': {
-    dimSize: 1024,
-  },
-  'ViT-H-14-quickgelu__dfn5b': {
-    dimSize: 1024,
-  },
-  'ViT-H-14-378-quickgelu__dfn5b': {
-    dimSize: 1024,
-  },
-  'ViT-g-14__laion2b-s12b-b42k': {
-    dimSize: 1024,
-  },
-  'LABSE-Vit-L-14': {
-    dimSize: 768,
-  },
-  'XLM-Roberta-Large-Vit-B-32': {
-    dimSize: 512,
-  },
-  'XLM-Roberta-Large-Vit-B-16Plus': {
-    dimSize: 640,
-  },
-  'XLM-Roberta-Large-Vit-L-14': {
-    dimSize: 768,
-  },
-  'XLM-Roberta-Large-ViT-H-14__frozen_laion5b_s13b_b90k': {
-    dimSize: 1024,
-  },
-  'nllb-clip-base-siglip__v1': {
-    dimSize: 768,
-  },
-  'nllb-clip-large-siglip__v1': {
-    dimSize: 1152,
-  },
-};
-
-export function cleanModelName(modelName: string): string {
-  const token = modelName.split('/').at(-1);
-  if (!token) {
-    throw new Error(`Invalid model name: ${modelName}`);
-  }
-
-  return token.replaceAll(':', '_');
-}
-
-export function getCLIPModelInfo(modelName: string): ModelInfo {
-  const modelInfo = CLIP_MODEL_INFO[cleanModelName(modelName)];
-  if (!modelInfo) {
-    throw new Error(`Unknown CLIP model: ${modelName}`);
-  }
-
-  return modelInfo;
-}

server/src/domain/system-config/dto/system-config-ffmpeg.dto.ts

@@ -1,103 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
-import { IsEnum, IsInt, IsString, Max, Min } from 'class-validator';
-import {
-  AudioCodec,
-  CQMode,
-  ToneMapping,
-  TranscodeHWAccel,
-  TranscodePolicy,
-  VideoCodec,
-} from 'src/entities/system-config.entity';
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigFFmpegDto {
-  @IsInt()
-  @Min(0)
-  @Max(51)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  crf!: number;
-
-  @IsInt()
-  @Min(0)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  threads!: number;
-
-  @IsString()
-  preset!: string;
-
-  @IsEnum(VideoCodec)
-  @ApiProperty({ enumName: 'VideoCodec', enum: VideoCodec })
-  targetVideoCodec!: VideoCodec;
-
-  @IsEnum(VideoCodec, { each: true })
-  @ApiProperty({ enumName: 'VideoCodec', enum: VideoCodec, isArray: true })
-  acceptedVideoCodecs!: VideoCodec[];
-
-  @IsEnum(AudioCodec)
-  @ApiProperty({ enumName: 'AudioCodec', enum: AudioCodec })
-  targetAudioCodec!: AudioCodec;
-
-  @IsEnum(AudioCodec, { each: true })
-  @ApiProperty({ enumName: 'AudioCodec', enum: AudioCodec, isArray: true })
-  acceptedAudioCodecs!: AudioCodec[];
-
-  @IsString()
-  targetResolution!: string;
-
-  @IsString()
-  maxBitrate!: string;
-
-  @IsInt()
-  @Min(-1)
-  @Max(16)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  bframes!: number;
-
-  @IsInt()
-  @Min(0)
-  @Max(6)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  refs!: number;
-
-  @IsInt()
-  @Min(0)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  gopSize!: number;
-
-  @IsInt()
-  @Min(0)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  npl!: number;
-
-  @ValidateBoolean()
-  temporalAQ!: boolean;
-
-  @IsEnum(CQMode)
-  @ApiProperty({ enumName: 'CQMode', enum: CQMode })
-  cqMode!: CQMode;
-
-  @ValidateBoolean()
-  twoPass!: boolean;
-
-  @IsString()
-  preferredHwDevice!: string;
-
-  @IsEnum(TranscodePolicy)
-  @ApiProperty({ enumName: 'TranscodePolicy', enum: TranscodePolicy })
-  transcode!: TranscodePolicy;
-
-  @IsEnum(TranscodeHWAccel)
-  @ApiProperty({ enumName: 'TranscodeHWAccel', enum: TranscodeHWAccel })
-  accel!: TranscodeHWAccel;
-
-  @IsEnum(ToneMapping)
-  @ApiProperty({ enumName: 'ToneMapping', enum: ToneMapping })
-  tonemap!: ToneMapping;
-}

server/src/domain/system-config/dto/system-config-job.dto.ts

@@ -1,73 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
-import { IsInt, IsObject, IsPositive, ValidateNested } from 'class-validator';
-import { ConcurrentQueueName, QueueName } from 'src/domain/job/job.constants';
-
-export class JobSettingsDto {
-  @IsInt()
-  @IsPositive()
-  @ApiProperty({ type: 'integer' })
-  concurrency!: number;
-}
-
-export class SystemConfigJobDto implements Record<ConcurrentQueueName, JobSettingsDto> {
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.THUMBNAIL_GENERATION]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.METADATA_EXTRACTION]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.VIDEO_CONVERSION]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.SMART_SEARCH]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.MIGRATION]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.BACKGROUND_TASK]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.SEARCH]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.FACE_DETECTION]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.SIDECAR]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.LIBRARY]!: JobSettingsDto;
-}

server/src/domain/system-config/dto/system-config-library.dto.ts

@@ -1,49 +0,0 @@
-import { Type } from 'class-transformer';
-import {
-  IsNotEmpty,
-  IsObject,
-  IsString,
-  Validate,
-  ValidateIf,
-  ValidateNested,
-  ValidatorConstraint,
-  ValidatorConstraintInterface,
-} from 'class-validator';
-import { ValidateBoolean, validateCronExpression } from 'src/validation';
-
-const isEnabled = (config: SystemConfigLibraryScanDto) => config.enabled;
-
-@ValidatorConstraint({ name: 'cronValidator' })
-class CronValidator implements ValidatorConstraintInterface {
-  validate(expression: string): boolean {
-    return validateCronExpression(expression);
-  }
-}
-
-export class SystemConfigLibraryScanDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @ValidateIf(isEnabled)
-  @IsNotEmpty()
-  @Validate(CronValidator, { message: 'Invalid cron expression' })
-  @IsString()
-  cronExpression!: string;
-}
-
-export class SystemConfigLibraryWatchDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-}
-
-export class SystemConfigLibraryDto {
-  @Type(() => SystemConfigLibraryScanDto)
-  @ValidateNested()
-  @IsObject()
-  scan!: SystemConfigLibraryScanDto;
-
-  @Type(() => SystemConfigLibraryWatchDto)
-  @ValidateNested()
-  @IsObject()
-  watch!: SystemConfigLibraryWatchDto;
-}

server/src/domain/system-config/dto/system-config-logging.dto.ts

@@ -1,13 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum } from 'class-validator';
-import { LogLevel } from 'src/entities/system-config.entity';
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigLoggingDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @ApiProperty({ enum: LogLevel, enumName: 'LogLevel' })
-  @IsEnum(LogLevel)
-  level!: LogLevel;
-}

server/src/domain/system-config/dto/system-config-machine-learning.dto.ts

@@ -1,23 +0,0 @@
-import { Type } from 'class-transformer';
-import { IsObject, IsUrl, ValidateIf, ValidateNested } from 'class-validator';
-import { CLIPConfig, RecognitionConfig } from 'src/domain/smart-info/dto/model-config.dto';
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigMachineLearningDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @IsUrl({ require_tld: false, allow_underscores: true })
-  @ValidateIf((dto) => dto.enabled)
-  url!: string;
-
-  @Type(() => CLIPConfig)
-  @ValidateNested()
-  @IsObject()
-  clip!: CLIPConfig;
-
-  @Type(() => RecognitionConfig)
-  @ValidateNested()
-  @IsObject()
-  facialRecognition!: RecognitionConfig;
-}

server/src/domain/system-config/dto/system-config-map.dto.ts

@@ -1,13 +0,0 @@
-import { IsString } from 'class-validator';
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigMapDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @IsString()
-  lightStyle!: string;
-
-  @IsString()
-  darkStyle!: string;
-}

server/src/domain/system-config/dto/system-config-new-version-check.dto.ts

@@ -1,6 +0,0 @@
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigNewVersionCheckDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-}

server/src/domain/system-config/dto/system-config-oauth.dto.ts

@@ -1,58 +0,0 @@
-import { IsNotEmpty, IsNumber, IsString, IsUrl, Min, ValidateIf } from 'class-validator';
-import { ValidateBoolean } from 'src/validation';
-
-const isEnabled = (config: SystemConfigOAuthDto) => config.enabled;
-const isOverrideEnabled = (config: SystemConfigOAuthDto) => config.mobileOverrideEnabled;
-
-export class SystemConfigOAuthDto {
-  @ValidateBoolean()
-  autoLaunch!: boolean;
-
-  @ValidateBoolean()
-  autoRegister!: boolean;
-
-  @IsString()
-  buttonText!: string;
-
-  @ValidateIf(isEnabled)
-  @IsNotEmpty()
-  @IsString()
-  clientId!: string;
-
-  @ValidateIf(isEnabled)
-  @IsNotEmpty()
-  @IsString()
-  clientSecret!: string;
-
-  @IsNumber()
-  @Min(0)
-  defaultStorageQuota!: number;
-
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @ValidateIf(isEnabled)
-  @IsNotEmpty()
-  @IsString()
-  issuerUrl!: string;
-
-  @ValidateBoolean()
-  mobileOverrideEnabled!: boolean;
-
-  @ValidateIf(isOverrideEnabled)
-  @IsUrl()
-  mobileRedirectUri!: string;
-
-  @IsString()
-  scope!: string;
-
-  @IsString()
-  @IsNotEmpty()
-  signingAlgorithm!: string;
-
-  @IsString()
-  storageLabelClaim!: string;
-
-  @IsString()
-  storageQuotaClaim!: string;
-}

server/src/domain/system-config/dto/system-config-password-login.dto.ts

@@ -1,6 +0,0 @@
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigPasswordLoginDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-}

server/src/domain/system-config/dto/system-config-reverse-geocoding.dto.ts

@@ -1,6 +0,0 @@
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigReverseGeocodingDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-}

server/src/domain/system-config/dto/system-config-server.dto.ts

@@ -1,9 +0,0 @@
-import { IsString } from 'class-validator';
-
-export class SystemConfigServerDto {
-  @IsString()
-  externalDomain!: string;
-
-  @IsString()
-  loginPageMessage!: string;
-}

server/src/domain/system-config/dto/system-config-storage-template.dto.ts

@@ -1,14 +0,0 @@
-import { IsNotEmpty, IsString } from 'class-validator';
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigStorageTemplateDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @ValidateBoolean()
-  hashVerificationEnabled!: boolean;
-
-  @IsNotEmpty()
-  @IsString()
-  template!: string;
-}

server/src/domain/system-config/dto/system-config-theme.dto.ts

@@ -1,6 +0,0 @@
-import { IsString } from 'class-validator';
-
-export class SystemConfigThemeDto {
-  @IsString()
-  customCss!: string;
-}

server/src/domain/system-config/dto/system-config-thumbnail.dto.ts

@@ -1,29 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
-import { IsEnum, IsInt, Max, Min } from 'class-validator';
-import { Colorspace } from 'src/entities/system-config.entity';
-
-export class SystemConfigThumbnailDto {
-  @IsInt()
-  @Min(1)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  webpSize!: number;
-
-  @IsInt()
-  @Min(1)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  jpegSize!: number;
-
-  @IsInt()
-  @Min(1)
-  @Max(100)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  quality!: number;
-
-  @IsEnum(Colorspace)
-  @ApiProperty({ enumName: 'Colorspace', enum: Colorspace })
-  colorspace!: Colorspace;
-}

server/src/domain/system-config/dto/system-config-trash.dto.ts

@@ -1,15 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
-import { IsInt, Min } from 'class-validator';
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigTrashDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @IsInt()
-  @Min(0)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  days!: number;
-}

server/src/domain/system-config/dto/system-config-user.dto.ts

@@ -1,11 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
-import { IsInt, Min } from 'class-validator';
-
-export class SystemConfigUserDto {
-  @IsInt()
-  @Min(1)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  deleteDelay!: number;
-}

server/src/domain/system-config/dto/system-config.dto.ts

@@ -1,105 +0,0 @@
-import { Type } from 'class-transformer';
-import { IsObject, ValidateNested } from 'class-validator';
-import { SystemConfigFFmpegDto } from 'src/domain/system-config/dto/system-config-ffmpeg.dto';
-import { SystemConfigJobDto } from 'src/domain/system-config/dto/system-config-job.dto';
-import { SystemConfigLibraryDto } from 'src/domain/system-config/dto/system-config-library.dto';
-import { SystemConfigLoggingDto } from 'src/domain/system-config/dto/system-config-logging.dto';
-import { SystemConfigMachineLearningDto } from 'src/domain/system-config/dto/system-config-machine-learning.dto';
-import { SystemConfigMapDto } from 'src/domain/system-config/dto/system-config-map.dto';
-import { SystemConfigNewVersionCheckDto } from 'src/domain/system-config/dto/system-config-new-version-check.dto';
-import { SystemConfigOAuthDto } from 'src/domain/system-config/dto/system-config-oauth.dto';
-import { SystemConfigPasswordLoginDto } from 'src/domain/system-config/dto/system-config-password-login.dto';
-import { SystemConfigReverseGeocodingDto } from 'src/domain/system-config/dto/system-config-reverse-geocoding.dto';
-import { SystemConfigServerDto } from 'src/domain/system-config/dto/system-config-server.dto';
-import { SystemConfigStorageTemplateDto } from 'src/domain/system-config/dto/system-config-storage-template.dto';
-import { SystemConfigThemeDto } from 'src/domain/system-config/dto/system-config-theme.dto';
-import { SystemConfigThumbnailDto } from 'src/domain/system-config/dto/system-config-thumbnail.dto';
-import { SystemConfigTrashDto } from 'src/domain/system-config/dto/system-config-trash.dto';
-import { SystemConfigUserDto } from 'src/domain/system-config/dto/system-config-user.dto';
-import { SystemConfig } from 'src/entities/system-config.entity';
-
-export class SystemConfigDto implements SystemConfig {
-  @Type(() => SystemConfigFFmpegDto)
-  @ValidateNested()
-  @IsObject()
-  ffmpeg!: SystemConfigFFmpegDto;
-
-  @Type(() => SystemConfigLoggingDto)
-  @ValidateNested()
-  @IsObject()
-  logging!: SystemConfigLoggingDto;
-
-  @Type(() => SystemConfigMachineLearningDto)
-  @ValidateNested()
-  @IsObject()
-  machineLearning!: SystemConfigMachineLearningDto;
-
-  @Type(() => SystemConfigMapDto)
-  @ValidateNested()
-  @IsObject()
-  map!: SystemConfigMapDto;
-
-  @Type(() => SystemConfigNewVersionCheckDto)
-  @ValidateNested()
-  @IsObject()
-  newVersionCheck!: SystemConfigNewVersionCheckDto;
-
-  @Type(() => SystemConfigOAuthDto)
-  @ValidateNested()
-  @IsObject()
-  oauth!: SystemConfigOAuthDto;
-
-  @Type(() => SystemConfigPasswordLoginDto)
-  @ValidateNested()
-  @IsObject()
-  passwordLogin!: SystemConfigPasswordLoginDto;
-
-  @Type(() => SystemConfigReverseGeocodingDto)
-  @ValidateNested()
-  @IsObject()
-  reverseGeocoding!: SystemConfigReverseGeocodingDto;
-
-  @Type(() => SystemConfigStorageTemplateDto)
-  @ValidateNested()
-  @IsObject()
-  storageTemplate!: SystemConfigStorageTemplateDto;
-
-  @Type(() => SystemConfigJobDto)
-  @ValidateNested()
-  @IsObject()
-  job!: SystemConfigJobDto;
-
-  @Type(() => SystemConfigThumbnailDto)
-  @ValidateNested()
-  @IsObject()
-  thumbnail!: SystemConfigThumbnailDto;
-
-  @Type(() => SystemConfigTrashDto)
-  @ValidateNested()
-  @IsObject()
-  trash!: SystemConfigTrashDto;
-
-  @Type(() => SystemConfigThemeDto)
-  @ValidateNested()
-  @IsObject()
-  theme!: SystemConfigThemeDto;
-
-  @Type(() => SystemConfigLibraryDto)
-  @ValidateNested()
-  @IsObject()
-  library!: SystemConfigLibraryDto;
-
-  @Type(() => SystemConfigServerDto)
-  @ValidateNested()
-  @IsObject()
-  server!: SystemConfigServerDto;
-
-  @Type(() => SystemConfigUserDto)
-  @ValidateNested()
-  @IsObject()
-  user!: SystemConfigUserDto;
-}
-
-export function mapConfig(config: SystemConfig): SystemConfigDto {
-  return config;
-}

server/src/domain/system-config/response-dto/system-config-template-storage-option.dto.ts

@@ -1,10 +0,0 @@
-export class SystemConfigTemplateStorageOptionDto {
-  yearOptions!: string[];
-  monthOptions!: string[];
-  weekOptions!: string[];
-  dayOptions!: string[];
-  hourOptions!: string[];
-  minuteOptions!: string[];
-  secondOptions!: string[];
-  presetOptions!: string[];
-}

server/src/domain/system-config/system-config-map-theme.dto.ts

@@ -1,13 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum } from 'class-validator';
-
-export enum MapTheme {
-  LIGHT = 'light',
-  DARK = 'dark',
-}
-
-export class MapThemeDto {
-  @IsEnum(MapTheme)
-  @ApiProperty({ enum: MapTheme, enumName: 'MapTheme' })
-  theme!: MapTheme;
-}

server/src/domain/system-config/system-config.constants.ts

@@ -1,27 +0,0 @@
-export const supportedYearTokens = ['y', 'yy'];
-export const supportedMonthTokens = ['M', 'MM', 'MMM', 'MMMM'];
-export const supportedWeekTokens = ['W', 'WW'];
-export const supportedDayTokens = ['d', 'dd'];
-export const supportedHourTokens = ['h', 'hh', 'H', 'HH'];
-export const supportedMinuteTokens = ['m', 'mm'];
-export const supportedSecondTokens = ['s', 'ss', 'SSS'];
-export const supportedPresetTokens = [
-  '{{y}}/{{y}}-{{MM}}-{{dd}}/{{filename}}',
-  '{{y}}/{{MM}}-{{dd}}/{{filename}}',
-  '{{y}}/{{MMMM}}-{{dd}}/{{filename}}',
-  '{{y}}/{{MM}}/{{filename}}',
-  '{{y}}/{{MMM}}/{{filename}}',
-  '{{y}}/{{MMMM}}/{{filename}}',
-  '{{y}}/{{MM}}/{{dd}}/{{filename}}',
-  '{{y}}/{{MMMM}}/{{dd}}/{{filename}}',
-  '{{y}}/{{y}}-{{MM}}/{{y}}-{{MM}}-{{dd}}/{{filename}}',
-  '{{y}}-{{MM}}-{{dd}}/{{filename}}',
-  '{{y}}-{{MMM}}-{{dd}}/{{filename}}',
-  '{{y}}-{{MMMM}}-{{dd}}/{{filename}}',
-  '{{y}}/{{y}}-{{MM}}/{{filename}}',
-  '{{y}}/{{y}}-{{WW}}/{{filename}}',
-  '{{y}}/{{y}}-{{MM}}-{{dd}}/{{assetId}}',
-  '{{y}}/{{y}}-{{MM}}/{{assetId}}',
-  '{{y}}/{{y}}-{{WW}}/{{assetId}}',
-  '{{album}}/{{filename}}',
-];

server/src/domain/tag/tag.dto.ts

@@ -1,21 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum, IsNotEmpty, IsString } from 'class-validator';
-import { TagType } from 'src/entities/tag.entity';
-import { Optional } from 'src/validation';
-
-export class CreateTagDto {
-  @IsString()
-  @IsNotEmpty()
-  name!: string;
-
-  @IsEnum(TagType)
-  @IsNotEmpty()
-  @ApiProperty({ enumName: 'TagTypeEnum', enum: TagType })
-  type!: TagType;
-}
-
-export class UpdateTagDto {
-  @IsString()
-  @Optional()
-  name?: string;
-}

server/src/domain/user/dto/create-profile-image.dto.ts

@@ -1,7 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { UploadFieldName } from 'src/domain/asset/asset.service';
-
-export class CreateProfileImageDto {
-  @ApiProperty({ type: 'string', format: 'binary' })
-  [UploadFieldName.PROFILE_DATA]!: Express.Multer.File;
-}

server/src/domain/user/dto/create-user.dto.ts

@@ -1,61 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Transform } from 'class-transformer';
-import { IsEmail, IsNotEmpty, IsNumber, IsPositive, IsString } from 'class-validator';
-import { Optional, ValidateBoolean, toEmail, toSanitized } from 'src/validation';
-
-export class CreateUserDto {
-  @IsEmail({ require_tld: false })
-  @Transform(toEmail)
-  email!: string;
-
-  @IsNotEmpty()
-  @IsString()
-  password!: string;
-
-  @IsNotEmpty()
-  @IsString()
-  name!: string;
-
-  @Optional({ nullable: true })
-  @IsString()
-  @Transform(toSanitized)
-  storageLabel?: string | null;
-
-  @ValidateBoolean({ optional: true })
-  memoriesEnabled?: boolean;
-
-  @Optional({ nullable: true })
-  @IsNumber()
-  @IsPositive()
-  @ApiProperty({ type: 'integer', format: 'int64' })
-  quotaSizeInBytes?: number | null;
-
-  @ValidateBoolean({ optional: true })
-  shouldChangePassword?: boolean;
-}
-
-export class CreateAdminDto {
-  @IsNotEmpty()
-  isAdmin!: true;
-
-  @IsEmail({ require_tld: false })
-  @Transform(({ value }) => value?.toLowerCase())
-  email!: string;
-
-  @IsNotEmpty()
-  password!: string;
-
-  @IsNotEmpty()
-  name!: string;
-}
-
-export class CreateUserOAuthDto {
-  @IsEmail({ require_tld: false })
-  @Transform(({ value }) => value?.toLowerCase())
-  email!: string;
-
-  @IsNotEmpty()
-  oauthId!: string;
-
-  name?: string;
-}

server/src/domain/user/dto/delete-user.dto.ts

@@ -1,6 +0,0 @@
-import { ValidateBoolean } from 'src/validation';
-
-export class DeleteUserDto {
-  @ValidateBoolean({ optional: true })
-  force?: boolean;
-}

server/src/domain/user/dto/update-user.dto.spec.ts

@@ -1,17 +0,0 @@
-import { plainToInstance } from 'class-transformer';
-import { validate } from 'class-validator';
-import { UpdateUserDto } from 'src/domain/user/dto/update-user.dto';
-
-describe('update user DTO', () => {
-  it('should allow emails without a tld', async () => {
-    const someEmail = 'test@test';
-
-    const dto = plainToInstance(UpdateUserDto, {
-      email: someEmail,
-      id: '3fe388e4-2078-44d7-b36c-39d9dee3a657',
-    });
-    const errors = await validate(dto);
-    expect(errors).toHaveLength(0);
-    expect(dto.email).toEqual(someEmail);
-  });
-});

server/src/domain/user/dto/update-user.dto.ts

@@ -1,52 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Transform } from 'class-transformer';
-import { IsEmail, IsEnum, IsNotEmpty, IsNumber, IsPositive, IsString, IsUUID } from 'class-validator';
-import { UserAvatarColor } from 'src/entities/user.entity';
-import { Optional, ValidateBoolean, toEmail, toSanitized } from 'src/validation';
-
-export class UpdateUserDto {
-  @Optional()
-  @IsEmail({ require_tld: false })
-  @Transform(toEmail)
-  email?: string;
-
-  @Optional()
-  @IsNotEmpty()
-  @IsString()
-  password?: string;
-
-  @Optional()
-  @IsString()
-  @IsNotEmpty()
-  name?: string;
-
-  @Optional()
-  @IsString()
-  @Transform(toSanitized)
-  storageLabel?: string;
-
-  @IsNotEmpty()
-  @IsUUID('4')
-  @ApiProperty({ format: 'uuid' })
-  id!: string;
-
-  @ValidateBoolean({ optional: true })
-  isAdmin?: boolean;
-
-  @ValidateBoolean({ optional: true })
-  shouldChangePassword?: boolean;
-
-  @ValidateBoolean({ optional: true })
-  memoriesEnabled?: boolean;
-
-  @Optional()
-  @IsEnum(UserAvatarColor)
-  @ApiProperty({ enumName: 'UserAvatarColor', enum: UserAvatarColor })
-  avatarColor?: UserAvatarColor;
-
-  @Optional({ nullable: true })
-  @IsNumber()
-  @IsPositive()
-  @ApiProperty({ type: 'integer', format: 'int64' })
-  quotaSizeInBytes?: number | null;
-}

server/src/domain/user/response-dto/create-profile-image-response.dto.ts

@@ -1,11 +0,0 @@
-export class CreateProfileImageResponseDto {
-  userId!: string;
-  profileImagePath!: string;
-}
-
-export function mapCreateProfileImageResponse(userId: string, profileImagePath: string): CreateProfileImageResponseDto {
-  return {
-    userId: userId,
-    profileImagePath: profileImagePath,
-  };
-}

server/src/domain/user/response-dto/user-response.dto.ts

@@ -1,65 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum } from 'class-validator';
-import { UserAvatarColor, UserEntity, UserStatus } from 'src/entities/user.entity';
-
-export const getRandomAvatarColor = (user: UserEntity): UserAvatarColor => {
-  const values = Object.values(UserAvatarColor);
-  const randomIndex = Math.floor(
-    [...user.email].map((letter) => letter.codePointAt(0) ?? 0).reduce((a, b) => a + b, 0) % values.length,
-  );
-  return values[randomIndex] as UserAvatarColor;
-};
-
-export class UserDto {
-  id!: string;
-  name!: string;
-  email!: string;
-  profileImagePath!: string;
-  @IsEnum(UserAvatarColor)
-  @ApiProperty({ enumName: 'UserAvatarColor', enum: UserAvatarColor })
-  avatarColor!: UserAvatarColor;
-}
-
-export class UserResponseDto extends UserDto {
-  storageLabel!: string | null;
-  shouldChangePassword!: boolean;
-  isAdmin!: boolean;
-  createdAt!: Date;
-  deletedAt!: Date | null;
-  updatedAt!: Date;
-  oauthId!: string;
-  memoriesEnabled?: boolean;
-  @ApiProperty({ type: 'integer', format: 'int64' })
-  quotaSizeInBytes!: number | null;
-  @ApiProperty({ type: 'integer', format: 'int64' })
-  quotaUsageInBytes!: number | null;
-  @ApiProperty({ enumName: 'UserStatus', enum: UserStatus })
-  status!: string;
-}
-
-export const mapSimpleUser = (entity: UserEntity): UserDto => {
-  return {
-    id: entity.id,
-    email: entity.email,
-    name: entity.name,
-    profileImagePath: entity.profileImagePath,
-    avatarColor: entity.avatarColor ?? getRandomAvatarColor(entity),
-  };
-};
-
-export function mapUser(entity: UserEntity): UserResponseDto {
-  return {
-    ...mapSimpleUser(entity),
-    storageLabel: entity.storageLabel,
-    shouldChangePassword: entity.shouldChangePassword,
-    isAdmin: entity.isAdmin,
-    createdAt: entity.createdAt,
-    deletedAt: entity.deletedAt,
-    updatedAt: entity.updatedAt,
-    oauthId: entity.oauthId,
-    memoriesEnabled: entity.memoriesEnabled,
-    quotaSizeInBytes: entity.quotaSizeInBytes,
-    quotaUsageInBytes: entity.quotaUsageInBytes,
-    status: entity.status,
-  };
-}

server/src/dtos/activity.dto.ts

@@ -1,6 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsEnum, IsNotEmpty, IsString, ValidateIf } from 'class-validator';
-import { UserDto, mapSimpleUser } from 'src/domain/user/response-dto/user-response.dto';
+import { UserDto, mapSimpleUser } from 'src/dtos/user.dto';
 import { ActivityEntity } from 'src/entities/activity.entity';
 import { Optional, ValidateUUID } from 'src/validation';
 

server/src/dtos/album-response.dto.spec.ts

@@ -1,4 +1,4 @@
-import { mapAlbum } from 'src/domain/album/album-response.dto';
+import { mapAlbum } from 'src/dtos/album.dto';
 import { albumStub } from 'test/fixtures/album.stub';
 
 describe('mapAlbum', () => {

server/src/dtos/album.dto.ts

@@ -1,9 +1,87 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { AssetResponseDto, mapAsset } from 'src/domain/asset/response-dto/asset-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { UserResponseDto, mapUser } from 'src/domain/user/response-dto/user-response.dto';
+import { ArrayNotEmpty, IsEnum, IsString } from 'class-validator';
+import { AssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
 import { AlbumEntity, AssetOrder } from 'src/entities/album.entity';
-import { Optional } from 'src/validation';
+import { Optional, ValidateBoolean, ValidateUUID } from 'src/validation';
+
+export class AlbumInfoDto {
+  @ValidateBoolean({ optional: true })
+  withoutAssets?: boolean;
+}
+
+export class AddUsersDto {
+  @ValidateUUID({ each: true })
+  @ArrayNotEmpty()
+  sharedUserIds!: string[];
+}
+
+export class CreateAlbumDto {
+  @IsString()
+  @ApiProperty()
+  albumName!: string;
+
+  @IsString()
+  @Optional()
+  description?: string;
+
+  @ValidateUUID({ optional: true, each: true })
+  sharedWithUserIds?: string[];
+
+  @ValidateUUID({ optional: true, each: true })
+  assetIds?: string[];
+}
+
+export class UpdateAlbumDto {
+  @Optional()
+  @IsString()
+  albumName?: string;
+
+  @Optional()
+  @IsString()
+  description?: string;
+
+  @ValidateUUID({ optional: true })
+  albumThumbnailAssetId?: string;
+
+  @ValidateBoolean({ optional: true })
+  isActivityEnabled?: boolean;
+
+  @IsEnum(AssetOrder)
+  @Optional()
+  @ApiProperty({ enum: AssetOrder, enumName: 'AssetOrder' })
+  order?: AssetOrder;
+}
+
+export class GetAlbumsDto {
+  @ValidateBoolean({ optional: true })
+  /**
+   * true: only shared albums
+   * false: only non-shared own albums
+   * undefined: shared and owned albums
+   */
+  shared?: boolean;
+
+  /**
+   * Only returns albums that contain the asset
+   * Ignores the shared parameter
+   * undefined: get all albums
+   */
+  @ValidateUUID({ optional: true })
+  assetId?: string;
+}
+
+export class AlbumCountResponseDto {
+  @ApiProperty({ type: 'integer' })
+  owned!: number;
+
+  @ApiProperty({ type: 'integer' })
+  shared!: number;
+
+  @ApiProperty({ type: 'integer' })
+  notShared!: number;
+}
 
 export class AlbumResponseDto {
   id!: string;
@@ -73,14 +151,3 @@ export const mapAlbum = (entity: AlbumEntity, withAssets: boolean, auth?: AuthDt
 
 export const mapAlbumWithAssets = (entity: AlbumEntity) => mapAlbum(entity, true);
 export const mapAlbumWithoutAssets = (entity: AlbumEntity) => mapAlbum(entity, false);
-
-export class AlbumCountResponseDto {
-  @ApiProperty({ type: 'integer' })
-  owned!: number;
-
-  @ApiProperty({ type: 'integer' })
-  shared!: number;
-
-  @ApiProperty({ type: 'integer' })
-  notShared!: number;
-}

server/src/dtos/asset-response.dto.ts

@@ -1,12 +1,12 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { ExifResponseDto, mapExif } from 'src/domain/asset/response-dto/exif-response.dto';
-import { SmartInfoResponseDto, mapSmartInfo } from 'src/domain/asset/response-dto/smart-info-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { PersonWithFacesResponseDto, mapFacesWithoutPerson, mapPerson } from 'src/domain/person/person.dto';
-import { TagResponseDto, mapTag } from 'src/domain/tag/tag-response.dto';
-import { UserResponseDto, mapUser } from 'src/domain/user/response-dto/user-response.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { ExifResponseDto, mapExif } from 'src/dtos/exif.dto';
+import { PersonWithFacesResponseDto, mapFacesWithoutPerson, mapPerson } from 'src/dtos/person.dto';
+import { TagResponseDto, mapTag } from 'src/dtos/tag.dto';
+import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
 import { AssetFaceEntity } from 'src/entities/asset-face.entity';
 import { AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { SmartInfoEntity } from 'src/entities/smart-info.entity';
 
 export class SanitizedAssetResponseDto {
   id!: string;
@@ -134,3 +134,15 @@ export class MemoryLaneResponseDto {
   title!: string;
   assets!: AssetResponseDto[];
 }
+
+export class SmartInfoResponseDto {
+  tags?: string[] | null;
+  objects?: string[] | null;
+}
+
+export function mapSmartInfo(entity: SmartInfoEntity): SmartInfoResponseDto {
+  return {
+    tags: entity.tags,
+    objects: entity.objects,
+  };
+}

server/src/dtos/asset-v1-response.dto.ts

@@ -0,0 +1,45 @@
+export class AssetBulkUploadCheckResult {
+  id!: string;
+  action!: AssetUploadAction;
+  reason?: AssetRejectReason;
+  assetId?: string;
+}
+
+export class AssetBulkUploadCheckResponseDto {
+  results!: AssetBulkUploadCheckResult[];
+}
+
+export enum AssetUploadAction {
+  ACCEPT = 'accept',
+  REJECT = 'reject',
+}
+
+export enum AssetRejectReason {
+  DUPLICATE = 'duplicate',
+  UNSUPPORTED_FORMAT = 'unsupported-format',
+}
+
+export class AssetFileUploadResponseDto {
+  id!: string;
+  duplicate!: boolean;
+}
+
+export class CheckExistingAssetsResponseDto {
+  existingIds!: string[];
+}
+
+export class CuratedLocationsResponseDto {
+  id!: string;
+  city!: string;
+  resizePath!: string;
+  deviceAssetId!: string;
+  deviceId!: string;
+}
+
+export class CuratedObjectsResponseDto {
+  id!: string;
+  object!: string;
+  resizePath!: string;
+  deviceAssetId!: string;
+  deviceId!: string;
+}

server/src/dtos/asset-v1.dto.ts

@@ -0,0 +1,154 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import { ArrayNotEmpty, IsArray, IsEnum, IsInt, IsNotEmpty, IsString, IsUUID, ValidateNested } from 'class-validator';
+import { UploadFieldName } from 'src/dtos/asset.dto';
+import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
+
+export class AssetBulkUploadCheckItem {
+  @IsString()
+  @IsNotEmpty()
+  id!: string;
+
+  /** base64 or hex encoded sha1 hash */
+  @IsString()
+  @IsNotEmpty()
+  checksum!: string;
+}
+
+export class AssetBulkUploadCheckDto {
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => AssetBulkUploadCheckItem)
+  assets!: AssetBulkUploadCheckItem[];
+}
+
+export class AssetSearchDto {
+  @ValidateBoolean({ optional: true })
+  isFavorite?: boolean;
+
+  @ValidateBoolean({ optional: true })
+  isArchived?: boolean;
+
+  @Optional()
+  @IsInt()
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  skip?: number;
+
+  @Optional()
+  @IsInt()
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  take?: number;
+
+  @Optional()
+  @IsUUID('4')
+  @ApiProperty({ format: 'uuid' })
+  userId?: string;
+
+  @ValidateDate({ optional: true })
+  updatedAfter?: Date;
+
+  @ValidateDate({ optional: true })
+  updatedBefore?: Date;
+}
+
+export class CheckExistingAssetsDto {
+  @ArrayNotEmpty()
+  @IsString({ each: true })
+  @IsNotEmpty({ each: true })
+  deviceAssetIds!: string[];
+
+  @IsNotEmpty()
+  deviceId!: string;
+}
+
+export class CreateAssetDto {
+  @ValidateUUID({ optional: true })
+  libraryId?: string;
+
+  @IsNotEmpty()
+  @IsString()
+  deviceAssetId!: string;
+
+  @IsNotEmpty()
+  @IsString()
+  deviceId!: string;
+
+  @ValidateDate()
+  fileCreatedAt!: Date;
+
+  @ValidateDate()
+  fileModifiedAt!: Date;
+
+  @Optional()
+  @IsString()
+  duration?: string;
+
+  @ValidateBoolean({ optional: true })
+  isFavorite?: boolean;
+
+  @ValidateBoolean({ optional: true })
+  isArchived?: boolean;
+
+  @ValidateBoolean({ optional: true })
+  isVisible?: boolean;
+
+  @ValidateBoolean({ optional: true })
+  isOffline?: boolean;
+
+  @ValidateBoolean({ optional: true })
+  isReadOnly?: boolean;
+
+  // The properties below are added to correctly generate the API docs
+  // and client SDKs. Validation should be handled in the controller.
+  @ApiProperty({ type: 'string', format: 'binary' })
+  [UploadFieldName.ASSET_DATA]!: any;
+
+  @ApiProperty({ type: 'string', format: 'binary', required: false })
+  [UploadFieldName.LIVE_PHOTO_DATA]?: any;
+
+  @ApiProperty({ type: 'string', format: 'binary', required: false })
+  [UploadFieldName.SIDECAR_DATA]?: any;
+}
+
+export enum GetAssetThumbnailFormatEnum {
+  JPEG = 'JPEG',
+  WEBP = 'WEBP',
+}
+
+export class GetAssetThumbnailDto {
+  @Optional()
+  @IsEnum(GetAssetThumbnailFormatEnum)
+  @ApiProperty({
+    type: String,
+    enum: GetAssetThumbnailFormatEnum,
+    default: GetAssetThumbnailFormatEnum.WEBP,
+    required: false,
+    enumName: 'ThumbnailFormat',
+  })
+  format: GetAssetThumbnailFormatEnum = GetAssetThumbnailFormatEnum.WEBP;
+}
+
+export class SearchPropertiesDto {
+  tags?: string[];
+  objects?: string[];
+  assetType?: string;
+  orientation?: string;
+  lensModel?: string;
+  make?: string;
+  model?: string;
+  city?: string;
+  state?: string;
+  country?: string;
+}
+
+export class ServeFileDto {
+  @ValidateBoolean({ optional: true })
+  @ApiProperty({ title: 'Is serve thumbnail (resize) file' })
+  isThumb?: boolean;
+
+  @ValidateBoolean({ optional: true })
+  @ApiProperty({ title: 'Is request made from web' })
+  isWeb?: boolean;
+}