Merge pull request #26 from codacy/bitbucket-comments-ft-3108

Add endpoint to list comments

Author: machadoit

src/main/scala/com/codacy/client/bitbucket/SimplePullRequestComment.scala

@@ -0,0 +1,14 @@
+package com.codacy.client.bitbucket
+
+import play.api.libs.functional.syntax._
+import play.api.libs.json._
+
+case class SimplePullRequestComment(id: Long, anchor: Option[String])
+
+object SimplePullRequestComment {
+
+  implicit val reader: Reads[SimplePullRequestComment] = (
+    (__ \ "comment_id").read[Long] and
+      (__ \ "anchor").readNullable[String]
+    )(SimplePullRequestComment.apply _)
+}

src/main/scala/com/codacy/client/bitbucket/service/CommitServices.scala

@@ -1,13 +1,14 @@
 package com.codacy.client.bitbucket.service
 
 import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.util.CommitHelper
 import com.codacy.client.bitbucket.{CommitComment, PullRequestComment}
 import play.api.libs.json.{JsNumber, JsObject, JsString}
 
 class CommitServices(client: BitbucketClient) {
 
   def createComment(author: String, repo: String, commit: String, body: String, file: Option[String] = None, line: Option[Int] = None): RequestResponse[CommitComment] = {
-    val url = s"https://bitbucket.org/!api/1.0/repositories/$author/$repo/changesets/${commit.take(12)}/comments"
+    val url = s"https://bitbucket.org/!api/1.0/repositories/$author/$repo/changesets/${CommitHelper.anchor(commit)}/comments"
 
     val params = file.map(filename => "filename" -> JsString(filename)) ++
       line.map(lineTo => "line_to" -> JsNumber(lineTo))
@@ -18,7 +19,7 @@ class CommitServices(client: BitbucketClient) {
   }
 
   def deleteComment(author: String, repo: String, commit: String, commentId: Long): Unit = {
-    val url = s"https://bitbucket.org/!api/1.0/repositories/$author/$repo/changesets/${commit.take(12)}/comments/$commentId"
+    val url = s"https://bitbucket.org/!api/1.0/repositories/$author/$repo/changesets/${CommitHelper.anchor(commit)}/comments/$commentId"
 
     client.delete(url)
   }

src/main/scala/com/codacy/client/bitbucket/service/PullRequestServices.scala

@@ -1,7 +1,8 @@
 package com.codacy.client.bitbucket.service
 
 import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
-import com.codacy.client.bitbucket.{PullRequestComment, PullRequest, SimpleCommit}
+import com.codacy.client.bitbucket.util.CommitHelper
+import com.codacy.client.bitbucket.{PullRequest, PullRequestComment, SimpleCommit, SimplePullRequestComment}
 import play.api.libs.json._
 
 class PullRequestServices(client: BitbucketClient) {
@@ -78,11 +79,12 @@ class PullRequestServices(client: BitbucketClient) {
     postNewComment(author, repo, prId, values)
   }
 
-  def createComment(author: String, repo: String, prId: Int, commitUUID: String, body: String, file: Option[String], line: Option[Int]): RequestResponse[PullRequestComment] = {
+  def createLineComment(author: String, repo: String, prId: Int, commitUUID: String, body: String,
+                        file: Option[String], line: Option[Int]): RequestResponse[PullRequestComment] = {
     val params = file.map(filename => "filename" -> JsString(filename)) ++
       line.map(lineTo => "line_to" -> JsNumber(lineTo))
 
-    val values = JsObject(params.toSeq :+ "content" -> JsString(body) :+ "anchor" -> JsString(commitUUID.take(12)))
+    val values = JsObject(params.toSeq :+ "content" -> JsString(body) :+ "anchor" -> JsString(CommitHelper.anchor(commitUUID)))
     postNewComment(author, repo, prId, values = values)
   }
 
@@ -92,4 +94,10 @@ class PullRequestServices(client: BitbucketClient) {
     client.delete(url)
   }
 
+  def listComments(author: String, repo: String, pullRequestId: Int): RequestResponse[Seq[SimplePullRequestComment]] = {
+    val url = s"https://bitbucket.org/!api/1.0/repositories/$author/$repo/pullrequests/$pullRequestId/comments"
+
+    client.execute(Request(url, classOf[Seq[SimplePullRequestComment]]))
+  }
+
 }

src/main/scala/com/codacy/client/bitbucket/util/CommitHelper.scala

@@ -0,0 +1,7 @@
+package com.codacy.client.bitbucket.util
+
+object CommitHelper {
+  def anchor(commitUUID: String): String = {
+    commitUUID.take(12)
+  }
+}