merge moved to testVariation controller

Author: pashidlos

src/test-runs/test-runs.controller.ts

@@ -96,16 +96,4 @@ export class TestRunsController {
   postTestRun(@Body() createTestRequestDto: CreateTestRequestDto): Promise<TestRunResultDto> {
     return this.testRunsService.postTestRun(createTestRequestDto);
   }
-
-  @Get('merge')
-  @ApiQuery({ name: 'projectId', required: true })
-  @ApiQuery({ name: 'branchName', required: true })
-  @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
-  merge(
-    @Query('projectId', new ParseUUIDPipe()) projectId: string,
-    @Query('branchName') branchName: string
-  ): Promise<void> {
-    return this.testRunsService.merge(projectId, branchName);
-  }
 }

src/test-runs/test-runs.service.spec.ts

@@ -959,127 +959,4 @@ describe('TestRunsService', () => {
     expect(createMock).toHaveBeenCalledWith(testVariation, createTestRequestDto);
     expect(mocked(TestRunResultDto)).toHaveBeenCalledWith(testRun, testVariation);
   });
-
-  it('merge', async () => {
-    const mergedBranch = 'develop';
-    const project: Project = {
-      id: 'some id',
-      name: 'some name',
-      mainBranchName: 'master',
-      updatedAt: new Date(),
-      createdAt: new Date(),
-    };
-    const build: Build = {
-      id: 'a9385fc1-884d-4f9f-915e-40da0e7773d5',
-      number: null,
-      branchName: project.mainBranchName,
-      status: null,
-      projectId: project.id,
-      updatedAt: new Date(),
-      createdAt: new Date(),
-      userId: null,
-    };
-    const testVariation: TestVariation = {
-      id: '123',
-      projectId: project.id,
-      name: 'Test name',
-      baselineName: 'baselineName',
-      os: 'OS',
-      browser: 'browser',
-      viewport: 'viewport',
-      device: 'device',
-      ignoreAreas: '[]',
-      comment: 'some comment',
-      createdAt: new Date(),
-      updatedAt: new Date(),
-      branchName: mergedBranch,
-    };
-    const testVariationNoBaseline: TestVariation = {
-      id: '123',
-      projectId: project.id,
-      name: 'Test name',
-      baselineName: null,
-      os: 'OS',
-      browser: 'browser',
-      viewport: 'viewport',
-      device: 'device',
-      ignoreAreas: '[]',
-      comment: 'some comment',
-      createdAt: new Date(),
-      updatedAt: new Date(),
-      branchName: mergedBranch,
-    };
-    const testVariationMainBranch: TestVariation = {
-      id: '123',
-      projectId: project.id,
-      name: 'Test name',
-      baselineName: 'baselineName',
-      os: 'OS',
-      browser: 'browser',
-      viewport: 'viewport',
-      device: 'device',
-      ignoreAreas: '[]',
-      comment: 'some comment',
-      createdAt: new Date(),
-      updatedAt: new Date(),
-      branchName: project.mainBranchName,
-    };
-    const projectFindOneMock = jest.fn().mockResolvedValueOnce(project);
-    const buildCreateMock = jest.fn().mockResolvedValueOnce(build);
-    const eventBuildCreatedMock = jest.fn();
-    const testVariationFindManyMock = jest.fn().mockResolvedValueOnce([testVariation, testVariationNoBaseline]);
-    const image = new PNG({
-      width: 10,
-      height: 10,
-    });
-    const getImageMock = jest
-      .fn()
-      .mockReturnValueOnce(image)
-      .mockReturnValueOnce(null);
-    const testVariationFindOrCreateMock = jest.fn().mockResolvedValueOnce(testVariationMainBranch);
-    const createMock = jest.fn();
-    const service = await initService({
-      projectFindOneMock,
-      buildCreateMock,
-      eventBuildCreatedMock,
-      testVariationFindManyMock,
-      testVariationFindOrCreateMock,
-      getImageMock,
-    });
-    service.create = createMock;
-
-    await service.merge(project.id, mergedBranch);
-
-    expect(projectFindOneMock).toHaveBeenCalledWith({ where: { id: project.id } });
-    expect(buildCreateMock).toHaveBeenCalledWith({
-      data: {
-        branchName: project.mainBranchName,
-        project: {
-          connect: {
-            id: project.id,
-          },
-        },
-      },
-    });
-    expect(eventBuildCreatedMock).toHaveBeenCalledWith(new BuildDto(build));
-    expect(testVariationFindManyMock).toHaveBeenCalledWith({
-      where: { projectId: project.id, branchName: mergedBranch },
-    });
-    expect(getImageMock).toHaveBeenCalledWith(testVariation.baselineName);
-    expect(testVariationFindOrCreateMock).toHaveBeenCalledWith(project.id, {
-      name: testVariation.name,
-      os: testVariation.os,
-      device: testVariation.device,
-      browser: testVariation.browser,
-      viewport: testVariation.viewport,
-      branchName: project.mainBranchName,
-    });
-    expect(createMock).toHaveBeenCalledWith(testVariationMainBranch, {
-      ...testVariation,
-      buildId: build.id,
-      imageBase64: PNG.sync.write(image).toString('base64'),
-      diffTollerancePercent: 0,
-      merge: true,
-    });
-  });
 });

src/test-runs/test-runs.service.ts

@@ -5,7 +5,7 @@ import { CreateTestRequestDto } from './dto/create-test-request.dto';
 import { IgnoreAreaDto } from './dto/ignore-area.dto';
 import { StaticService } from '../shared/static/static.service';
 import { PrismaService } from '../prisma/prisma.service';
-import { TestRun, TestStatus, TestVariation, Project, Build } from '@prisma/client';
+import { TestRun, TestStatus, TestVariation } from '@prisma/client';
 import { DiffResult } from './diffResult';
 import { EventsGateway } from '../events/events.gateway';
 import { CommentDto } from '../shared/dto/comment.dto';
@@ -44,60 +44,6 @@ export class TestRunsService {
     });
   }
 
-  async merge(projectId: string, branchName: string): Promise<void> {
-    const project: Project = await this.prismaService.project.findOne({ where: { id: projectId } });
-
-    // create build
-    const build: Build = await this.prismaService.build.create({
-      data: {
-        branchName: project.mainBranchName,
-        project: {
-          connect: {
-            id: project.id,
-          },
-        },
-      },
-    });
-    this.eventsGateway.buildCreated(new BuildDto(build));
-
-    // find side branch variations
-    const testVariations: TestVariation[] = await this.prismaService.testVariation.findMany({
-      where: { projectId, branchName },
-    });
-
-    // compare to main branch variations
-    await Promise.all(
-      testVariations.map(async sideBranchTestVariation => {
-        const baseline = this.staticService.getImage(sideBranchTestVariation.baselineName);
-        if (baseline) {
-          try {
-            let imageBase64 = PNG.sync.write(baseline).toString('base64');
-
-            // get main branch variation
-            const baselineData = convertBaselineDataToQuery({
-              ...sideBranchTestVariation,
-              branchName: project.mainBranchName,
-            });
-            const mainBranchTestVariation = await this.testVariationService.findOrCreate(projectId, baselineData);
-
-            // get side branch request
-            const createTestRequestDto: CreateTestRequestDto = {
-              ...sideBranchTestVariation,
-              buildId: build.id,
-              imageBase64,
-              diffTollerancePercent: 0,
-              merge: true,
-            };
-
-            return this.create(mainBranchTestVariation, createTestRequestDto);
-          } catch (err) {
-            console.log(err);
-          }
-        }
-      })
-    );
-  }
-
   async postTestRun(createTestRequestDto: CreateTestRequestDto): Promise<TestRunResultDto> {
     const baselineData = convertBaselineDataToQuery(createTestRequestDto);
 

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

@@ -48,4 +48,16 @@ export class TestVariationsController {
   updateComment(@Param('id', new ParseUUIDPipe()) id: string, @Body() body: CommentDto): Promise<TestVariation> {
     return this.testVariations.updateComment(id, body);
   }
+
+  @Get('merge')
+  @ApiQuery({ name: 'projectId', required: true })
+  @ApiQuery({ name: 'branchName', required: true })
+  @ApiBearerAuth()
+  @UseGuards(JwtAuthGuard)
+  merge(
+    @Query('projectId', new ParseUUIDPipe()) projectId: string,
+    @Query('branchName') branchName: string
+  ): Promise<void> {
+    return this.testVariations.merge(projectId, branchName);
+  }
 }

src/test-variations/test-variations.module.ts

@@ -2,10 +2,13 @@ import { Module } from '@nestjs/common';
 import { TestVariationsService } from './test-variations.service';
 import { TestVariationsController } from './test-variations.controller';
 import { PrismaService } from '../prisma/prisma.service';
+import { TestRunsService } from '../test-runs/test-runs.service';
+import { EventsGateway } from '../events/events.gateway';
+import { BuildsService } from '../builds/builds.service';
 
 @Module({
-  providers: [TestVariationsService, PrismaService],
+  providers: [TestVariationsService, PrismaService, TestRunsService, EventsGateway, BuildsService],
   controllers: [TestVariationsController],
-  exports: [TestVariationsService]
+  exports: [TestVariationsService],
 })
 export class TestVariationsModule {}