POC merge

Author: pashidlos

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

@@ -69,13 +69,7 @@ export class TestRunsService {
     // create test run result
     const testRun = await this.create(testVariation, createTestRequestDto);
 
-    // calculate diff
-    let testRunWithResult = await this.calculateDiff(testRun);
-
-    // try auto approve
-    testRunWithResult = await this.tryAutoApproveByPastBaselines(testVariation, testRunWithResult);
-    testRunWithResult = await this.tryAutoApproveByNewBaselines(testVariation, testRunWithResult);
-    return new TestRunResultDto(testRunWithResult, testVariation);
+    return new TestRunResultDto(testRun, testVariation);
   }
 
   /**
@@ -228,7 +222,15 @@ export class TestRunsService {
     });
 
     this.eventsGateway.testRunCreated(testRun);
-    return testRun;
+
+     // calculate diff
+     let testRunWithResult = await this.calculateDiff(testRun);
+
+     // try auto approve
+     testRunWithResult = await this.tryAutoApproveByPastBaselines(testVariation, testRunWithResult);
+     testRunWithResult = await this.tryAutoApproveByNewBaselines(testVariation, testRunWithResult);
+
+    return testRunWithResult;
   }
 
   async delete(id: string): Promise<TestRun> {

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

@@ -52,15 +52,17 @@ 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)
   merge(
     @Query('projectId', new ParseUUIDPipe()) projectId: string,
-    @Query('branchName') branchName: string
+    @Query('fromBranch') fromBranch: string,
+    @Query('toBranch') toBranch: string
   ): Promise<BuildDto> {
-    return this.testVariations.merge(projectId, branchName);
+    return this.testVariations.merge(projectId, fromBranch, toBranch);
   }
 
   @Delete(':id')

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

@@ -39,15 +39,15 @@ export class TestVariationsService {
     });
   }
 
-  async findOrCreate(projectId: string, baselineData: BaselineDataDto): Promise<TestVariation> {
+  async findOrCreate(projectId: string, baselineData: BaselineDataDto, mainBranchName?: string): Promise<TestVariation> {
     const project = await this.prismaService.project.findUnique({ where: { id: projectId } });
 
     const [[mainBranchTestVariation], [currentBranchTestVariation]] = await Promise.all([
       // search main branch variation
       this.prismaService.testVariation.findMany({
         where: {
           projectId,
-          branchName: project.mainBranchName,
+          branchName: mainBranchName ?? project.mainBranchName,
           ...getTestVariationUniqueData(baselineData),
         },
       }),
@@ -92,18 +92,18 @@ export class TestVariationsService {
     });
   }
 
-  async merge(projectId: string, branchName: string): Promise<BuildDto> {
+  async merge(projectId: string, fromBranch: string, toBranch: string): Promise<BuildDto> {
     const project: Project = await this.prismaService.project.findUnique({ where: { id: projectId } });
 
     // create build
     const build: BuildDto = await this.buildsService.create({
-      branchName: project.mainBranchName,
+      branchName: toBranch,
       project: projectId,
     });
 
     // find side branch variations
     const testVariations: TestVariation[] = await this.prismaService.testVariation.findMany({
-      where: { projectId, branchName },
+      where: { projectId, branchName: fromBranch },
     });
 
     // compare to main branch variations
@@ -113,10 +113,10 @@ export class TestVariationsService {
         try {
           const imageBase64 = PNG.sync.write(baseline).toString('base64');
 
-          // get main branch variation
+          // get destination branch variation
           const baselineData = convertBaselineDataToQuery({
             ...sideBranchTestVariation,
-            branchName: project.mainBranchName,
+            branchName: toBranch,
           });
           const mainBranchTestVariation = await this.findOrCreate(projectId, baselineData);