chore(server): organize imports (#2779)

* feat: lint rule for organize imports

* chore: organize imports

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

@@ -1,5 +1,4 @@
 import { BadRequestException, ForbiddenException } from '@nestjs/common';
-import _ from 'lodash';
 import {
   albumStub,
   authStub,
@@ -9,6 +8,7 @@ import {
   newUserRepositoryMock,
   userEntityStub,
 } from '@test';
+import _ from 'lodash';
 import { IAssetRepository } from '../asset';
 import { IJobRepository, JobName } from '../job';
 import { IUserRepository } from '../user';

server/src/domain/album/dto/album-add-users.dto.ts

@@ -1,5 +1,5 @@
-import { ArrayNotEmpty } from 'class-validator';
 import { ValidateUUID } from '@app/immich/decorators/validate-uuid.decorator';
+import { ArrayNotEmpty } from 'class-validator';
 
 export class AddUsersDto {
   @ValidateUUID({ each: true })

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

@@ -1,5 +1,5 @@
-import { ApiProperty } from '@nestjs/swagger';
 import { ValidateUUID } from '@app/immich/decorators/validate-uuid.decorator';
+import { ApiProperty } from '@nestjs/swagger';
 import { IsNotEmpty, IsString } from 'class-validator';
 
 export class CreateAlbumDto {

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

@@ -1,6 +1,6 @@
+import { ValidateUUID } from '@app/immich/decorators/validate-uuid.decorator';
 import { ApiProperty } from '@nestjs/swagger';
 import { IsOptional } from 'class-validator';
-import { ValidateUUID } from '@app/immich/decorators/validate-uuid.decorator';
 
 export class UpdateAlbumDto {
   @IsOptional()

server/src/domain/album/dto/get-albums.dto.ts

@@ -1,8 +1,8 @@
+import { ValidateUUID } from '@app/immich/decorators/validate-uuid.decorator';
+import { toBoolean } from '@app/immich/utils/transform.util';
 import { ApiProperty } from '@nestjs/swagger';
 import { Transform } from 'class-transformer';
 import { IsBoolean, IsOptional } from 'class-validator';
-import { ValidateUUID } from '@app/immich/decorators/validate-uuid.decorator';
-import { toBoolean } from '@app/immich/utils/transform.util';
 
 export class GetAlbumsDto {
   @IsOptional()

server/src/domain/asset/dto/map-marker.dto.ts

@@ -1,7 +1,7 @@
+import { toBoolean } from '@app/immich/utils/transform.util';
 import { ApiProperty } from '@nestjs/swagger';
 import { Transform, Type } from 'class-transformer';
 import { IsBoolean, IsDate, IsOptional } from 'class-validator';
-import { toBoolean } from '@app/immich/utils/transform.util';
 
 export class MapMarkerDto {
   @ApiProperty()

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

@@ -1,8 +1,5 @@
 import { SystemConfig, UserEntity } from '@app/infra/entities';
 import { BadRequestException, UnauthorizedException } from '@nestjs/common';
-import { IncomingHttpHeaders } from 'http';
-import { generators, Issuer } from 'openid-client';
-import { Socket } from 'socket.io';
 import {
   authStub,
   keyStub,
@@ -18,6 +15,9 @@ import {
   userEntityStub,
   userTokenEntityStub,
 } from '@test';
+import { IncomingHttpHeaders } from 'http';
+import { generators, Issuer } from 'openid-client';
+import { Socket } from 'socket.io';
 import { IKeyRepository } from '../api-key';
 import { ICryptoRepository } from '../crypto/crypto.repository';
 import { ISharedLinkRepository } from '../shared-link';

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

@@ -7,21 +7,27 @@ import {
   Logger,
   UnauthorizedException,
 } from '@nestjs/common';
+import cookieParser from 'cookie';
 import { IncomingHttpHeaders } from 'http';
+import { IKeyRepository } from '../api-key';
+import { APIKeyCore } from '../api-key/api-key.core';
+import { ICryptoRepository } from '../crypto/crypto.repository';
 import { OAuthCore } from '../oauth/oauth.core';
+import { ISharedLinkRepository, SharedLinkCore } from '../shared-link';
 import { INITIAL_SYSTEM_CONFIG, ISystemConfigRepository } from '../system-config';
 import { IUserRepository, UserCore } from '../user';
+import { IUserTokenRepository, UserTokenCore } from '../user-token';
 import { AuthType, IMMICH_ACCESS_COOKIE, IMMICH_API_KEY_HEADER } from './auth.constant';
 import { AuthCore, LoginDetails } from './auth.core';
-import { ICryptoRepository } from '../crypto/crypto.repository';
 import { AuthUserDto, ChangePasswordDto, LoginCredentialDto, SignUpDto } from './dto';
-import { AdminSignupResponseDto, LoginResponseDto, LogoutResponseDto, mapAdminSignupResponse } from './response-dto';
-import { IUserTokenRepository, UserTokenCore } from '../user-token';
-import cookieParser from 'cookie';
-import { ISharedLinkRepository, SharedLinkCore } from '../shared-link';
-import { APIKeyCore } from '../api-key/api-key.core';
-import { IKeyRepository } from '../api-key';
-import { AuthDeviceResponseDto, mapUserToken } from './response-dto';
+import {
+  AdminSignupResponseDto,
+  AuthDeviceResponseDto,
+  LoginResponseDto,
+  LogoutResponseDto,
+  mapAdminSignupResponse,
+  mapUserToken,
+} from './response-dto';
 
 @Injectable()
 export class AuthService {

server/src/domain/facial-recognition/index.ts

@@ -1,2 +1,2 @@
-export * from './facial-recognition.services';
 export * from './face.repository';
+export * from './facial-recognition.services';

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

@@ -7,9 +7,9 @@ import {
   newJobRepositoryMock,
   newSystemConfigRepositoryMock,
 } from '@test';
+import { IJobRepository, JobCommand, JobHandler, JobItem, JobName, JobService, QueueName } from '.';
 import { IAssetRepository } from '../asset';
 import { ICommunicationRepository } from '../communication';
-import { IJobRepository, JobCommand, JobHandler, JobItem, JobName, JobService, QueueName } from '.';
 import { ISystemConfigRepository } from '../system-config';
 import { SystemConfigCore } from '../system-config/system-config.core';
 

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

@@ -1,5 +1,5 @@
-import { constants } from 'fs/promises';
 import { assetEntityStub, newAssetRepositoryMock, newJobRepositoryMock, newStorageRepositoryMock } from '@test';
+import { constants } from 'fs/promises';
 import { IAssetRepository, WithoutProperty, WithProperty } from '../asset';
 import { IJobRepository, JobName } from '../job';
 import { IStorageRepository } from '../storage';

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

@@ -1,6 +1,5 @@
 import { SystemConfig, UserEntity } from '@app/infra/entities';
 import { BadRequestException } from '@nestjs/common';
-import { generators, Issuer } from 'openid-client';
 import {
   authStub,
   loginResponseStub,
@@ -12,6 +11,7 @@ import {
   userEntityStub,
   userTokenEntityStub,
 } from '@test';
+import { generators, Issuer } from 'openid-client';
 import { OAuthService } from '.';
 import { LoginDetails } from '../auth';
 import { ICryptoRepository } from '../crypto';

server/src/domain/partner/partner.service.ts

@@ -1,7 +1,7 @@
 import { PartnerEntity } from '@app/infra/entities';
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
-import { AuthUserDto } from '../auth';
 import { IPartnerRepository, PartnerDirection, PartnerIds } from '.';
+import { AuthUserDto } from '../auth';
 import { mapUser, UserResponseDto } from '../user';
 
 @Injectable()

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

@@ -1,5 +1,4 @@
 import { BadRequestException, NotFoundException } from '@nestjs/common';
-import { IJobRepository, JobName } from '..';
 import {
   assetEntityStub,
   authStub,
@@ -8,6 +7,7 @@ import {
   newStorageRepositoryMock,
   personStub,
 } from '@test';
+import { IJobRepository, JobName } from '..';
 import { IStorageRepository } from '../storage';
 import { IPersonRepository } from './person.repository';
 import { PersonService } from './person.service';

server/src/domain/search/dto/search.dto.ts

@@ -1,7 +1,7 @@
+import { toBoolean } from '@app/immich/utils/transform.util';
 import { AssetType } from '@app/infra/entities';
 import { Transform } from 'class-transformer';
 import { IsArray, IsBoolean, IsEnum, IsNotEmpty, IsOptional, IsString } from 'class-validator';
-import { toBoolean } from '@app/immich/utils/transform.util';
 
 export class SearchDto {
   @IsString()

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

@@ -1,6 +1,5 @@
 import { BadRequestException } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { plainToInstance } from 'class-transformer';
 import {
   albumStub,
   assetEntityStub,
@@ -15,6 +14,7 @@ import {
   newSearchRepositoryMock,
   searchStub,
 } from '@test';
+import { plainToInstance } from 'class-transformer';
 import { IAlbumRepository } from '../album/album.repository';
 import { IAssetRepository } from '../asset/asset.repository';
 import { IFaceRepository } from '../facial-recognition';

server/src/domain/server-info/response-dto/server-version-response.dto.ts

@@ -1,5 +1,5 @@
-import { ApiProperty } from '@nestjs/swagger';
 import { IServerVersion } from '@app/domain';
+import { ApiProperty } from '@nestjs/swagger';
 
 export class ServerVersionReponseDto implements IServerVersion {
   @ApiProperty({ type: 'integer' })

server/src/domain/shared-link/index.ts

@@ -1,5 +1,5 @@
 export * from './dto';
 export * from './response-dto';
 export * from './shared-link.core';
-export * from './shared-link.service';
 export * from './shared-link.repository';
+export * from './shared-link.service';

server/src/domain/shared-link/shared-link.service.spec.ts

@@ -1,7 +1,7 @@
 import { BadRequestException, ForbiddenException } from '@nestjs/common';
 import { authStub, newSharedLinkRepositoryMock, sharedLinkResponseStub, sharedLinkStub } from '@test';
-import { SharedLinkService } from './shared-link.service';
 import { ISharedLinkRepository } from './shared-link.repository';
+import { SharedLinkService } from './shared-link.service';
 
 describe(SharedLinkService.name, () => {
   let sut: SharedLinkService;

server/src/domain/storage-template/storage-template.service.spec.ts

@@ -1,4 +1,3 @@
-import { when } from 'jest-when';
 import {
   assetEntityStub,
   newAssetRepositoryMock,
@@ -8,8 +7,9 @@ import {
   systemConfigStub,
   userEntityStub,
 } from '@test';
-import { IAssetRepository } from '../asset';
+import { when } from 'jest-when';
 import { StorageTemplateService } from '.';
+import { IAssetRepository } from '../asset';
 import { IStorageRepository } from '../storage/storage.repository';
 import { ISystemConfigRepository } from '../system-config';
 import { IUserRepository } from '../user';

server/src/domain/system-config/dto/system-config-ffmpeg.dto.ts

@@ -1,7 +1,7 @@
-import { IsEnum, IsString, IsInt, IsBoolean, Min, Max } from 'class-validator';
 import { TranscodePreset } from '@app/infra/entities';
-import { Type } from 'class-transformer';
 import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import { IsBoolean, IsEnum, IsInt, IsString, Max, Min } from 'class-validator';
 
 export class SystemConfigFFmpegDto {
   @IsInt()

server/src/domain/system-config/dto/system-config.dto.ts

@@ -1,8 +1,8 @@
 import { SystemConfig } from '@app/infra/entities';
 import { Type } from 'class-transformer';
 import { IsObject, ValidateNested } from 'class-validator';
-import { SystemConfigJobDto } from './system-config-job.dto';
 import { SystemConfigFFmpegDto } from './system-config-ffmpeg.dto';
+import { SystemConfigJobDto } from './system-config-job.dto';
 import { SystemConfigOAuthDto } from './system-config-oauth.dto';
 import { SystemConfigPasswordLoginDto } from './system-config-password-login.dto';
 import { SystemConfigStorageTemplateDto } from './system-config-storage-template.dto';

server/src/domain/system-config/system-config.service.ts

@@ -1,4 +1,8 @@
+import { Inject, Injectable } from '@nestjs/common';
 import { ISystemConfigRepository } from '.';
+import { IJobRepository, JobName } from '../job';
+import { mapConfig, SystemConfigDto } from './dto/system-config.dto';
+import { SystemConfigTemplateStorageOptionDto } from './response-dto/system-config-template-storage-option.dto';
 import {
   supportedDayTokens,
   supportedHourTokens,
@@ -8,10 +12,6 @@ import {
   supportedSecondTokens,
   supportedYearTokens,
 } from './system-config.constants';
-import { Inject, Injectable } from '@nestjs/common';
-import { IJobRepository, JobName } from '../job';
-import { mapConfig, SystemConfigDto } from './dto/system-config.dto';
-import { SystemConfigTemplateStorageOptionDto } from './response-dto/system-config-template-storage-option.dto';
 import { SystemConfigCore, SystemConfigValidator } from './system-config.core';
 
 @Injectable()

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

@@ -1,7 +1,7 @@
 import { TagType } from '@app/infra/entities';
 import { BadRequestException } from '@nestjs/common';
-import { when } from 'jest-when';
 import { assetEntityStub, authStub, newTagRepositoryMock, tagResponseStub, tagStub } from '@test';
+import { when } from 'jest-when';
 import { AssetIdErrorReason } from '../asset';
 import { ITagRepository } from './tag.repository';
 import { TagService } from './tag.service';

server/src/domain/user-token/index.ts

@@ -1,2 +1,2 @@
-export * from './user-token.repository';
 export * from './user-token.core';
+export * from './user-token.repository';

server/src/domain/user/dto/create-user.dto.ts

@@ -1,6 +1,6 @@
+import { toEmail, toSanitized } from '@app/immich/utils/transform.util';
 import { Transform } from 'class-transformer';
 import { IsEmail, IsNotEmpty, IsOptional, IsString } from 'class-validator';
-import { toEmail, toSanitized } from '@app/immich/utils/transform.util';
 
 export class CreateUserDto {
   @IsEmail({ require_tld: false })

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

@@ -1,7 +1,7 @@
+import { toEmail, toSanitized } from '@app/immich/utils/transform.util';
 import { ApiProperty } from '@nestjs/swagger';
 import { Transform } from 'class-transformer';
 import { IsBoolean, IsEmail, IsNotEmpty, IsOptional, IsString, IsUUID } from 'class-validator';
-import { toEmail, toSanitized } from '@app/immich/utils/transform.util';
 
 export class UpdateUserDto {
   @IsOptional()

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

@@ -1,6 +1,5 @@
 import { UserEntity } from '@app/infra/entities';
 import { BadRequestException, ForbiddenException, NotFoundException } from '@nestjs/common';
-import { when } from 'jest-when';
 import {
   newAlbumRepositoryMock,
   newAssetRepositoryMock,
@@ -9,6 +8,7 @@ import {
   newStorageRepositoryMock,
   newUserRepositoryMock,
 } from '@test';
+import { when } from 'jest-when';
 import { IAlbumRepository } from '../album';
 import { IAssetRepository } from '../asset';
 import { AuthUserDto } from '../auth';

server/src/domain/user/user.service.ts

@@ -9,7 +9,6 @@ import { ICryptoRepository } from '../crypto/crypto.repository';
 import { IEntityJob, IJobRepository, JobName } from '../job';
 import { StorageCore, StorageFolder } from '../storage';
 import { IStorageRepository } from '../storage/storage.repository';
-import { IUserRepository } from './user.repository';
 import { CreateUserDto, UpdateUserDto, UserCountDto } from './dto';
 import {
   CreateProfileImageResponseDto,
@@ -20,6 +19,7 @@ import {
   UserResponseDto,
 } from './response-dto';
 import { UserCore } from './user.core';
+import { IUserRepository } from './user.repository';
 
 @Injectable()
 export class UserService {