refactor(server): domain/infra (#1298)

* refactor: user repository

* refactor: user module

* refactor: move database into infra

* refactor(cli): use user core

* chore: import path

* chore: tests

server/apps/cli/src/app.module.ts

@@ -1,11 +1,17 @@
-import { DatabaseModule, SystemConfigEntity, UserEntity } from '@app/database';
+import { DomainModule } from '@app/domain';
+import { InfraModule, SystemConfigEntity } from '@app/infra';
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { DisablePasswordLoginCommand, EnablePasswordLoginCommand } from './commands/password-login';
 import { PromptPasswordQuestions, ResetAdminPasswordCommand } from './commands/reset-admin-password.command';
 
 @Module({
-  imports: [DatabaseModule, TypeOrmModule.forFeature([UserEntity, SystemConfigEntity])],
+  imports: [
+    DomainModule.register({
+      imports: [InfraModule],
+    }),
+    TypeOrmModule.forFeature([SystemConfigEntity]),
+  ],
   providers: [
     ResetAdminPasswordCommand,
     PromptPasswordQuestions,

server/apps/cli/src/commands/password-login.ts

@@ -1,4 +1,4 @@
-import { SystemConfigEntity, SystemConfigKey } from '@app/database';
+import { SystemConfigEntity, SystemConfigKey } from '@app/infra';
 import { InjectRepository } from '@nestjs/typeorm';
 import axios from 'axios';
 import { Command, CommandRunner } from 'nest-commander';
@@ -9,9 +9,7 @@ import { Repository } from 'typeorm';
   description: 'Enable password login',
 })
 export class EnablePasswordLoginCommand extends CommandRunner {
-  constructor(
-    @InjectRepository(SystemConfigEntity) private repository: Repository<SystemConfigEntity>, //
-  ) {
+  constructor(@InjectRepository(SystemConfigEntity) private repository: Repository<SystemConfigEntity>) {
     super();
   }
 

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

@@ -1,40 +1,38 @@
-import { UserEntity } from '@app/database';
-import { InjectRepository } from '@nestjs/typeorm';
-import bcrypt from 'bcrypt';
+import { Inject } from '@nestjs/common';
 import { Command, CommandRunner, InquirerService, Question, QuestionSet } from 'nest-commander';
 import { randomBytes } from 'node:crypto';
-import { Repository } from 'typeorm';
+import { IUserRepository, UserCore } from '@app/domain';
 
 @Command({
   name: 'reset-admin-password',
   description: 'Reset the admin password',
 })
 export class ResetAdminPasswordCommand extends CommandRunner {
-  constructor(
-    private readonly inquirer: InquirerService,
-    @InjectRepository(UserEntity) private userRepository: Repository<UserEntity>,
-  ) {
+  userCore: UserCore;
+
+  constructor(private readonly inquirer: InquirerService, @Inject(IUserRepository) userRepository: IUserRepository) {
     super();
+
+    this.userCore = new UserCore(userRepository);
   }
 
   async run(): Promise<void> {
-    let { password } = await this.inquirer.ask<{ password: string }>('prompt-password', undefined);
-    password = password || randomBytes(24).toString('base64').replace(/\W/g, '');
-
-    const hashedPassword = await bcrypt.hash(password, 10);
-
-    const user = await this.userRepository.findOne({ where: { isAdmin: true } });
+    const user = await this.userCore.getAdmin();
     if (!user) {
       console.log('Unable to reset password: no admin user.');
       return;
     }
 
-    user.password = hashedPassword;
-    user.shouldChangePassword = true;
+    const { password: providedPassword } = await this.inquirer.ask<{ password: string }>('prompt-password', undefined);
+    const password = providedPassword || randomBytes(24).toString('base64').replace(/\W/g, '');
 
-    await this.userRepository.save(user);
+    await this.userCore.updateUser(user, user.id, { password });
 
-    console.log(`New password:\n${password}`);
+    if (providedPassword) {
+      console.log('The admin password has been updated.');
+    } else {
+      console.log(`The admin password has been updated to:\n${password}`);
+    }
   }
 }
 

server/apps/immich/src/api-v1/album/album-repository.ts

@@ -1,4 +1,4 @@
-import { AlbumEntity, AssetAlbumEntity, UserAlbumEntity } from '@app/database';
+import { AlbumEntity, AssetAlbumEntity, UserAlbumEntity } from '@app/infra';
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { In, Repository, SelectQueryBuilder, DataSource, Brackets, Not, IsNull } from 'typeorm';

server/apps/immich/src/api-v1/album/album.module.ts

@@ -2,11 +2,10 @@ import { forwardRef, Module } from '@nestjs/common';
 import { AlbumService } from './album.service';
 import { AlbumController } from './album.controller';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { AlbumEntity, AssetAlbumEntity, UserAlbumEntity } from '@app/database';
+import { AlbumEntity, AssetAlbumEntity, UserAlbumEntity } from '@app/infra';
 import { AlbumRepository, IAlbumRepository } from './album-repository';
 import { DownloadModule } from '../../modules/download/download.module';
 import { AssetModule } from '../asset/asset.module';
-import { UserModule } from '../user/user.module';
 import { ShareModule } from '../share/share.module';
 
 const ALBUM_REPOSITORY_PROVIDER = {
@@ -18,7 +17,6 @@ const ALBUM_REPOSITORY_PROVIDER = {
   imports: [
     TypeOrmModule.forFeature([AlbumEntity, AssetAlbumEntity, UserAlbumEntity]),
     DownloadModule,
-    UserModule,
     forwardRef(() => AssetModule),
     ShareModule,
   ],

server/apps/immich/src/api-v1/album/album.service.spec.ts

@@ -1,7 +1,7 @@
 import { AlbumService } from './album.service';
 import { AuthUserDto } from '../../decorators/auth-user.decorator';
 import { BadRequestException, NotFoundException, ForbiddenException } from '@nestjs/common';
-import { AlbumEntity } from '@app/database';
+import { AlbumEntity } from '@app/infra';
 import { AlbumResponseDto } from './response-dto/album-response.dto';
 import { AddAssetsResponseDto } from './response-dto/add-assets-response.dto';
 import { IAlbumRepository } from './album-repository';

server/apps/immich/src/api-v1/album/album.service.ts

@@ -1,7 +1,7 @@
 import { BadRequestException, Inject, Injectable, NotFoundException, ForbiddenException, Logger } from '@nestjs/common';
 import { AuthUserDto } from '../../decorators/auth-user.decorator';
 import { CreateAlbumDto } from './dto/create-album.dto';
-import { AlbumEntity, SharedLinkType } from '@app/database';
+import { AlbumEntity, SharedLinkType } from '@app/infra';
 import { AddUsersDto } from './dto/add-users.dto';
 import { RemoveAssetsDto } from './dto/remove-assets.dto';
 import { UpdateAlbumDto } from './dto/update-album.dto';

server/apps/immich/src/api-v1/album/response-dto/album-response.dto.ts

@@ -1,5 +1,5 @@
-import { AlbumEntity } from '@app/database';
-import { UserResponseDto, mapUser } from '../../user/response-dto/user-response.dto';
+import { AlbumEntity } from '@app/infra';
+import { UserResponseDto, mapUser } from '@app/domain';
 import { AssetResponseDto, mapAsset } from '../../asset/response-dto/asset-response.dto';
 import { ApiProperty } from '@nestjs/swagger';
 

server/apps/immich/src/api-v1/api-key/api-key.module.ts

@@ -1,4 +1,4 @@
-import { APIKeyEntity } from '@app/database';
+import { APIKeyEntity } from '@app/infra';
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { APIKeyController } from './api-key.controller';

server/apps/immich/src/api-v1/api-key/api-key.repository.ts

@@ -1,4 +1,4 @@
-import { APIKeyEntity } from '@app/database';
+import { APIKeyEntity } from '@app/infra';
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';

server/apps/immich/src/api-v1/api-key/api-key.service.ts

@@ -1,4 +1,4 @@
-import { UserEntity } from '@app/database';
+import { UserEntity } from '@app/infra';
 import { BadRequestException, Inject, Injectable, UnauthorizedException } from '@nestjs/common';
 import { compareSync, hash } from 'bcrypt';
 import { randomBytes } from 'node:crypto';

server/apps/immich/src/api-v1/api-key/repsonse-dto/api-key-response.dto.ts

@@ -1,4 +1,4 @@
-import { APIKeyEntity } from '@app/database';
+import { APIKeyEntity } from '@app/infra';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class APIKeyResponseDto {

server/apps/immich/src/api-v1/asset/asset-repository.ts

@@ -1,6 +1,6 @@
 import { SearchPropertiesDto } from './dto/search-properties.dto';
 import { CuratedLocationsResponseDto } from './response-dto/curated-locations-response.dto';
-import { AssetEntity, AssetType } from '@app/database';
+import { AssetEntity, AssetType } from '@app/infra';
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm/repository/Repository';

server/apps/immich/src/api-v1/asset/asset.module.ts

@@ -2,7 +2,7 @@ import { forwardRef, Module } from '@nestjs/common';
 import { AssetService } from './asset.service';
 import { AssetController } from './asset.controller';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { AssetEntity } from '@app/database';
+import { AssetEntity } from '@app/infra';
 import { BullModule } from '@nestjs/bull';
 import { BackgroundTaskModule } from '../../modules/background-task/background-task.module';
 import { BackgroundTaskService } from '../../modules/background-task/background-task.service';
@@ -11,7 +11,6 @@ import { AssetRepository, IAssetRepository } from './asset-repository';
 import { DownloadModule } from '../../modules/download/download.module';
 import { TagModule } from '../tag/tag.module';
 import { AlbumModule } from '../album/album.module';
-import { UserModule } from '../user/user.module';
 import { StorageModule } from '@app/storage';
 import { immichSharedQueues } from '@app/job/constants/bull-queue-registration.constant';
 import { ShareModule } from '../share/share.module';
@@ -27,7 +26,6 @@ const ASSET_REPOSITORY_PROVIDER = {
     CommunicationModule,
     BackgroundTaskModule,
     DownloadModule,
-    UserModule,
     AlbumModule,
     TagModule,
     StorageModule,

server/apps/immich/src/api-v1/asset/asset.service.spec.ts

@@ -2,7 +2,7 @@ import { IAssetRepository } from './asset-repository';
 import { AuthUserDto } from '../../decorators/auth-user.decorator';
 import { AssetService } from './asset.service';
 import { Repository } from 'typeorm';
-import { AssetEntity, AssetType } from '@app/database';
+import { AssetEntity, AssetType } from '@app/infra';
 import { CreateAssetDto } from './dto/create-asset.dto';
 import { AssetCountByTimeBucket } from './response-dto/asset-count-by-time-group-response.dto';
 import { TimeGroupEnum } from './dto/get-asset-count-by-time-bucket.dto';

server/apps/immich/src/api-v1/asset/asset.service.ts

@@ -13,7 +13,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { createHash, randomUUID } from 'node:crypto';
 import { QueryFailedError, Repository } from 'typeorm';
 import { AuthUserDto } from '../../decorators/auth-user.decorator';
-import { AssetEntity, AssetType } from '@app/database';
+import { AssetEntity, AssetType } from '@app/infra';
 import { constants, createReadStream, ReadStream, stat } from 'fs';
 import { ServeFileDto } from './dto/serve-file.dto';
 import { Response as Res } from 'express';

server/apps/immich/src/api-v1/asset/dto/create-asset.dto.ts

@@ -1,5 +1,5 @@
 import { IsNotEmpty, IsOptional } from 'class-validator';
-import { AssetType } from '@app/database';
+import { AssetType } from '@app/infra';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class CreateAssetDto {

server/apps/immich/src/api-v1/asset/response-dto/asset-response.dto.ts

@@ -1,4 +1,4 @@
-import { AssetEntity, AssetType } from '@app/database';
+import { AssetEntity, AssetType } from '@app/infra';
 import { ApiProperty } from '@nestjs/swagger';
 import { mapTag, TagResponseDto } from '../../tag/response-dto/tag-response.dto';
 import { ExifResponseDto, mapExif } from './exif-response.dto';

server/apps/immich/src/api-v1/asset/response-dto/exif-response.dto.ts

@@ -1,4 +1,4 @@
-import { ExifEntity } from '@app/database';
+import { ExifEntity } from '@app/infra';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class ExifResponseDto {

server/apps/immich/src/api-v1/asset/response-dto/smart-info-response.dto.ts

@@ -1,4 +1,4 @@
-import { SmartInfoEntity } from '@app/database';
+import { SmartInfoEntity } from '@app/infra';
 
 export class SmartInfoResponseDto {
   id?: string;

server/apps/immich/src/api-v1/auth/auth.controller.ts

@@ -5,7 +5,7 @@ import { AuthType, IMMICH_AUTH_TYPE_COOKIE } from '../../constants/jwt.constant'
 import { AuthUserDto, GetAuthUser } from '../../decorators/auth-user.decorator';
 import { Authenticated } from '../../decorators/authenticated.decorator';
 import { ImmichJwtService } from '../../modules/immich-jwt/immich-jwt.service';
-import { UserResponseDto } from '../user/response-dto/user-response.dto';
+import { UserResponseDto } from '@app/domain';
 import { AuthService } from './auth.service';
 import { ChangePasswordDto } from './dto/change-password.dto';
 import { LoginCredentialDto } from './dto/login-credential.dto';

server/apps/immich/src/api-v1/auth/auth.module.ts

@@ -2,12 +2,11 @@ import { Module } from '@nestjs/common';
 import { ImmichConfigModule } from '@app/immich-config';
 import { ImmichJwtModule } from '../../modules/immich-jwt/immich-jwt.module';
 import { OAuthModule } from '../oauth/oauth.module';
-import { UserModule } from '../user/user.module';
 import { AuthController } from './auth.controller';
 import { AuthService } from './auth.service';
 
 @Module({
-  imports: [UserModule, ImmichJwtModule, OAuthModule, ImmichConfigModule],
+  imports: [ImmichJwtModule, OAuthModule, ImmichConfigModule],
   controllers: [AuthController],
   providers: [AuthService],
 })

server/apps/immich/src/api-v1/auth/auth.service.spec.ts

@@ -1,12 +1,12 @@
-import { UserEntity } from '@app/database';
+import { UserEntity } from '@app/infra';
 import { BadRequestException, UnauthorizedException } from '@nestjs/common';
 import * as bcrypt from 'bcrypt';
-import { SystemConfig } from '@app/database/entities/system-config.entity';
+import { SystemConfig } from '@app/infra';
 import { ImmichConfigService } from '@app/immich-config';
 import { AuthType } from '../../constants/jwt.constant';
 import { ImmichJwtService } from '../../modules/immich-jwt/immich-jwt.service';
 import { OAuthService } from '../oauth/oauth.service';
-import { IUserRepository } from '../user/user-repository';
+import { IUserRepository } from '@app/domain';
 import { AuthService } from './auth.service';
 import { SignUpDto } from './dto/sign-up.dto';
 import { LoginResponseDto } from './response-dto/login-response.dto';

server/apps/immich/src/api-v1/auth/auth.service.ts

@@ -7,11 +7,11 @@ import {
   UnauthorizedException,
 } from '@nestjs/common';
 import * as bcrypt from 'bcrypt';
-import { UserEntity } from '@app/database';
+import { UserEntity } from '@app/infra';
 import { AuthType } from '../../constants/jwt.constant';
 import { AuthUserDto } from '../../decorators/auth-user.decorator';
 import { ImmichJwtService } from '../../modules/immich-jwt/immich-jwt.service';
-import { IUserRepository } from '../user/user-repository';
+import { IUserRepository } from '@app/domain';
 import { ChangePasswordDto } from './dto/change-password.dto';
 import { LoginCredentialDto } from './dto/login-credential.dto';
 import { SignUpDto } from './dto/sign-up.dto';
@@ -19,9 +19,9 @@ import { AdminSignupResponseDto, mapAdminSignupResponse } from './response-dto/a
 import { LoginResponseDto } from './response-dto/login-response.dto';
 import { LogoutResponseDto } from './response-dto/logout-response.dto';
 import { OAuthService } from '../oauth/oauth.service';
-import { UserCore } from '../user/user.core';
+import { UserCore } from '@app/domain';
 import { ImmichConfigService, INITIAL_SYSTEM_CONFIG } from '@app/immich-config';
-import { SystemConfig } from '@app/database/entities/system-config.entity';
+import { SystemConfig } from '@app/infra';
 
 @Injectable()
 export class AuthService {

server/apps/immich/src/api-v1/auth/response-dto/admin-signup-response.dto.ts

@@ -1,4 +1,4 @@
-import { UserEntity } from '@app/database';
+import { UserEntity } from '@app/infra';
 
 export class AdminSignupResponseDto {
   id!: string;

server/apps/immich/src/api-v1/auth/response-dto/login-response.dto.ts

@@ -1,4 +1,4 @@
-import { UserEntity } from '@app/database';
+import { UserEntity } from '@app/infra';
 import { ApiResponseProperty } from '@nestjs/swagger';
 
 export class LoginResponseDto {

server/apps/immich/src/api-v1/communication/communication.gateway.ts

@@ -3,7 +3,7 @@ import { Socket, Server } from 'socket.io';
 import { ImmichJwtService, JwtValidationResult } from '../../modules/immich-jwt/immich-jwt.service';
 import { Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { UserEntity } from '@app/database';
+import { UserEntity } from '@app/infra';
 import { Repository } from 'typeorm';
 import cookieParser from 'cookie';
 import { IMMICH_ACCESS_COOKIE } from '../../constants/jwt.constant';

server/apps/immich/src/api-v1/communication/communication.module.ts

@@ -6,7 +6,7 @@ import { ImmichJwtService } from '../../modules/immich-jwt/immich-jwt.service';
 import { JwtModule } from '@nestjs/jwt';
 import { jwtConfig } from '../../config/jwt.config';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { UserEntity } from '@app/database';
+import { UserEntity } from '@app/infra';
 
 @Module({
   imports: [TypeOrmModule.forFeature([UserEntity]), ImmichJwtModule, JwtModule.register(jwtConfig)],

server/apps/immich/src/api-v1/device-info/device-info.module.ts

@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
 import { DeviceInfoService } from './device-info.service';
 import { DeviceInfoController } from './device-info.controller';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { DeviceInfoEntity } from '@app/database';
+import { DeviceInfoEntity } from '@app/infra';
 
 @Module({
   imports: [TypeOrmModule.forFeature([DeviceInfoEntity])],

server/apps/immich/src/api-v1/device-info/device-info.service.spec.ts

@@ -1,4 +1,4 @@
-import { DeviceInfoEntity, DeviceType } from '@app/database';
+import { DeviceInfoEntity, DeviceType } from '@app/infra';
 import { Repository } from 'typeorm';
 import { DeviceInfoService } from './device-info.service';
 

server/apps/immich/src/api-v1/device-info/device-info.service.ts

@@ -1,4 +1,4 @@
-import { DeviceInfoEntity } from '@app/database';
+import { DeviceInfoEntity } from '@app/infra';
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';

server/apps/immich/src/api-v1/device-info/dto/upsert-device-info.dto.ts

@@ -1,5 +1,5 @@
 import { IsNotEmpty, IsOptional } from 'class-validator';
-import { DeviceType } from '@app/database';
+import { DeviceType } from '@app/infra';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class UpsertDeviceInfoDto {

server/apps/immich/src/api-v1/device-info/response-dto/device-info-response.dto.ts

@@ -1,4 +1,4 @@
-import { DeviceInfoEntity, DeviceType } from '@app/database';
+import { DeviceInfoEntity, DeviceType } from '@app/infra';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class DeviceInfoResponseDto {

server/apps/immich/src/api-v1/job/job.module.ts

@@ -1,15 +1,11 @@
 import { Module } from '@nestjs/common';
 import { JobService } from './job.service';
 import { JobController } from './job.controller';
-import { ImmichJwtService } from '../../modules/immich-jwt/immich-jwt.service';
 import { ImmichJwtModule } from '../../modules/immich-jwt/immich-jwt.module';
-import { JwtModule } from '@nestjs/jwt';
-import { jwtConfig } from '../../config/jwt.config';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { ExifEntity } from '@app/database';
+import { ExifEntity } from '@app/infra';
 import { TagModule } from '../tag/tag.module';
 import { AssetModule } from '../asset/asset.module';
-import { UserModule } from '../user/user.module';
 
 import { StorageModule } from '@app/storage';
 import { BullModule } from '@nestjs/bull';
@@ -21,12 +17,10 @@ import { immichSharedQueues } from '@app/job/constants/bull-queue-registration.c
     ImmichJwtModule,
     TagModule,
     AssetModule,
-    UserModule,
-    JwtModule.register(jwtConfig),
     StorageModule,
     BullModule.registerQueue(...immichSharedQueues),
   ],
   controllers: [JobController],
-  providers: [JobService, ImmichJwtService],
+  providers: [JobService],
 })
 export class JobModule {}

server/apps/immich/src/api-v1/job/job.service.ts

@@ -15,7 +15,7 @@ import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { AllJobStatusResponseDto } from './response-dto/all-job-status-response.dto';
 import { randomUUID } from 'crypto';
 import { IAssetRepository } from '../asset/asset-repository';
-import { AssetType } from '@app/database';
+import { AssetType } from '@app/infra';
 import { GetJobDto, JobId } from './dto/get-job.dto';
 import { JobStatusResponseDto } from './response-dto/job-status-response.dto';
 import { IMachineLearningJob } from '@app/job/interfaces/machine-learning.interface';

server/apps/immich/src/api-v1/oauth/oauth.controller.ts

@@ -6,7 +6,7 @@ import { AuthUserDto, GetAuthUser } from '../../decorators/auth-user.decorator';
 import { Authenticated } from '../../decorators/authenticated.decorator';
 import { ImmichJwtService } from '../../modules/immich-jwt/immich-jwt.service';
 import { LoginResponseDto } from '../auth/response-dto/login-response.dto';
-import { UserResponseDto } from '../user/response-dto/user-response.dto';
+import { UserResponseDto } from '@app/domain';
 import { OAuthCallbackDto } from './dto/oauth-auth-code.dto';
 import { OAuthConfigDto } from './dto/oauth-config.dto';
 import { MOBILE_REDIRECT, OAuthService } from './oauth.service';

server/apps/immich/src/api-v1/oauth/oauth.module.ts

@@ -1,12 +1,11 @@
 import { ImmichConfigModule } from '@app/immich-config';
 import { Module } from '@nestjs/common';
 import { ImmichJwtModule } from '../../modules/immich-jwt/immich-jwt.module';
-import { UserModule } from '../user/user.module';
 import { OAuthController } from './oauth.controller';
 import { OAuthService } from './oauth.service';
 
 @Module({
-  imports: [UserModule, ImmichJwtModule, ImmichConfigModule],
+  imports: [ImmichJwtModule, ImmichConfigModule],
   controllers: [OAuthController],
   providers: [OAuthService],
   exports: [OAuthService],

server/apps/immich/src/api-v1/oauth/oauth.service.spec.ts

@@ -1,4 +1,4 @@
-import { SystemConfig, UserEntity } from '@app/database';
+import { SystemConfig, UserEntity } from '@app/infra';
 import { ImmichConfigService } from '@app/immich-config';
 import { BadRequestException } from '@nestjs/common';
 import { generators, Issuer } from 'openid-client';
@@ -6,7 +6,7 @@ import { AuthUserDto } from '../../decorators/auth-user.decorator';
 import { ImmichJwtService } from '../../modules/immich-jwt/immich-jwt.service';
 import { LoginResponseDto } from '../auth/response-dto/login-response.dto';
 import { OAuthService } from '../oauth/oauth.service';
-import { IUserRepository } from '../user/user-repository';
+import { IUserRepository } from '@app/domain';
 
 const email = 'user@immich.com';
 const sub = 'my-auth-user-sub';

server/apps/immich/src/api-v1/oauth/oauth.service.ts

@@ -1,13 +1,11 @@
-import { SystemConfig } from '@app/database/entities/system-config.entity';
+import { SystemConfig } from '@app/infra';
 import { ImmichConfigService, INITIAL_SYSTEM_CONFIG } from '@app/immich-config';
 import { BadRequestException, Inject, Injectable, Logger } from '@nestjs/common';
 import { ClientMetadata, custom, generators, Issuer, UserinfoResponse } from 'openid-client';
 import { AuthUserDto } from '../../decorators/auth-user.decorator';
 import { ImmichJwtService } from '../../modules/immich-jwt/immich-jwt.service';
 import { LoginResponseDto } from '../auth/response-dto/login-response.dto';
-import { UserResponseDto } from '../user/response-dto/user-response.dto';
-import { IUserRepository } from '../user/user-repository';
-import { UserCore } from '../user/user.core';
+import { IUserRepository, UserResponseDto, UserCore } from '@app/domain';
 import { OAuthCallbackDto } from './dto/oauth-auth-code.dto';
 import { OAuthConfigDto } from './dto/oauth-config.dto';
 import { OAuthConfigResponseDto } from './response-dto/oauth-config-response.dto';

server/apps/immich/src/api-v1/server-info/server-info.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { ServerInfoService } from './server-info.service';
 import { ServerInfoController } from './server-info.controller';
-import { AssetEntity, UserEntity } from '@app/database';
+import { AssetEntity, UserEntity } from '@app/infra';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { ImmichJwtModule } from '../../modules/immich-jwt/immich-jwt.module';
 

server/apps/immich/src/api-v1/server-info/server-info.service.ts

@@ -4,7 +4,7 @@ import { ServerInfoResponseDto } from './response-dto/server-info-response.dto';
 import diskusage from 'diskusage';
 import { ServerStatsResponseDto } from './response-dto/server-stats-response.dto';
 import { UsageByUserDto } from './response-dto/usage-by-user-response.dto';
-import { AssetEntity } from '@app/database';
+import { AssetEntity } from '@app/infra';
 import { Repository } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
 import { asHumanReadable } from '../../utils/human-readable.util';

server/apps/immich/src/api-v1/share/dto/create-shared-link.dto.ts

@@ -1,5 +1,5 @@
-import { AlbumEntity, AssetEntity } from '@app/database';
-import { SharedLinkType } from '@app/database/entities/shared-link.entity';
+import { AlbumEntity, AssetEntity } from '@app/infra';
+import { SharedLinkType } from '@app/infra';
 
 export class CreateSharedLinkDto {
   description?: string;

server/apps/immich/src/api-v1/share/response-dto/shared-link-response.dto.ts

@@ -1,4 +1,4 @@
-import { SharedLinkEntity, SharedLinkType } from '@app/database';
+import { SharedLinkEntity, SharedLinkType } from '@app/infra';
 import { ApiProperty } from '@nestjs/swagger';
 import _ from 'lodash';
 import { AlbumResponseDto, mapAlbumExcludeAssetInfo } from '../../album/response-dto/album-response.dto';

server/apps/immich/src/api-v1/share/share.core.ts

@@ -1,9 +1,9 @@
-import { SharedLinkEntity } from '@app/database/entities/shared-link.entity';
+import { SharedLinkEntity } from '@app/infra';
 import { CreateSharedLinkDto } from './dto/create-shared-link.dto';
 import { ISharedLinkRepository } from './shared-link.repository';
 import crypto from 'node:crypto';
 import { BadRequestException, InternalServerErrorException, Logger } from '@nestjs/common';
-import { AssetEntity } from '@app/database';
+import { AssetEntity } from '@app/infra';
 import { EditSharedLinkDto } from './dto/edit-shared-link.dto';
 
 export class ShareCore {

server/apps/immich/src/api-v1/share/share.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { ShareService } from './share.service';
 import { ShareController } from './share.controller';
-import { SharedLinkEntity } from '@app/database/entities/shared-link.entity';
+import { SharedLinkEntity } from '@app/infra';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { SharedLinkRepository, ISharedLinkRepository } from './shared-link.repository';
 

server/apps/immich/src/api-v1/share/shared-link.repository.ts

@@ -1,4 +1,4 @@
-import { SharedLinkEntity } from '@app/database/entities/shared-link.entity';
+import { SharedLinkEntity } from '@app/infra';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 

server/apps/immich/src/api-v1/system-config/dto/system-config.dto.ts

@@ -1,4 +1,4 @@
-import { SystemConfig } from '@app/database';
+import { SystemConfig } from '@app/infra';
 import { ValidateNested } from 'class-validator';
 import { SystemConfigFFmpegDto } from './system-config-ffmpeg.dto';
 import { SystemConfigOAuthDto } from './system-config-oauth.dto';

server/apps/immich/src/api-v1/system-config/system-config.module.ts

@@ -1,4 +1,4 @@
-import { SystemConfigEntity } from '@app/database';
+import { SystemConfigEntity } from '@app/infra';
 import { immichSharedQueues } from '@app/job/constants/bull-queue-registration.constant';
 import { BullModule } from '@nestjs/bull';
 import { Module } from '@nestjs/common';

server/apps/immich/src/api-v1/tag/dto/create-tag.dto.ts

@@ -1,4 +1,4 @@
-import { TagType } from '@app/database';
+import { TagType } from '@app/infra';
 import { ApiProperty } from '@nestjs/swagger';
 import { IsEnum, IsNotEmpty, IsString } from 'class-validator';
 

server/apps/immich/src/api-v1/tag/response-dto/tag-response.dto.ts

@@ -1,4 +1,4 @@
-import { TagEntity, TagType } from '@app/database';
+import { TagEntity, TagType } from '@app/infra';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class TagResponseDto {

server/apps/immich/src/api-v1/tag/tag.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TagService } from './tag.service';
 import { TagController } from './tag.controller';
-import { TagEntity } from '@app/database';
+import { TagEntity } from '@app/infra';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { TagRepository, ITagRepository } from './tag.repository';
 

server/apps/immich/src/api-v1/tag/tag.repository.ts

@@ -1,4 +1,4 @@
-import { TagEntity, TagType } from '@app/database';
+import { TagEntity, TagType } from '@app/infra';
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { In, Repository } from 'typeorm';

server/apps/immich/src/api-v1/tag/tag.service.spec.ts

@@ -1,4 +1,4 @@
-import { TagEntity, TagType, UserEntity } from '@app/database';
+import { TagEntity, TagType, UserEntity } from '@app/infra';
 import { AuthUserDto } from '../../decorators/auth-user.decorator';
 import { ITagRepository } from './tag.repository';
 import { TagService } from './tag.service';

server/apps/immich/src/api-v1/tag/tag.service.ts

@@ -1,4 +1,4 @@
-import { TagEntity } from '@app/database';
+import { TagEntity } from '@app/infra';
 import { BadRequestException, Inject, Injectable, Logger } from '@nestjs/common';
 import { AuthUserDto } from '../../decorators/auth-user.decorator';
 import { CreateTagDto } from './dto/create-tag.dto';

server/apps/immich/src/api-v1/user/dto/create-profile-image.dto.ts

@@ -1,7 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Express } from 'express';
-
-export class CreateProfileImageDto {
-  @ApiProperty({ type: 'string', format: 'binary' })
-  file!: Express.Multer.File;
-}

server/apps/immich/src/api-v1/user/dto/create-user.dto.spec.ts

@@ -1,27 +0,0 @@
-import { plainToInstance } from 'class-transformer';
-import { validate } from 'class-validator';
-import { CreateUserDto } from './create-user.dto';
-
-describe('create user DTO', () => {
-  it('validates the email', async () => {
-    const params: Partial<CreateUserDto> = {
-      email: undefined,
-      password: 'password',
-      firstName: 'first name',
-      lastName: 'last name',
-    };
-    let dto: CreateUserDto = plainToInstance(CreateUserDto, params);
-    let errors = await validate(dto);
-    expect(errors).toHaveLength(1);
-
-    params.email = 'invalid email';
-    dto = plainToInstance(CreateUserDto, params);
-    errors = await validate(dto);
-    expect(errors).toHaveLength(1);
-
-    params.email = 'valid@email.com';
-    dto = plainToInstance(CreateUserDto, params);
-    errors = await validate(dto);
-    expect(errors).toHaveLength(0);
-  });
-});

server/apps/immich/src/api-v1/user/dto/create-user.dto.ts

@@ -1,53 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Transform } from 'class-transformer';
-import { IsNotEmpty, IsEmail } from 'class-validator';
-
-export class CreateUserDto {
-  @IsEmail()
-  @Transform(({ value }) => value?.toLowerCase())
-  @ApiProperty({ example: 'testuser@email.com' })
-  email!: string;
-
-  @IsNotEmpty()
-  @ApiProperty({ example: 'password' })
-  password!: string;
-
-  @IsNotEmpty()
-  @ApiProperty({ example: 'John' })
-  firstName!: string;
-
-  @IsNotEmpty()
-  @ApiProperty({ example: 'Doe' })
-  lastName!: string;
-}
-
-export class CreateAdminDto {
-  @IsNotEmpty()
-  isAdmin!: true;
-
-  @IsEmail()
-  @Transform(({ value }) => value?.toLowerCase())
-  email!: string;
-
-  @IsNotEmpty()
-  password!: string;
-
-  @IsNotEmpty()
-  firstName!: string;
-
-  @IsNotEmpty()
-  lastName!: string;
-}
-
-export class CreateUserOAuthDto {
-  @IsEmail()
-  @Transform(({ value }) => value?.toLowerCase())
-  email!: string;
-
-  @IsNotEmpty()
-  oauthId!: string;
-
-  firstName?: string;
-
-  lastName?: string;
-}

server/apps/immich/src/api-v1/user/dto/update-user.dto.ts

@@ -1,28 +0,0 @@
-import { IsEmail, IsNotEmpty, IsOptional } from 'class-validator';
-
-export class UpdateUserDto {
-  @IsNotEmpty()
-  id!: string;
-
-  @IsEmail()
-  @IsOptional()
-  email?: string;
-
-  @IsOptional()
-  password?: string;
-
-  @IsOptional()
-  firstName?: string;
-
-  @IsOptional()
-  lastName?: string;
-
-  @IsOptional()
-  isAdmin?: boolean;
-
-  @IsOptional()
-  shouldChangePassword?: boolean;
-
-  @IsOptional()
-  profileImagePath?: string;
-}

server/apps/immich/src/api-v1/user/dto/user-count.dto.ts

@@ -1,12 +0,0 @@
-import { Transform } from 'class-transformer';
-import { IsBoolean, IsOptional } from 'class-validator';
-
-export class UserCountDto {
-  @IsBoolean()
-  @IsOptional()
-  @Transform(({ value }) => value === 'true')
-  /**
-   * When true, return the number of admins accounts
-   */
-  admin?: boolean = false;
-}

server/apps/immich/src/api-v1/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/apps/immich/src/api-v1/user/response-dto/user-count-response.dto.ts

@@ -1,12 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-
-export class UserCountResponseDto {
-  @ApiProperty({ type: 'integer' })
-  userCount!: number;
-}
-
-export function mapUserCountResponse(count: number): UserCountResponseDto {
-  return {
-    userCount: count,
-  };
-}

server/apps/immich/src/api-v1/user/response-dto/user-response.dto.ts

@@ -1,29 +0,0 @@
-import { UserEntity } from '@app/database';
-
-export class UserResponseDto {
-  id!: string;
-  email!: string;
-  firstName!: string;
-  lastName!: string;
-  createdAt!: string;
-  profileImagePath!: string;
-  shouldChangePassword!: boolean;
-  isAdmin!: boolean;
-  deletedAt?: Date;
-  oauthId!: string;
-}
-
-export function mapUser(entity: UserEntity): UserResponseDto {
-  return {
-    id: entity.id,
-    email: entity.email,
-    firstName: entity.firstName,
-    lastName: entity.lastName,
-    createdAt: entity.createdAt,
-    profileImagePath: entity.profileImagePath,
-    shouldChangePassword: entity.shouldChangePassword,
-    isAdmin: entity.isAdmin,
-    deletedAt: entity.deletedAt,
-    oauthId: entity.oauthId,
-  };
-}

server/apps/immich/src/api-v1/user/user-repository.ts

@@ -1,87 +0,0 @@
-import { UserEntity } from '@app/database';
-import { InternalServerErrorException } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { Not, Repository } from 'typeorm';
-
-export interface IUserRepository {
-  get(id: string, withDeleted?: boolean): Promise<UserEntity | null>;
-  getAdmin(): Promise<UserEntity | null>;
-  getByEmail(email: string, withPassword?: boolean): Promise<UserEntity | null>;
-  getByOAuthId(oauthId: string): Promise<UserEntity | null>;
-  getList(filter?: UserListFilter): Promise<UserEntity[]>;
-  create(user: Partial<UserEntity>): Promise<UserEntity>;
-  update(id: string, user: Partial<UserEntity>): Promise<UserEntity>;
-  delete(user: UserEntity): Promise<UserEntity>;
-  restore(user: UserEntity): Promise<UserEntity>;
-}
-
-export interface UserListFilter {
-  excludeId?: string;
-}
-
-export const IUserRepository = 'IUserRepository';
-
-export class UserRepository implements IUserRepository {
-  constructor(
-    @InjectRepository(UserEntity)
-    private userRepository: Repository<UserEntity>,
-  ) {}
-
-  async get(userId: string, withDeleted?: boolean): Promise<UserEntity | null> {
-    return this.userRepository.findOne({ where: { id: userId }, withDeleted: withDeleted });
-  }
-
-  async getAdmin(): Promise<UserEntity | null> {
-    return this.userRepository.findOne({ where: { isAdmin: true } });
-  }
-
-  async getByEmail(email: string, withPassword?: boolean): Promise<UserEntity | null> {
-    let builder = this.userRepository.createQueryBuilder('user').where({ email });
-
-    if (withPassword) {
-      builder = builder.addSelect('user.password');
-    }
-
-    return builder.getOne();
-  }
-
-  async getByOAuthId(oauthId: string): Promise<UserEntity | null> {
-    return this.userRepository.findOne({ where: { oauthId } });
-  }
-
-  async getList({ excludeId }: UserListFilter = {}): Promise<UserEntity[]> {
-    if (!excludeId) {
-      return this.userRepository.find(); // TODO: this should also be ordered the same as below
-    }
-    return this.userRepository.find({
-      where: { id: Not(excludeId) },
-      withDeleted: true,
-      order: {
-        createdAt: 'DESC',
-      },
-    });
-  }
-
-  async create(user: Partial<UserEntity>): Promise<UserEntity> {
-    return this.userRepository.save(user);
-  }
-
-  async update(id: string, user: Partial<UserEntity>): Promise<UserEntity> {
-    user.id = id;
-
-    await this.userRepository.save(user);
-    const updatedUser = await this.get(id);
-    if (!updatedUser) {
-      throw new InternalServerErrorException('Cannot reload user after update');
-    }
-    return updatedUser;
-  }
-
-  async delete(user: UserEntity): Promise<UserEntity> {
-    return this.userRepository.softRemove(user);
-  }
-
-  async restore(user: UserEntity): Promise<UserEntity> {
-    return this.userRepository.recover(user);
-  }
-}

server/apps/immich/src/api-v1/user/user.core.ts

@@ -1,156 +0,0 @@
-import { UserEntity } from '@app/database';
-import {
-  BadRequestException,
-  ForbiddenException,
-  InternalServerErrorException,
-  Logger,
-  NotFoundException,
-  UnauthorizedException,
-} from '@nestjs/common';
-import { hash } from 'bcrypt';
-import { createReadStream, constants, ReadStream } from 'fs';
-import fs from 'fs/promises';
-import { AuthUserDto } from '../../decorators/auth-user.decorator';
-import { CreateAdminDto, CreateUserDto, CreateUserOAuthDto } from './dto/create-user.dto';
-import { IUserRepository, UserListFilter } from './user-repository';
-
-const SALT_ROUNDS = 10;
-
-export class UserCore {
-  constructor(private userRepository: IUserRepository) {}
-
-  async updateUser(authUser: AuthUserDto, id: string, dto: Partial<UserEntity>): Promise<UserEntity> {
-    if (!(authUser.isAdmin || authUser.id === id)) {
-      throw new ForbiddenException('You are not allowed to update this user');
-    }
-
-    if (dto.isAdmin && authUser.isAdmin && authUser.id !== id) {
-      throw new BadRequestException('Admin user exists');
-    }
-
-    if (dto.email) {
-      const duplicate = await this.userRepository.getByEmail(dto.email);
-      if (duplicate && duplicate.id !== id) {
-        throw new BadRequestException('Email already in user by another account');
-      }
-    }
-
-    try {
-      if (dto.password) {
-        dto.password = await hash(dto.password, SALT_ROUNDS);
-      }
-
-      return this.userRepository.update(id, dto);
-    } catch (e) {
-      Logger.error(e, 'Failed to update user info');
-      throw new InternalServerErrorException('Failed to update user info');
-    }
-  }
-
-  async createUser(createUserDto: CreateUserDto | CreateAdminDto | CreateUserOAuthDto): Promise<UserEntity> {
-    const user = await this.userRepository.getByEmail(createUserDto.email);
-    if (user) {
-      throw new BadRequestException('User exists');
-    }
-
-    if (!(createUserDto as CreateAdminDto).isAdmin) {
-      const localAdmin = await this.userRepository.getAdmin();
-      if (!localAdmin) {
-        throw new BadRequestException('The first registered account must the administrator.');
-      }
-    }
-
-    try {
-      const payload: Partial<UserEntity> = { ...createUserDto };
-      if (payload.password) {
-        payload.password = await hash(payload.password, SALT_ROUNDS);
-      }
-      return this.userRepository.create(payload);
-    } catch (e) {
-      Logger.error(e, 'Create new user');
-      throw new InternalServerErrorException('Failed to register new user');
-    }
-  }
-
-  async get(userId: string, withDeleted?: boolean): Promise<UserEntity | null> {
-    return this.userRepository.get(userId, withDeleted);
-  }
-
-  async getAdmin(): Promise<UserEntity | null> {
-    return this.userRepository.getAdmin();
-  }
-
-  async getByEmail(email: string, withPassword?: boolean): Promise<UserEntity | null> {
-    return this.userRepository.getByEmail(email, withPassword);
-  }
-
-  async getByOAuthId(oauthId: string): Promise<UserEntity | null> {
-    return this.userRepository.getByOAuthId(oauthId);
-  }
-
-  async getUserProfileImage(user: UserEntity): Promise<ReadStream> {
-    if (!user.profileImagePath) {
-      throw new NotFoundException('User does not have a profile image');
-    }
-    await fs.access(user.profileImagePath, constants.R_OK | constants.W_OK);
-    return createReadStream(user.profileImagePath);
-  }
-
-  async getList(filter?: UserListFilter): Promise<UserEntity[]> {
-    return this.userRepository.getList(filter);
-  }
-
-  async createProfileImage(authUser: AuthUserDto, filePath: string): Promise<UserEntity> {
-    // TODO: do we need to do this? Maybe we can trust the authUser
-    const user = await this.userRepository.get(authUser.id);
-    if (!user) {
-      throw new NotFoundException('User not found');
-    }
-
-    try {
-      return this.userRepository.update(user.id, { profileImagePath: filePath });
-    } catch (e) {
-      Logger.error(e, 'Create User Profile Image');
-      throw new InternalServerErrorException('Failed to create new user profile image');
-    }
-  }
-
-  async restoreUser(authUser: AuthUserDto, userToRestore: UserEntity): Promise<UserEntity> {
-    // TODO: do we need to do this? Maybe we can trust the authUser
-    const requestor = await this.userRepository.get(authUser.id);
-    if (!requestor) {
-      throw new UnauthorizedException('Requestor not found');
-    }
-    if (!requestor.isAdmin) {
-      throw new ForbiddenException('Unauthorized');
-    }
-    try {
-      return this.userRepository.restore(userToRestore);
-    } catch (e) {
-      Logger.error(e, 'Failed to restore deleted user');
-      throw new InternalServerErrorException('Failed to restore deleted user');
-    }
-  }
-
-  async deleteUser(authUser: AuthUserDto, userToDelete: UserEntity): Promise<UserEntity> {
-    // TODO: do we need to do this? Maybe we can trust the authUser
-    const requestor = await this.userRepository.get(authUser.id);
-    if (!requestor) {
-      throw new UnauthorizedException('Requestor not found');
-    }
-    if (!requestor.isAdmin) {
-      throw new ForbiddenException('Unauthorized');
-    }
-
-    if (userToDelete.isAdmin) {
-      throw new ForbiddenException('Cannot delete admin user');
-    }
-
-    try {
-      return this.userRepository.delete(userToDelete);
-    } catch (e) {
-      Logger.error(e, 'Failed to delete user');
-      throw new InternalServerErrorException('Failed to delete user');
-    }
-  }
-}

server/apps/immich/src/api-v1/user/user.module.ts

@@ -1,23 +0,0 @@
-import { UserEntity } from '@app/database';
-import { Module } from '@nestjs/common';
-import { JwtModule } from '@nestjs/jwt';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { jwtConfig } from '../../config/jwt.config';
-import { ImmichJwtModule } from '../../modules/immich-jwt/immich-jwt.module';
-import { ImmichJwtService } from '../../modules/immich-jwt/immich-jwt.service';
-import { UserRepository, IUserRepository } from './user-repository';
-import { UserController } from './user.controller';
-import { UserService } from './user.service';
-
-const USER_REPOSITORY_PROVIDER = {
-  provide: IUserRepository,
-  useClass: UserRepository,
-};
-
-@Module({
-  imports: [TypeOrmModule.forFeature([UserEntity]), ImmichJwtModule, JwtModule.register(jwtConfig)],
-  controllers: [UserController],
-  providers: [UserService, ImmichJwtService, USER_REPOSITORY_PROVIDER],
-  exports: [USER_REPOSITORY_PROVIDER],
-})
-export class UserModule {}

server/apps/immich/src/api-v1/user/user.service.spec.ts

@@ -1,198 +0,0 @@
-import { UserEntity } from '@app/database';
-import { BadRequestException, ForbiddenException, NotFoundException } from '@nestjs/common';
-import { newUserRepositoryMock } from '../../../test/test-utils';
-import { AuthUserDto } from '../../decorators/auth-user.decorator';
-import { IUserRepository } from './user-repository';
-import { when } from 'jest-when';
-import { UserService } from './user.service';
-import { UpdateUserDto } from './dto/update-user.dto';
-
-describe('UserService', () => {
-  let sut: UserService;
-  let userRepositoryMock: jest.Mocked<IUserRepository>;
-
-  const adminUserAuth: AuthUserDto = Object.freeze({
-    id: 'admin_id',
-    email: 'admin@test.com',
-    isAdmin: true,
-  });
-
-  const immichUserAuth: AuthUserDto = Object.freeze({
-    id: 'immich_id',
-    email: 'immich@test.com',
-    isAdmin: false,
-  });
-
-  const adminUser: UserEntity = Object.freeze({
-    id: adminUserAuth.id,
-    email: 'admin@test.com',
-    password: 'admin_password',
-    firstName: 'admin_first_name',
-    lastName: 'admin_last_name',
-    isAdmin: true,
-    oauthId: '',
-    shouldChangePassword: false,
-    profileImagePath: '',
-    createdAt: '2021-01-01',
-    tags: [],
-  });
-
-  const immichUser: UserEntity = Object.freeze({
-    id: immichUserAuth.id,
-    email: 'immich@test.com',
-    password: 'immich_password',
-    firstName: 'immich_first_name',
-    lastName: 'immich_last_name',
-    isAdmin: false,
-    oauthId: '',
-    shouldChangePassword: false,
-    profileImagePath: '',
-    createdAt: '2021-01-01',
-    tags: [],
-  });
-
-  const updatedImmichUser: UserEntity = Object.freeze({
-    id: immichUserAuth.id,
-    email: 'immich@test.com',
-    password: 'immich_password',
-    firstName: 'updated_immich_first_name',
-    lastName: 'updated_immich_last_name',
-    isAdmin: false,
-    oauthId: '',
-    shouldChangePassword: true,
-    profileImagePath: '',
-    createdAt: '2021-01-01',
-    tags: [],
-  });
-
-  beforeEach(() => {
-    userRepositoryMock = newUserRepositoryMock();
-    when(userRepositoryMock.get).calledWith(adminUser.id).mockResolvedValue(adminUser);
-    when(userRepositoryMock.get).calledWith(adminUser.id, undefined).mockResolvedValue(adminUser);
-    when(userRepositoryMock.get).calledWith(immichUser.id, undefined).mockResolvedValue(immichUser);
-
-    sut = new UserService(userRepositoryMock);
-  });
-
-  describe('Update user', () => {
-    it('should update user', async () => {
-      const update: UpdateUserDto = {
-        id: immichUser.id,
-        shouldChangePassword: true,
-      };
-
-      when(userRepositoryMock.update).calledWith(update.id, update).mockResolvedValueOnce(updatedImmichUser);
-
-      const updatedUser = await sut.updateUser(immichUserAuth, update);
-      expect(updatedUser.shouldChangePassword).toEqual(true);
-    });
-
-    it('user can only update its information', async () => {
-      when(userRepositoryMock.get)
-        .calledWith('not_immich_auth_user_id', undefined)
-        .mockResolvedValueOnce({
-          ...immichUser,
-          id: 'not_immich_auth_user_id',
-        });
-
-      const result = sut.updateUser(immichUserAuth, {
-        id: 'not_immich_auth_user_id',
-        password: 'I take over your account now',
-      });
-      await expect(result).rejects.toBeInstanceOf(ForbiddenException);
-    });
-
-    it('should let a user change their email', async () => {
-      const dto = { id: immichUser.id, email: 'updated@test.com' };
-
-      userRepositoryMock.get.mockResolvedValue(immichUser);
-      userRepositoryMock.update.mockResolvedValue(immichUser);
-
-      await sut.updateUser(immichUser, dto);
-
-      expect(userRepositoryMock.update).toHaveBeenCalledWith(immichUser.id, {
-        id: 'immich_id',
-        email: 'updated@test.com',
-      });
-    });
-
-    it('should not let a user change their email to one already in use', async () => {
-      const dto = { id: immichUser.id, email: 'updated@test.com' };
-
-      userRepositoryMock.get.mockResolvedValue(immichUser);
-      userRepositoryMock.getByEmail.mockResolvedValue(adminUser);
-
-      await expect(sut.updateUser(immichUser, dto)).rejects.toBeInstanceOf(BadRequestException);
-
-      expect(userRepositoryMock.update).not.toHaveBeenCalled();
-    });
-
-    it('admin can update any user information', async () => {
-      const update: UpdateUserDto = {
-        id: immichUser.id,
-        shouldChangePassword: true,
-      };
-
-      when(userRepositoryMock.update).calledWith(immichUser.id, update).mockResolvedValueOnce(updatedImmichUser);
-
-      const result = await sut.updateUser(adminUserAuth, update);
-
-      expect(result).toBeDefined();
-      expect(result.id).toEqual(updatedImmichUser.id);
-      expect(result.shouldChangePassword).toEqual(updatedImmichUser.shouldChangePassword);
-    });
-
-    it('update user information should throw error if user not found', async () => {
-      when(userRepositoryMock.get).calledWith(immichUser.id, undefined).mockResolvedValueOnce(null);
-
-      const result = sut.updateUser(adminUser, {
-        id: immichUser.id,
-        shouldChangePassword: true,
-      });
-
-      await expect(result).rejects.toBeInstanceOf(NotFoundException);
-    });
-  });
-
-  describe('Delete user', () => {
-    it('cannot delete admin user', async () => {
-      const result = sut.deleteUser(adminUserAuth, adminUserAuth.id);
-
-      await expect(result).rejects.toBeInstanceOf(ForbiddenException);
-    });
-  });
-
-  describe('Create user', () => {
-    it('should let the admin update himself', async () => {
-      const dto = { id: adminUser.id, shouldChangePassword: true, isAdmin: true };
-
-      when(userRepositoryMock.get).calledWith(adminUser.id).mockResolvedValueOnce(null);
-      when(userRepositoryMock.update).calledWith(adminUser.id, dto).mockResolvedValueOnce(adminUser);
-
-      await sut.updateUser(adminUser, dto);
-
-      expect(userRepositoryMock.update).toHaveBeenCalledWith(adminUser.id, dto);
-    });
-
-    it('should not let the another user become an admin', async () => {
-      const dto = { id: immichUser.id, shouldChangePassword: true, isAdmin: true };
-
-      when(userRepositoryMock.get).calledWith(immichUser.id).mockResolvedValueOnce(immichUser);
-
-      await expect(sut.updateUser(adminUser, dto)).rejects.toBeInstanceOf(BadRequestException);
-    });
-
-    it('should not create a user if there is no local admin account', async () => {
-      when(userRepositoryMock.getAdmin).calledWith().mockResolvedValueOnce(null);
-
-      await expect(
-        sut.createUser({
-          email: 'john_smith@email.com',
-          firstName: 'John',
-          lastName: 'Smith',
-          password: 'password',
-        }),
-      ).rejects.toBeInstanceOf(BadRequestException);
-    });
-  });
-});

server/apps/immich/src/api-v1/user/user.service.ts

@@ -1,107 +0,0 @@
-import { BadRequestException, Inject, Injectable, NotFoundException } from '@nestjs/common';
-import { ReadStream } from 'fs';
-import { AuthUserDto } from '../../decorators/auth-user.decorator';
-import { CreateUserDto } from './dto/create-user.dto';
-import { UpdateUserDto } from './dto/update-user.dto';
-import { UserCountDto } from './dto/user-count.dto';
-import {
-  CreateProfileImageResponseDto,
-  mapCreateProfileImageResponse,
-} from './response-dto/create-profile-image-response.dto';
-import { mapUserCountResponse, UserCountResponseDto } from './response-dto/user-count-response.dto';
-import { mapUser, UserResponseDto } from './response-dto/user-response.dto';
-import { IUserRepository } from './user-repository';
-import { UserCore } from './user.core';
-
-@Injectable()
-export class UserService {
-  private userCore: UserCore;
-  constructor(@Inject(IUserRepository) userRepository: IUserRepository) {
-    this.userCore = new UserCore(userRepository);
-  }
-
-  async getAllUsers(authUser: AuthUserDto, isAll: boolean): Promise<UserResponseDto[]> {
-    if (isAll) {
-      const allUsers = await this.userCore.getList();
-      return allUsers.map(mapUser);
-    }
-
-    const allUserExceptRequestedUser = await this.userCore.getList({ excludeId: authUser.id });
-    return allUserExceptRequestedUser.map(mapUser);
-  }
-
-  async getUserById(userId: string, withDeleted = false): Promise<UserResponseDto> {
-    const user = await this.userCore.get(userId, withDeleted);
-    if (!user) {
-      throw new NotFoundException('User not found');
-    }
-
-    return mapUser(user);
-  }
-
-  async getUserInfo(authUser: AuthUserDto): Promise<UserResponseDto> {
-    const user = await this.userCore.get(authUser.id);
-    if (!user) {
-      throw new BadRequestException('User not found');
-    }
-    return mapUser(user);
-  }
-
-  async getUserCount(dto: UserCountDto): Promise<UserCountResponseDto> {
-    let users = await this.userCore.getList();
-
-    if (dto.admin) {
-      users = users.filter((user) => user.isAdmin);
-    }
-
-    return mapUserCountResponse(users.length);
-  }
-
-  async createUser(createUserDto: CreateUserDto): Promise<UserResponseDto> {
-    const createdUser = await this.userCore.createUser(createUserDto);
-    return mapUser(createdUser);
-  }
-
-  async updateUser(authUser: AuthUserDto, dto: UpdateUserDto): Promise<UserResponseDto> {
-    const user = await this.userCore.get(dto.id);
-    if (!user) {
-      throw new NotFoundException('User not found');
-    }
-    const updatedUser = await this.userCore.updateUser(authUser, dto.id, dto);
-    return mapUser(updatedUser);
-  }
-
-  async deleteUser(authUser: AuthUserDto, userId: string): Promise<UserResponseDto> {
-    const user = await this.userCore.get(userId);
-    if (!user) {
-      throw new BadRequestException('User not found');
-    }
-    const deletedUser = await this.userCore.deleteUser(authUser, user);
-    return mapUser(deletedUser);
-  }
-
-  async restoreUser(authUser: AuthUserDto, userId: string): Promise<UserResponseDto> {
-    const user = await this.userCore.get(userId, true);
-    if (!user) {
-      throw new BadRequestException('User not found');
-    }
-    const updatedUser = await this.userCore.restoreUser(authUser, user);
-    return mapUser(updatedUser);
-  }
-
-  async createProfileImage(
-    authUser: AuthUserDto,
-    fileInfo: Express.Multer.File,
-  ): Promise<CreateProfileImageResponseDto> {
-    const updatedUser = await this.userCore.createProfileImage(authUser, fileInfo.path);
-    return mapCreateProfileImageResponse(updatedUser.id, updatedUser.profileImagePath);
-  }
-
-  async getUserProfileImage(userId: string): Promise<ReadStream> {
-    const user = await this.userCore.get(userId);
-    if (!user) {
-      throw new NotFoundException('User not found');
-    }
-    return this.userCore.getUserProfileImage(user);
-  }
-}

server/apps/immich/src/app.module.ts

@@ -1,6 +1,5 @@
 import { immichAppConfig, immichBullAsyncConfig } from '@app/common/config';
 import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
-import { UserModule } from './api-v1/user/user.module';
 import { AssetModule } from './api-v1/asset/asset.module';
 import { AuthModule } from './api-v1/auth/auth.module';
 import { APIKeyModule } from './api-v1/api-key/api-key.module';
@@ -15,20 +14,23 @@ import { AlbumModule } from './api-v1/album/album.module';
 import { AppController } from './app.controller';
 import { ScheduleModule } from '@nestjs/schedule';
 import { ScheduleTasksModule } from './modules/schedule-tasks/schedule-tasks.module';
-import { DatabaseModule } from '@app/database';
 import { JobModule } from './api-v1/job/job.module';
 import { SystemConfigModule } from './api-v1/system-config/system-config.module';
 import { OAuthModule } from './api-v1/oauth/oauth.module';
 import { TagModule } from './api-v1/tag/tag.module';
 import { ImmichConfigModule } from '@app/immich-config';
 import { ShareModule } from './api-v1/share/share.module';
+import { DomainModule } from '@app/domain';
+import { InfraModule } from '@app/infra';
+import { UserController } from './controllers';
 
 @Module({
   imports: [
     ConfigModule.forRoot(immichAppConfig),
 
-    DatabaseModule,
-    UserModule,
+    DomainModule.register({
+      imports: [InfraModule],
+    }),
 
     APIKeyModule,
 
@@ -64,7 +66,11 @@ import { ShareModule } from './api-v1/share/share.module';
 
     ShareModule,
   ],
-  controllers: [AppController],
+  controllers: [
+    //
+    AppController,
+    UserController,
+  ],
   providers: [],
 })
 export class AppModule implements NestModule {

server/apps/immich/src/config/asset-upload.config.ts

@@ -51,7 +51,7 @@ function destination(req: Request, file: Express.Multer.File, cb: any) {
 
   const basePath = APP_UPLOAD_LOCATION;
   const sanitizedDeviceId = sanitize(String(req.body['deviceId']));
-  const originalUploadFolder = join(basePath, req.user.id, 'original', sanitizedDeviceId);
+  const originalUploadFolder = join(basePath, user.id, 'original', sanitizedDeviceId);
 
   if (!existsSync(originalUploadFolder)) {
     mkdirSync(originalUploadFolder, { recursive: true });

server/apps/immich/src/config/profile-image-upload.config.ts

@@ -6,6 +6,7 @@ import { existsSync, mkdirSync } from 'fs';
 import { diskStorage } from 'multer';
 import { extname } from 'path';
 import sanitize from 'sanitize-filename';
+import { AuthUserDto } from '../decorators/auth-user.decorator';
 import { patchFormData } from '../utils/path-form-data.util';
 
 export const profileImageUploadOption: MulterOptions = {
@@ -35,8 +36,10 @@ function destination(req: Request, file: Express.Multer.File, cb: any) {
     return cb(new UnauthorizedException());
   }
 
+  const user = req.user as AuthUserDto;
+
   const basePath = APP_UPLOAD_LOCATION;
-  const profileImageLocation = `${basePath}/${req.user.id}/profile`;
+  const profileImageLocation = `${basePath}/${user.id}/profile`;
 
   if (!existsSync(profileImageLocation)) {
     mkdirSync(profileImageLocation, { recursive: true });

server/apps/immich/src/controllers/index.ts

@@ -0,0 +1 @@
+export * from './user.controller';

server/apps/immich/src/controllers/user.controller.ts

@@ -15,20 +15,20 @@ import {
   StreamableFile,
   Header,
 } from '@nestjs/common';
-import { UserService } from './user.service';
-import { Authenticated } from '../../decorators/authenticated.decorator';
-import { AuthUserDto, GetAuthUser } from '../../decorators/auth-user.decorator';
-import { CreateUserDto } from './dto/create-user.dto';
-import { UpdateUserDto } from './dto/update-user.dto';
+import { UserService } from '@app/domain';
+import { Authenticated } from '../decorators/authenticated.decorator';
+import { AuthUserDto, GetAuthUser } from '../decorators/auth-user.decorator';
+import { CreateUserDto } from '@app/domain';
+import { UpdateUserDto } from '@app/domain';
 import { FileInterceptor } from '@nestjs/platform-express';
-import { profileImageUploadOption } from '../../config/profile-image-upload.config';
+import { profileImageUploadOption } from '../config/profile-image-upload.config';
 import { Response as Res } from 'express';
 import { ApiBearerAuth, ApiBody, ApiConsumes, ApiTags } from '@nestjs/swagger';
-import { UserResponseDto } from './response-dto/user-response.dto';
-import { UserCountResponseDto } from './response-dto/user-count-response.dto';
-import { CreateProfileImageDto } from './dto/create-profile-image.dto';
-import { CreateProfileImageResponseDto } from './response-dto/create-profile-image-response.dto';
-import { UserCountDto } from './dto/user-count.dto';
+import { UserResponseDto } from '@app/domain';
+import { UserCountResponseDto } from '@app/domain';
+import { CreateProfileImageDto } from '@app/domain';
+import { CreateProfileImageResponseDto } from '@app/domain';
+import { UserCountDto } from '@app/domain';
 
 @ApiTags('User')
 @Controller('user')

server/apps/immich/src/decorators/auth-user.decorator.ts

@@ -1,14 +1,6 @@
+export { AuthUserDto } from '@app/domain';
+import { AuthUserDto } from '@app/domain';
 import { createParamDecorator, ExecutionContext } from '@nestjs/common';
-// import { AuthUserDto } from './dto/auth-user.dto';
-
-export class AuthUserDto {
-  id!: string;
-  email!: string;
-  isAdmin!: boolean;
-  isPublicUser?: boolean;
-  sharedLinkId?: string;
-  isAllowUpload?: boolean;
-}
 
 export const GetAuthUser = createParamDecorator((data, ctx: ExecutionContext): AuthUserDto => {
   return ctx.switchToHttp().getRequest<{ user: AuthUserDto }>().user;

server/apps/immich/src/global.d.ts

@@ -1,8 +1,8 @@
-import { UserResponseDto } from './api-v1/user/response-dto/user-response.dto';
+import { AuthUserDto } from './decorators/auth-user.decorator';
 
 declare global {
   namespace Express {
     // eslint-disable-next-line @typescript-eslint/no-empty-interface
-    interface User extends UserResponseDto {}
+    interface User extends AuthUserDto {}
   }
 }

server/apps/immich/src/middlewares/admin-role-guard.middleware.ts

@@ -1,6 +1,6 @@
 import { CanActivate, ExecutionContext, Injectable, Logger } from '@nestjs/common';
 import { Request } from 'express';
-import { UserResponseDto } from '../api-v1/user/response-dto/user-response.dto';
+import { UserResponseDto } from '@app/domain';
 
 interface UserRequest extends Request {
   user: UserResponseDto;

server/apps/immich/src/modules/background-task/background-task.module.ts

@@ -1,7 +1,7 @@
 import { BullModule } from '@nestjs/bull';
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { AssetEntity, ExifEntity, SmartInfoEntity } from '@app/database';
+import { AssetEntity, ExifEntity, SmartInfoEntity } from '@app/infra';
 import { BackgroundTaskProcessor } from './background-task.processor';
 import { BackgroundTaskService } from './background-task.service';
 

server/apps/immich/src/modules/background-task/background-task.processor.ts

@@ -1,7 +1,7 @@
 import { Process, Processor } from '@nestjs/bull';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
-import { AssetEntity, SmartInfoEntity } from '@app/database';
+import { AssetEntity, SmartInfoEntity } from '@app/infra';
 import { Job } from 'bull';
 import { AssetResponseDto } from '../../api-v1/asset/response-dto/asset-response.dto';
 import { assetUtils } from '@app/common/utils';

server/apps/immich/src/modules/download/download.service.ts

@@ -1,4 +1,4 @@
-import { AssetEntity } from '@app/database';
+import { AssetEntity } from '@app/infra';
 import { BadRequestException, Injectable, InternalServerErrorException, Logger, StreamableFile } from '@nestjs/common';
 import archiver from 'archiver';
 import { extname } from 'path';

server/apps/immich/src/modules/immich-jwt/immich-jwt.module.ts

@@ -4,7 +4,7 @@ import { JwtModule } from '@nestjs/jwt';
 import { jwtConfig } from '../../config/jwt.config';
 import { JwtStrategy } from './strategies/jwt.strategy';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { UserEntity } from '@app/database';
+import { UserEntity } from '@app/infra';
 import { APIKeyModule } from '../../api-v1/api-key/api-key.module';
 import { APIKeyStrategy } from './strategies/api-key.strategy';
 import { ShareModule } from '../../api-v1/share/share.module';

server/apps/immich/src/modules/immich-jwt/immich-jwt.service.spec.ts

@@ -1,7 +1,7 @@
 import { Logger } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { Request } from 'express';
-import { UserEntity } from '../../../../../libs/database/src/entities/user.entity';
+import { UserEntity } from '@app/infra';
 import { LoginResponseDto } from '../../api-v1/auth/response-dto/login-response.dto';
 import { AuthType } from '../../constants/jwt.constant';
 import { ImmichJwtService } from './immich-jwt.service';

server/apps/immich/src/modules/immich-jwt/immich-jwt.service.ts

@@ -1,4 +1,4 @@
-import { UserEntity } from '@app/database';
+import { UserEntity } from '@app/infra';
 import { Injectable, Logger } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { Request } from 'express';

server/apps/immich/src/modules/immich-jwt/strategies/jwt.strategy.ts

@@ -1,4 +1,4 @@
-import { UserEntity } from '@app/database';
+import { UserEntity } from '@app/infra';
 import { Injectable, UnauthorizedException } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import { InjectRepository } from '@nestjs/typeorm';

server/apps/immich/src/modules/immich-jwt/strategies/public-share.strategy.ts

@@ -1,4 +1,4 @@
-import { UserEntity } from '@app/database';
+import { UserEntity } from '@app/infra';
 import { Injectable, UnauthorizedException } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import { InjectRepository } from '@nestjs/typeorm';

server/apps/immich/src/modules/schedule-tasks/schedule-tasks.module.ts

@@ -1,7 +1,7 @@
 import { BullModule } from '@nestjs/bull';
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { AssetEntity, ExifEntity, UserEntity } from '@app/database';
+import { AssetEntity, ExifEntity, UserEntity } from '@app/infra';
 import { ScheduleTasksService } from './schedule-tasks.service';
 import { immichSharedQueues } from '@app/job/constants/bull-queue-registration.constant';
 

server/apps/immich/src/modules/schedule-tasks/schedule-tasks.service.ts

@@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';
 import { Cron, CronExpression } from '@nestjs/schedule';
 import { InjectRepository } from '@nestjs/typeorm';
 import { IsNull, Not, Repository } from 'typeorm';
-import { AssetEntity, AssetType, ExifEntity, UserEntity } from '@app/database';
+import { AssetEntity, AssetType, ExifEntity, UserEntity } from '@app/infra';
 import { InjectQueue } from '@nestjs/bull';
 import { Queue } from 'bull';
 import { randomUUID } from 'crypto';

server/apps/immich/test/album.e2e-spec.ts

@@ -3,13 +3,12 @@ import { INestApplication } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import request from 'supertest';
 import { clearDb, getAuthUser, authCustom } from './test-utils';
-import { databaseConfig } from '@app/database';
+import { databaseConfig } from '@app/infra';
 import { AlbumModule } from '../src/api-v1/album/album.module';
 import { CreateAlbumDto } from '../src/api-v1/album/dto/create-album.dto';
 import { ImmichJwtModule } from '../src/modules/immich-jwt/immich-jwt.module';
 import { AuthUserDto } from '../src/decorators/auth-user.decorator';
-import { UserService } from '../src/api-v1/user/user.service';
-import { UserModule } from '../src/api-v1/user/user.module';
+import { UserService } from '@app/domain';
 import { DataSource } from 'typeorm';
 
 function _createAlbum(app: INestApplication, data: CreateAlbumDto) {
@@ -52,7 +51,7 @@ describe('Album', () => {
 
     beforeAll(async () => {
       const builder = Test.createTestingModule({
-        imports: [AlbumModule, UserModule, TypeOrmModule.forRoot(databaseConfig)],
+        imports: [AlbumModule, TypeOrmModule.forRoot(databaseConfig)],
       });
       authUser = getAuthUser(); // set default auth user
       const moduleFixture: TestingModule = await authCustom(builder, () => authUser).compile();

server/apps/immich/test/jest-e2e.json

@@ -7,15 +7,11 @@
     "^.+\\.(t|j)s$": "ts-jest"
   },
   "moduleNameMapper": {
-    "^@app/database(|/.*)$": "<rootDir>../../../libs/database/src/$1",
-    "@app/database/config": "<rootDir>../../../libs/database/src/config",
-    "@app/database/config/(.*)": "<rootDir>../../../libs/database/src/config/$1",
-    "@app/database/entities/(.*)": "<rootDir>../../../libs/database/src/entities/$1",
-    "@app/common": "<rootDir>../../../libs/common/src",
-    "@app/common/(.*)": "<rootDir>../../../libs/common/src/$1",
+    "^@app/common": "<rootDir>../../../libs/common/src",
     "^@app/job(|/.*)$": "<rootDir>../../../libs/job/src/$1",
-    "@app/job": "<rootDir>../../../libs/job/src",
     "^@app/immich-config(|/.*)$": "<rootDir>../../../libs/immich-config/src/$1",
-    "^@app/storage(|/.*)$": "<rootDir>../../../libs/storage/src/$1"
+    "^@app/storage(|/.*)$": "<rootDir>../../../libs/storage/src/$1",
+    "^@app/infra(|/.*)$": "<rootDir>../../../libs/infra/src/$1",
+    "^@app/domain(|/.*)$": "<rootDir>../../../libs/domain/src/$1"
   }
 }

server/apps/immich/test/test-utils.ts

@@ -1,7 +1,6 @@
 import { CanActivate, ExecutionContext } from '@nestjs/common';
 import { TestingModuleBuilder } from '@nestjs/testing';
 import { DataSource } from 'typeorm';
-import { IUserRepository } from '../src/api-v1/user/user-repository';
 import { AuthUserDto } from '../src/decorators/auth-user.decorator';
 import { AuthGuard } from '../src/modules/immich-jwt/guards/auth.guard';
 
@@ -15,20 +14,6 @@ export async function clearDb(db: DataSource) {
   }
 }
 
-export function newUserRepositoryMock(): jest.Mocked<IUserRepository> {
-  return {
-    get: jest.fn(),
-    getAdmin: jest.fn(),
-    getByEmail: jest.fn(),
-    getByOAuthId: jest.fn(),
-    getList: jest.fn(),
-    create: jest.fn(),
-    update: jest.fn(),
-    delete: jest.fn(),
-    restore: jest.fn(),
-  };
-}
-
 export function getAuthUser(): AuthUserDto {
   return {
     id: '3108ac14-8afb-4b7e-87fd-39ebb6b79750',

server/apps/immich/test/user.e2e-spec.ts

@@ -3,12 +3,9 @@ import { INestApplication } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import request from 'supertest';
 import { clearDb, authCustom } from './test-utils';
-import { databaseConfig } from '@app/database/config/database.config';
-import { UserModule } from '../src/api-v1/user/user.module';
+import { databaseConfig } from '@app/infra';
 import { ImmichJwtModule } from '../src/modules/immich-jwt/immich-jwt.module';
-import { UserService } from '../src/api-v1/user/user.service';
-import { CreateAdminDto, CreateUserDto } from '../src/api-v1/user/dto/create-user.dto';
-import { UserResponseDto } from '../src/api-v1/user/response-dto/user-response.dto';
+import { CreateAdminDto, CreateUserDto, UserResponseDto, UserService } from '@app/domain';
 import { DataSource } from 'typeorm';
 
 function _createUser(userService: UserService, data: CreateUserDto | CreateAdminDto) {
@@ -27,7 +24,7 @@ describe('User', () => {
   describe('without auth', () => {
     beforeAll(async () => {
       const moduleFixture: TestingModule = await Test.createTestingModule({
-        imports: [UserModule, ImmichJwtModule, TypeOrmModule.forRoot(databaseConfig)],
+        imports: [ImmichJwtModule, TypeOrmModule.forRoot(databaseConfig)],
       }).compile();
 
       app = moduleFixture.createNestApplication();
@@ -51,7 +48,7 @@ describe('User', () => {
 
     beforeAll(async () => {
       const builder = Test.createTestingModule({
-        imports: [UserModule, TypeOrmModule.forRoot(databaseConfig)],
+        imports: [TypeOrmModule.forRoot(databaseConfig)],
       });
       const moduleFixture: TestingModule = await authCustom(builder, () => authUser).compile();
 

server/apps/microservices/src/microservices.module.ts

@@ -1,5 +1,5 @@
 import { immichAppConfig, immichBullAsyncConfig } from '@app/common/config';
-import { DatabaseModule, AssetEntity, ExifEntity, SmartInfoEntity, UserEntity, APIKeyEntity } from '@app/database';
+import { AssetEntity, ExifEntity, SmartInfoEntity, UserEntity, APIKeyEntity, InfraModule } from '@app/infra';
 import { StorageModule } from '@app/storage';
 import { BullModule } from '@nestjs/bull';
 import { Module } from '@nestjs/common';
@@ -17,11 +17,14 @@ import { ThumbnailGeneratorProcessor } from './processors/thumbnail.processor';
 import { UserDeletionProcessor } from './processors/user-deletion.processor';
 import { VideoTranscodeProcessor } from './processors/video-transcode.processor';
 import { immichSharedQueues } from '@app/job/constants/bull-queue-registration.constant';
+import { DomainModule } from '@app/domain';
 
 @Module({
   imports: [
     ConfigModule.forRoot(immichAppConfig),
-    DatabaseModule,
+    DomainModule.register({
+      imports: [InfraModule],
+    }),
     ImmichConfigModule,
     TypeOrmModule.forFeature([UserEntity, ExifEntity, AssetEntity, SmartInfoEntity, APIKeyEntity]),
     StorageModule,

server/apps/microservices/src/processors/asset-uploaded.processor.ts

@@ -1,4 +1,4 @@
-import { AssetType } from '@app/database';
+import { AssetType } from '@app/infra';
 import {
   IAssetUploadedJob,
   IMetadataExtractionJob,

server/apps/microservices/src/processors/generate-checksum.processor.ts

@@ -1,4 +1,4 @@
-import { AssetEntity } from '@app/database';
+import { AssetEntity } from '@app/infra';
 import { QueueNameEnum } from '@app/job';
 import { Process, Processor } from '@nestjs/bull';
 import { Logger } from '@nestjs/common';

server/apps/microservices/src/processors/machine-learning.processor.ts

@@ -1,5 +1,5 @@
-import { AssetEntity } from '@app/database';
-import { SmartInfoEntity } from '@app/database';
+import { AssetEntity } from '@app/infra';
+import { SmartInfoEntity } from '@app/infra';
 import { MachineLearningJobNameEnum, QueueNameEnum } from '@app/job';
 import { IMachineLearningJob } from '@app/job/interfaces/machine-learning.interface';
 import { Process, Processor } from '@nestjs/bull';

server/apps/microservices/src/processors/metadata-extraction.processor.ts

@@ -1,5 +1,5 @@
 import { ImmichLogLevel } from '@app/common/constants/log-level.constant';
-import { AssetEntity, ExifEntity } from '@app/database';
+import { AssetEntity, ExifEntity } from '@app/infra';
 import {
   IExifExtractionProcessor,
   IVideoLengthExtractionProcessor,

server/apps/microservices/src/processors/storage-migration.processor.ts

@@ -1,5 +1,5 @@
 import { APP_UPLOAD_LOCATION } from '@app/common';
-import { AssetEntity } from '@app/database';
+import { AssetEntity } from '@app/infra';
 import { ImmichConfigService } from '@app/immich-config';
 import { QueueNameEnum, templateMigrationProcessorName, updateTemplateProcessorName } from '@app/job';
 import { StorageService } from '@app/storage';

server/apps/microservices/src/processors/thumbnail.processor.ts

@@ -1,5 +1,5 @@
 import { APP_UPLOAD_LOCATION } from '@app/common';
-import { AssetEntity, AssetType } from '@app/database';
+import { AssetEntity, AssetType } from '@app/infra';
 import {
   WebpGeneratorProcessor,
   generateJPEGThumbnailProcessorName,

server/apps/microservices/src/processors/user-deletion.processor.ts

@@ -1,5 +1,5 @@
 import { APP_UPLOAD_LOCATION, userUtils } from '@app/common';
-import { APIKeyEntity, AssetEntity, UserEntity } from '@app/database';
+import { APIKeyEntity, AssetEntity, UserEntity } from '@app/infra';
 import { QueueNameEnum, userDeletionProcessorName } from '@app/job';
 import { IUserDeletionJob } from '@app/job/interfaces/user-deletion.interface';
 import { Process, Processor } from '@nestjs/bull';

server/apps/microservices/src/processors/video-transcode.processor.ts

@@ -1,5 +1,5 @@
 import { APP_UPLOAD_LOCATION } from '@app/common/constants';
-import { AssetEntity } from '@app/database';
+import { AssetEntity } from '@app/infra';
 import { QueueNameEnum } from '@app/job';
 import { mp4ConversionProcessorName } from '@app/job/constants/job-name.constant';
 import { IMp4ConversionProcessor } from '@app/job/interfaces/video-transcode.interface';