소스 검색

refactor(server): person dto (#3058)

Jason Rasmussen 2 년 전
부모
커밋
49f1f6cad7

+ 1 - 1
server/src/domain/asset/response-dto/asset-response.dto.ts

@@ -1,6 +1,6 @@
 import { AssetEntity, AssetType } from '@app/infra/entities';
 import { AssetEntity, AssetType } from '@app/infra/entities';
 import { ApiProperty } from '@nestjs/swagger';
 import { ApiProperty } from '@nestjs/swagger';
-import { mapFace, PersonResponseDto } from '../../person';
+import { mapFace, PersonResponseDto } from '../../person/person.dto';
 import { mapTag, TagResponseDto } from '../../tag';
 import { mapTag, TagResponseDto } from '../../tag';
 import { ExifResponseDto, mapExif } from './exif-response.dto';
 import { ExifResponseDto, mapExif } from './exif-response.dto';
 import { mapSmartInfo, SmartInfoResponseDto } from './smart-info-response.dto';
 import { mapSmartInfo, SmartInfoResponseDto } from './smart-info-response.dto';

+ 0 - 1
server/src/domain/person/dto/index.ts

@@ -1 +0,0 @@
-export * from './person-update.dto';

+ 0 - 7
server/src/domain/person/dto/person-update.dto.ts

@@ -1,7 +0,0 @@
-import { IsNotEmpty, IsString } from 'class-validator';
-
-export class PersonUpdateDto {
-  @IsNotEmpty()
-  @IsString()
-  name!: string;
-}

+ 1 - 2
server/src/domain/person/index.ts

@@ -1,4 +1,3 @@
-export * from './dto';
+export * from './person.dto';
 export * from './person.repository';
 export * from './person.repository';
 export * from './person.service';
 export * from './person.service';
-export * from './response-dto';

+ 7 - 0
server/src/domain/person/response-dto/person-response.dto.ts → server/src/domain/person/person.dto.ts

@@ -1,4 +1,11 @@
 import { AssetFaceEntity, PersonEntity } from '@app/infra/entities';
 import { AssetFaceEntity, PersonEntity } from '@app/infra/entities';
+import { IsNotEmpty, IsString } from 'class-validator';
+
+export class PersonUpdateDto {
+  @IsNotEmpty()
+  @IsString()
+  name!: string;
+}
 
 
 export class PersonResponseDto {
 export class PersonResponseDto {
   id!: string;
   id!: string;

+ 1 - 1
server/src/domain/person/person.service.spec.ts

@@ -9,9 +9,9 @@ import {
 } from '@test';
 } from '@test';
 import { IJobRepository, JobName } from '..';
 import { IJobRepository, JobName } from '..';
 import { IStorageRepository } from '../storage';
 import { IStorageRepository } from '../storage';
+import { PersonResponseDto } from './person.dto';
 import { IPersonRepository } from './person.repository';
 import { IPersonRepository } from './person.repository';
 import { PersonService } from './person.service';
 import { PersonService } from './person.service';
-import { PersonResponseDto } from './response-dto';
 
 
 const responseDto: PersonResponseDto = {
 const responseDto: PersonResponseDto = {
   id: 'person-1',
   id: 'person-1',

+ 1 - 2
server/src/domain/person/person.service.ts

@@ -3,9 +3,8 @@ import { AssetResponseDto, mapAsset } from '../asset';
 import { AuthUserDto } from '../auth';
 import { AuthUserDto } from '../auth';
 import { IJobRepository, JobName } from '../job';
 import { IJobRepository, JobName } from '../job';
 import { ImmichReadStream, IStorageRepository } from '../storage';
 import { ImmichReadStream, IStorageRepository } from '../storage';
-import { PersonUpdateDto } from './dto';
+import { mapPerson, PersonResponseDto, PersonUpdateDto } from './person.dto';
 import { IPersonRepository } from './person.repository';
 import { IPersonRepository } from './person.repository';
-import { mapPerson, PersonResponseDto } from './response-dto';
 
 
 @Injectable()
 @Injectable()
 export class PersonService {
 export class PersonService {

+ 0 - 1
server/src/domain/person/response-dto/index.ts

@@ -1 +0,0 @@
-export * from './person-response.dto';