chore: migrate database files (#8126)

.github/workflows/test.yml

@@ -329,14 +329,14 @@ jobs:
 
       - name: Generate new migrations
         continue-on-error: true
-        run: npm run typeorm:migrations:generate ./src/infra/migrations/TestMigration
+        run: npm run typeorm:migrations:generate ./src/migrations/TestMigration
 
       - name: Find file changes
         uses: tj-actions/verify-changed-files@v19
         id: verify-changed-files
         with:
           files: |
-            server/src/infra/migrations/
+            server/src/migrations/
       - name: Verify migration files have not changed
         if: steps.verify-changed-files.outputs.files_changed == 'true'
         run: |

docs/docs/developer/database-migrations.md

@@ -1,6 +1,6 @@
 # Database Migrations
 
-After making any changes in the `server/src/infra/entities`, a database migration need to run in order to register the changes in the database. Follow the steps below to create a new migration.
+After making any changes in the `server/src/entities`, a database migration need to run in order to register the changes in the database. Follow the steps below to create a new migration.
 
 1. Run the command
 
@@ -9,6 +9,6 @@ npm run typeorm:migrations:generate ./src/infra/<migration-name>
 ```
 
 2. Check if the migration file makes sense.
-3. Move the migration file to folder `./server/src/infra/migrations` in your code editor.
+3. Move the migration file to folder `./server/src/migrations` in your code editor.
 
 The server will automatically detect `*.ts` file changes and restart. Part of the server start-up process includes running any new migrations, so it will be applied immediately.

server/e2e/jobs/jest-e2e.json

@@ -12,11 +12,11 @@
   "collectCoverageFrom": [
     "<rootDir>/src/**/*.(t|j)s",
     "!<rootDir>/src/**/*.spec.(t|s)s",
-    "!<rootDir>/src/infra/migrations/**"
+    "!<rootDir>/src/migrations/**"
   ],
   "coverageDirectory": "./coverage",
   "moduleNameMapper": {
-      "^test(|/.*)$": "<rootDir>/test/$1",
-      "^src(|/.*)$": "<rootDir>/src/$1"
+    "^test(|/.*)$": "<rootDir>/test/$1",
+    "^src(|/.*)$": "<rootDir>/src/$1"
   }
 }

server/e2e/jobs/specs/library-watcher.e2e-spec.ts

@@ -4,8 +4,8 @@ import path from 'node:path';
 import { LoginResponseDto } from 'src/domain/auth/auth.dto';
 import { LibraryResponseDto } from 'src/domain/library/library.dto';
 import { LibraryService } from 'src/domain/library/library.service';
-import { AssetType } from 'src/infra/entities/asset.entity';
-import { LibraryType } from 'src/infra/entities/library.entity';
+import { AssetType } from 'src/entities/asset.entity';
+import { LibraryType } from 'src/entities/library.entity';
 import { StorageEventType } from 'src/interfaces/storage.repository';
 import {
   IMMICH_TEST_ASSET_PATH,

server/e2e/jobs/specs/library.e2e-spec.ts

@@ -2,7 +2,7 @@ import { api } from 'e2e/client';
 import fs from 'node:fs';
 import { LibraryController } from 'src/controllers/library.controller';
 import { LoginResponseDto } from 'src/domain/auth/auth.dto';
-import { LibraryType } from 'src/infra/entities/library.entity';
+import { LibraryType } from 'src/entities/library.entity';
 import { IMMICH_TEST_ASSET_PATH, IMMICH_TEST_ASSET_TEMP_PATH, restoreTempFolder, testApp } from 'src/test-utils/utils';
 import request from 'supertest';
 import { errorStub } from 'test/fixtures/error.stub';

server/package.json

@@ -148,6 +148,8 @@
     "collectCoverageFrom": [
       "<rootDir>/src/**/*.(t|j)s",
       "!<rootDir>/src/infra/**/*",
+      "!<rootDir>/src/migrations/**/*",
+      "!<rootDir>/src/subscribers/**/*",
       "!<rootDir>/src/immich/controllers/**/*"
     ],
     "coverageDirectory": "./coverage",

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/infra/entities/user.entity';
+import { UserEntity } from 'src/entities/user.entity';
 
 @Command({
   name: 'list-users',

server/src/config.ts

@@ -4,7 +4,7 @@ import { QueueOptions } from 'bullmq';
 import { RedisOptions } from 'ioredis';
 import Joi from 'joi';
 import { QueueName } from 'src/domain/job/job.constants';
-import { LogLevel } from 'src/infra/entities/system-config.entity';
+import { LogLevel } from 'src/entities/system-config.entity';
 
 const WHEN_DB_URL_SET = Joi.when('DB_URL', {
   is: Joi.exist(),

server/src/cores/access.core.ts

@@ -1,6 +1,6 @@
 import { BadRequestException, UnauthorizedException } from '@nestjs/common';
 import { AuthDto } from 'src/domain/auth/auth.dto';
-import { SharedLinkEntity } from 'src/infra/entities/shared-link.entity';
+import { SharedLinkEntity } from 'src/entities/shared-link.entity';
 import { IAccessRepository } from 'src/interfaces/access.repository';
 import { setDifference, setIsEqual, setUnion } from 'src/utils';
 

server/src/cores/storage.core.ts

@@ -1,9 +1,9 @@
 import { dirname, join, resolve } from 'node:path';
 import { SystemConfigCore } from 'src/cores/system-config.core';
 import { APP_MEDIA_LOCATION } from 'src/domain/domain.constant';
-import { AssetEntity } from 'src/infra/entities/asset.entity';
-import { AssetPathType, PathType, PersonPathType } from 'src/infra/entities/move.entity';
-import { PersonEntity } from 'src/infra/entities/person.entity';
+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';

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

@@ -20,7 +20,7 @@ import {
   TranscodeHWAccel,
   TranscodePolicy,
   VideoCodec,
-} from 'src/infra/entities/system-config.entity';
+} from 'src/entities/system-config.entity';
 import { ImmichLogger } from 'src/infra/logger';
 import { ISystemConfigRepository } from 'src/interfaces/system-config.repository';
 

server/src/cores/user.core.ts

@@ -1,8 +1,8 @@
 import { BadRequestException, ForbiddenException } from '@nestjs/common';
 import sanitize from 'sanitize-filename';
 import { UserResponseDto } from 'src/domain/user/response-dto/user-response.dto';
-import { LibraryType } from 'src/infra/entities/library.entity';
-import { UserEntity } from 'src/infra/entities/user.entity';
+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';

server/src/domain/activity/activity.dto.ts

@@ -1,7 +1,7 @@
 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 { ActivityEntity } from 'src/infra/entities/activity.entity';
+import { ActivityEntity } from 'src/entities/activity.entity';
 import { Optional, ValidateUUID } from 'src/validation';
 
 export enum ReactionType {

server/src/domain/activity/activity.service.ts

@@ -12,7 +12,7 @@ import {
   mapActivity,
 } from 'src/domain/activity/activity.dto';
 import { AuthDto } from 'src/domain/auth/auth.dto';
-import { ActivityEntity } from 'src/infra/entities/activity.entity';
+import { ActivityEntity } from 'src/entities/activity.entity';
 import { IAccessRepository } from 'src/interfaces/access.repository';
 import { IActivityRepository } from 'src/interfaces/activity.repository';
 

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

@@ -2,7 +2,7 @@ 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 { AlbumEntity, AssetOrder } from 'src/infra/entities/album.entity';
+import { AlbumEntity, AssetOrder } from 'src/entities/album.entity';
 import { Optional } from 'src/validation';
 
 export class AlbumResponseDto {

server/src/domain/album/album.service.ts

@@ -14,9 +14,9 @@ import { AlbumInfoDto } from 'src/domain/album/dto/album.dto';
 import { GetAlbumsDto } from 'src/domain/album/dto/get-albums.dto';
 import { BulkIdErrorReason, BulkIdResponseDto, BulkIdsDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
 import { AuthDto } from 'src/domain/auth/auth.dto';
-import { AlbumEntity } from 'src/infra/entities/album.entity';
-import { AssetEntity } from 'src/infra/entities/asset.entity';
-import { UserEntity } from 'src/infra/entities/user.entity';
+import { AlbumEntity } from 'src/entities/album.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
+import { UserEntity } from 'src/entities/user.entity';
 import { IAccessRepository } from 'src/interfaces/access.repository';
 import { AlbumAssetCount, AlbumInfoOptions, IAlbumRepository } from 'src/interfaces/album.repository';
 import { IAssetRepository } from 'src/interfaces/asset.repository';

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

@@ -1,6 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsEnum, IsString } from 'class-validator';
-import { AssetOrder } from 'src/infra/entities/album.entity';
+import { AssetOrder } from 'src/entities/album.entity';
 import { Optional, ValidateBoolean, ValidateUUID } from 'src/validation';
 
 export class UpdateAlbumDto {

server/src/domain/api-key/api-key.service.ts

@@ -1,7 +1,7 @@
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { APIKeyCreateDto, APIKeyCreateResponseDto, APIKeyResponseDto } from 'src/domain/api-key/api-key.dto';
 import { AuthDto } from 'src/domain/auth/auth.dto';
-import { APIKeyEntity } from 'src/infra/entities/api-key.entity';
+import { APIKeyEntity } from 'src/entities/api-key.entity';
 import { IKeyRepository } from 'src/interfaces/api-key.repository';
 import { ICryptoRepository } from 'src/interfaces/crypto.repository';
 

server/src/domain/asset/asset.service.spec.ts

@@ -5,7 +5,7 @@ import { AssetJobName } from 'src/domain/asset/dto/asset-ids.dto';
 import { AssetStatsResponseDto } from 'src/domain/asset/dto/asset-statistics.dto';
 import { mapAsset } from 'src/domain/asset/response-dto/asset-response.dto';
 import { JobName } from 'src/domain/job/job.constants';
-import { AssetEntity, AssetType } from 'src/infra/entities/asset.entity';
+import { AssetEntity, AssetType } from 'src/entities/asset.entity';
 import { IAssetStackRepository } from 'src/interfaces/asset-stack.repository';
 import { AssetStats, IAssetRepository, TimeBucketSize } from 'src/interfaces/asset.repository';
 import { ClientEvent, ICommunicationRepository } from 'src/interfaces/communication.repository';

server/src/domain/asset/asset.service.ts

@@ -25,8 +25,8 @@ import { AuthDto } from 'src/domain/auth/auth.dto';
 import { mimeTypes } from 'src/domain/domain.constant';
 import { JOBS_ASSET_PAGINATION_SIZE, JobName } from 'src/domain/job/job.constants';
 import { IAssetDeletionJob, ISidecarWriteJob } from 'src/domain/job/job.interface';
-import { AssetEntity } from 'src/infra/entities/asset.entity';
-import { LibraryType } from 'src/infra/entities/library.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
+import { LibraryType } from 'src/entities/library.entity';
 import { ImmichLogger } from 'src/infra/logger';
 import { IAccessRepository } from 'src/interfaces/access.repository';
 import { IAssetStackRepository } from 'src/interfaces/asset-stack.repository';

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

@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { AssetType } from 'src/infra/entities/asset.entity';
+import { AssetType } from 'src/entities/asset.entity';
 import { AssetStats } from 'src/interfaces/asset.repository';
 import { ValidateBoolean } from 'src/validation';
 

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

@@ -1,6 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsEnum, IsNotEmpty, IsString } from 'class-validator';
-import { AssetOrder } from 'src/infra/entities/album.entity';
+import { AssetOrder } from 'src/entities/album.entity';
 import { TimeBucketSize } from 'src/interfaces/asset.repository';
 import { Optional, ValidateBoolean, ValidateUUID } from 'src/validation';
 

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

@@ -5,8 +5,8 @@ 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 { AssetFaceEntity } from 'src/infra/entities/asset-face.entity';
-import { AssetEntity, AssetType } from 'src/infra/entities/asset.entity';
+import { AssetFaceEntity } from 'src/entities/asset-face.entity';
+import { AssetEntity, AssetType } from 'src/entities/asset.entity';
 
 export class SanitizedAssetResponseDto {
   id!: string;

server/src/domain/asset/response-dto/exif-response.dto.ts

@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { ExifEntity } from 'src/infra/entities/exif.entity';
+import { ExifEntity } from 'src/entities/exif.entity';
 
 export class ExifResponseDto {
   make?: string | null = null;

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

@@ -1,4 +1,4 @@
-import { SmartInfoEntity } from 'src/infra/entities/smart-info.entity';
+import { SmartInfoEntity } from 'src/entities/smart-info.entity';
 
 export class SmartInfoResponseDto {
   tags?: string[] | null;

server/src/domain/audit/audit.dto.ts

@@ -1,8 +1,8 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
 import { IsArray, IsEnum, IsString, IsUUID, ValidateNested } from 'class-validator';
-import { EntityType } from 'src/infra/entities/audit.entity';
-import { AssetPathType, PathType, PersonPathType, UserPathType } from 'src/infra/entities/move.entity';
+import { EntityType } from 'src/entities/audit.entity';
+import { AssetPathType, PathType, PersonPathType, UserPathType } from 'src/entities/move.entity';
 import { Optional, ValidateDate, ValidateUUID } from 'src/validation';
 
 const PathEnum = Object.values({ ...AssetPathType, ...PersonPathType, ...UserPathType });

server/src/domain/audit/audit.service.spec.ts

@@ -1,5 +1,5 @@
 import { AuditService } from 'src/domain/audit/audit.service';
-import { DatabaseAction, EntityType } from 'src/infra/entities/audit.entity';
+import { DatabaseAction, EntityType } from 'src/entities/audit.entity';
 import { IAssetRepository } from 'src/interfaces/asset.repository';
 import { IAuditRepository } from 'src/interfaces/audit.repository';
 import { ICryptoRepository } from 'src/interfaces/crypto.repository';

server/src/domain/audit/audit.service.ts

@@ -14,8 +14,8 @@ import {
 import { AuthDto } from 'src/domain/auth/auth.dto';
 import { AUDIT_LOG_MAX_DURATION } from 'src/domain/domain.constant';
 import { JOBS_ASSET_PAGINATION_SIZE } from 'src/domain/job/job.constants';
-import { DatabaseAction } from 'src/infra/entities/audit.entity';
-import { AssetPathType, PersonPathType, UserPathType } from 'src/infra/entities/move.entity';
+import { DatabaseAction } from 'src/entities/audit.entity';
+import { AssetPathType, PersonPathType, UserPathType } from 'src/entities/move.entity';
 import { ImmichLogger } from 'src/infra/logger';
 import { IAccessRepository } from 'src/interfaces/access.repository';
 import { IAssetRepository } from 'src/interfaces/asset.repository';

server/src/domain/auth/auth.dto.ts

@@ -1,10 +1,10 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Transform } from 'class-transformer';
 import { IsEmail, IsNotEmpty, IsString, MinLength } from 'class-validator';
-import { APIKeyEntity } from 'src/infra/entities/api-key.entity';
-import { SharedLinkEntity } from 'src/infra/entities/shared-link.entity';
-import { UserTokenEntity } from 'src/infra/entities/user-token.entity';
-import { UserEntity } from 'src/infra/entities/user.entity';
+import { APIKeyEntity } from 'src/entities/api-key.entity';
+import { SharedLinkEntity } from 'src/entities/shared-link.entity';
+import { UserTokenEntity } from 'src/entities/user-token.entity';
+import { UserEntity } from 'src/entities/user.entity';
 
 export class AuthDto {
   user!: UserEntity;

server/src/domain/auth/auth.service.spec.ts

@@ -5,7 +5,7 @@ import { Socket } from 'socket.io';
 import { AuthType } from 'src/domain/auth/auth.constant';
 import { AuthDto, SignUpDto } from 'src/domain/auth/auth.dto';
 import { AuthService } from 'src/domain/auth/auth.service';
-import { UserEntity } from 'src/infra/entities/user.entity';
+import { UserEntity } from 'src/entities/user.entity';
 import { IKeyRepository } from 'src/interfaces/api-key.repository';
 import { ICryptoRepository } from 'src/interfaces/crypto.repository';
 import { ILibraryRepository } from 'src/interfaces/library.repository';

server/src/domain/auth/auth.service.ts

@@ -37,8 +37,8 @@ import {
   mapUserToken,
 } from 'src/domain/auth/auth.dto';
 import { UserResponseDto, mapUser } from 'src/domain/user/response-dto/user-response.dto';
-import { SystemConfig } from 'src/infra/entities/system-config.entity';
-import { UserEntity } from 'src/infra/entities/user.entity';
+import { SystemConfig } from 'src/entities/system-config.entity';
+import { UserEntity } from 'src/entities/user.entity';
 import { ImmichLogger } from 'src/infra/logger';
 import { IAccessRepository } from 'src/interfaces/access.repository';
 import { IKeyRepository } from 'src/interfaces/api-key.repository';

server/src/domain/domain.constant.ts

@@ -1,7 +1,7 @@
 import { Duration } from 'luxon';
 import { readFileSync } from 'node:fs';
 import { extname, join } from 'node:path';
-import { AssetType } from 'src/infra/entities/asset.entity';
+import { AssetType } from 'src/entities/asset.entity';
 
 export const AUDIT_LOG_MAX_DURATION = Duration.fromObject({ days: 100 });
 export const ONE_HOUR = Duration.fromObject({ hours: 1 });

server/src/domain/download/download.service.ts

@@ -5,7 +5,7 @@ import { AssetIdsDto } from 'src/domain/asset/dto/asset-ids.dto';
 import { AuthDto } from 'src/domain/auth/auth.dto';
 import { mimeTypes } from 'src/domain/domain.constant';
 import { DownloadArchiveInfo, DownloadInfoDto, DownloadResponseDto } from 'src/domain/download/download.dto';
-import { AssetEntity } from 'src/infra/entities/asset.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
 import { IAccessRepository } from 'src/interfaces/access.repository';
 import { IAssetRepository } from 'src/interfaces/asset.repository';
 import { IStorageRepository, ImmichReadStream } from 'src/interfaces/storage.repository';

server/src/domain/job/job.service.spec.ts

@@ -2,7 +2,7 @@ import { BadRequestException } from '@nestjs/common';
 import { FeatureFlag, SystemConfigCore } from 'src/cores/system-config.core';
 import { JobCommand, JobName, QueueName } from 'src/domain/job/job.constants';
 import { JobService } from 'src/domain/job/job.service';
-import { SystemConfig, SystemConfigKey } from 'src/infra/entities/system-config.entity';
+import { SystemConfig, SystemConfigKey } from 'src/entities/system-config.entity';
 import { IAssetRepository } from 'src/interfaces/asset.repository';
 import { ICommunicationRepository } from 'src/interfaces/communication.repository';
 import { IJobRepository, JobHandler, JobItem, JobStatus } from 'src/interfaces/job.repository';

server/src/domain/job/job.service.ts

@@ -3,7 +3,7 @@ import { FeatureFlag, SystemConfigCore } from 'src/cores/system-config.core';
 import { mapAsset } from 'src/domain/asset/response-dto/asset-response.dto';
 import { ConcurrentQueueName, JobCommand, JobName, QueueName } from 'src/domain/job/job.constants';
 import { AllJobStatusResponseDto, JobCommandDto, JobStatusDto } from 'src/domain/job/job.dto';
-import { AssetType } from 'src/infra/entities/asset.entity';
+import { AssetType } from 'src/entities/asset.entity';
 import { ImmichLogger } from 'src/infra/logger';
 import { IAssetRepository } from 'src/interfaces/asset.repository';
 import { ClientEvent, ICommunicationRepository } from 'src/interfaces/communication.repository';

server/src/domain/library/library.dto.ts

@@ -1,6 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { ArrayMaxSize, ArrayUnique, IsEnum, IsNotEmpty, IsString } from 'class-validator';
-import { LibraryEntity, LibraryType } from 'src/infra/entities/library.entity';
+import { LibraryEntity, LibraryType } from 'src/entities/library.entity';
 import { Optional, ValidateBoolean, ValidateUUID } from 'src/validation';
 
 export class CreateLibraryDto {