Merge pull request #6 from codacy/feature/changesetComments

Add comments on changesets and PR endpoints

Author: mrfyda

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

@@ -0,0 +1,20 @@
+package com.codacy.client.bitbucket
+
+import org.joda.time.DateTime
+import play.api.libs.functional.syntax._
+import play.api.libs.json._
+
+case class PullRequestComment(id: Long, username: String, display_name: String, content: String, created_on: DateTime)
+
+object PullRequestComment {
+  val dateFormat = "yyyy-MM-dd HH:mm:ssZZ"
+  implicit val jodaDateTimeReads = Reads.jodaDateReads(dateFormat)
+
+  implicit val reader: Reads[PullRequestComment] = (
+    (__ \ "comment_id").read[Long] and
+      (__ \ "username").read[String] and
+      (__ \ "display_name").read[String] and
+      (__ \ "content").read[String] and
+      (__ \ "utc_created_on").read[DateTime]
+    )(PullRequestComment.apply _)
+}

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

@@ -1,17 +1,25 @@
 package com.codacy.client.bitbucket.service
 
-import com.codacy.client.bitbucket.CommitComment
 import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
-import play.api.libs.json.Json
+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): RequestResponse[CommitComment] = {
+  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 values = Json.obj("content" -> body)
+    val params = file.map(filename => "filename" -> JsString(filename)) ++
+      line.map(lineTo => "line_to" -> JsNumber(lineTo))
+
+    val values = JsObject(params.toSeq :+ "content" -> JsString(body))
 
     client.post(Request(url, classOf[CommitComment]), values)
   }
 
-}
+  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"
+
+    client.delete(url)
+  }
+}

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

@@ -1,8 +1,8 @@
 package com.codacy.client.bitbucket.service
 
 import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
-import com.codacy.client.bitbucket.{PullRequest, SimpleCommit}
-import play.api.libs.json.{JsNull, JsObject, Json}
+import com.codacy.client.bitbucket.{PullRequestComment, PullRequest, SimpleCommit}
+import play.api.libs.json._
 
 class PullRequestServices(client: BitbucketClient) {
 
@@ -68,4 +68,21 @@ class PullRequestServices(client: BitbucketClient) {
     client.post(Request(url, classOf[JsObject]), JsNull)
   }
 
+  def createComment(author: String, repo: String, prId: Int, commitUUID: String, body: String, file: Option[String], line: Option[Int]): RequestResponse[PullRequestComment] = {
+    val url = s"https://bitbucket.org/api/1.0/repositories/$author/$repo/pullrequests/$prId/comments"
+
+    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)))
+
+    client.post(Request(url, classOf[PullRequestComment]), values)
+  }
+
+  def deleteComment(author: String, repo: String, commitUUID: String, pullRequestId: Int, commentId: Long): Unit = {
+    val url = s"https://bitbucket.org/api/1.0/repositories/$author/$repo/pullrequests/$pullRequestId/comments/$commentId"
+
+    client.delete(url)
+  }
+
 }