fix: use different interfaces for GitHub PR and Bitbucket PR

DXHeroes · Nov 19, 2019 · 7d2ecb5 · 7d2ecb5
1 parent 572371b
commit 7d2ecb5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/src/inspectors/CollaborationInspector.ts b/src/inspectors/CollaborationInspector.ts
@@ -1,8 +1,10 @@
 import { inject, injectable } from 'inversify';
 import { ProjectIssueBrowserService as ContentRepositoryBrowserService } from '../model';
+import { GitHubPullRequestState } from '../services/git/IGitHubService';
 import { Types } from '../types';
 import { ListGetterOptions } from './common/ListGetterOptions';
-import { ICollaborationInspector, PullRequestState } from './ICollaborationInspector';
+import { ICollaborationInspector } from './ICollaborationInspector';
+import { BitbucketPullRequestState } from '../services/git/ICVSService';
 
 @injectable()
 export class CollaborationInspector implements ICollaborationInspector {
@@ -12,7 +14,11 @@ export class CollaborationInspector implements ICollaborationInspector {
     this.service = service;
   }
 
-  async getPullRequests(owner: string, repo: string, options?: ListGetterOptions<{ state?: PullRequestState }>) {
+  async getPullRequests(
+    owner: string,
+    repo: string,
+    options?: ListGetterOptions<{ state?: GitHubPullRequestState | BitbucketPullRequestState }>,
+  ) {
     return this.service.getPullRequests(owner, repo, options);
   }
 

diff --git a/src/inspectors/ICollaborationInspector.ts b/src/inspectors/ICollaborationInspector.ts
@@ -1,9 +1,15 @@
 import { PullCommits, PullFiles, PullRequest } from '../services/git/model';
 import { ListGetterOptions } from './common/ListGetterOptions';
 import { Paginated } from './common/Paginated';
+import { GitHubPullRequestState } from '../services/git/IGitHubService';
+import { BitbucketPullRequestState } from '../services/git/ICVSService';
 
 export interface ICollaborationInspector {
-  getPullRequests(owner: string, repo: string, options?: ListGetterOptions<{ state?: PullRequestState }>): Promise<Paginated<PullRequest>>;
+  getPullRequests(
+    owner: string,
+    repo: string,
+    options?: ListGetterOptions<{ state?: GitHubPullRequestState | BitbucketPullRequestState }>,
+  ): Promise<Paginated<PullRequest>>;
   getPullRequest(owner: string, repo: string, prNumber: number): Promise<PullRequest>;
   getPullCommits(owner: string, repo: string, prNumber: number): Promise<Paginated<PullCommits>>;
   getPullRequestFiles(owner: string, repo: string, prNumber: number): Promise<Paginated<PullFiles>>;

diff --git a/src/services/git/ICVSService.ts b/src/services/git/ICVSService.ts
@@ -1,13 +1,13 @@
 import { ListGetterOptions } from '../../inspectors/common/ListGetterOptions';
-import { PullRequest, PullRequestReview, Commit, Contributor, ContributorStats, Issue, Directory, File, Symlink, PullFiles } from './model';
 import { Paginated } from '../../inspectors/common/Paginated';
 import { GitHubPullRequestState } from './IGitHubService';
+import { Commit, Contributor, ContributorStats, Directory, File, Issue, PullFiles, PullRequest, PullRequestReview, Symlink } from './model';
 
 export interface ICVSService {
   getPullRequests(
     owner: string,
     repo: string,
-    options?: ListGetterOptions<{ state?: GitHubPullRequestState }>,
+    options?: ListGetterOptions<{ state?: GitHubPullRequestState | BitbucketPullRequestState }>,
   ): Promise<Paginated<PullRequest>>;
   getPullRequestReviews(owner: string, repo: string, prNumber: number): Promise<Paginated<PullRequestReview>>;
   getPullRequestFiles(owner: string, repo: string, prNumber: number): Promise<Paginated<PullFiles>>;
@@ -19,3 +19,10 @@ export interface ICVSService {
   getIssue(owner: string, repo: string, issueNumber: number): Promise<Issue>;
   getRepoContent(owner: string, repo: string, path: string): Promise<File | Symlink | Directory | null>;
 }
+
+export enum BitbucketPullRequestState {
+  open = 'OPEN',
+  closed = 'MERGED',
+  declined = 'DECLINED',
+  superseded = 'SUPERSEDED',
+}