use baselineBranchName to find testVariation in postTestRun

Author: wsbaser

src/builds/dto/build-create.dto.ts

@@ -14,6 +14,11 @@ export class CreateBuildDto {
   @IsNotEmpty()
   readonly branchName?: string;
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  readonly baselineBranchName?: string;
+
   @ApiProperty()
   @IsString()
   readonly project: string;

src/test-runs/dto/create-test-request.dto.ts

@@ -14,6 +14,11 @@ export class CreateTestRequestDto extends BaselineDataDto {
   @IsUUID()
   projectId: string;
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  baselineBranchName?: string;
+
   @ApiPropertyOptional()
   @IsOptional()
   @IsNumber()

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

@@ -80,20 +80,20 @@ export class TestVariationsService {
    * @returns
    */
   async find(
-    createTestRequestDto: BaselineDataDto & { projectId: string; sourceBranch?: string }
+    createTestRequestDto: BaselineDataDto & { projectId: string; baselineBranchName?: string }
   ): Promise<TestVariation | null> {
     const project = await this.prismaService.project.findUnique({ where: { id: createTestRequestDto.projectId } });
-    const mainBranch = createTestRequestDto.sourceBranch ?? project.mainBranchName;
+    const baselineBranchName = createTestRequestDto.baselineBranchName ?? project.mainBranchName;
 
-    const [mainBranchTestVariation, currentBranchTestVariation] = await Promise.all([
+    const [baselineBranchTestVariation, currentBranchTestVariation] = await Promise.all([
       // search main branch variation
       this.findUnique({
         projectId: createTestRequestDto.projectId,
-        branchName: mainBranch,
+        branchName: baselineBranchName,
         ...getTestVariationUniqueData(createTestRequestDto),
       }),
       // search current branch variation
-      createTestRequestDto.branchName !== mainBranch &&
+      createTestRequestDto.branchName !== baselineBranchName &&
         this.findUnique({
           projectId: createTestRequestDto.projectId,
           branchName: createTestRequestDto.branchName,
@@ -102,14 +102,14 @@ export class TestVariationsService {
     ]);
 
     if (!!currentBranchTestVariation) {
-      if (mainBranchTestVariation && mainBranchTestVariation.updatedAt > currentBranchTestVariation.updatedAt) {
-        return mainBranchTestVariation;
+      if (baselineBranchTestVariation && baselineBranchTestVariation.updatedAt > currentBranchTestVariation.updatedAt) {
+        return baselineBranchTestVariation;
       }
       return currentBranchTestVariation;
     }
 
-    if (!!mainBranchTestVariation) {
-      return mainBranchTestVariation;
+    if (!!baselineBranchTestVariation) {
+      return baselineBranchTestVariation;
     }
   }