merge now returns buildDto

Author: pashidlos

src/test-variations/test-variations.controller.ts

@@ -1,11 +1,12 @@
 import { Controller, ParseUUIDPipe, Get, UseGuards, Param, Query, Put, Body } from '@nestjs/common';
-import { ApiTags, ApiParam, ApiBearerAuth, ApiQuery } from '@nestjs/swagger';
+import { ApiTags, ApiParam, ApiBearerAuth, ApiQuery, ApiOkResponse } from '@nestjs/swagger';
 import { TestVariationsService } from './test-variations.service';
 import { TestVariation, Baseline } from '@prisma/client';
 import { JwtAuthGuard } from '../auth/guards/auth.guard';
 import { PrismaService } from '../prisma/prisma.service';
 import { IgnoreAreaDto } from '../test-runs/dto/ignore-area.dto';
 import { CommentDto } from '../shared/dto/comment.dto';
+import { BuildDto } from 'src/builds/dto/build.dto';
 
 @ApiTags('test-variations')
 @Controller('test-variations')
@@ -16,17 +17,17 @@ export class TestVariationsController {
   @ApiQuery({ name: 'projectId', required: true })
   @ApiBearerAuth()
   @UseGuards(JwtAuthGuard)
-  getList(@Query('projectId', new ParseUUIDPipe()) projectId): Promise<TestVariation[]> {
+  getList(@Query('projectId', new ParseUUIDPipe()) projectId: string): Promise<TestVariation[]> {
     return this.prismaService.testVariation.findMany({
       where: { projectId },
     });
   }
 
-  @Get(':id')
+  @Get('details/:id')
   @ApiQuery({ name: 'id', required: true })
   @ApiBearerAuth()
   @UseGuards(JwtAuthGuard)
-  getDetails(@Param('id', new ParseUUIDPipe()) id): Promise<TestVariation & { baselines: Baseline[] }> {
+  getDetails(@Param('id', new ParseUUIDPipe()) id: string): Promise<TestVariation & { baselines: Baseline[] }> {
     return this.testVariations.getDetails(id);
   }
 
@@ -49,15 +50,13 @@ export class TestVariationsController {
     return this.testVariations.updateComment(id, body);
   }
 
-  @Get('merge')
+  @Get('merge/')
   @ApiQuery({ name: 'projectId', required: true })
   @ApiQuery({ name: 'branchName', required: true })
+  @ApiOkResponse({ type: BuildDto })
   @ApiBearerAuth()
   @UseGuards(JwtAuthGuard)
-  merge(
-    @Query('projectId', new ParseUUIDPipe()) projectId: string,
-    @Query('branchName') branchName: string
-  ): Promise<void> {
+  merge(@Query('projectId') projectId: string, @Query('branchName') branchName: string): Promise<BuildDto> {
     return this.testVariations.merge(projectId, branchName);
   }
 }

src/test-variations/test-variations.service.ts

@@ -9,6 +9,7 @@ import { BuildsService } from '../builds/builds.service';
 import { TestRunsService } from '../test-runs/test-runs.service';
 import { PNG } from 'pngjs';
 import { CreateTestRequestDto } from 'src/test-runs/dto/create-test-request.dto';
+import { BuildDto } from 'src/builds/dto/build.dto';
 
 @Injectable()
 export class TestVariationsService {
@@ -118,11 +119,11 @@ export class TestVariationsService {
     });
   }
 
-  async merge(projectId: string, branchName: string): Promise<void> {
+  async merge(projectId: string, branchName: string): Promise<BuildDto> {
     const project: Project = await this.prismaService.project.findOne({ where: { id: projectId } });
 
     // create build
-    const build: Build = await this.buildsService.create({
+    const build: BuildDto = await this.buildsService.create({
       branchName: project.mainBranchName,
       project: projectId,
     });
@@ -163,5 +164,7 @@ export class TestVariationsService {
         }
       })
     );
+
+    return build;
   }
 }