Merge pull request #764 from langovoi/bitbucket-diff

Fix `GitJSONDSL` and `diffForFile` for BitBucket Server

CHANGELOG.md

@@ -13,6 +13,8 @@
 
 ## Master
 
+- Fix `GitJSONDSL` and `diffForFile` for BitBucket Server [@langovoi][]
+
 # 6.1.3
 
 - Add support for personal tokens of BitBucket Server - [@langovoi][]

source/danger.d.ts

@@ -296,6 +296,30 @@ interface BitBucketServerPRComment {
   }
 }
 
+interface BitBucketServerChanges {
+  nextPageStart: number | null
+  values: BitBucketServerChangesValue[]
+}
+
+interface BitBucketServerChangesValueAddModifyDelete {
+  type: "ADD" | "MODIFY" | "DELETE"
+  path: {
+    toString: string
+  }
+}
+
+interface BitBucketServerChangesValueMove {
+  type: "MOVE"
+  path: {
+    toString: string
+  }
+  srcPath: {
+    toString: string
+  }
+}
+
+type BitBucketServerChangesValue = BitBucketServerChangesValueAddModifyDelete | BitBucketServerChangesValueMove
+
 /** A platform agnostic reference to a Git commit */
 interface GitCommit {
   /** The SHA for the commit */

source/dsl/BitBucketServerDSL.ts

@@ -287,3 +287,27 @@ export interface BitBucketServerPRComment {
     id: number
   }
 }
+
+export interface BitBucketServerChanges {
+  nextPageStart: number | null
+  values: BitBucketServerChangesValue[]
+}
+
+export interface BitBucketServerChangesValueAddModifyDelete {
+  type: "ADD" | "MODIFY" | "DELETE"
+  path: {
+    toString: string
+  }
+}
+
+export interface BitBucketServerChangesValueMove {
+  type: "MOVE"
+  path: {
+    toString: string
+  }
+  srcPath: {
+    toString: string
+  }
+}
+
+export type BitBucketServerChangesValue = BitBucketServerChangesValueAddModifyDelete | BitBucketServerChangesValueMove

source/platforms/_tests/_bitbucket_server.test.ts

@@ -24,8 +24,8 @@ class mockBitBucketServerAPI /*tslint:disable-line*/ {
     const fixtures = await requestWithFixturedJSON("bitbucket_server_comments.json")
     return await fixtures()
   }
-  async getPullRequestDiff() {
-    const fixtures = await requestWithFixturedJSON("bitbucket_server_diff.json")
+  async getPullRequestChanges() {
+    const fixtures = await requestWithFixturedJSON("bitbucket_server_changes.json")
     return await fixtures()
   }
   async getPullRequestActivities() {

source/platforms/_tests/fixtures/bitbucket_server_changes.json

@@ -0,0 +1,29 @@
+[
+  {
+    "type": "MODIFY",
+    "path": {
+      "toString": ".gitignore"
+    }
+  },
+  {
+    "type": "ADD",
+    "path": {
+      "toString": "banana"
+    }
+  },
+  {
+    "type": "MOVE",
+    "path": {
+      "toString": ".babelrc"
+    },
+    "srcPath": {
+      "toString": ".babelrc.example"
+    }
+  },
+  {
+    "type": "DELETE",
+    "path": {
+      "toString": "jest.eslint.config.js"
+    }
+  }
+]

source/platforms/bitbucket_server/BitBucketServerAPI.ts

@@ -12,6 +12,8 @@ import {
   BitBucketServerPRActivity,
   BitBucketServerDiff,
   RepoMetaData,
+  BitBucketServerChanges,
+  BitBucketServerChangesValue,
 } from "../../dsl/BitBucketServerDSL"
 import { Comment } from "../platform"
 
@@ -87,19 +89,30 @@ export class BitBucketServerAPI {
     return (await res.json()).values
   }
 
-  getStructuredDiff = async (base: string, head: string): Promise<BitBucketServerDiff[]> => {
+  getStructuredDiffForFile = async (base: string, head: string, filename: string): Promise<BitBucketServerDiff[]> => {
     const { repoSlug } = this.repoMetadata
-    const path = `rest/api/1.0/${repoSlug}/compare/diff?withComments=false&from=${base}&to=${head}`
+    const path = `rest/api/1.0/${repoSlug}/compare/diff/${filename}?withComments=false&from=${base}&to=${head}`
     const res = await this.get(path)
     throwIfNotOk(res)
     return (await res.json()).diffs
   }
 
-  getPullRequestDiff = async (): Promise<BitBucketServerDiff[]> => {
-    const path = `${this.getPRBasePath()}/diff?withComments=false`
-    const res = await this.get(path)
-    throwIfNotOk(res)
-    return (await res.json()).diffs
+  getPullRequestChanges = async (): Promise<BitBucketServerChangesValue[]> => {
+    let nextPageStart: null | number = 0
+    let values: BitBucketServerChangesValue[] = []
+
+    do {
+      const path = `${this.getPRBasePath()}/changes?start=${nextPageStart}`
+      const res = await this.get(path)
+      throwIfNotOk(res)
+
+      const data = (await res.json()) as BitBucketServerChanges
+
+      values = values.concat(data.values)
+      nextPageStart = data.nextPageStart
+    } while (nextPageStart !== null)
+
+    return values
   }
 
   getPullRequestComments = async (): Promise<BitBucketServerPRActivity[]> => {

source/platforms/bitbucket_server/BitBucketServerGit.ts

@@ -4,6 +4,7 @@ import {
   BitBucketServerDSL,
   BitBucketServerDiff,
   RepoMetaData,
+  BitBucketServerChangesValue,
 } from "../../dsl/BitBucketServerDSL"
 import { GitCommit } from "../../dsl/Commit"
 
@@ -53,12 +54,12 @@ function bitBucketServerCommitToGitCommit(
 
 export default async function gitDSLForBitBucketServer(api: BitBucketServerAPI): Promise<GitJSONDSL> {
   // We'll need all this info to be able to generate a working GitDSL object
-  const diff = await api.getPullRequestDiff()
+  const changes = await api.getPullRequestChanges()
   const gitCommits = await api.getPullRequestCommits()
   const commits = gitCommits.map(commit =>
     bitBucketServerCommitToGitCommit(commit, api.repoMetadata, api.repoCredentials.host)
   )
-  return bitBucketServerDiffToGitJSONDSL(diff, commits)
+  return bitBucketServerChangesToGitJSONDSL(changes, commits)
 }
 
 export const bitBucketServerGitDSL = (
@@ -73,8 +74,8 @@ export const bitBucketServerGitDSL = (
     baseSHA: bitBucketServer.pr.fromRef.latestCommit,
     headSHA: bitBucketServer.pr.toRef.latestCommit,
     getFileContents: bitBucketServerAPI.getFileContents,
-    getFullStructuredDiff: async (base: string, head: string) => {
-      const diff = await bitBucketServerAPI.getStructuredDiff(base, head)
+    getStructuredDiffForFile: async (base: string, head: string, filename: string) => {
+      const diff = await bitBucketServerAPI.getStructuredDiffForFile(base, head, filename)
       return bitBucketServerDiffToGitStructuredDiff(diff)
     },
   }
@@ -83,17 +84,45 @@ export const bitBucketServerGitDSL = (
   return gitJSONToGitDSL(json, config)
 }
 
-const bitBucketServerDiffToGitJSONDSL = (diffs: BitBucketServerDiff[], commits: GitCommit[]): GitJSONDSL => {
-  const deleted_files = diffs.filter(diff => diff.source && !diff.destination).map(diff => diff.source!.toString)
-  const created_files = diffs.filter(diff => !diff.source && diff.destination).map(diff => diff.destination!.toString)
-  const modified_files = diffs.filter(diff => diff.source && diff.destination).map(diff => diff.destination!.toString)
-
-  return {
-    modified_files,
-    created_files,
-    deleted_files,
-    commits,
-  }
+const bitBucketServerChangesToGitJSONDSL = (
+  changes: BitBucketServerChangesValue[],
+  commits: GitCommit[]
+): GitJSONDSL => {
+  return changes.reduce<GitJSONDSL>(
+    (git, value) => {
+      switch (value.type) {
+        case "ADD":
+          return {
+            ...git,
+            created_files: [...git.created_files, value.path.toString],
+          }
+        case "MODIFY":
+          return {
+            ...git,
+            modified_files: [...git.modified_files, value.path.toString],
+          }
+        case "MOVE":
+          return {
+            ...git,
+            created_files: [...git.created_files, value.path.toString],
+            deleted_files: [...git.deleted_files, value.srcPath.toString],
+          }
+        case "DELETE":
+          return {
+            ...git,
+            deleted_files: [...git.deleted_files, value.path.toString],
+          }
+        default:
+          throw new Error("Unhandled change type")
+      }
+    },
+    {
+      modified_files: [],
+      created_files: [],
+      deleted_files: [],
+      commits,
+    }
+  )
 }
 
 const bitBucketServerDiffToGitStructuredDiff = (diffs: BitBucketServerDiff[]): GitStructuredDiff => {