Add missing endpoints for Api v2

Author: jllopes

src/main/scala/com/codacy/client/bitbucket/v2/CommitComment.scala

@@ -0,0 +1,18 @@
+package com.codacy.client.bitbucket.v2
+
+import java.time.LocalDateTime
+
+import play.api.libs.functional.syntax._
+import play.api.libs.json._
+
+case class CommitComment(id: Long, commit: String, content: String, created_on: LocalDateTime, deleted: Boolean)
+
+object CommitComment {
+  implicit val reader: Reads[CommitComment] = (
+    (__ \ "id").read[Long] and
+      (__ \ "commit" \ "hash").read[String] and
+      (__ \ "content" \ "raw").read[String] and
+      (__ \ "created_on").read[LocalDateTime] and
+      (__ \ "deleted").read[Boolean]
+    )(CommitComment.apply _)
+}

src/main/scala/com/codacy/client/bitbucket/v2/Email.scala

@@ -0,0 +1,14 @@
+package com.codacy.client.bitbucket.v2
+
+import play.api.libs.functional.syntax._
+import play.api.libs.json._
+
+case class Email(email: String, is_primary: Boolean, is_confirmed: Boolean)
+
+object Email {
+  implicit def emailReader: Reads[Email] =
+    ((__ \ "email").read[String] and
+      (__ \ "is_primary").read[Boolean] and
+      (__ \ "is_confirmed").read[Boolean]
+      ) (Email.apply _)
+}

src/main/scala/com/codacy/client/bitbucket/v2/Issue.scala

@@ -0,0 +1,22 @@
+package com.codacy.client.bitbucket.v2
+
+import java.time.LocalDateTime
+
+import play.api.libs.functional.syntax._
+import play.api.libs.json._
+
+case class Issue(id: Long, state: String, priority: String, title: String, content: String, reporter: String,
+                 created_on: LocalDateTime, kind: String)
+
+object Issue {
+  implicit val reader: Reads[Issue] = (
+    (__ \ "id").read[Long] and
+      (__ \ "state").read[String] and
+      (__ \ "priority").read[String] and
+      (__ \ "title").read[String] and
+      (__ \ "content" \ "raw").read[String] and
+      (__ \ "reporter" \ "username").read[String] and
+      (__ \ "created_on").read[LocalDateTime] and
+      (__ \ "kind").read[String]
+    )(Issue.apply _)
+}

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

@@ -0,0 +1,17 @@
+package com.codacy.client.bitbucket.v2
+
+import java.time.LocalDateTime
+
+import play.api.libs.functional.syntax._
+import play.api.libs.json._
+
+case class PullRequestComment(id: Long, content: String, created_on: LocalDateTime, deleted: Boolean)
+
+object PullRequestComment {
+  implicit val reader: Reads[PullRequestComment] = (
+    (__ \ "id").read[Long] and
+      (__ \ "content" \ "raw").read[String] and
+      (__ \ "created_on").read[LocalDateTime] and
+      (__ \ "deleted").read[Boolean]
+    )(PullRequestComment.apply _)
+}

src/main/scala/com/codacy/client/bitbucket/v2/PullRequestReviewers.scala

@@ -0,0 +1,12 @@
+package com.codacy.client.bitbucket.v2
+
+import play.api.libs.json._
+
+case class PullRequestReviewers(reviewers: Seq[String])
+
+object PullRequestReviewers {
+
+  implicit val reader: Reads[PullRequestReviewers] =
+    (__ \ "reviewers" ).read(Reads.list((__ \ "uuid").read[String])).map(PullRequestReviewers.apply)
+
+}

src/main/scala/com/codacy/client/bitbucket/v2/SimpleCommit.scala

@@ -0,0 +1,24 @@
+package com.codacy.client.bitbucket.v2
+
+import java.time.LocalDateTime
+
+import play.api.libs.json._
+
+case class SimpleCommit(hash: String, authorName: Option[String], parents: Seq[String], date: LocalDateTime, message: String)
+
+object SimpleCommit {
+  val dateFormat = "yyyy-MM-dd'T'HH:mm:ssXXX"
+  implicit val dateTimeReads: Reads[LocalDateTime] = Reads.localDateTimeReads(dateFormat, s=> {println(s);s})
+
+  implicit def commitReader: Reads[SimpleCommit] = Reads { (json: JsValue) =>
+    (for {
+      hash <- (json \ "hash").asOpt[String]
+      username = (json \ "author" \ "user" \ "username").asOpt[String]
+      parents = (json \ "parents" \\ "hash").flatMap(_.asOpt[String])
+      date <- (json \ "date").asOpt[LocalDateTime]
+      message <- (json \ "message").asOpt[String]
+    } yield SimpleCommit(hash, username, parents, date, message))
+      .map(JsSuccess(_))
+      .getOrElse(JsError("could not read commit"))
+  }
+}

src/main/scala/com/codacy/client/bitbucket/v2/SshKey.scala

@@ -0,0 +1,14 @@
+package com.codacy.client.bitbucket.v2
+
+import play.api.libs.functional.syntax._
+import play.api.libs.json._
+
+case class SshKey(uuid: String, key: String, label: String)
+
+object SshKey {
+  implicit val reader: Reads[SshKey] = (
+    (__ \ "uuid").read[String] and
+      (__ \ "key").read[String] and
+      (__ \ "label").read[String]
+    )(SshKey.apply _)
+}

src/main/scala/com/codacy/client/bitbucket/v2/User.scala

@@ -0,0 +1,13 @@
+package com.codacy.client.bitbucket.v2
+
+import play.api.libs.functional.syntax._
+import play.api.libs.json._
+
+case class User(username: String, display_name: String)
+
+object User {
+  implicit val reader: Reads[User] = (
+    (__ \ "username").read[String] and
+      (__ \ "display_name").read[String]
+    )(User.apply _)
+}

src/main/scala/com/codacy/client/bitbucket/v2/Webhook.scala

@@ -0,0 +1,14 @@
+package com.codacy.client.bitbucket.v2
+
+import play.api.libs.json.{Reads, Json, JsObject}
+
+case class Webhook(uuid:String,description:Option[String],url:String,subject:JsObject,events:Set[String],active:Boolean,created_at:String,links:JsObject)
+object Webhook{
+  implicit val reads: Reads[Webhook] = Json.reads[Webhook].map{ case hook =>
+    hook.uuid match{
+      case uuid if uuid.startsWith("{") && uuid.endsWith("}") =>
+        hook.copy(uuid = uuid.drop(1).dropRight(1))
+      case _ => hook
+    }
+  }
+}

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

@@ -0,0 +1,36 @@
+package com.codacy.client.bitbucket.v2.service
+
+import com.codacy.client.bitbucket.v2.CommitComment
+import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import play.api.libs.json.{JsNumber, JsObject, JsString, Json}
+
+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/2.0/repositories/$author/$repo/commit/$commit/comments"
+
+    val params = for {
+      filename <- file
+      lineTo <- line
+    } yield {
+      "inline" -> Json.obj("path" -> JsString(filename), "to" -> JsNumber(lineTo))
+    }
+
+    val values = JsObject(params.toSeq :+ "content" -> Json.obj("raw" -> JsString(body)))
+
+    client.postJson(Request(url, classOf[CommitComment]), values)
+  }
+
+  def listComments(author: String, repo: String, commit: String): RequestResponse[Seq[CommitComment]] = {
+    val url = s"https://bitbucket.org/api/2.0/repositories/$author/$repo/commit/$commit/comments"
+
+    client.executePaginated(Request(url, classOf[Seq[CommitComment]]))
+      .map(_.filterNot(_.deleted))
+  }
+
+  def deleteComment(author: String, repo: String, commit: String, commentId: Long): RequestResponse[Boolean] = {
+    val url = s"https://bitbucket.org/api/2.0/repositories/$author/$repo/commit/$commit/comments/$commentId"
+
+    client.delete(url)
+  }
+}