244 poc merge (#156)

* POC merge

* fix

* Visual-Regression-Tracker/Visual-Regression-Tracker#287

Visual-Regression-Tracker/Visual-Regression-Tracker#287

Author: pashidlos

src/builds/builds.controller.spec.ts

@@ -53,10 +53,6 @@ describe('Builds Controller', () => {
     project: 'name',
   };
   const project = TEST_PROJECT;
-  const newBuild: Build = {
-    ...TEST_BUILD,
-    number: null,
-  };
   const buildWithNumber: Build = {
     ...TEST_BUILD,
     number: 12,
@@ -70,25 +66,19 @@ describe('Builds Controller', () => {
   });
 
   it('should create new build', async () => {
-    const eventBuildCreatedMock = jest.fn();
     const projectFindOneMock = jest.fn().mockResolvedValueOnce(project);
-    const buildFindOrCreateMock = jest.fn().mockResolvedValueOnce(newBuild);
-    const buildIncrementBuildNumberMock = jest.fn().mockResolvedValueOnce(buildWithNumber);
+    const buildFindOrCreateMock = jest.fn().mockResolvedValueOnce(buildWithNumber);
     const deleteOldBuilds = jest.fn();
     controller = await initController({
       projectFindOneMock,
       buildFindOrCreateMock,
-      buildIncrementBuildNumberMock,
-      eventBuildCreatedMock,
       deleteOldBuilds,
     });
 
     const result = await controller.create(createBuildDto);
 
     expect(result).toStrictEqual(new BuildDto(buildWithNumber));
     expect(deleteOldBuilds).toHaveBeenCalledWith(project.id, project.maxBuildAllowed);
-    expect(buildIncrementBuildNumberMock).toHaveBeenCalledWith(newBuild.id, project.id);
-    expect(eventBuildCreatedMock).toHaveBeenCalledWith(new BuildDto(buildWithNumber));
   });
 
   it('should reuse build', async () => {

src/builds/builds.controller.ts

@@ -25,7 +25,6 @@ import { MixedGuard } from '../auth/guards/mixed.guard';
 import { PaginatedBuildDto } from './dto/build-paginated.dto';
 import { ModifyBuildDto } from './dto/build-modify.dto';
 import { ProjectsService } from '../projects/projects.service';
-import { EventsGateway } from '../shared/events/events.gateway';
 import { RoleGuard } from '../auth/guards/role.guard';
 import { Roles } from '../shared/roles.decorator';
 
@@ -34,7 +33,6 @@ import { Roles } from '../shared/roles.decorator';
 export class BuildsController {
   constructor(
     private buildsService: BuildsService,
-    private eventsGateway: EventsGateway,
     @Inject(forwardRef(() => ProjectsService))
     private projectService: ProjectsService
   ) {}
@@ -75,15 +73,11 @@ export class BuildsController {
   async create(@Body() createBuildDto: CreateBuildDto): Promise<BuildDto> {
     const project = await this.projectService.findOne(createBuildDto.project);
     await this.buildsService.deleteOldBuilds(project.id, project.maxBuildAllowed);
-    let build = await this.buildsService.findOrCreate({
+    const build = await this.buildsService.findOrCreate({
       projectId: project.id,
       branchName: createBuildDto.branchName,
       ciBuildId: createBuildDto.ciBuildId,
     });
-    if (!build.number) {
-      build = await this.buildsService.incrementBuildNumber(build.id, project.id);
-      this.eventsGateway.buildCreated(new BuildDto(build));
-    }
     return new BuildDto(build);
   }
 

src/builds/builds.service.ts

@@ -132,7 +132,8 @@ export class BuildsService {
           },
         }
       : { id: projectId };
-    return this.prismaService.build.upsert({
+
+    let build = await this.prismaService.build.upsert({
       where,
       create: {
         ciBuildId,
@@ -148,6 +149,14 @@ export class BuildsService {
         isRunning: true,
       },
     });
+
+    // assigne build number
+    if (!build.number) {
+      build = await this.incrementBuildNumber(build.id, projectId);
+      this.eventsGateway.buildCreated(new BuildDto(build));
+    }
+
+    return build;
   }
 
   async incrementBuildNumber(buildId: string, projectId: string): Promise<Build> {

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

@@ -7,11 +7,12 @@ import { PrismaService } from '../prisma/prisma.service';
 import { BuildDto } from '../builds/dto/build.dto';
 import { RoleGuard } from '../auth/guards/role.guard';
 import { Roles } from '../shared/roles.decorator';
+import { MergeParams } from './types';
 
 @ApiTags('test-variations')
 @Controller('test-variations')
 export class TestVariationsController {
-  constructor(private testVariations: TestVariationsService, private prismaService: PrismaService) { }
+  constructor(private testVariations: TestVariationsService, private prismaService: PrismaService) {}
 
   @Get()
   @ApiQuery({ name: 'projectId', required: true })
@@ -33,16 +34,15 @@ export class TestVariationsController {
 
   @Get('merge/')
   @ApiQuery({ name: 'projectId', required: true })
-  @ApiQuery({ name: 'branchName', required: true })
+  @ApiQuery({ name: 'fromBranch', required: true })
+  @ApiQuery({ name: 'toBranch', required: true })
   @ApiOkResponse({ type: BuildDto })
   @ApiBearerAuth()
   @UseGuards(JwtAuthGuard, RoleGuard)
   @Roles(Role.admin, Role.editor)
-  merge(
-    @Query('projectId', new ParseUUIDPipe()) projectId: string,
-    @Query('branchName') branchName: string
-  ): Promise<BuildDto> {
-    return this.testVariations.merge(projectId, branchName);
+  merge(@Query() params: MergeParams): Promise<BuildDto> {
+    const { projectId, fromBranch, toBranch } = params;
+    return this.testVariations.merge(projectId, fromBranch, toBranch);
   }
 
   @Delete(':id')

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

@@ -25,6 +25,7 @@ const initModule = async ({
   testRunCreateMock = jest.fn(),
   testRunFindMany = jest.fn(),
   testRunDeleteMock = jest.fn(),
+  testRuncalCulateDiffMock = jest.fn(),
   $executeRawMock = jest.fn(),
 }) => {
   const module: TestingModule = await Test.createTestingModule({
@@ -49,6 +50,7 @@ const initModule = async ({
         useValue: {
           delete: testRunDeleteMock,
           create: testRunCreateMock,
+          calculateDiff: testRuncalCulateDiffMock,
         },
       },
       {
@@ -369,13 +371,14 @@ describe('TestVariationsService', () => {
   });
 
   it('merge', async () => {
-    const mergedBranch = 'develop';
+    const fromBranch = 'develop';
+    const targetBranch = 'test';
     const project: Project = TEST_PROJECT;
     const build: Build = {
       id: 'a9385fc1-884d-4f9f-915e-40da0e7773d5',
       ciBuildId: 'ciBuildId',
       number: null,
-      branchName: project.mainBranchName,
+      branchName: targetBranch,
       status: null,
       projectId: project.id,
       updatedAt: new Date(),
@@ -397,7 +400,7 @@ describe('TestVariationsService', () => {
       comment: 'some comment',
       createdAt: new Date(),
       updatedAt: new Date(),
-      branchName: mergedBranch,
+      branchName: fromBranch,
     };
     const testVariationSecond: TestVariation = {
       id: '123',
@@ -413,7 +416,7 @@ describe('TestVariationsService', () => {
       comment: 'some comment',
       createdAt: new Date(),
       updatedAt: new Date(),
-      branchName: mergedBranch,
+      branchName: fromBranch,
     };
     const testVariationNoBaseline: TestVariation = {
       id: '123',
@@ -429,9 +432,9 @@ describe('TestVariationsService', () => {
       comment: 'some comment',
       createdAt: new Date(),
       updatedAt: new Date(),
-      branchName: mergedBranch,
+      branchName: fromBranch,
     };
-    const testVariationMainBranch: TestVariation = {
+    const testVariationSourceBranch: TestVariation = {
       id: '123',
       projectId: project.id,
       name: 'Test name',
@@ -445,9 +448,12 @@ describe('TestVariationsService', () => {
       comment: 'some comment',
       createdAt: new Date(),
       updatedAt: new Date(),
-      branchName: project.mainBranchName,
+      branchName: fromBranch,
+    };
+    const testVariationTargetBranch: TestVariation = {
+      ...testVariationSourceBranch,
+      branchName: targetBranch,
     };
-    const projectFindUniqueMock = jest.fn().mockResolvedValueOnce(project);
     const buildFindOrCreateMock = jest.fn().mockResolvedValueOnce(build);
     const variationFindManyMock = jest
       .fn()
@@ -459,38 +465,38 @@ describe('TestVariationsService', () => {
     const getImageMock = jest.fn().mockReturnValueOnce(image).mockReturnValueOnce(image).mockReturnValueOnce(null);
     const testRunCreateMock = jest.fn();
     const buildUpdateMock = jest.fn();
+    const testRuncalCulateDiffMock = jest.fn();
     const service = await initModule({
-      projectFindUniqueMock,
       buildFindOrCreateMock,
       buildUpdateMock,
       testRunCreateMock,
+      testRuncalCulateDiffMock,
       variationFindManyMock,
       getImageMock,
     });
     service.find = jest
       .fn()
-      .mockResolvedValueOnce(testVariationMainBranch)
-      .mockResolvedValueOnce(testVariationMainBranch);
+      .mockResolvedValueOnce(testVariationSourceBranch)
+      .mockResolvedValueOnce(testVariationSourceBranch);
+    service.create = jest
+      .fn()
+      .mockResolvedValueOnce(testVariationTargetBranch)
+      .mockResolvedValueOnce(testVariationTargetBranch);
 
-    await service.merge(project.id, mergedBranch);
+    await service.merge(project.id, fromBranch, targetBranch);
 
-    expect(projectFindUniqueMock).toHaveBeenCalledWith({ where: { id: project.id } });
     expect(buildFindOrCreateMock).toHaveBeenCalledWith({
-      branchName: project.mainBranchName,
+      branchName: targetBranch,
       projectId: project.id,
     });
-    expect(variationFindManyMock).toHaveBeenCalledWith({
-      where: { projectId: project.id, branchName: mergedBranch },
-    });
-    expect(getImageMock).toHaveBeenCalledWith(testVariation.baselineName);
     expect(service.find).toHaveBeenNthCalledWith(1, {
       name: testVariation.name,
       os: testVariation.os,
       device: testVariation.device,
       browser: testVariation.browser,
       viewport: testVariation.viewport,
       customTags: testVariation.customTags,
-      branchName: project.mainBranchName,
+      branchName: targetBranch,
       projectId: project.id,
     });
     expect(service.find).toHaveBeenNthCalledWith(2, {
@@ -500,14 +506,14 @@ describe('TestVariationsService', () => {
       browser: testVariationSecond.browser,
       viewport: testVariationSecond.viewport,
       customTags: testVariationSecond.customTags,
-      branchName: project.mainBranchName,
+      branchName: targetBranch,
       projectId: project.id,
     });
-
     expect(testRunCreateMock).toHaveBeenNthCalledWith(1, {
-      testVariation: testVariationMainBranch,
+      testVariation: testVariationTargetBranch,
       createTestRequestDto: {
         ...testVariation,
+        branchName: targetBranch,
         buildId: build.id,
         diffTollerancePercent: 0,
         merge: true,
@@ -516,9 +522,10 @@ describe('TestVariationsService', () => {
       imageBuffer: PNG.sync.write(image),
     });
     expect(testRunCreateMock).toHaveBeenNthCalledWith(2, {
-      testVariation: testVariationMainBranch,
+      testVariation: testVariationTargetBranch,
       createTestRequestDto: {
         ...testVariationSecond,
+        branchName: targetBranch,
         buildId: build.id,
         diffTollerancePercent: 0,
         merge: true,