fix(test): repos resolver 测试用例不通过的问题。

config.yml.example

@@ -1,6 +1,7 @@
 env: dev
 http:
   port: 7122
+
 db:
   postgres:
     host: 192.168.31.194
@@ -8,9 +9,5 @@ db:
     database: fennec
     username: fennec
     password:
-redis:
-  mq:
-    host: localhost
-    port: 6379
 workspaces:
   root: '/Users/ivanli/Projects/fennec/workspaces'

package-lock.json

@@ -9087,14 +9087,6 @@
         }
       }
     },
-    "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
     "moment": {
       "version": "2.29.1",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
@@ -9126,6 +9118,16 @@
         "on-finished": "^2.3.0",
         "type-is": "^1.6.4",
         "xtend": "^4.0.0"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        }
       }
     },
     "multimatch": {
@@ -9489,6 +9491,14 @@
             "minipass": "^2.9.0"
           }
         },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",

src/app.module.ts

@@ -8,7 +8,6 @@ import { AppService } from './app.service';
 import { ProjectsModule } from './projects/projects.module';
 import { ReposModule } from './repos/repos.module';
 import configuration from './commons/config/configuration';
-import { BullModule } from '@nestjs/bull';
 
 @Module({
   imports: [
@@ -38,16 +37,6 @@ import { BullModule } from '@nestjs/bull';
       }),
       inject: [ConfigService],
     }),
-    BullModule.forRootAsync({
-      imports: [ConfigModule],
-      useFactory: async (configService: ConfigService) => ({
-        redis: {
-          host: configService.get<string>('redis.mq.host', 'localhost'),
-          port: configService.get<number>('redis.mq.port', 6379),
-        },
-      }),
-      inject: [ConfigService],
-    }),
     ProjectsModule,
     ReposModule,
   ],

src/projects/dtos/create-project.input.ts

@@ -3,6 +3,7 @@ import {
   IsOptional,
   IsString,
   IsUrl,
+  Matches,
   MaxLength,
   MinLength,
 } from 'class-validator';
@@ -19,7 +20,9 @@ export class CreateProjectInput {
   @MinLength(2)
   comment: string;
 
-  @IsUrl({ protocols: ['ssh'] })
+  @Matches(
+    /^(?:ssh:\/\/)?(?:[\w\d-_]+@)(?:[\w\d-_]+\.)*\w{2,10}(?::\d{1,5})?(?:\/[\w\d-_.]+)*/,
+  )
   @MaxLength(256)
   sshUrl: string;
 

src/repos/dtos/checkout.input.ts

@@ -0,0 +1,16 @@
+import { InputType } from '@nestjs/graphql';
+import { IsOptional, IsString, IsUUID } from 'class-validator';
+
+@InputType()
+export class CheckoutInput {
+  @IsUUID()
+  projectId: string;
+
+  @IsString()
+  @IsOptional()
+  branch?: string;
+
+  @IsString()
+  @IsOptional()
+  commitNumber?: string;
+}

src/repos/dtos/list-logs.args.ts

@@ -1,4 +1,4 @@
-import { InputType, ObjectType } from '@nestjs/graphql';
+import { InputType } from '@nestjs/graphql';
 import { IsOptional, IsString, IsUUID } from 'class-validator';
 
 @InputType()

src/repos/repos.constants.ts

@@ -1 +0,0 @@
-export const WORKSPACE_ACTION = 'workspace-action';

src/repos/repos.module.ts

@@ -4,17 +4,10 @@ import { Project } from '../projects/project.entity';
 import { ReposResolver } from './repos.resolver';
 import { ReposService } from './repos.service';
 import { ConfigModule } from '@nestjs/config';
-import { BullModule } from '@nestjs/bull';
+import { ProjectsModule } from '../projects/projects.module';
-import { WORKSPACE_ACTION } from './repos.constants';
 
 @Module({
-  imports: [
+  imports: [TypeOrmModule.forFeature([Project]), ConfigModule, ProjectsModule],
-    TypeOrmModule.forFeature([Project]),
-    ConfigModule,
-    BullModule.registerQueue({
-      name: WORKSPACE_ACTION,
-    }),
-  ],
   providers: [ReposResolver, ReposService],
 })
 export class ReposModule {}

src/repos/repos.resolver.spec.ts

@@ -1,6 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { ReposResolver } from './repos.resolver';
 import { ReposService } from './repos.service';
+import { ProjectsService } from '../projects/projects.service';
 
 describe('ReposResolver', () => {
   let resolver: ReposResolver;
@@ -13,6 +14,10 @@ describe('ReposResolver', () => {
           provide: ReposService,
           useValue: {},
         },
+        {
+          provide: ProjectsService,
+          useValue: {},
+        },
       ],
     }).compile();
 

src/repos/repos.resolver.ts

@@ -1,19 +1,24 @@
-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);
   }
   @Query(() => BranchList)
-  async ListBranchesArgs(
+  async listBranches(
     @Args('listBranchesArgs') dto: ListBranchesArgs,
   ): Promise<BranchList> {
     return await this.service.listBranches(dto).then((data) => {
@@ -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;
+  }
 }

src/repos/repos.service.spec.ts

@@ -75,7 +75,7 @@ describe('ReposService', () => {
     it('should be checkout', async () => {
       await service.checkoutBranch(getTest1Project(), 'master');
       const filePath = join(
-        service.getWorkspaceRoot(getTest1Project()),
+        service.getWorkspaceRoot(getTest1Project(), 'master'),
         'README.md',
       );
       const text = await readFile(filePath, { encoding: 'utf-8' });
@@ -86,7 +86,7 @@ describe('ReposService', () => {
       await service.checkoutBranch(getTest1Project(), 'branch-a');
       await service.checkoutBranch(getTest1Project(), 'branch-b');
       const filePath = join(
-        service.getWorkspaceRoot(getTest1Project()),
+        service.getWorkspaceRoot(getTest1Project(), 'branch-b'),
         'branch-b.md',
       );
       const text = await readFile(filePath, { encoding: 'utf-8' });
@@ -100,7 +100,7 @@ describe('ReposService', () => {
     it('checkout the specified version', async () => {
       await service.checkoutBranch(getTest1Project(), 'master');
       const filePath = join(
-        service.getWorkspaceRoot(getTest1Project()),
+        service.getWorkspaceRoot(getTest1Project(), 'master'),
         'README.md',
       );
       const text = await readFile(filePath, { encoding: 'utf-8' });
@@ -112,7 +112,7 @@ describe('ReposService', () => {
     it('should be checkout', async () => {
       await service.checkoutCommit(getTest1Project(), '498c782685');
       const filePath = join(
-        service.getWorkspaceRoot(getTest1Project()),
+        service.getWorkspaceRoot(getTest1Project(), '498c782685'),
         'README.md',
       );
       const text = await readFile(filePath, { encoding: 'utf-8' });
@@ -121,7 +121,7 @@ describe('ReposService', () => {
     it('should be checkout right commit', async () => {
       await service.checkoutCommit(getTest1Project(), '7f7123fe5b');
       const filePath = join(
-        service.getWorkspaceRoot(getTest1Project()),
+        service.getWorkspaceRoot(getTest1Project(), '7f7123fe5b'),
         'README.md',
       );
       const text = await readFile(filePath, { encoding: 'utf-8' });

src/repos/repos.service.ts

@@ -19,10 +19,11 @@ export class ReposService {
     private readonly configService: ConfigService,
   ) {}
 
-  getWorkspaceRoot(project: Project): string {
+  getWorkspaceRoot(project: Project, subDir = ''): string {
     return join(
       this.configService.get<string>('workspaces.root'),
       project.name,
+      encodeURIComponent(subDir),
     );
   }
 
@@ -30,14 +31,14 @@ export class ReposService {
     // TODO:  获取锁，失败抛错。
   }
 
-  async getGit(project: Project) {
+  async getGit(project: Project, subDir = 'default') {
-    const workspaceRoot = this.getWorkspaceRoot(project);
+    const workspaceRoot = this.getWorkspaceRoot(project, subDir);
     await this.lockWorkspace(workspaceRoot);
 
     const firstInit = await access(workspaceRoot, F_OK)
       .then(() => false)
       .catch(async () => {
-        await mkdir(workspaceRoot);
+        await mkdir(workspaceRoot, { recursive: true });
         return true;
       });
     const git = gitP(workspaceRoot);
@@ -54,10 +55,9 @@ export class ReposService {
     });
     const git = await this.getGit(project);
     await git.fetch();
-    return await git.log({
+    return await git.log(
-      '--branches': dto.branch ?? '',
+      dto.branch ? ['--branches', dto.branch, '--'] : ['--all'],
-      '--remotes': DEFAULT_REMOTE_NAME,
+    );
-    });
   }
 
   async listBranches(dto: ListBranchesArgs) {
@@ -69,7 +69,7 @@ export class ReposService {
   }
 
   async checkoutBranch(project: Project, branch: string) {
-    const git = await this.getGit(project);
+    const git = await this.getGit(project, branch);
     try {
       await git.fetch(DEFAULT_REMOTE_NAME, branch);
     } catch (err) {
@@ -87,7 +87,7 @@ export class ReposService {
   }
 
   async checkoutCommit(project: Project, commitNumber: string) {
-    const git = await this.getGit(project);
+    const git = await this.getGit(project, commitNumber);
     try {
       await git.fetch(DEFAULT_REMOTE_NAME);
     } catch (err) {

src/repos/workspace-action.consumer.ts

@@ -1,8 +0,0 @@
-import { Process, Processor } from '@nestjs/bull';
-import { WORKSPACE_ACTION } from './repos.constants';
-
-@Processor(WORKSPACE_ACTION)
-export class WorkspaceActionConsumer {
-  @Process()
-  async dispatch() {}
-}

src/repos/workspace-action.model.ts

@@ -1,5 +0,0 @@
-import { WorkspaceActions } from './workspace-actions.enum';
-
-export class WorkspaceAction {
-  action: WorkspaceActions;
-}

src/repos/workspace-actions.enum.ts

@@ -1,6 +0,0 @@
-export enum WorkspaceActions {
-  checkoutBranch = 'checkoutBranch',
-  checkoutCommit = 'checkoutCommit',
-  listLogs = 'listLogs',
-  listBranches = 'listBranches',
-}