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

refactor(server): flatten infra folders (#2120)

Browse Source 
* refactor: flatten infra folders

* fix: database migrations

* fix: test related import

* fix: github actions workflow

* chore: rename schemas to typesense-schemas
This commit is contained in:
Jason Rasmussen
2023-03-30 15:38:55 -04:00
committed by GitHub
parent 468e620372
commit 34d300d1da
176 changed files with 185 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
import { AlbumEntity } from '@app/infra/db/entities';
import { AlbumEntity } from '@app/infra/entities';
export const IAlbumRepository = 'IAlbumRepository';

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

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

2
server/libs/domain/src/album/response-dto/album-response.dto.ts
View File

@@ -1,4 +1,4 @@
import { AlbumEntity } from '@app/infra/db/entities';
import { AlbumEntity } from '@app/infra/entities';
import { ApiProperty } from '@nestjs/swagger';
import { AssetResponseDto, mapAsset } from '../../asset';
import { mapUser, UserResponseDto } from '../../user';

2
server/libs/domain/src/api-key/api-key.repository.ts
View File

@@ -1,4 +1,4 @@
import { APIKeyEntity } from '@app/infra/db/entities';
import { APIKeyEntity } from '@app/infra/entities';
export const IKeyRepository = 'IKeyRepository';

2
server/libs/domain/src/api-key/response-dto/api-key-response.dto.ts
View File

@@ -1,4 +1,4 @@
import { APIKeyEntity } from '@app/infra/db/entities';
import { APIKeyEntity } from '@app/infra/entities';
export class APIKeyResponseDto {
id!: string;

2
server/libs/domain/src/asset/asset.core.ts
View File

@@ -1,4 +1,4 @@
import { AssetEntity, AssetType } from '@app/infra/db/entities';
import { AssetEntity, AssetType } from '@app/infra/entities';
import { IJobRepository, JobName } from '../job';
import { AssetSearchOptions, IAssetRepository } from './asset.repository';

2
server/libs/domain/src/asset/asset.repository.ts
View File

@@ -1,4 +1,4 @@
import { AssetEntity, AssetType } from '@app/infra/db/entities';
import { AssetEntity, AssetType } from '@app/infra/entities';
export interface AssetSearchOptions {
isVisible?: boolean;

2
server/libs/domain/src/asset/asset.service.spec.ts
View File

@@ -1,4 +1,4 @@
import { AssetEntity, AssetType } from '@app/infra/db/entities';
import { AssetEntity, AssetType } from '@app/infra/entities';
import { assetEntityStub, newAssetRepositoryMock, newJobRepositoryMock } from '../../test';
import { AssetService, IAssetRepository } from '../asset';
import { IJobRepository, JobName } from '../job';

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

@@ -1,4 +1,4 @@
import { AssetEntity, AssetType } from '@app/infra/db/entities';
import { AssetEntity, AssetType } from '@app/infra/entities';
import { Inject } from '@nestjs/common';
import { IAssetUploadedJob, IJobRepository, JobName } from '../job';
import { AssetCore } from './asset.core';

2
server/libs/domain/src/asset/response-dto/asset-response.dto.ts
View File

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

2
server/libs/domain/src/asset/response-dto/exif-response.dto.ts
View File

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

2
server/libs/domain/src/asset/response-dto/smart-info-response.dto.ts
View File

@@ -1,4 +1,4 @@
import { SmartInfoEntity } from '@app/infra/db/entities';
import { SmartInfoEntity } from '@app/infra/entities';
export class SmartInfoResponseDto {
tags?: string[] | null;

2
server/libs/domain/src/auth/auth.core.ts
View File

@@ -1,4 +1,4 @@
import { SystemConfig, UserEntity } from '@app/infra/db/entities';
import { SystemConfig, UserEntity } from '@app/infra/entities';
import { ISystemConfigRepository } from '../system-config';
import { SystemConfigCore } from '../system-config/system-config.core';
import { AuthType, IMMICH_ACCESS_COOKIE, IMMICH_AUTH_TYPE_COOKIE } from './auth.constant';

2
server/libs/domain/src/auth/auth.service.spec.ts
View File

@@ -1,4 +1,4 @@
import { SystemConfig, UserEntity } from '@app/infra/db/entities';
import { SystemConfig, UserEntity } from '@app/infra/entities';
import { BadRequestException, UnauthorizedException } from '@nestjs/common';
import { IncomingHttpHeaders } from 'http';
import { generators, Issuer } from 'openid-client';

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

@@ -1,4 +1,4 @@
import { SystemConfig } from '@app/infra/db/entities';
import { SystemConfig } from '@app/infra/entities';
import {
BadRequestException,
Inject,

2
server/libs/domain/src/auth/response-dto/admin-signup-response.dto.ts
View File

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

2
server/libs/domain/src/auth/response-dto/login-response.dto.ts
View File

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

2
server/libs/domain/src/device-info/device-info.core.ts
View File

@@ -1,4 +1,4 @@
import { DeviceInfoEntity } from '@app/infra/db/entities';
import { DeviceInfoEntity } from '@app/infra/entities';
import { IDeviceInfoRepository } from './device-info.repository';
type UpsertKeys = Pick<DeviceInfoEntity, 'deviceId' | 'userId'>;

2
server/libs/domain/src/device-info/device-info.repository.ts
View File

@@ -1,4 +1,4 @@
import { DeviceInfoEntity } from '@app/infra/db/entities';
import { DeviceInfoEntity } from '@app/infra/entities';
export const IDeviceInfoRepository = 'IDeviceInfoRepository';

2
server/libs/domain/src/device-info/device-info.service.spec.ts
View File

@@ -1,4 +1,4 @@
import { DeviceInfoEntity, DeviceType } from '@app/infra/db/entities';
import { DeviceInfoEntity, DeviceType } from '@app/infra/entities';
import { authStub, newDeviceInfoRepositoryMock } from '../../test';
import { IDeviceInfoRepository } from './device-info.repository';
import { DeviceInfoService } from './device-info.service';

2
server/libs/domain/src/device-info/dto/upsert-device-info.dto.ts
View File

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

2
server/libs/domain/src/device-info/response-dto/device-info-response.dto.ts
View File

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

2
server/libs/domain/src/job/job.interface.ts
View File

@@ -1,4 +1,4 @@
import { AlbumEntity, AssetEntity, UserEntity } from '@app/infra/db/entities';
import { AlbumEntity, AssetEntity, UserEntity } from '@app/infra/entities';
export interface IBaseJob {
force?: boolean;

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

@@ -1,4 +1,4 @@
import { AssetType } from '@app/infra/db/entities';
import { AssetType } from '@app/infra/entities';
import { Inject, Injectable, Logger } from '@nestjs/common';
import { join } from 'path';
import { IAssetRepository, mapAsset, WithoutProperty } from '../asset';

2
server/libs/domain/src/oauth/oauth.core.ts
View File

@@ -1,4 +1,4 @@
import { SystemConfig } from '@app/infra/db/entities';
import { SystemConfig } from '@app/infra/entities';
import { BadRequestException, Injectable, Logger } from '@nestjs/common';
import { ClientMetadata, custom, generators, Issuer, UserinfoResponse } from 'openid-client';
import { ISystemConfigRepository } from '../system-config';

2
server/libs/domain/src/oauth/oauth.service.spec.ts
View File

@@ -1,4 +1,4 @@
import { SystemConfig, UserEntity } from '@app/infra/db/entities';
import { SystemConfig, UserEntity } from '@app/infra/entities';
import { BadRequestException } from '@nestjs/common';
import { generators, Issuer } from 'openid-client';
import {

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

@@ -1,4 +1,4 @@
import { SystemConfig } from '@app/infra/db/entities';
import { SystemConfig } from '@app/infra/entities';
import { BadRequestException, Inject, Injectable, Logger } from '@nestjs/common';
import { AuthType, AuthUserDto, LoginResponseDto } from '../auth';
import { AuthCore } from '../auth/auth.core';

2
server/libs/domain/src/search/dto/search.dto.ts
View File

@@ -1,4 +1,4 @@
import { AssetType } from '@app/infra/db/entities';
import { AssetType } from '@app/infra/entities';
import { Transform } from 'class-transformer';
import { IsArray, IsBoolean, IsEnum, IsNotEmpty, IsOptional, IsString } from 'class-validator';
import { toBoolean } from '../../../../../apps/immich/src/utils/transform.util';

2
server/libs/domain/src/search/search.repository.ts
View File

@@ -1,4 +1,4 @@
import { AlbumEntity, AssetEntity, AssetType } from '@app/infra/db/entities';
import { AlbumEntity, AssetEntity, AssetType } from '@app/infra/entities';
export enum SearchCollection {
ASSETS = 'assets',

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

@@ -1,4 +1,4 @@
import { AlbumEntity, AssetEntity } from '@app/infra/db/entities';
import { AlbumEntity, AssetEntity } from '@app/infra/entities';
import { BadRequestException, Inject, Injectable, Logger } from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import { mapAlbum } from '../album';

2
server/libs/domain/src/share/dto/create-shared-link.dto.ts
View File

@@ -1,4 +1,4 @@
import { AlbumEntity, AssetEntity, SharedLinkType } from '@app/infra/db/entities';
import { AlbumEntity, AssetEntity, SharedLinkType } from '@app/infra/entities';
export class CreateSharedLinkDto {
description?: string;

2
server/libs/domain/src/share/response-dto/shared-link-response.dto.ts
View File

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

2
server/libs/domain/src/share/share.core.ts
View File

@@ -1,4 +1,4 @@
import { AssetEntity, SharedLinkEntity } from '@app/infra/db/entities';
import { AssetEntity, SharedLinkEntity } from '@app/infra/entities';
import {
BadRequestException,
ForbiddenException,

2
server/libs/domain/src/share/shared-link.repository.ts
View File

@@ -1,4 +1,4 @@
import { SharedLinkEntity } from '@app/infra/db/entities';
import { SharedLinkEntity } from '@app/infra/entities';
export const ISharedLinkRepository = 'ISharedLinkRepository';

2
server/libs/domain/src/smart-info/smart-info.repository.ts
View File

@@ -1,4 +1,4 @@
import { SmartInfoEntity } from '@app/infra/db/entities';
import { SmartInfoEntity } from '@app/infra/entities';
export const ISmartInfoRepository = 'ISmartInfoRepository';

2
server/libs/domain/src/smart-info/smart-info.service.spec.ts
View File

@@ -1,4 +1,4 @@
import { AssetEntity } from '@app/infra/db/entities';
import { AssetEntity } from '@app/infra/entities';
import {
assetEntityStub,
newAssetRepositoryMock,

2
server/libs/domain/src/storage-template/storage-template.core.ts
View File

@@ -1,4 +1,4 @@
import { AssetEntity, AssetType, SystemConfig } from '@app/infra/db/entities';
import { AssetEntity, AssetType, SystemConfig } from '@app/infra/entities';
import { Logger } from '@nestjs/common';
import handlebar from 'handlebars';
import * as luxon from 'luxon';

2
server/libs/domain/src/storage-template/storage-template.service.ts
View File

@@ -1,4 +1,4 @@
import { AssetEntity, SystemConfig } from '@app/infra/db/entities';
import { AssetEntity, SystemConfig } from '@app/infra/entities';
import { Inject, Injectable, Logger } from '@nestjs/common';
import { IAssetRepository } from '../asset/asset.repository';
import { APP_MEDIA_LOCATION } from '../domain.constant';

2
server/libs/domain/src/system-config/dto/system-config-ffmpeg.dto.ts
View File

@@ -1,5 +1,5 @@
import { IsEnum, IsString } from 'class-validator';
import { TranscodePreset } from '@app/infra/db/entities';
import { TranscodePreset } from '@app/infra/entities';
export class SystemConfigFFmpegDto {
@IsString()

2
server/libs/domain/src/system-config/dto/system-config.dto.ts
View File

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

2
server/libs/domain/src/system-config/system-config.core.ts
View File

@@ -1,4 +1,4 @@
import { SystemConfig, SystemConfigEntity, SystemConfigKey, TranscodePreset } from '@app/infra/db/entities';
import { SystemConfig, SystemConfigEntity, SystemConfigKey, TranscodePreset } from '@app/infra/entities';
import { BadRequestException, Injectable, Logger } from '@nestjs/common';
import * as _ from 'lodash';
import { Subject } from 'rxjs';

2
server/libs/domain/src/system-config/system-config.repository.ts
View File

@@ -1,4 +1,4 @@
import { SystemConfigEntity } from '@app/infra/db/entities';
import { SystemConfigEntity } from '@app/infra/entities';
export const ISystemConfigRepository = 'ISystemConfigRepository';

2
server/libs/domain/src/system-config/system-config.service.spec.ts
View File

@@ -1,4 +1,4 @@
import { SystemConfigEntity, SystemConfigKey, TranscodePreset } from '@app/infra/db/entities';
import { SystemConfigEntity, SystemConfigKey, TranscodePreset } from '@app/infra/entities';
import { BadRequestException } from '@nestjs/common';
import { newJobRepositoryMock, newSystemConfigRepositoryMock, systemConfigStub } from '../../test';
import { IJobRepository, JobName } from '../job';

2
server/libs/domain/src/tag/response-dto/tag-response.dto.ts
View File

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

2
server/libs/domain/src/user-token/user-token.core.ts
View File

@@ -1,4 +1,4 @@
import { UserEntity } from '@app/infra/db/entities';
import { UserEntity } from '@app/infra/entities';
import { Injectable, UnauthorizedException } from '@nestjs/common';
import { ICryptoRepository } from '../crypto';
import { IUserTokenRepository } from './user-token.repository';

2
server/libs/domain/src/user-token/user-token.repository.ts
View File

@@ -1,4 +1,4 @@
import { UserTokenEntity } from '@app/infra/db/entities';
import { UserTokenEntity } from '@app/infra/entities';
export const IUserTokenRepository = 'IUserTokenRepository';

2
server/libs/domain/src/user/response-dto/user-response.dto.ts
View File

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

2
server/libs/domain/src/user/user.core.ts
View File

@@ -1,4 +1,4 @@
import { UserEntity } from '@app/infra/db/entities';
import { UserEntity } from '@app/infra/entities';
import {
BadRequestException,
ForbiddenException,

2
server/libs/domain/src/user/user.repository.ts
View File

@@ -1,4 +1,4 @@
import { UserEntity } from '@app/infra/db/entities';
import { UserEntity } from '@app/infra/entities';
export interface UserListFilter {
excludeId?: string;

2
server/libs/domain/src/user/user.service.spec.ts
View File

@@ -1,4 +1,4 @@
import { UserEntity } from '@app/infra/db/entities';
import { UserEntity } from '@app/infra/entities';
import { BadRequestException, ForbiddenException, NotFoundException } from '@nestjs/common';
import { when } from 'jest-when';
import {

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

@@ -1,4 +1,4 @@
import { UserEntity } from '@app/infra/db/entities';
import { UserEntity } from '@app/infra/entities';
import { BadRequestException, Inject, Injectable, Logger, NotFoundException } from '@nestjs/common';
import { randomBytes } from 'crypto';
import { ReadStream } from 'fs';

2
server/libs/domain/test/fixtures.ts
View File

@@ -9,7 +9,7 @@ import {
TranscodePreset,
UserEntity,
UserTokenEntity,
} from '@app/infra/db/entities';
} from '@app/infra/entities';
import {
AlbumResponseDto,
AssetResponseDto,