If branch not sent, take default branch (#163)

* If branch not sent, take default branch

* Fixed review comments.

Co-authored-by: Pavel Strunkin <[email protected]>

* Added a test for null branch name

* Made branch name optional in DTO

Co-authored-by: Pavel Strunkin <[email protected]>

Author: suratdas

src/builds/builds.controller.ts

@@ -75,7 +75,7 @@ export class BuildsController {
     await this.buildsService.deleteOldBuilds(project.id, project.maxBuildAllowed);
     const build = await this.buildsService.findOrCreate({
       projectId: project.id,
-      branchName: createBuildDto.branchName,
+      branchName: createBuildDto.branchName ?? project.mainBranchName,
       ciBuildId: createBuildDto.ciBuildId,
     });
     return new BuildDto(build);

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

@@ -8,9 +8,11 @@ export class CreateBuildDto {
   @IsNotEmpty()
   readonly ciBuildId?: string;
 
-  @ApiProperty()
+  @ApiPropertyOptional()
+  @IsOptional()
   @IsString()
-  readonly branchName: string;
+  @IsNotEmpty()
+  readonly branchName?: string;
 
   @ApiProperty()
   @IsString()

test/builds.e2e-spec.ts

@@ -76,6 +76,41 @@ describe('Builds (e2e)', () => {
         });
     });
 
+    it('201 by null branchname', () => {
+      const createBuildDto: CreateBuildDto = {
+        branchName: null,
+        project: project.id,
+      };
+      return requestWithApiKey(app, 'post', '/builds', user.apiKey)
+        .send(createBuildDto)
+        .expect(201)
+        .expect((res) => {
+          expect(res.body.projectId).toBe(project.id);
+          expect(res.body.branchName).toBe(TEST_PROJECT.mainBranchName);
+          expect(res.body.failedCount).toBe(0);
+          expect(res.body.passedCount).toBe(0);
+          expect(res.body.unresolvedCount).toBe(0);
+          expect(res.body.isRunning).toBe(true);
+        });
+    });
+
+    it('201 with no branchname and no ciBuildId', () => {
+      const createBuildDto: CreateBuildDto = {
+        project: project.id,
+      };
+      return requestWithApiKey(app, 'post', '/builds', user.apiKey)
+        .send(createBuildDto)
+        .expect(201)
+        .expect((res) => {
+          expect(res.body.projectId).toBe(project.id);
+          expect(res.body.branchName).toBe(TEST_PROJECT.mainBranchName);
+          expect(res.body.failedCount).toBe(0);
+          expect(res.body.passedCount).toBe(0);
+          expect(res.body.unresolvedCount).toBe(0);
+          expect(res.body.isRunning).toBe(true);
+        });
+    });
+
     it('201 by name', () => {
       const createBuildDto: CreateBuildDto = {
         branchName: 'branchName',