Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/builds/builds.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ import { Build } from '@prisma/client';
import { BuildDto } from './dto/build.dto';
import { MixedGuard } from '../auth/guards/mixed.guard';
import { PaginatedBuildDto } from './dto/build-paginated.dto';
import { ModifyBuildDto } from './dto/build-modify.dto';

@Controller('builds')
@ApiTags('builds')
export class BuildsController {
constructor(private buildsService: BuildsService) {}
constructor(private buildsService: BuildsService) { }

@Get()
@ApiOkResponse({ type: PaginatedBuildDto })
Expand Down Expand Up @@ -67,8 +68,12 @@ export class BuildsController {
@ApiSecurity('api_key')
@ApiBearerAuth()
@UseGuards(MixedGuard)
stop(@Param('id', new ParseUUIDPipe()) id: string): Promise<BuildDto> {
return this.buildsService.stop(id);
update(@Param('id', new ParseUUIDPipe()) id: string, @Body() modifyBuildDto?: ModifyBuildDto): Promise<BuildDto> {
//In future, no or empty body will do nothing as this check will be removed. It will expect a proper body to perform any patch.
if (modifyBuildDto === null || Object.keys(modifyBuildDto).length === 0) {
modifyBuildDto.isRunning = false;
}
return this.buildsService.update(id, modifyBuildDto);
}

@Patch(':id/approve')
Expand Down
16 changes: 6 additions & 10 deletions src/builds/builds.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ const initService = async ({
testRunApproveMock = jest.fn(),
eventsBuildUpdatedMock = jest.fn(),
eventsBuildCreatedMock = jest.fn(),
eventsBuildFinishedMock = jest.fn(),
projectFindOneMock = jest.fn(),
projectUpdateMock = jest.fn(),
}) => {
Expand Down Expand Up @@ -58,8 +57,7 @@ const initService = async ({
provide: EventsGateway,
useValue: {
buildUpdated: eventsBuildUpdatedMock,
buildCreated: eventsBuildCreatedMock,
buildFinished: eventsBuildFinishedMock,
buildCreated: eventsBuildCreatedMock
},
},
{
Expand Down Expand Up @@ -284,22 +282,20 @@ describe('BuildsService', () => {
it('should stop', async () => {
const id = 'some id';
const buildUpdateMock = jest.fn();
const eventsBuildFinishedMock = jest.fn();
const eventsBuildUpdatedMock = jest.fn();
mocked(BuildDto).mockReturnValueOnce(buildDto);
service = await initService({ buildUpdateMock, eventsBuildFinishedMock });
service = await initService({ buildUpdateMock, eventsBuildUpdatedMock });

const result = await service.stop(id);
const result = await service.update(id, { "isRunning": false });

expect(buildUpdateMock).toHaveBeenCalledWith({
where: { id },
include: {
testRuns: true,
},
data: {
isRunning: false,
},
data: { "isRunning": false }
});
expect(eventsBuildFinishedMock).toHaveBeenCalledWith(buildDto);
expect(eventsBuildUpdatedMock).toHaveBeenCalledWith(buildDto);
expect(result).toBe(buildDto);
});

Expand Down
11 changes: 5 additions & 6 deletions src/builds/builds.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { EventsGateway } from '../shared/events/events.gateway';
import { BuildDto } from './dto/build.dto';
import { ProjectsService } from '../projects/projects.service';
import { PaginatedBuildDto } from './dto/build-paginated.dto';
import { ModifyBuildDto } from './dto/build-modify.dto';

@Injectable()
export class BuildsService {
Expand All @@ -17,7 +18,7 @@ export class BuildsService {
private testRunsService: TestRunsService,
@Inject(forwardRef(() => ProjectsService))
private projectService: ProjectsService
) {}
) { }

async findOne(id: string): Promise<BuildDto> {
return this.prismaService.build
Expand Down Expand Up @@ -99,18 +100,16 @@ export class BuildsService {
return new BuildDto(build);
}

async stop(id: string): Promise<BuildDto> {
async update(id: string, modifyBuildDto: ModifyBuildDto): Promise<BuildDto> {
const build = await this.prismaService.build.update({
where: { id },
include: {
testRuns: true,
},
data: {
isRunning: false,
},
data: modifyBuildDto
});
const buildDto = new BuildDto(build);
this.eventsGateway.buildFinished(buildDto);
this.eventsGateway.buildUpdated(buildDto);
return buildDto;
}

Expand Down
4 changes: 4 additions & 0 deletions src/builds/dto/build-modify.dto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export interface ModifyBuildDto {
ciBuildId?: string;
isRunning?: boolean;
}
4 changes: 0 additions & 4 deletions src/shared/events/events.gateway.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ export class EventsGateway {
this.server.emit('build_created', build);
}

buildFinished(build: BuildDto): void {
this.server.emit('build_finished', build);
}

buildUpdated(build: BuildDto): void {
this.server.emit('build_updated', build);
}
Expand Down
10 changes: 5 additions & 5 deletions src/test-variations/test-variations.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const initModule = async ({
baselineDeleteMock = jest.fn(),
projectFindUniqueMock = jest.fn(),
buildCreateMock = jest.fn(),
buildStopMock = jest.fn(),
buildUpdateMock = jest.fn(),
testRunCreateMock = jest.fn(),
testRunFindMany = jest.fn(),
testRunDeleteMock = jest.fn(),
Expand All @@ -41,7 +41,7 @@ const initModule = async ({
provide: BuildsService,
useValue: {
create: buildCreateMock,
stop: buildStopMock,
update: buildUpdateMock,
},
},
{
Expand Down Expand Up @@ -417,11 +417,11 @@ describe('TestVariationsService', () => {
.mockResolvedValueOnce(testVariationMainBranch)
.mockResolvedValueOnce(testVariationMainBranch);
const testRunCreateMock = jest.fn();
const buildStopMock = jest.fn();
const buildUpdateMock = jest.fn();
const service = await initModule({
projectFindUniqueMock,
buildCreateMock,
buildStopMock,
buildUpdateMock,
testRunCreateMock,
variationFindManyMock,
getImageMock,
Expand Down Expand Up @@ -466,7 +466,7 @@ describe('TestVariationsService', () => {
ignoreAreas: JSON.parse(testVariationSecond.ignoreAreas),
});
expect(testRunCreateMock).toHaveBeenCalledTimes(2);
expect(buildStopMock).toHaveBeenCalledWith(build.id);
expect(buildUpdateMock).toHaveBeenCalledWith(build.id, { "isRunning": false });
});

it('delete', async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/test-variations/test-variations.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class TestVariationsService {
private testRunsService: TestRunsService,
@Inject(forwardRef(() => BuildsService))
private buildsService: BuildsService
) {}
) { }

async getDetails(id: string): Promise<TestVariation & { baselines: Baseline[] }> {
return this.prismaService.testVariation.findUnique({
Expand Down Expand Up @@ -138,7 +138,7 @@ export class TestVariationsService {
});

// stop build
return this.buildsService.stop(build.id);
return this.buildsService.update(build.id, { "isRunning": false });
}

async delete(id: string): Promise<TestVariation> {
Expand Down