From 93cbd783d2090b0f88fe43cb49f4231bca5d5604 Mon Sep 17 00:00:00 2001
From: JamesMMiller <7511223+JamesMMiller@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:33:20 +0000
Subject: [PATCH] Update stubs

---
 .../hmrc/pillar2stubs/controllers/LiabilityController.scala   | 2 +-
 app/uk/gov/hmrc/pillar2stubs/models/LiableEntity.scala        | 4 +---
 .../gov/hmrc/pillar2stubs/models/UKTRSubmissionRequest.scala  | 4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/uk/gov/hmrc/pillar2stubs/controllers/LiabilityController.scala b/app/uk/gov/hmrc/pillar2stubs/controllers/LiabilityController.scala
index 363cafa..7354eb4 100644
--- a/app/uk/gov/hmrc/pillar2stubs/controllers/LiabilityController.scala
+++ b/app/uk/gov/hmrc/pillar2stubs/controllers/LiabilityController.scala
@@ -76,7 +76,7 @@ class LiabilityController @Inject() (
                 Future.successful(BadRequest(Json.obj("error" -> "liableEntities must not be empty")).as("application/json"))
               } else {
                 logger.error(s"JSON validation failed with errors: $errors")
-                Future.successful(BadRequest(Json.obj("error" -> "Invalid JSON request format")).as("application/json"))
+                Future.successful(BadRequest(Json.obj("error" -> s"Invalid JSON request format: $errors")).as("application/json"))
               }
           }
 
diff --git a/app/uk/gov/hmrc/pillar2stubs/models/LiableEntity.scala b/app/uk/gov/hmrc/pillar2stubs/models/LiableEntity.scala
index 10cc7df..ea281bf 100644
--- a/app/uk/gov/hmrc/pillar2stubs/models/LiableEntity.scala
+++ b/app/uk/gov/hmrc/pillar2stubs/models/LiableEntity.scala
@@ -23,10 +23,8 @@ case class LiableEntity(
   idType:                 String,
   idValue:                String,
   amountOwedDTT:          BigDecimal,
-  electedDTT:             Boolean,
   amountOwedIIR:          BigDecimal,
-  amountOwedUTPR:         BigDecimal,
-  electedUTPR:            Boolean
+  amountOwedUTPR:         BigDecimal
 )
 
 object LiableEntity {
diff --git a/app/uk/gov/hmrc/pillar2stubs/models/UKTRSubmissionRequest.scala b/app/uk/gov/hmrc/pillar2stubs/models/UKTRSubmissionRequest.scala
index 3a714e4..ff90a43 100644
--- a/app/uk/gov/hmrc/pillar2stubs/models/UKTRSubmissionRequest.scala
+++ b/app/uk/gov/hmrc/pillar2stubs/models/UKTRSubmissionRequest.scala
@@ -26,8 +26,6 @@ import scala.util.Try
 case class UKTRSubmissionRequest(
   accountingPeriodFrom: String,
   accountingPeriodTo:   String,
-  qualifyingGroup:      Boolean,
-  obligationDTT:        Boolean,
   obligationMTT:        Boolean,
   electionUKGAAP:       Boolean,
   liabilities:          Liability
@@ -47,8 +45,6 @@ object UKTRSubmissionRequest {
   implicit val reads: Reads[UKTRSubmissionRequest] = (
     (JsPath \ "accountingPeriodFrom").read[String] and
       (JsPath \ "accountingPeriodTo").read[String] and
-      (JsPath \ "qualifyingGroup").read[Boolean] and
-      (JsPath \ "obligationDTT").read[Boolean] and
       (JsPath \ "obligationMTT").read[Boolean] and
       (JsPath \ "electionUKGAAP").read[Boolean] and
       (JsPath \ "liabilities").read[Liability]