create list update for services

Author: Johann Egger

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

@@ -74,6 +74,36 @@ class BitbucketClient(key: String, secretKey: String, token: String, secretToken
       RequestResponse(None, result.statusText, hasError = true)
     }
   }
+  /* copy paste from post ... */
+  def delete[T](request: Request[T])(implicit reader: Reads[T]): RequestResponse[T] = {
+    val client: WSClient = new NingWSClient(new AsyncHttpClient().getConfig)
+
+    val jpromise = client.url(request.url).sign(OAuthCalculator(KEY, TOKEN)).withFollowRedirects(follow = true).delete()
+    val result = Await.result(jpromise, Duration(10, SECONDS))
+
+    if (Seq(HTTPStatusCodes.OK, HTTPStatusCodes.CREATED).contains(result.status)) {
+      val body = result.body
+
+      /* TODO: remove this when not needed (only keep for debug purposes) */
+      //    println("\n\n")
+      //    println(s"STATUS: ${result.status}")
+      //    println("\n\n")
+      //    println(body)
+      //    println("\n\n")
+
+      val jsValue = parseJson(body)
+      jsValue match {
+        case Right(responseObj) =>
+          RequestResponse(responseObj.asOpt[T])
+        case Left(message) =>
+          RequestResponse(None, message = message.detail, hasError = true)
+      }
+    } else {
+      RequestResponse(None, result.statusText, hasError = true)
+    }
+  }
+
+
 
   private def get(url: String): Either[ResponseError, JsValue] = {
     val client: WSClient = new NingWSClient(new AsyncHttpClient().getConfig)

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

@@ -3,16 +3,36 @@ package com.codacy.client.bitbucket.service
 import com.codacy.client.bitbucket.Service
 import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 
-class HookServices(client: BitbucketClient) {
+class ServiceServices(client: BitbucketClient) {
 
-  def createPostPushHook(author: String, repo: String, hookUrl:String): RequestResponse[Service] = {
-    val url = s"https://bitbucket.org/!api/1.0/repositories/$author/$repo/services"
+  def list(author: String, repo: String): RequestResponse[Seq[Service]] =
+    AuthorRepoOps(author,repo).list()
 
-    val payload = Map(
-      "type" -> "POST",
-      "URL"  -> hookUrl
-    ).mapValues(Seq(_))
+  /*def byId(author: String, repo: String, id:Long) = {
+    val resp = AuthorRepoOps(author,repo).list()
+    val value = resp.value.map(_.find(_.id == id))
+    resp.copy(value = value)
+  }*/
 
-    client.post(Request(url, classOf[Service]), payload)
+  def created(author: String, repo: String, payload: Map[String,Seq[String]]) =
+    AuthorRepoOps(author,repo).created(payload)
+
+  def removed(author: String, repo: String, id:Long) =
+    AuthorRepoOps(author,repo).removed(id)
+
+  private[this] lazy val BASE_URL: String = "https://bitbucket.org/!api/1.0/repositories"
+  private[this] def servicesUrl(author: String, repo: String) = s"$BASE_URL/$author/$repo/services"
+
+  private[this] case class AuthorRepoOps(author: String, repo: String){
+    private[this] lazy val BASE_URL = servicesUrl(author,repo)
+
+    def created(payload: Map[String,Seq[String]]): RequestResponse[Service] =
+      client.post(Request(BASE_URL,classOf[Service]),payload)
+
+    def removed(id:Long): RequestResponse[Boolean] =
+      client.delete(Request(s"%BASE_URL/$id",classOf[Boolean]))
+
+    def list(): RequestResponse[Seq[Service]] =
+      client.execute(Request(BASE_URL,classOf[Seq[Service]]))
   }
 }