KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2025-10-29 17:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): missing dep in immich cli (#2094)

Browse Source 
* fix: missing dep in immich cli

* fix: imports
This commit is contained in:
Jason Rasmussen
2023-03-28 12:29:20 -04:00
committed by GitHub
parent 0854737be2
commit da5a6d2272
22 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/apps/cli/src/app.module.ts
View File

@@ -6,11 +6,7 @@ import { DisablePasswordLoginCommand, EnablePasswordLoginCommand } from './comma
import { PromptPasswordQuestions, ResetAdminPasswordCommand } from './commands/reset-admin-password.command';
@Module({
imports: [
DomainModule.register({
imports: [InfraModule],
}),
],
imports: [DomainModule.register({ imports: [InfraModule] })],
providers: [
ResetAdminPasswordCommand,
PromptPasswordQuestions,

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

@@ -1,4 +1,5 @@
import { AlbumEntity, AssetEntity, dataSource, UserEntity } from '@app/infra';
import { AlbumEntity, AssetEntity, UserEntity } from '@app/infra/db/entities';
import { dataSource } from '@app/infra/db/config';
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';

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

@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
import { AlbumService } from './album.service';
import { AlbumController } from './album.controller';
import { TypeOrmModule } from '@nestjs/typeorm';
import { AlbumEntity, AssetEntity } from '@app/infra';
import { AlbumEntity, AssetEntity } from '@app/infra/db/entities';
import { AlbumRepository, IAlbumRepository } from './album-repository';
import { DownloadModule } from '../../modules/download/download.module';

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

@@ -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, UserEntity } from '@app/infra';
import { AlbumEntity, UserEntity } from '@app/infra/db/entities';
import { AlbumResponseDto, ICryptoRepository, IJobRepository, JobName, mapUser } from '@app/domain';
import { AddAssetsResponseDto } from './response-dto/add-assets-response.dto';
import { IAlbumRepository } from './album-repository';

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

@@ -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/infra';
import { AlbumEntity, SharedLinkType } from '@app/infra/db/entities';
import { AddUsersDto } from './dto/add-users.dto';
import { RemoveAssetsDto } from './dto/remove-assets.dto';
import { UpdateAlbumDto } from './dto/update-album.dto';

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

@@ -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/infra';
import { AssetEntity, AssetType } from '@app/infra/db/entities';
import { Inject, Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm/repository/Repository';

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

@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
import { AssetService } from './asset.service';
import { AssetController } from './asset.controller';
import { TypeOrmModule } from '@nestjs/typeorm';
import { AssetEntity } from '@app/infra';
import { AssetEntity } from '@app/infra/db/entities';
import { AssetRepository, IAssetRepository } from './asset-repository';
import { DownloadModule } from '../../modules/download/download.module';
import { TagModule } from '../tag/tag.module';

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

@@ -1,7 +1,7 @@
import { IAssetRepository } from './asset-repository';
import { AssetService } from './asset.service';
import { QueryFailedError, Repository } from 'typeorm';
import { AssetEntity, AssetType } from '@app/infra';
import { AssetEntity, AssetType } from '@app/infra/db/entities';
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';

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

@@ -12,7 +12,7 @@ import {
import { InjectRepository } from '@nestjs/typeorm';
import { QueryFailedError, Repository } from 'typeorm';
import { AuthUserDto } from '../../decorators/auth-user.decorator';
import { AssetEntity, AssetType, SharedLinkType, SystemConfig } from '@app/infra';
import { AssetEntity, AssetType, SharedLinkType, SystemConfig } from '@app/infra/db/entities';
import { constants, createReadStream, stat } from 'fs';
import { ServeFileDto } from './dto/serve-file.dto';
import { Response as Res } from 'express';

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

@@ -1,4 +1,4 @@
import { AssetType } from '@app/infra';
import { AssetType } from '@app/infra/db/entities';
import { ApiProperty } from '@nestjs/swagger';
import { IsBoolean, IsEnum, IsNotEmpty, IsOptional } from 'class-validator';
import { ImmichFile } from '../../../config/asset-upload.config';

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

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

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

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

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

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

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

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

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

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

3
server/apps/immich/src/app.module.ts
View File

@@ -1,7 +1,5 @@
import { immichAppConfig } from '@app/domain';
import { Module, OnModuleInit } from '@nestjs/common';
import { AssetModule } from './api-v1/asset/asset.module';
import { ConfigModule } from '@nestjs/config';
import { AlbumModule } from './api-v1/album/album.module';
import { AppController } from './app.controller';
import { ScheduleModule } from '@nestjs/schedule';
@@ -27,7 +25,6 @@ import { AppCronJobs } from './app.cron-jobs';
@Module({
imports: [
ConfigModule.forRoot(immichAppConfig),
DomainModule.register({ imports: [InfraModule] }),
AssetModule,
AlbumModule,

2
server/apps/immich/src/modules/download/download.service.ts
View File

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

7
server/apps/microservices/src/microservices.module.ts
View File

@@ -1,8 +1,7 @@
import { immichAppConfig } from '@app/domain';
import { DomainModule } from '@app/domain';
import { ExifEntity, InfraModule } from '@app/infra';
import { InfraModule } from '@app/infra';
import { ExifEntity } from '@app/infra/db/entities';
import { Module } from '@nestjs/common';
import { ConfigModule } from '@nestjs/config';
import { TypeOrmModule } from '@nestjs/typeorm';
import {
BackgroundTaskProcessor,
@@ -17,7 +16,7 @@ import { VideoTranscodeProcessor } from './processors/video-transcode.processor'
@Module({
imports: [
ConfigModule.forRoot(immichAppConfig),
//
DomainModule.register({ imports: [InfraModule] }),
TypeOrmModule.forFeature([ExifEntity]),
],

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

@@ -10,7 +10,7 @@ import {
QueueName,
WithoutProperty,
} from '@app/domain';
import { AssetEntity, AssetType, ExifEntity } from '@app/infra';
import { AssetEntity, AssetType, ExifEntity } from '@app/infra/db/entities';
import { Process, Processor } from '@nestjs/bull';
import { Inject, Logger } from '@nestjs/common';
import { ConfigService } from '@nestjs/config';

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

@@ -11,7 +11,7 @@ import {
SystemConfigService,
WithoutProperty,
} from '@app/domain';
import { AssetEntity, AssetType } from '@app/infra';
import { AssetEntity, AssetType } from '@app/infra/db/entities';
import { Process, Processor } from '@nestjs/bull';
import { Inject, Logger } from '@nestjs/common';
import { Job } from 'bull';

2
server/libs/domain/src/album/album.service.ts
View File

@@ -1,4 +1,4 @@
import { AlbumEntity } from '@app/infra';
import { AlbumEntity } from '@app/infra/db/entities';
import { Inject, Injectable } from '@nestjs/common';
import { IAssetRepository } from '../asset';
import { AuthUserDto } from '../auth';

5
server/libs/infra/src/infra.module.ts
View File

@@ -8,6 +8,7 @@ import {
IKeyRepository,
IMachineLearningRepository,
IMediaRepository,
immichAppConfig,
ISearchRepository,
ISharedLinkRepository,
ISmartInfoRepository,
@@ -19,6 +20,7 @@ import {
} from '@app/domain';
import { BullModule } from '@nestjs/bull';
import { Global, Module, Provider } from '@nestjs/common';
import { ConfigModule } from '@nestjs/config';
import { TypeOrmModule } from '@nestjs/typeorm';
import { CryptoRepository } from './auth/crypto.repository';
import { CommunicationGateway, CommunicationRepository } from './communication';
@@ -71,6 +73,8 @@ const providers: Provider[] = [
@Global()
@Module({
imports: [
ConfigModule.forRoot(immichAppConfig),
TypeOrmModule.forRoot(databaseConfig),
TypeOrmModule.forFeature([
AssetEntity,
@@ -83,6 +87,7 @@ const providers: Provider[] = [
SystemConfigEntity,
UserTokenEntity,
]),
BullModule.forRootAsync({
useFactory: async () => ({
prefix: 'immich_bull',