Move the review attributes for the review DSL into the root of the gi…

…thub DSL
danger · Mar 12, 2017 · 123cb9d · 123cb9d
1 parent 9088ca6
commit 123cb9d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 25 deletions.
diff --git a/source/dsl/GitHubDSL.ts b/source/dsl/GitHubDSL.ts
@@ -10,6 +10,10 @@ export interface GitHubDSL {
   pr: GitHubPRDSL,
   /** The github commit metadata for a code review session */
   commits: Array<GitHubCommit>
+  /** The reviews left on this pull request */
+  reviews: Array<GitHubReview>
+  /** The people requested to review this PR */
+  requestedReviewers: Array<GitHubUser>
 }
 
 /**
@@ -149,19 +153,6 @@ export interface GitHubPRDSL {
    */
   assignees: Array<GitHubUser>
 
-  /**
-   * The people requested to review this PR
-   * @type {GitHubReview}
-   */
-  requestedReviewers: Array<GitHubUser>
-
-  /**
-   * The reviews left on this pull request
-   * @type {Array<GitHubReview>}
-   * @memberOf GitHubPRDSL
-   */
-  reviews: Array<GitHubReview>
-
   /**
    * Has the PR been merged yet
    * @type {boolean}
@@ -305,7 +296,7 @@ export interface GitHubRepo {
 
 export interface GitHubMergeRef {
   /**
-   * The human display name for the merge reference, e.g. "artsy:master"
+   * The human di 0 . 0splay name for the merge reference, e.g. "artsy:master"
    * @type {string}
    */
   label: string

diff --git a/source/platforms/GitHub.ts b/source/platforms/GitHub.ts
@@ -25,12 +25,7 @@ export class GitHub {
    */
   async getReviewInfo(): Promise<GitHubPRDSL> {
     const deets = await this.api.getPullRequestInfo()
-
-    return {
-      ...await deets.json(),
-      reviews: await this.api.getReviews(),
-      requestedReviewers: await this.api.getReviewerRequests(),
-    }
+    return await deets.json()
   }
 
   /**
@@ -93,10 +88,15 @@ export class GitHub {
     const issue = await this.getIssue()
     const pr = await this.getReviewInfo()
     const commits = await this.api.getPullRequestCommits()
+    const reviews = await this.api.getReviews()
+    const requestedReviewers = await this.api.getReviewerRequests()
+
     return {
       issue,
       pr,
-      commits
+      commits,
+      reviews,
+      requestedReviewers
     }
   }
 

diff --git a/source/platforms/github/GitHubAPI.ts b/source/platforms/github/GitHubAPI.ts
@@ -159,7 +159,7 @@ export class GitHubAPI {
     return {}
   }
 
-  private api(path: string, headers: any = {}, body: any = {}, method: string): Promise<any> {
+  private api(path: string, headers: any = {}, body: any = {}, method: string) {
     if (this.token !== undefined) {
       headers["Authorization"] = `token ${this.token}`
     }
@@ -175,15 +175,15 @@ export class GitHubAPI {
     })
   }
 
-  get(path: string, headers: any = {}, body: any = {}): Promise<any> {
+  get(path: string, headers: any = {}, body: any = {}) {
     return this.api(path, headers, body, "GET")
   }
 
-  post(path: string, headers: any = {}, body: any = {}): Promise<any> {
+  post(path: string, headers: any = {}, body: any = {}) {
     return this.api(path, headers, JSON.stringify(body), "POST")
   }
 
-  patch(path: string, headers: any = {}, body: any = {}): Promise<any> {
+  patch(path: string, headers: any = {}, body: any = {}) {
     return this.api(path, headers, JSON.stringify(body), "PATCH")
   }
 }