fix: accept Repository without optional fields in json (#127)

Author: andrzej-janczak

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

@@ -12,12 +12,12 @@ case class Repository(
     description: String,
     scm: String,
     created_on: LocalDateTime,
-    updated_on: LocalDateTime,
+    updated_on: Option[LocalDateTime],
     owner: Owner,
-    size: Long,
-    has_issues: Boolean,
+    size: Option[Long],
+    has_issues: Option[Boolean],
     is_private: Boolean,
-    language: String,
+    language: Option[String],
     urls: Seq[RepositoryUrl],
     uuid: String,
     slug: String
@@ -36,15 +36,15 @@ object Repository {
   implicit val reader: Reads[Repository] = {
     ((__ \ "name").read[String] and
       (__ \ "full_name").read[String] and
-      (__ \ "description").read[String] and
+      (__ \ "description").read[String] and 
       (__ \ "scm").read[String] and
       (__ \ "created_on").read[LocalDateTime] and
-      (__ \ "updated_on").read[LocalDateTime] and
+      (__ \ "updated_on").readNullable[LocalDateTime] and
       (__ \ "owner").read[Owner] and
-      (__ \ "size").read[Long] and
-      (__ \ "has_issues").read[Boolean] and
+      (__ \ "size").readNullable[Long] and
+      (__ \ "has_issues").readNullable[Boolean] and
       (__ \ "is_private").read[Boolean] and
-      (__ \ "language").read[String] and
+      (__ \ "language").readNullable[String] and
       (__ \ "links").read[Map[String, JsValue]].map(parseLinks) and
       (__ \ "uuid" ).read[String] and
       (__ \ "slug" ).read[String]

src/test/resources/test-files/minimal_repository.json

@@ -0,0 +1,98 @@
+{
+  "type": "repository",
+  "full_name": "adinsbitbucket2/atacso-new",
+  "links": {
+    "self": {
+      "href": "https://bitbucket.org/!api/2.0/repositories/adinsbitbucket2/atacso-new"
+    },
+    "html": {
+      "href": "https://bitbucket.org/adinsbitbucket2/atacso-new"
+    },
+    "avatar": {
+      "href": "https://bytebucket.org/ravatar/%7Ba0eed669-d61c-429d-91d7-9c140adf32c5%7D?ts=default"
+    },
+    "pullrequests": {
+      "href": "https://bitbucket.org/!api/2.0/repositories/adinsbitbucket2/atacso-new/pullrequests"
+    },
+    "commits": {
+      "href": "https://bitbucket.org/!api/2.0/repositories/adinsbitbucket2/atacso-new/commits"
+    },
+    "forks": {
+      "href": "https://bitbucket.org/!api/2.0/repositories/adinsbitbucket2/atacso-new/forks"
+    },
+    "watchers": {
+      "href": "https://bitbucket.org/!api/2.0/repositories/adinsbitbucket2/atacso-new/watchers"
+    },
+    "branches": {
+      "href": "https://bitbucket.org/!api/2.0/repositories/adinsbitbucket2/atacso-new/refs/branches"
+    },
+    "tags": {
+      "href": "https://bitbucket.org/!api/2.0/repositories/adinsbitbucket2/atacso-new/refs/tags"
+    },
+    "downloads": {
+      "href": "https://bitbucket.org/!api/2.0/repositories/adinsbitbucket2/atacso-new/downloads"
+    },
+    "source": {
+      "href": "https://bitbucket.org/!api/2.0/repositories/adinsbitbucket2/atacso-new/src"
+    },
+    "clone": [
+      {
+        "name": "https",
+        "href": "https://[email protected]/adinsbitbucket2/atacso-new.git"
+      }, {
+        "name": "ssh",
+        "href": "[email protected]:adinsbitbucket2/atacso-new.git"
+      }
+    ],
+    "hooks": {
+      "href": "https://bitbucket.org/!api/2.0/repositories/adinsbitbucket2/atacso-new/hooks"
+    }
+  },
+  "name": "ATACSO New",
+  "slug": "atacso-new",
+  "description": "",
+  "scm": "git",
+  "website": null,
+  "owner": {
+    "display_name": "AdInsBitBucket2",
+    "links": {
+      "self": {
+        "href": "https://bitbucket.org/!api/2.0/workspaces/%7Bee3b0b8f-7a8b-4aa3-b09e-76b0b1068b42%7D"
+      },
+      "avatar": {
+        "href": "https://bitbucket.org/account/adinsbitbucket2/avatar/"
+      },
+      "html": {
+        "href": "https://bitbucket.org/%7Bee3b0b8f-7a8b-4aa3-b09e-76b0b1068b42%7D/"
+      }
+    },
+    "type": "team",
+    "uuid": "{ee3b0b8f-7a8b-4aa3-b09e-76b0b1068b42}",
+    "username": "adinsbitbucket2"
+  },
+  "workspace": {
+    "type": "workspace",
+    "uuid": "{ee3b0b8f-7a8b-4aa3-b09e-76b0b1068b42}",
+    "name": "AdInsBitBucket2",
+    "slug": "adinsbitbucket2",
+    "links": {
+      "avatar": {
+        "href": "https://bitbucket.org/workspaces/adinsbitbucket2/avatar/?ts=1709775650"
+      },
+      "html": {
+        "href": "https://bitbucket.org/adinsbitbucket2/"
+      },
+      "self": {
+        "href": "https://bitbucket.org/!api/2.0/workspaces/adinsbitbucket2"
+      }
+    }
+  },
+  "is_private": false,
+  "created_on": "2024-03-05T08:07:33.038149+00:00",
+  "uuid": "{a0eed669-d61c-429d-91d7-9c140adf32c5}",
+  "override_settings": {
+    "default_merge_strategy": true,
+    "branching_model": true
+  },
+  "parent": null
+}

src/test/scala/com/codacy/client/bitbucket/v2/RepositorySpecs.scala

@@ -1,6 +1,7 @@
 package com.codacy.client.bitbucket.v2
+import com.codacy.client.bitbucket.TestUtils
 import org.scalatest.{Matchers, _}
-import play.api.libs.json.Json
+import play.api.libs.json.{JsSuccess, Json}
 
 class RepositorySpecs extends FlatSpec with Matchers {
 
@@ -136,4 +137,10 @@ class RepositorySpecs extends FlatSpec with Matchers {
       r.owner.display_name shouldBe "John Mulligan"
     })
   }
+
+  it should "parse minimal repository without optional fields" in {
+    val rawJson = TestUtils.getTestContent("/test-files/minimal_repository.json")
+    val value = Json.parse(rawJson).validate[Repository]
+    value shouldBe a[JsSuccess[_]]
+  }
 }