[FEATURE] add samples in result of GET /vr-resource

RememVR-2024-SolutionChallenge · Apr 20, 2024 · 209e470 · 209e470
1 parent 2ac693e
commit 209e470
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/src/domain/sample/sample.module.ts b/src/domain/sample/sample.module.ts
@@ -19,5 +19,6 @@ import { RequestInfoRepository } from './repository/request-info.repository';
     SampleVrResourceRepository,
     RequestInfoRepository,
   ],
+  exports: [SampleVrResourceService],
 })
 export class SampleModule {}
diff --git a/src/domain/vr-resource/dto/response/get-vr-resources.response.dto.ts b/src/domain/vr-resource/dto/response/get-vr-resources.response.dto.ts
@@ -1,5 +1,6 @@
 import { ApiProperty, PickType } from '@nestjs/swagger';
 import { VrResource } from '../../entity/vr-resource.entity';
+import { SampleVrResourceDto } from 'src/domain/sample/dto/response/sample-get-vr-resources.response.dto';
 
 export class VrResourceDto extends PickType(VrResource, [
   'id',
@@ -34,7 +35,17 @@ export class GetVrResourcesResponseDto {
   })
   vrResources: VrResourceDto[];
 
-  constructor(vrResources: VrResourceDto[]) {
+  @ApiProperty({
+    description: '샘플 VR자원 목록',
+    type: [SampleVrResourceDto],
+  })
+  sampleVrResources: SampleVrResourceDto[];
+
+  constructor(
+    vrResources: VrResourceDto[],
+    sampleVrResources: SampleVrResourceDto[],
+  ) {
     this.vrResources = vrResources;
+    this.sampleVrResources = sampleVrResources;
   }
 }
diff --git a/src/domain/vr-resource/vr-resource.controller.ts b/src/domain/vr-resource/vr-resource.controller.ts
@@ -31,13 +31,15 @@ import { GetAiTaskQueueResponseDto } from './dto/response/get-ai-task-queue.resp
 import { VrResourceService } from './service/vr-resource.service';
 import { GetVrResourcesResponseDto } from './dto/response/get-vr-resources.response.dto';
 import { GenerateAvatarRequestDto } from './dto/request/generate-avatar.request.dto';
+import { SampleVrResourceService } from '../sample/service/sample-vr-resource.service';
 
 @ApiTags('VR-resource')
 @Controller('vr-resource')
 export class VrResourceController {
   constructor(
     private readonly vrResourceQueueService: VrResourceQueueService,
     private readonly vrResourceService: VrResourceService,
+    private readonly sampleVrResourceService: SampleVrResourceService,
   ) {}
 
   @ApiOperation({
@@ -88,7 +90,7 @@ export class VrResourceController {
   }
 
   @ApiOperation({
-    summary: '완성된 VR 자원(배경, 아바타) 불러오기',
+    summary: '완성된 VR 자원 불러오기 (샘플 포함)',
   })
   @ApiBearerAuth()
   @ApiResponse({ type: GetVrResourcesResponseDto })
@@ -98,7 +100,9 @@ export class VrResourceController {
     @AuthUser() user: User,
   ): Promise<GetVrResourcesResponseDto> {
     const vrResourceDtos = await this.vrResourceService.getVrResources(user);
-    return new GetVrResourcesResponseDto(vrResourceDtos);
+    const sampleVrResourceDtos =
+      await this.sampleVrResourceService.getVrResources();
+    return new GetVrResourcesResponseDto(vrResourceDtos, sampleVrResourceDtos);
   }
 
   @ApiOperation({

diff --git a/src/domain/vr-resource/vr-resource.module.ts b/src/domain/vr-resource/vr-resource.module.ts
@@ -13,9 +13,14 @@ import { VrResourceService } from './service/vr-resource.service';
 import { VrResourceRepository } from './repository/vr-resource.repository';
 import { VrResource } from './entity/vr-resource.entity';
 import { RequestInfoRepository } from '../sample/repository/request-info.repository';
+import { SampleModule } from '../sample/sample.module';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([Group, User, VrResource]), GcpModule],
+  imports: [
+    TypeOrmModule.forFeature([Group, User, VrResource]),
+    GcpModule,
+    SampleModule,
+  ],
   controllers: [VrResourceController],
   providers: [
     VrResourceQueueService,