Merge pull request #970 from hmrc/DL-8837-3

add getFinancialData and financialDetails objects to models
hmrc · Dec 14, 2022 · 6c9aed4 · 6c9aed4
2 parents 2d0d64e + 86c3488
commit 6c9aed4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/app/v1/models/response/financialData/FinancialDataResponse.scala b/app/v1/models/response/financialData/FinancialDataResponse.scala
@@ -106,8 +106,12 @@ case class FinancialDataResponse(totalisation: Option[Totalisation],
                                  documentDetails: Option[Seq[DocumentDetail]])
 
 object FinancialDataResponse {
-  implicit val format: OFormat[FinancialDataResponse] = Json.format[FinancialDataResponse]
-}
+  implicit val reads: Reads[FinancialDataResponse] = (
+    (JsPath \ "getFinancialData" \ "financialDetails" \ "totalisation").readNullable[Totalisation] and
+      (JsPath \ "getFinancialData" \ "financialDetails" \ "documentDetails").readNullable[Seq[DocumentDetail]]
+    )(FinancialDataResponse.apply _)
+
+  implicit val writes: OWrites[FinancialDataResponse] = Json.writes[FinancialDataResponse]}
 
 case class FinancialDataErrors(
                             failures: List[FinancialDataError]

diff --git a/test/v1/connectors/httpparsers/FinancialDataHttpParserSpec.scala b/test/v1/connectors/httpparsers/FinancialDataHttpParserSpec.scala
@@ -86,10 +86,15 @@ class FinancialDataHttpParserSpec extends UnitSpec {
           "return Left(InvalidJson)" in {
 
             val jsonObject =
-              Json.parse("""
-                           | "totalisations" {
-                           |   "test": "test"
-                           | }
+              Json.parse("""{
+                           |  "getFinancialData": {
+                           |    "financialDetails": {
+                           |      "documentDetails": {
+                           |        "test": "test"
+                           |      }
+                           |    }
+                           |  }
+                           |}
                            |""".stripMargin)
 
             val result = FinancialDataHttpReads.read("", "",

diff --git a/test/v1/constants/FinancialDataConstants.scala b/test/v1/constants/FinancialDataConstants.scala
@@ -49,6 +49,8 @@ object FinancialDataConstants {
   val testDownstreamFinancialDetailsNoDocumentDetails: JsValue = {
     Json.parse(
       """{
+        |"getFinancialData": {
+        |"financialDetails": {
         |  "totalisation": {
         |    "regimeTotalisation": {
         |      "totalAccountOverdue": 1000.00,
@@ -68,14 +70,16 @@ object FinancialDataConstants {
         |     "totalAccountAccruingInterest": 100
         |    }
         |  }
-        |}
+        |}}}
         |""".stripMargin
     )
   }
 
   val testDownstreamFinancialDetails: JsValue = {
     Json.parse(
       """{
+        |"getFinancialData": {
+        |"financialDetails": {
         |  "totalisation": {
         |    "regimeTotalisation": {
         |      "totalAccountOverdue": 1000.00,
@@ -161,7 +165,7 @@ object FinancialDataConstants {
         |      ]
         |    }
         |  ]
-        |}
+        |}}}
         |""".stripMargin
     )
   }