chore(server): move dtos (#8131)

move dtos

server/e2e/client/asset-api.ts

@@ -1,4 +1,4 @@
-import { AssetResponseDto } from 'src/domain/asset/response-dto/asset-response.dto';
+import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import request from 'supertest';
 
 export const assetApi = {

server/e2e/client/auth-api.ts

@@ -1,5 +1,5 @@
-import { LoginResponseDto } from 'src/domain/auth/auth.dto';
-import { UserResponseDto } from 'src/domain/user/response-dto/user-response.dto';
+import { LoginResponseDto } from 'src/dtos/auth.dto';
+import { UserResponseDto } from 'src/dtos/user.dto';
 import request from 'supertest';
 import { adminSignupStub, loginResponseStub, loginStub } from 'test/fixtures/auth.stub';
 

server/e2e/client/library-api.ts

@@ -1,4 +1,4 @@
-import { CreateLibraryDto, LibraryResponseDto, ScanLibraryDto } from 'src/domain/library/library.dto';
+import { CreateLibraryDto, LibraryResponseDto, ScanLibraryDto } from 'src/dtos/library.dto';
 import request from 'supertest';
 
 export const libraryApi = {

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

@@ -1,9 +1,9 @@
 import { api } from 'e2e/client';
 import fs from 'node:fs/promises';
 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 { LoginResponseDto } from 'src/dtos/auth.dto';
+import { LibraryResponseDto } from 'src/dtos/library.dto';
 import { AssetType } from 'src/entities/asset.entity';
 import { LibraryType } from 'src/entities/library.entity';
 import { StorageEventType } from 'src/interfaces/storage.repository';

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

@@ -1,7 +1,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 { LoginResponseDto } from 'src/dtos/auth.dto';
 import { LibraryType } from 'src/entities/library.entity';
 import request from 'supertest';
 import { errorStub } from 'test/fixtures/error.stub';

server/src/commands/reset-admin-password.command.ts

@@ -1,6 +1,6 @@
 import { Command, CommandRunner, InquirerService, Question, QuestionSet } from 'nest-commander';
-import { UserResponseDto } from 'src/domain/user/response-dto/user-response.dto';
 import { UserService } from 'src/domain/user/user.service';
+import { UserResponseDto } from 'src/dtos/user.dto';
 
 @Command({
   name: 'reset-admin-password',

server/src/controllers/activity.controller.ts

@@ -1,15 +1,15 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Query, Res } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { Response } from 'express';
+import { ActivityService } from 'src/domain/activity/activity.service';
 import {
   ActivityCreateDto,
   ActivityDto,
   ActivityResponseDto,
   ActivitySearchDto,
   ActivityStatisticsResponseDto,
-} from 'src/domain/activity/activity.dto';
-import { ActivityService } from 'src/domain/activity/activity.service';
-import { AuthDto } from 'src/domain/auth/auth.dto';
+} from 'src/dtos/activity.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { UUIDParamDto } from 'src/validation';
 

server/src/controllers/album.controller.ts

@@ -1,14 +1,17 @@
 import { Body, Controller, Delete, Get, Param, Patch, Post, Put, Query } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { AlbumCountResponseDto, AlbumResponseDto } from 'src/domain/album/album-response.dto';
 import { AlbumService } from 'src/domain/album/album.service';
-import { AddUsersDto } from 'src/domain/album/dto/album-add-users.dto';
-import { CreateAlbumDto } from 'src/domain/album/dto/album-create.dto';
-import { UpdateAlbumDto } from 'src/domain/album/dto/album-update.dto';
-import { AlbumInfoDto } from 'src/domain/album/dto/album.dto';
-import { GetAlbumsDto } from 'src/domain/album/dto/get-albums.dto';
-import { BulkIdResponseDto, BulkIdsDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
+import {
+  AddUsersDto,
+  AlbumCountResponseDto,
+  AlbumInfoDto,
+  AlbumResponseDto,
+  CreateAlbumDto,
+  GetAlbumsDto,
+  UpdateAlbumDto,
+} from 'src/dtos/album.dto';
+import { BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import { Auth, Authenticated, SharedLinkRoute } from 'src/middleware/auth.guard';
 import { ParseMeUUIDPipe, UUIDParamDto } from 'src/validation';
 

server/src/controllers/api-key.controller.ts

@@ -1,13 +1,8 @@
 import { Body, Controller, Delete, Get, Param, Post, Put } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import {
-  APIKeyCreateDto,
-  APIKeyCreateResponseDto,
-  APIKeyResponseDto,
-  APIKeyUpdateDto,
-} from 'src/domain/api-key/api-key.dto';
 import { APIKeyService } from 'src/domain/api-key/api-key.service';
-import { AuthDto } from 'src/domain/auth/auth.dto';
+import { APIKeyCreateDto, APIKeyCreateResponseDto, APIKeyResponseDto, APIKeyUpdateDto } from 'src/dtos/api-key.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { UUIDParamDto } from 'src/validation';
 

server/src/controllers/asset.controller.ts

@@ -1,25 +1,22 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AssetService } from 'src/domain/asset/asset.service';
-import { AssetJobsDto } from 'src/domain/asset/dto/asset-ids.dto';
-import { UpdateStackParentDto } from 'src/domain/asset/dto/asset-stack.dto';
-import { AssetStatsDto, AssetStatsResponseDto } from 'src/domain/asset/dto/asset-statistics.dto';
+import { SearchService } from 'src/domain/search/search.service';
+import { AssetResponseDto, MemoryLaneResponseDto } from 'src/dtos/asset-response.dto';
 import {
   AssetBulkDeleteDto,
   AssetBulkUpdateDto,
+  AssetJobsDto,
+  AssetStatsDto,
+  AssetStatsResponseDto,
   DeviceIdDto,
   RandomAssetsDto,
   UpdateAssetDto,
-} from 'src/domain/asset/dto/asset.dto';
-import { MapMarkerDto } from 'src/domain/asset/dto/map-marker.dto';
-import { MemoryLaneDto } from 'src/domain/asset/dto/memory-lane.dto';
-import { TimeBucketAssetDto, TimeBucketDto } from 'src/domain/asset/dto/time-bucket.dto';
-import { AssetResponseDto, MemoryLaneResponseDto } from 'src/domain/asset/response-dto/asset-response.dto';
-import { MapMarkerResponseDto } from 'src/domain/asset/response-dto/map-marker-response.dto';
-import { TimeBucketResponseDto } from 'src/domain/asset/response-dto/time-bucket-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { MetadataSearchDto } from 'src/domain/search/dto/search.dto';
-import { SearchService } from 'src/domain/search/search.service';
+} from 'src/dtos/asset.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { MapMarkerDto, MapMarkerResponseDto, MemoryLaneDto, MetadataSearchDto } from 'src/dtos/search.dto';
+import { UpdateStackParentDto } from 'src/dtos/stack.dto';
+import { TimeBucketAssetDto, TimeBucketDto, TimeBucketResponseDto } from 'src/dtos/time-bucket.dto';
 import { Auth, Authenticated, SharedLinkRoute } from 'src/middleware/auth.guard';
 import { Route } from 'src/middleware/file-upload.interceptor';
 import { UUIDParamDto } from 'src/validation';

server/src/controllers/audit.controller.ts

@@ -1,15 +1,15 @@
 import { Body, Controller, Get, Post, Query } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
+import { AuditService } from 'src/domain/audit/audit.service';
 import {
   AuditDeletesDto,
   AuditDeletesResponseDto,
   FileChecksumDto,
   FileChecksumResponseDto,
   FileReportDto,
   FileReportFixDto,
-} from 'src/domain/audit/audit.dto';
-import { AuditService } from 'src/domain/audit/audit.service';
-import { AuthDto } from 'src/domain/auth/auth.dto';
+} from 'src/dtos/audit.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import { AdminRoute, Auth, Authenticated } from 'src/middleware/auth.guard';
 
 @ApiTags('Audit')

server/src/controllers/auth.controller.ts

@@ -2,6 +2,7 @@ import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Req,
 import { ApiTags } from '@nestjs/swagger';
 import { Request, Response } from 'express';
 import { IMMICH_ACCESS_COOKIE, IMMICH_AUTH_TYPE_COOKIE, IMMICH_IS_AUTHENTICATED } from 'src/domain/auth/auth.constant';
+import { AuthService, LoginDetails } from 'src/domain/auth/auth.service';
 import {
   AuthDeviceResponseDto,
   AuthDto,
@@ -11,9 +12,8 @@ import {
   LogoutResponseDto,
   SignUpDto,
   ValidateAccessTokenResponseDto,
-} from 'src/domain/auth/auth.dto';
-import { AuthService, LoginDetails } from 'src/domain/auth/auth.service';
-import { UserResponseDto, mapUser } from 'src/domain/user/response-dto/user-response.dto';
+} from 'src/dtos/auth.dto';
+import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
 import { Auth, Authenticated, GetLoginDetails, PublicRoute } from 'src/middleware/auth.guard';
 import { UUIDParamDto } from 'src/validation';
 

server/src/controllers/download.controller.ts

@@ -1,10 +1,10 @@
 import { Body, Controller, HttpCode, HttpStatus, Next, Param, Post, Res, StreamableFile } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { NextFunction, Response } from 'express';
-import { AssetIdsDto } from 'src/domain/asset/dto/asset-ids.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { DownloadInfoDto, DownloadResponseDto } from 'src/domain/download/download.dto';
 import { DownloadService } from 'src/domain/download/download.service';
+import { AssetIdsDto } from 'src/dtos/asset.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { DownloadInfoDto, DownloadResponseDto } from 'src/dtos/download.dto';
 import { asStreamableFile, sendFile } from 'src/immich/app.utils';
 import { Auth, Authenticated, FileResponse, SharedLinkRoute } from 'src/middleware/auth.guard';
 import { UUIDParamDto } from 'src/validation';

server/src/controllers/face.controller.ts

@@ -1,8 +1,8 @@
 import { Body, Controller, Get, Param, Put, Query } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { AssetFaceResponseDto, FaceDto, PersonResponseDto } from 'src/domain/person/person.dto';
 import { PersonService } from 'src/domain/person/person.service';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { AssetFaceResponseDto, FaceDto, PersonResponseDto } from 'src/dtos/person.dto';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { UUIDParamDto } from 'src/validation';
 

server/src/controllers/job.controller.ts

@@ -1,7 +1,7 @@
 import { Body, Controller, Get, Param, Put } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { AllJobStatusResponseDto, JobCommandDto, JobIdParamDto, JobStatusDto } from 'src/domain/job/job.dto';
 import { JobService } from 'src/domain/job/job.service';
+import { AllJobStatusResponseDto, JobCommandDto, JobIdParamDto, JobStatusDto } from 'src/dtos/job.dto';
 import { Authenticated } from 'src/middleware/auth.guard';
 
 @ApiTags('Job')

server/src/controllers/library.controller.ts

@@ -1,5 +1,6 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
+import { LibraryService } from 'src/domain/library/library.service';
 import {
   CreateLibraryDto,
   LibraryResponseDto,
@@ -9,8 +10,7 @@ import {
   UpdateLibraryDto,
   ValidateLibraryDto,
   ValidateLibraryResponseDto,
-} from 'src/domain/library/library.dto';
-import { LibraryService } from 'src/domain/library/library.service';
+} from 'src/dtos/library.dto';
 import { AdminRoute, Authenticated } from 'src/middleware/auth.guard';
 import { UUIDParamDto } from 'src/validation';
 

server/src/controllers/oauth.controller.ts

@@ -1,15 +1,15 @@
 import { Body, Controller, Get, HttpStatus, Post, Redirect, Req, Res } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { Request, Response } from 'express';
+import { AuthService, LoginDetails } from 'src/domain/auth/auth.service';
 import {
   AuthDto,
   LoginResponseDto,
   OAuthAuthorizeResponseDto,
   OAuthCallbackDto,
   OAuthConfigDto,
-} from 'src/domain/auth/auth.dto';
-import { AuthService, LoginDetails } from 'src/domain/auth/auth.service';
-import { UserResponseDto } from 'src/domain/user/response-dto/user-response.dto';
+} from 'src/dtos/auth.dto';
+import { UserResponseDto } from 'src/dtos/user.dto';
 import { Auth, Authenticated, GetLoginDetails, PublicRoute } from 'src/middleware/auth.guard';
 
 @ApiTags('OAuth')

server/src/controllers/partner.controller.ts

@@ -1,8 +1,8 @@
 import { Body, Controller, Delete, Get, Param, Post, Put, Query } from '@nestjs/common';
 import { ApiQuery, ApiTags } from '@nestjs/swagger';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { PartnerResponseDto, UpdatePartnerDto } from 'src/domain/partner/partner.dto';
 import { PartnerService } from 'src/domain/partner/partner.service';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { PartnerResponseDto, UpdatePartnerDto } from 'src/dtos/partner.dto';
 import { PartnerDirection } from 'src/interfaces/partner.repository';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { UUIDParamDto } from 'src/validation';

server/src/controllers/person.controller.ts

@@ -1,9 +1,10 @@
 import { Body, Controller, Get, Next, Param, Post, Put, Query, Res } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { NextFunction, Response } from 'express';
-import { BulkIdResponseDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
-import { AssetResponseDto } from 'src/domain/asset/response-dto/asset-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
+import { PersonService } from 'src/domain/person/person.service';
+import { BulkIdResponseDto } from 'src/dtos/asset-ids.response.dto';
+import { AssetResponseDto } from 'src/dtos/asset-response.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import {
   AssetFaceUpdateDto,
   MergePersonDto,
@@ -14,8 +15,7 @@ import {
   PersonSearchDto,
   PersonStatisticsResponseDto,
   PersonUpdateDto,
-} from 'src/domain/person/person.dto';
-import { PersonService } from 'src/domain/person/person.service';
+} from 'src/dtos/person.dto';
 import { sendFile } from 'src/immich/app.utils';
 import { Auth, Authenticated, FileResponse } from 'src/middleware/auth.guard';
 import { UUIDParamDto } from 'src/validation';

server/src/controllers/search.controller.ts

@@ -1,20 +1,20 @@
 import { Body, Controller, Get, HttpCode, HttpStatus, Post, Query } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
-import { AssetResponseDto } from 'src/domain/asset/response-dto/asset-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { PersonResponseDto } from 'src/domain/person/person.dto';
-import { SearchSuggestionRequestDto } from 'src/domain/search/dto/search-suggestion.dto';
+import { SearchService } from 'src/domain/search/search.service';
+import { AssetResponseDto } from 'src/dtos/asset-response.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { PersonResponseDto } from 'src/dtos/person.dto';
 import {
   MetadataSearchDto,
   PlacesResponseDto,
   SearchDto,
+  SearchExploreResponseDto,
   SearchPeopleDto,
   SearchPlacesDto,
+  SearchResponseDto,
+  SearchSuggestionRequestDto,
   SmartSearchDto,
-} from 'src/domain/search/dto/search.dto';
-import { SearchExploreResponseDto } from 'src/domain/search/response-dto/search-explore.response.dto';
-import { SearchResponseDto } from 'src/domain/search/response-dto/search-response.dto';
-import { SearchService } from 'src/domain/search/search.service';
+} from 'src/dtos/search.dto';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 
 @ApiTags('Search')

server/src/controllers/server-info.controller.ts

@@ -1,5 +1,6 @@
 import { Controller, Get, HttpCode, HttpStatus, Post } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
+import { ServerInfoService } from 'src/domain/server-info/server-info.service';
 import {
   ServerConfigDto,
   ServerFeaturesDto,
@@ -9,8 +10,7 @@ import {
   ServerStatsResponseDto,
   ServerThemeDto,
   ServerVersionResponseDto,
-} from 'src/domain/server-info/server-info.dto';
-import { ServerInfoService } from 'src/domain/server-info/server-info.service';
+} from 'src/dtos/server-info.dto';
 import { AdminRoute, Authenticated, PublicRoute } from 'src/middleware/auth.guard';
 
 @ApiTags('Server Info')

server/src/controllers/shared-link.controller.ts

@@ -1,13 +1,17 @@
 import { Body, Controller, Delete, Get, Param, Patch, Post, Put, Query, Req, Res } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { Request, Response } from 'express';
-import { AssetIdsDto } from 'src/domain/asset/dto/asset-ids.dto';
-import { AssetIdsResponseDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
 import { IMMICH_SHARED_LINK_ACCESS_COOKIE } from 'src/domain/auth/auth.constant';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { SharedLinkResponseDto } from 'src/domain/shared-link/shared-link-response.dto';
-import { SharedLinkCreateDto, SharedLinkEditDto, SharedLinkPasswordDto } from 'src/domain/shared-link/shared-link.dto';
 import { SharedLinkService } from 'src/domain/shared-link/shared-link.service';
+import { AssetIdsResponseDto } from 'src/dtos/asset-ids.response.dto';
+import { AssetIdsDto } from 'src/dtos/asset.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
+import {
+  SharedLinkCreateDto,
+  SharedLinkEditDto,
+  SharedLinkPasswordDto,
+  SharedLinkResponseDto,
+} from 'src/dtos/shared-link.dto';
 import { Auth, Authenticated, SharedLinkRoute } from 'src/middleware/auth.guard';
 import { UUIDParamDto } from 'src/validation';
 

server/src/controllers/system-config.controller.ts

@@ -1,9 +1,9 @@
 import { Body, Controller, Get, Put, Query } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { SystemConfigDto } from 'src/domain/system-config/dto/system-config.dto';
-import { SystemConfigTemplateStorageOptionDto } from 'src/domain/system-config/response-dto/system-config-template-storage-option.dto';
 import { MapThemeDto } from 'src/domain/system-config/system-config-map-theme.dto';
 import { SystemConfigService } from 'src/domain/system-config/system-config.service';
+import { SystemConfigTemplateStorageOptionDto } from 'src/dtos/system-config-storage-template.dto';
+import { SystemConfigDto } from 'src/dtos/system-config.dto';
 import { AdminRoute, Authenticated } from 'src/middleware/auth.guard';
 
 @ApiTags('System Config')

server/src/controllers/tag.controller.ts

@@ -1,12 +1,11 @@
 import { Body, Controller, Delete, Get, Param, Patch, Post, Put } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { AssetIdsDto } from 'src/domain/asset/dto/asset-ids.dto';
-import { AssetIdsResponseDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
-import { AssetResponseDto } from 'src/domain/asset/response-dto/asset-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
-import { TagResponseDto } from 'src/domain/tag/tag-response.dto';
-import { CreateTagDto, UpdateTagDto } from 'src/domain/tag/tag.dto';
 import { TagService } from 'src/domain/tag/tag.service';
+import { AssetIdsResponseDto } from 'src/dtos/asset-ids.response.dto';
+import { AssetResponseDto } from 'src/dtos/asset-response.dto';
+import { AssetIdsDto } from 'src/dtos/asset.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { CreateTagDto, TagResponseDto, UpdateTagDto } from 'src/dtos/tag.dto';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { UUIDParamDto } from 'src/validation';
 

server/src/controllers/trash.controller.ts

@@ -1,8 +1,8 @@
 import { Body, Controller, HttpCode, HttpStatus, Post } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { BulkIdsDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
-import { AuthDto } from 'src/domain/auth/auth.dto';
 import { TrashService } from 'src/domain/trash/trash.service';
+import { BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
+import { AuthDto } from 'src/dtos/auth.dto';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 
 @ApiTags('Trash')