config.yml.example

@@ -9,10 +9,5 @@ db:
     database: fennec
     username: fennec
     password:
-  redis:
-    host: 192.168.31.194
-    port: 6379
-    password:
-    prefix: fennec
 workspaces:
   root: '/Users/ivanli/Projects/fennec/workspaces'

src/app.module.ts

@@ -10,7 +10,6 @@ import { ReposModule } from './repos/repos.module';
 import { PipelinesModule } from './pipelines/pipelines.module';
 import { PipelineTasksModule } from './pipeline-tasks/pipeline-tasks.module';
 import configuration from './commons/config/configuration';
-import { RedisModule } from 'nestjs-redis';
 
 @Module({
   imports: [
@@ -44,16 +43,6 @@ import { RedisModule } from 'nestjs-redis';
     ReposModule,
     PipelinesModule,
     PipelineTasksModule,
-    RedisModule.forRootAsync({
-      imports: [ConfigModule],
-      useFactory: (configService: ConfigService) => ({
-        host: configService.get<string>('db.redis.host', 'localhost'),
-        port: configService.get<number>('db.redis.port', 6379),
-        password: configService.get<string>('db.redis.password', ''),
-        keyPrefix: configService.get<string>('db.redis.prefix', 'fennec'),
-      }),
-      inject: [ConfigService],
-    }),
   ],
   controllers: [AppController],
   providers: [AppService, AppResolver],

src/pipeline-tasks/dtos/create-pipeline-task.input.ts

@@ -1,4 +1,4 @@
-import { Field, InputType } from '@nestjs/graphql';
+import { InputType } from '@nestjs/graphql';
 import { PipelineUnits } from '../enums/pipeline-units.enum';
 
 @InputType()
@@ -7,6 +7,5 @@ export class CreatePipelineTaskInput {
 
   commit: string;
 
-  @Field(() => PipelineUnits)
   units: PipelineUnits[];
 }

src/pipeline-tasks/enums/pipeline-units.enum.ts

@@ -1,5 +1,3 @@
-import { registerEnumType } from '@nestjs/graphql';
-
 export enum PipelineUnits {
   checkout = 'checkout',
   installDependencies = 'installDependencies',
@@ -7,8 +5,3 @@ export enum PipelineUnits {
   deploy = 'deploy',
   cleanUp = 'cleanUp',
 }
-
-registerEnumType(PipelineUnits, {
-  name: 'PipelineUnits',
-  description: '流水线单元',
-});

src/pipeline-tasks/models/work-unit-metadata.model.ts

@@ -1,8 +1,5 @@
-import { InputType, ObjectType } from '@nestjs/graphql';
 import { WorkUnit } from './work-unit.model';
 
-@InputType('WorkUnitMetadataInput')
-@ObjectType()
 export class WorkUnitMetadata {
   version = 1;
   units: WorkUnit[];

src/pipeline-tasks/models/work-unit.model.ts

@@ -1,13 +1,6 @@
-import { Field, InputType, ObjectType } from '@nestjs/graphql';
+import { PipelineUnits as PipelineUnitTypes } from '../enums/pipeline-units.enum';
-import {
-  PipelineUnits,
-  PipelineUnits as PipelineUnitTypes,
-} from '../enums/pipeline-units.enum';
 
-@ObjectType()
-@InputType('WorkUnitInput')
 export class WorkUnit {
-  @Field(() => PipelineUnits)
   type: PipelineUnitTypes;
   scripts: string[];
 }

src/pipeline-tasks/pipeline-tasks.module.ts

@@ -5,25 +5,9 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { PipelineTask } from './pipeline-task.entity';
 import { Pipeline } from '../pipelines/pipeline.entity';
 import { ReposModule } from '../repos/repos.module';
-import { RedisModule } from 'nestjs-redis';
-import { BullModule } from '@nestjs/bull';
-import {
-  PIPELINE_TASK_QUEUE,
-  PIPELINE_TASK_LOG_QUEUE,
-} from './pipeline-tasks.constants';
 
 @Module({
-  imports: [
+  imports: [TypeOrmModule.forFeature([PipelineTask, Pipeline]), ReposModule],
-    TypeOrmModule.forFeature([PipelineTask, Pipeline]),
-    BullModule.registerQueue(
-      {
-        name: PIPELINE_TASK_QUEUE,
-      },
-      { name: PIPELINE_TASK_LOG_QUEUE },
-    ),
-    RedisModule,
-    ReposModule,
-  ],
   providers: [PipelineTasksService, PipelineTasksResolver],
 })
 export class PipelineTasksModule {}

src/pipeline-tasks/pipeline-tasks.service.ts

@@ -17,9 +17,9 @@ export class PipelineTasksService {
     private readonly repository: Repository<PipelineTask>,
     @InjectRepository(Pipeline)
     private readonly pipelineRepository: Repository<Pipeline>,
+    private readonly redis: RedisService,
     @InjectQueue(PIPELINE_TASK_QUEUE)
     private readonly queue: Queue<PipelineTask>,
-    private readonly redis: RedisService,
   ) {}
   async addTask(dto: CreatePipelineTaskInput) {
     const pipeline = await this.pipelineRepository.findOneOrFail({

src/pipelines/dtos/create-pipeline.input.ts

@@ -1,7 +1,6 @@
 import { InputType } from '@nestjs/graphql';
-import { WorkUnitMetadata } from '../../pipeline-tasks/models/work-unit-metadata.model';
 import {
-  IsInstance,
+  IsObject,
   IsOptional,
   IsString,
   IsUUID,
@@ -22,6 +21,6 @@ export class CreatePipelineInput {
   name: string;
 
   @IsOptional()
-  @IsInstance(WorkUnitMetadata)
+  @IsObject()
-  workUnitMetadata: WorkUnitMetadata;
+  workUnitMetadata = {};
 }

src/pipelines/pipelines.resolver.ts

@@ -9,7 +9,7 @@ import { ListPipelineArgs } from './dtos/list-pipelines.args';
 export class PipelinesResolver {
   constructor(private readonly service: PipelinesService) {}
   @Query(() => [Pipeline])
-  async findPipelines(@Args() dto: ListPipelineArgs) {
+  async findPipelines(@Args('listPipelineArgs') dto: ListPipelineArgs) {
     return await this.service.list(dto);
   }
 

src/repos/dtos/checkout.input.ts

@@ -4,7 +4,7 @@ import { IsOptional, IsString, IsUUID } from 'class-validator';
 @InputType()
 export class CheckoutInput {
   @IsUUID()
-  pipelineId: string;
+  projectId: string;
 
   @IsString()
   @IsOptional()

src/repos/repos.resolver.ts

@@ -1,13 +1,18 @@
-import { Args, Query, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
 import { ListLogsArgs } from './dtos/list-logs.args';
 import { ReposService } from './repos.service';
 import { LogList } from './dtos/log-list.model';
 import { ListBranchesArgs } from './dtos/list-branches.args';
 import { BranchList } from './dtos/branch-list.model';
+import { CheckoutInput } from './dtos/checkout.input';
+import { ProjectsService } from '../projects/projects.service';
 
 @Resolver()
 export class ReposResolver {
-  constructor(private readonly service: ReposService) {}
+  constructor(
+    private readonly service: ReposService,
+    private readonly projectService: ProjectsService,
+  ) {}
   @Query(() => LogList)
   async listLogs(@Args('listLogsArgs') dto: ListLogsArgs) {
     return await this.service.listLogs(dto);
@@ -23,4 +28,10 @@ export class ReposResolver {
       };
     });
   }
+  @Mutation(() => Boolean)
+  async checkout(@Args('checkoutInput') dto: CheckoutInput): Promise<true> {
+    const project = await this.projectService.findOne(dto.projectId);
+    await this.service.checkoutCommit(project, dto.commitNumber);
+    return true;
+  }
 }