refactor: asset v1, app.utils (#8152)

server/src/apps/api.main.ts

@@ -6,12 +6,11 @@ import { existsSync } from 'node:fs';
 import sirv from 'sirv';
 import { ApiModule } from 'src/apps/api.module';
 import { ApiService } from 'src/apps/api.service';
-import { excludePaths } from 'src/config';
-import { WEB_ROOT, envName, isDev, serverVersion } from 'src/constants';
-import { useSwagger } from 'src/immich/app.utils';
+import { WEB_ROOT, envName, excludePaths, isDev, serverVersion } from 'src/constants';
 import { WebSocketAdapter } from 'src/middleware/websocket.adapter';
 import { otelSDK } from 'src/utils/instrumentation';
 import { ImmichLogger } from 'src/utils/logger';
+import { useSwagger } from 'src/utils/misc';
 
 const logger = new ImmichLogger('ImmichServer');
 const port = Number(process.env.SERVER_PORT) || 3001;

server/src/apps/api.module.ts

@@ -1,13 +1,13 @@
 import { Module, OnModuleInit, ValidationPipe } from '@nestjs/common';
 import { APP_GUARD, APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
 import { ScheduleModule } from '@nestjs/schedule';
-import { TypeOrmModule } from '@nestjs/typeorm';
 import { ApiService } from 'src/apps/api.service';
 import { AppModule } from 'src/apps/app.module';
 import { ActivityController } from 'src/controllers/activity.controller';
 import { AlbumController } from 'src/controllers/album.controller';
 import { APIKeyController } from 'src/controllers/api-key.controller';
 import { AppController } from 'src/controllers/app.controller';
+import { AssetControllerV1 } from 'src/controllers/asset-v1.controller';
 import { AssetController, AssetsController } from 'src/controllers/asset.controller';
 import { AuditController } from 'src/controllers/audit.controller';
 import { AuthController } from 'src/controllers/auth.controller';
@@ -25,11 +25,6 @@ import { SystemConfigController } from 'src/controllers/system-config.controller
 import { TagController } from 'src/controllers/tag.controller';
 import { TrashController } from 'src/controllers/trash.controller';
 import { UserController } from 'src/controllers/user.controller';
-import { AssetEntity } from 'src/entities/asset.entity';
-import { ExifEntity } from 'src/entities/exif.entity';
-import { AssetRepositoryV1, IAssetRepositoryV1 } from 'src/immich/api-v1/asset/asset-repository';
-import { AssetController as AssetControllerV1 } from 'src/immich/api-v1/asset/asset.controller';
-import { AssetService as AssetServiceV1 } from 'src/immich/api-v1/asset/asset.service';
 import { AuthGuard } from 'src/middleware/auth.guard';
 import { ErrorInterceptor } from 'src/middleware/error.interceptor';
 import { FileUploadInterceptor } from 'src/middleware/file-upload.interceptor';
@@ -39,7 +34,6 @@ import { FileUploadInterceptor } from 'src/middleware/file-upload.interceptor';
     //
     AppModule,
     ScheduleModule.forRoot(),
-    TypeOrmModule.forFeature([AssetEntity, ExifEntity]),
   ],
   controllers: [
     ActivityController,
@@ -67,19 +61,17 @@ import { FileUploadInterceptor } from 'src/middleware/file-upload.interceptor';
     PersonController,
   ],
   providers: [
+    ApiService,
+    FileUploadInterceptor,
     { provide: APP_PIPE, useValue: new ValidationPipe({ transform: true, whitelist: true }) },
     { provide: APP_INTERCEPTOR, useClass: ErrorInterceptor },
     { provide: APP_GUARD, useClass: AuthGuard },
-    { provide: IAssetRepositoryV1, useClass: AssetRepositoryV1 },
-    ApiService,
-    AssetServiceV1,
-    FileUploadInterceptor,
   ],
 })
 export class ApiModule implements OnModuleInit {
-  constructor(private appService: ApiService) {}
+  constructor(private apiService: ApiService) {}
 
   async onModuleInit() {
-    await this.appService.init();
+    await this.apiService.init();
   }
 }

server/src/apps/app.module.ts

@@ -13,6 +13,7 @@ import { IActivityRepository } from 'src/interfaces/activity.interface';
 import { IAlbumRepository } from 'src/interfaces/album.interface';
 import { IKeyRepository } from 'src/interfaces/api-key.interface';
 import { IAssetStackRepository } from 'src/interfaces/asset-stack.interface';
+import { IAssetRepositoryV1 } from 'src/interfaces/asset-v1.interface';
 import { IAssetRepository } from 'src/interfaces/asset.interface';
 import { IAuditRepository } from 'src/interfaces/audit.interface';
 import { ICommunicationRepository } from 'src/interfaces/communication.interface';
@@ -40,6 +41,7 @@ import { ActivityRepository } from 'src/repositories/activity.repository';
 import { AlbumRepository } from 'src/repositories/album.repository';
 import { ApiKeyRepository } from 'src/repositories/api-key.repository';
 import { AssetStackRepository } from 'src/repositories/asset-stack.repository';
+import { AssetRepositoryV1 } from 'src/repositories/asset-v1.repository';
 import { AssetRepository } from 'src/repositories/asset.repository';
 import { AuditRepository } from 'src/repositories/audit.repository';
 import { CommunicationRepository } from 'src/repositories/communication.repository';
@@ -65,6 +67,7 @@ import { UserRepository } from 'src/repositories/user.repository';
 import { ActivityService } from 'src/services/activity.service';
 import { AlbumService } from 'src/services/album.service';
 import { APIKeyService } from 'src/services/api-key.service';
+import { AssetServiceV1 } from 'src/services/asset-v1.service';
 import { AssetService } from 'src/services/asset.service';
 import { AuditService } from 'src/services/audit.service';
 import { AuthService } from 'src/services/auth.service';
@@ -94,6 +97,7 @@ const services: Provider[] = [
   ActivityService,
   AlbumService,
   AssetService,
+  AssetServiceV1,
   AuditService,
   AuthService,
   DatabaseService,
@@ -122,6 +126,7 @@ const repositories: Provider[] = [
   { provide: IAccessRepository, useClass: AccessRepository },
   { provide: IAlbumRepository, useClass: AlbumRepository },
   { provide: IAssetRepository, useClass: AssetRepository },
+  { provide: IAssetRepositoryV1, useClass: AssetRepositoryV1 },
   { provide: IAssetStackRepository, useClass: AssetStackRepository },
   { provide: IAuditRepository, useClass: AuditRepository },
   { provide: ICommunicationRepository, useClass: CommunicationRepository },