From 04e28586ae13bb077085ba69bba23a45bb3d68af Mon Sep 17 00:00:00 2001 From: naglisr <18595726+naglisr@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:06:47 +0000 Subject: [PATCH 1/2] MTDSA-25964 Rename costOfReplacingDomesticItems --- ...ateAmendUkPropertyAnnualSubmissionRulesValidator.scala | 2 +- .../ukProperty/CreateAmendUkPropertyAllowances.scala | 2 +- ...ateAmendUkPropertyAnnualSubmissionRulesValidator.scala | 2 +- .../def2/model/request/Allowances.scala | 2 +- .../ukProperty/RetrieveUkPropertyAllowances.scala | 5 +++-- .../model/response/RetrieveUkPropertyAllowances.scala | 5 +++-- .../Def1_CreateAmendUkPropertyAnnualSubmissionISpec.scala | 8 ++++---- .../Def2_CreateAmendUkPropertyAnnualSubmissionISpec.scala | 8 ++++---- .../Def2_RetrieveUkPropertyAnnualSubmissionISpec.scala | 2 +- ...eateAmendUkPropertyAnnualSubmissionValidatorSpec.scala | 4 ++-- ...teAmendUkPropertyAnnualSubmissionRequestBodySpec.scala | 2 +- .../ukProperty/CreateAmendUkPropertyAllowancesSpec.scala | 2 +- .../request/ukProperty/CreateAmendUkPropertySpec.scala | 2 +- ...eateAmendUkPropertyAnnualSubmissionValidatorSpec.scala | 4 ++-- .../def2/model/request/AllowancesSpec.scala | 2 +- ...teAmendUkPropertyAnnualSubmissionRequestBodySpec.scala | 2 +- .../def2/model/request/UkPropertySpec.scala | 2 +- ...RetrieveUkPropertyAnnualSubmissionControllerSpec.scala | 4 ++-- ...1_RetrieveUkPropertyAnnualSubmissionResponseSpec.scala | 4 ++-- .../ukProperty/RetrieveUkPropertyAllowancesSpec.scala | 4 ++-- .../response/ukProperty/RetrieveUkPropertySpec.scala | 4 ++-- ...2_RetrieveUkPropertyAnnualSubmissionResponseSpec.scala | 4 ++-- .../ukProperty/RetrieveUkPropertyAllowancesSpec.scala | 4 ++-- .../def2/response/ukProperty/RetrieveUkPropertySpec.scala | 4 ++-- 24 files changed, 43 insertions(+), 41 deletions(-) diff --git a/app/v5/createAmendUkPropertyAnnualSubmission/def1/Def1_CreateAmendUkPropertyAnnualSubmissionRulesValidator.scala b/app/v5/createAmendUkPropertyAnnualSubmission/def1/Def1_CreateAmendUkPropertyAnnualSubmissionRulesValidator.scala index 828c48da3..1390e2ac8 100644 --- a/app/v5/createAmendUkPropertyAnnualSubmission/def1/Def1_CreateAmendUkPropertyAnnualSubmissionRulesValidator.scala +++ b/app/v5/createAmendUkPropertyAnnualSubmission/def1/Def1_CreateAmendUkPropertyAnnualSubmissionRulesValidator.scala @@ -102,7 +102,7 @@ class Def1_CreateAmendUkPropertyAnnualSubmissionRulesValidator extends RulesVali (allowances.flatMap(_.zeroEmissionsGoodsVehicleAllowance), "/ukProperty/allowances/zeroEmissionsGoodsVehicleAllowance"), (allowances.flatMap(_.businessPremisesRenovationAllowance), "/ukProperty/allowances/businessPremisesRenovationAllowance"), (allowances.flatMap(_.otherCapitalAllowance), "/ukProperty/allowances/otherCapitalAllowance"), - (allowances.flatMap(_.costOfReplacingDomesticGoods), "/ukProperty/allowances/costOfReplacingDomesticGoods"), + (allowances.flatMap(_.costOfReplacingDomesticItems), "/ukProperty/allowances/costOfReplacingDomesticItems"), (allowances.flatMap(_.electricChargePointAllowance), "/ukProperty/allowances/electricChargePointAllowance"), (allowances.flatMap(_.zeroEmissionsCarAllowance), "/ukProperty/allowances/zeroEmissionsCarAllowance") ) diff --git a/app/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/ukProperty/CreateAmendUkPropertyAllowances.scala b/app/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/ukProperty/CreateAmendUkPropertyAllowances.scala index 8ce72d681..778d7bf26 100644 --- a/app/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/ukProperty/CreateAmendUkPropertyAllowances.scala +++ b/app/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/ukProperty/CreateAmendUkPropertyAllowances.scala @@ -23,7 +23,7 @@ case class CreateAmendUkPropertyAllowances(annualInvestmentAllowance: Option[Big zeroEmissionsGoodsVehicleAllowance: Option[BigDecimal], businessPremisesRenovationAllowance: Option[BigDecimal], otherCapitalAllowance: Option[BigDecimal], - costOfReplacingDomesticGoods: Option[BigDecimal], + costOfReplacingDomesticItems: Option[BigDecimal], electricChargePointAllowance: Option[BigDecimal], zeroEmissionsCarAllowance: Option[BigDecimal], propertyIncomeAllowance: Option[BigDecimal], diff --git a/app/v5/createAmendUkPropertyAnnualSubmission/def2/Def2_CreateAmendUkPropertyAnnualSubmissionRulesValidator.scala b/app/v5/createAmendUkPropertyAnnualSubmission/def2/Def2_CreateAmendUkPropertyAnnualSubmissionRulesValidator.scala index 33470a215..fd7b5a613 100644 --- a/app/v5/createAmendUkPropertyAnnualSubmission/def2/Def2_CreateAmendUkPropertyAnnualSubmissionRulesValidator.scala +++ b/app/v5/createAmendUkPropertyAnnualSubmission/def2/Def2_CreateAmendUkPropertyAnnualSubmissionRulesValidator.scala @@ -63,7 +63,7 @@ class Def2_CreateAmendUkPropertyAnnualSubmissionRulesValidator extends RulesVali (allowances.flatMap(_.zeroEmissionsGoodsVehicleAllowance), "/ukProperty/allowances/zeroEmissionsGoodsVehicleAllowance"), (allowances.flatMap(_.businessPremisesRenovationAllowance), "/ukProperty/allowances/businessPremisesRenovationAllowance"), (allowances.flatMap(_.otherCapitalAllowance), "/ukProperty/allowances/otherCapitalAllowance"), - (allowances.flatMap(_.costOfReplacingDomesticGoods), "/ukProperty/allowances/costOfReplacingDomesticGoods"), + (allowances.flatMap(_.costOfReplacingDomesticItems), "/ukProperty/allowances/costOfReplacingDomesticItems"), (allowances.flatMap(_.zeroEmissionsCarAllowance), "/ukProperty/allowances/zeroEmissionsCarAllowance") ) diff --git a/app/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/Allowances.scala b/app/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/Allowances.scala index 14bdee29f..82c5db75b 100644 --- a/app/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/Allowances.scala +++ b/app/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/Allowances.scala @@ -23,7 +23,7 @@ case class Allowances(annualInvestmentAllowance: Option[BigDecimal], zeroEmissionsGoodsVehicleAllowance: Option[BigDecimal], businessPremisesRenovationAllowance: Option[BigDecimal], otherCapitalAllowance: Option[BigDecimal], - costOfReplacingDomesticGoods: Option[BigDecimal], + costOfReplacingDomesticItems: Option[BigDecimal], zeroEmissionsCarAllowance: Option[BigDecimal], propertyIncomeAllowance: Option[BigDecimal], structuredBuildingAllowance: Option[Seq[StructuredBuildingAllowance]], diff --git a/app/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/ukProperty/RetrieveUkPropertyAllowances.scala b/app/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/ukProperty/RetrieveUkPropertyAllowances.scala index cd9ace749..da7222e34 100644 --- a/app/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/ukProperty/RetrieveUkPropertyAllowances.scala +++ b/app/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/ukProperty/RetrieveUkPropertyAllowances.scala @@ -24,7 +24,7 @@ case class RetrieveUkPropertyAllowances( zeroEmissionsGoodsVehicleAllowance: Option[BigDecimal], businessPremisesRenovationAllowance: Option[BigDecimal], otherCapitalAllowance: Option[BigDecimal], - costOfReplacingDomesticGoods: Option[BigDecimal], + costOfReplacingDomesticItems: Option[BigDecimal], propertyIncomeAllowance: Option[BigDecimal], electricChargePointAllowance: Option[BigDecimal], structuredBuildingAllowance: Option[Seq[RetrieveUkPropertyStructuredBuildingAllowance]], @@ -33,7 +33,8 @@ case class RetrieveUkPropertyAllowances( ) object RetrieveUkPropertyAllowances { - implicit val writes: OWrites[RetrieveUkPropertyAllowances] = Json.writes[RetrieveUkPropertyAllowances] + + implicit val writes: OWrites[RetrieveUkPropertyAllowances] = Json.writes implicit val reads: Reads[RetrieveUkPropertyAllowances] = ( (JsPath \ "annualInvestmentAllowance").readNullable[BigDecimal] and diff --git a/app/v5/retrieveUkPropertyAnnualSubmission/def2/model/response/RetrieveUkPropertyAllowances.scala b/app/v5/retrieveUkPropertyAnnualSubmission/def2/model/response/RetrieveUkPropertyAllowances.scala index 2e498eebf..2726e0b7f 100644 --- a/app/v5/retrieveUkPropertyAnnualSubmission/def2/model/response/RetrieveUkPropertyAllowances.scala +++ b/app/v5/retrieveUkPropertyAnnualSubmission/def2/model/response/RetrieveUkPropertyAllowances.scala @@ -24,7 +24,7 @@ case class RetrieveUkPropertyAllowances( zeroEmissionsGoodsVehicleAllowance: Option[BigDecimal], businessPremisesRenovationAllowance: Option[BigDecimal], otherCapitalAllowance: Option[BigDecimal], - costOfReplacingDomesticGoods: Option[BigDecimal], + costOfReplacingDomesticItems: Option[BigDecimal], propertyIncomeAllowance: Option[BigDecimal], structuredBuildingAllowance: Option[Seq[RetrieveUkPropertyStructuredBuildingAllowance]], enhancedStructuredBuildingAllowance: Option[Seq[RetrieveUkPropertyStructuredBuildingAllowance]], @@ -32,7 +32,8 @@ case class RetrieveUkPropertyAllowances( ) object RetrieveUkPropertyAllowances { - implicit val writes: OWrites[RetrieveUkPropertyAllowances] = Json.writes[RetrieveUkPropertyAllowances] + + implicit val writes: OWrites[RetrieveUkPropertyAllowances] = Json.writes implicit val reads: Reads[RetrieveUkPropertyAllowances] = ( (JsPath \ "annualInvestmentAllowance").readNullable[BigDecimal] and diff --git a/it/v5/createAmendUkPropertyAnnualSubmission/def1/Def1_CreateAmendUkPropertyAnnualSubmissionISpec.scala b/it/v5/createAmendUkPropertyAnnualSubmission/def1/Def1_CreateAmendUkPropertyAnnualSubmissionISpec.scala index 481f17c6b..85af87342 100644 --- a/it/v5/createAmendUkPropertyAnnualSubmission/def1/Def1_CreateAmendUkPropertyAnnualSubmissionISpec.scala +++ b/it/v5/createAmendUkPropertyAnnualSubmission/def1/Def1_CreateAmendUkPropertyAnnualSubmissionISpec.scala @@ -219,7 +219,7 @@ class Def1_CreateAmendUkPropertyAnnualSubmissionISpec extends IntegrationBaseSpe | "zeroEmissionsGoodsVehicleAllowance": 2000.6567890, | "businessPremisesRenovationAllowance": 2000.75678900, | "otherCapitalAllowance": 2000.56789080, - | "costOfReplacingDomesticGoods": 2000.95678900, + | "costOfReplacingDomesticItems": 2000.95678900, | "electricChargePointAllowance": 3000.1567890, | "structuredBuildingAllowance": [ | { @@ -297,7 +297,7 @@ class Def1_CreateAmendUkPropertyAnnualSubmissionISpec extends IntegrationBaseSpe "/ukProperty/allowances/zeroEmissionsGoodsVehicleAllowance", "/ukProperty/allowances/businessPremisesRenovationAllowance", "/ukProperty/allowances/otherCapitalAllowance", - "/ukProperty/allowances/costOfReplacingDomesticGoods", + "/ukProperty/allowances/costOfReplacingDomesticItems", "/ukProperty/allowances/electricChargePointAllowance", "/ukProperty/allowances/zeroEmissionsCarAllowance", "/ukProperty/allowances/structuredBuildingAllowance/0/firstYear/qualifyingAmountExpenditure", @@ -423,7 +423,7 @@ class Def1_CreateAmendUkPropertyAnnualSubmissionISpec extends IntegrationBaseSpe | "zeroEmissionsGoodsVehicleAllowance": 2000.6235450, | "businessPremisesRenovationAllowance": 2000.745360, | "otherCapitalAllowance": 2000.8243520, - | "costOfReplacingDomesticGoods": 2000.9064532, + | "costOfReplacingDomesticItems": 2000.9064532, | "electricChargePointAllowance": 3000.1234520, | "structuredBuildingAllowance": [ | { @@ -763,7 +763,7 @@ class Def1_CreateAmendUkPropertyAnnualSubmissionISpec extends IntegrationBaseSpe "/ukProperty/allowances/zeroEmissionsGoodsVehicleAllowance", "/ukProperty/allowances/businessPremisesRenovationAllowance", "/ukProperty/allowances/otherCapitalAllowance", - "/ukProperty/allowances/costOfReplacingDomesticGoods", + "/ukProperty/allowances/costOfReplacingDomesticItems", "/ukProperty/allowances/electricChargePointAllowance", "/ukProperty/allowances/zeroEmissionsCarAllowance", "/ukProperty/allowances/structuredBuildingAllowance/0/firstYear/qualifyingAmountExpenditure", diff --git a/it/v5/createAmendUkPropertyAnnualSubmission/def2/Def2_CreateAmendUkPropertyAnnualSubmissionISpec.scala b/it/v5/createAmendUkPropertyAnnualSubmission/def2/Def2_CreateAmendUkPropertyAnnualSubmissionISpec.scala index 74f008feb..43452ce15 100644 --- a/it/v5/createAmendUkPropertyAnnualSubmission/def2/Def2_CreateAmendUkPropertyAnnualSubmissionISpec.scala +++ b/it/v5/createAmendUkPropertyAnnualSubmission/def2/Def2_CreateAmendUkPropertyAnnualSubmissionISpec.scala @@ -169,7 +169,7 @@ class Def2_CreateAmendUkPropertyAnnualSubmissionISpec extends IntegrationBaseSpe | "zeroEmissionsGoodsVehicleAllowance": 2000.6567890, | "businessPremisesRenovationAllowance": 2000.75678900, | "otherCapitalAllowance": 2000.56789080, - | "costOfReplacingDomesticGoods": 2000.95678900, + | "costOfReplacingDomesticItems": 2000.95678900, | "structuredBuildingAllowance": [ | { | "amount": 3000.36780, @@ -238,7 +238,7 @@ class Def2_CreateAmendUkPropertyAnnualSubmissionISpec extends IntegrationBaseSpe "/ukProperty/allowances/zeroEmissionsGoodsVehicleAllowance", "/ukProperty/allowances/businessPremisesRenovationAllowance", "/ukProperty/allowances/otherCapitalAllowance", - "/ukProperty/allowances/costOfReplacingDomesticGoods", + "/ukProperty/allowances/costOfReplacingDomesticItems", "/ukProperty/allowances/zeroEmissionsCarAllowance", "/ukProperty/allowances/structuredBuildingAllowance/0/firstYear/qualifyingAmountExpenditure", "/ukProperty/allowances/structuredBuildingAllowance/0/amount", @@ -324,7 +324,7 @@ class Def2_CreateAmendUkPropertyAnnualSubmissionISpec extends IntegrationBaseSpe | "zeroEmissionsGoodsVehicleAllowance": 2000.6235450, | "businessPremisesRenovationAllowance": 2000.745360, | "otherCapitalAllowance": 2000.8243520, - | "costOfReplacingDomesticGoods": 2000.9064532, + | "costOfReplacingDomesticItems": 2000.9064532, | "structuredBuildingAllowance": [ | { | "amount": 3000.303645, @@ -575,7 +575,7 @@ class Def2_CreateAmendUkPropertyAnnualSubmissionISpec extends IntegrationBaseSpe "/ukProperty/allowances/zeroEmissionsGoodsVehicleAllowance", "/ukProperty/allowances/businessPremisesRenovationAllowance", "/ukProperty/allowances/otherCapitalAllowance", - "/ukProperty/allowances/costOfReplacingDomesticGoods", + "/ukProperty/allowances/costOfReplacingDomesticItems", "/ukProperty/allowances/zeroEmissionsCarAllowance", "/ukProperty/allowances/structuredBuildingAllowance/0/firstYear/qualifyingAmountExpenditure", "/ukProperty/allowances/structuredBuildingAllowance/0/amount", diff --git a/it/v5/retrieveUkPropertyAnnualSubmission/def2/Def2_RetrieveUkPropertyAnnualSubmissionISpec.scala b/it/v5/retrieveUkPropertyAnnualSubmission/def2/Def2_RetrieveUkPropertyAnnualSubmissionISpec.scala index 794093bef..1434128c1 100644 --- a/it/v5/retrieveUkPropertyAnnualSubmission/def2/Def2_RetrieveUkPropertyAnnualSubmissionISpec.scala +++ b/it/v5/retrieveUkPropertyAnnualSubmission/def2/Def2_RetrieveUkPropertyAnnualSubmissionISpec.scala @@ -162,7 +162,7 @@ class Def2_RetrieveUkPropertyAnnualSubmissionISpec extends IntegrationBaseSpec { | "zeroEmissionsGoodsVehicleAllowance": 456.34, | "businessPremisesRenovationAllowance": 573.45, | "otherCapitalAllowance": 452.34, - | "costOfReplacingDomesticGoods": 567.34, + | "costOfReplacingDomesticItems": 567.34, | "propertyIncomeAllowance": 342.34, | "structuredBuildingAllowance": [ | { diff --git a/test/v5/createAmendUkPropertyAnnualSubmission/def1/Def1_CreateAmendUkPropertyAnnualSubmissionValidatorSpec.scala b/test/v5/createAmendUkPropertyAnnualSubmission/def1/Def1_CreateAmendUkPropertyAnnualSubmissionValidatorSpec.scala index 0f0961444..38846369c 100644 --- a/test/v5/createAmendUkPropertyAnnualSubmission/def1/Def1_CreateAmendUkPropertyAnnualSubmissionValidatorSpec.scala +++ b/test/v5/createAmendUkPropertyAnnualSubmission/def1/Def1_CreateAmendUkPropertyAnnualSubmissionValidatorSpec.scala @@ -118,7 +118,7 @@ class Def1_CreateAmendUkPropertyAnnualSubmissionValidatorSpec extends UnitSpec w | "zeroEmissionsGoodsVehicleAllowance": 456.34, | "businessPremisesRenovationAllowance": 573.45, | "otherCapitalAllowance": 452.34, - | "costOfReplacingDomesticGoods": 567.34, + | "costOfReplacingDomesticItems": 567.34, | "electricChargePointAllowance": 454.34, | "structuredBuildingAllowance": ${JsArray(structuredBuildingAllowanceEntries)}, | "enhancedStructuredBuildingAllowance": ${JsArray(enhancedStructuredBuildingAllowance)}, @@ -492,7 +492,7 @@ class Def1_CreateAmendUkPropertyAnnualSubmissionValidatorSpec extends UnitSpec w "/ukProperty/allowances/zeroEmissionsGoodsVehicleAllowance", "/ukProperty/allowances/businessPremisesRenovationAllowance", "/ukProperty/allowances/otherCapitalAllowance", - "/ukProperty/allowances/costOfReplacingDomesticGoods", + "/ukProperty/allowances/costOfReplacingDomesticItems", "/ukProperty/allowances/electricChargePointAllowance", "/ukProperty/allowances/zeroEmissionsCarAllowance", "/ukProperty/adjustments/balancingCharge", diff --git a/test/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/Def1_CreateAmendUkPropertyAnnualSubmissionRequestBodySpec.scala b/test/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/Def1_CreateAmendUkPropertyAnnualSubmissionRequestBodySpec.scala index 514334af0..01afecac0 100644 --- a/test/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/Def1_CreateAmendUkPropertyAnnualSubmissionRequestBodySpec.scala +++ b/test/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/Def1_CreateAmendUkPropertyAnnualSubmissionRequestBodySpec.scala @@ -125,7 +125,7 @@ class Def1_CreateAmendUkPropertyAnnualSubmissionRequestBodySpec extends UnitSpec | "zeroEmissionsGoodsVehicleAllowance": 2000.60, | "businessPremisesRenovationAllowance": 2000.70, | "otherCapitalAllowance": 2000.80, - | "costOfReplacingDomesticGoods": 2000.90, + | "costOfReplacingDomesticItems": 2000.90, | "electricChargePointAllowance": 3000.10, | "structuredBuildingAllowance": [ | { diff --git a/test/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/ukProperty/CreateAmendUkPropertyAllowancesSpec.scala b/test/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/ukProperty/CreateAmendUkPropertyAllowancesSpec.scala index 3d70aafb7..1af6aba7a 100644 --- a/test/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/ukProperty/CreateAmendUkPropertyAllowancesSpec.scala +++ b/test/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/ukProperty/CreateAmendUkPropertyAllowancesSpec.scala @@ -69,7 +69,7 @@ class CreateAmendUkPropertyAllowancesSpec extends UnitSpec { | "zeroEmissionsGoodsVehicleAllowance": 2000.60, | "businessPremisesRenovationAllowance": 2000.70, | "otherCapitalAllowance": 2000.80, - | "costOfReplacingDomesticGoods": 2000.90, + | "costOfReplacingDomesticItems": 2000.90, | "electricChargePointAllowance": 3000.10, | "structuredBuildingAllowance": [ | { diff --git a/test/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/ukProperty/CreateAmendUkPropertySpec.scala b/test/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/ukProperty/CreateAmendUkPropertySpec.scala index f62ce0932..146a5ff6b 100644 --- a/test/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/ukProperty/CreateAmendUkPropertySpec.scala +++ b/test/v5/createAmendUkPropertyAnnualSubmission/def1/model/request/ukProperty/CreateAmendUkPropertySpec.scala @@ -80,7 +80,7 @@ class CreateAmendUkPropertySpec extends UnitSpec { | "zeroEmissionsGoodsVehicleAllowance": 2000.60, | "businessPremisesRenovationAllowance": 2000.70, | "otherCapitalAllowance": 2000.80, - | "costOfReplacingDomesticGoods": 2000.90, + | "costOfReplacingDomesticItems": 2000.90, | "electricChargePointAllowance": 3000.10, | "structuredBuildingAllowance": [ | { diff --git a/test/v5/createAmendUkPropertyAnnualSubmission/def2/Def2_CreateAmendUkPropertyAnnualSubmissionValidatorSpec.scala b/test/v5/createAmendUkPropertyAnnualSubmission/def2/Def2_CreateAmendUkPropertyAnnualSubmissionValidatorSpec.scala index 4471693d9..3ff4ac45a 100644 --- a/test/v5/createAmendUkPropertyAnnualSubmission/def2/Def2_CreateAmendUkPropertyAnnualSubmissionValidatorSpec.scala +++ b/test/v5/createAmendUkPropertyAnnualSubmission/def2/Def2_CreateAmendUkPropertyAnnualSubmissionValidatorSpec.scala @@ -68,7 +68,7 @@ class Def2_CreateAmendUkPropertyAnnualSubmissionValidatorSpec extends UnitSpec w | "zeroEmissionsGoodsVehicleAllowance": 456.34, | "businessPremisesRenovationAllowance": 573.45, | "otherCapitalAllowance": 452.34, - | "costOfReplacingDomesticGoods": 567.34, + | "costOfReplacingDomesticItems": 567.34, | "electricChargePointAllowance": 454.34, | "structuredBuildingAllowance": ${JsArray(structuredBuildingAllowanceEntries)}, | "enhancedStructuredBuildingAllowance": ${JsArray(enhancedStructuredBuildingAllowance)}, @@ -320,7 +320,7 @@ class Def2_CreateAmendUkPropertyAnnualSubmissionValidatorSpec extends UnitSpec w "/ukProperty/allowances/zeroEmissionsGoodsVehicleAllowance", "/ukProperty/allowances/businessPremisesRenovationAllowance", "/ukProperty/allowances/otherCapitalAllowance", - "/ukProperty/allowances/costOfReplacingDomesticGoods", + "/ukProperty/allowances/costOfReplacingDomesticItems", "/ukProperty/allowances/zeroEmissionsCarAllowance", "/ukProperty/adjustments/balancingCharge", "/ukProperty/adjustments/privateUseAdjustment", diff --git a/test/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/AllowancesSpec.scala b/test/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/AllowancesSpec.scala index 2974ba8a6..ee051261d 100644 --- a/test/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/AllowancesSpec.scala +++ b/test/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/AllowancesSpec.scala @@ -68,7 +68,7 @@ class AllowancesSpec extends UnitSpec { | "zeroEmissionsGoodsVehicleAllowance": 2000.60, | "businessPremisesRenovationAllowance": 2000.70, | "otherCapitalAllowance": 2000.80, - | "costOfReplacingDomesticGoods": 2000.90, + | "costOfReplacingDomesticItems": 2000.90, | "structuredBuildingAllowance": [ | { | "amount": 3000.30, diff --git a/test/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/Def2_CreateAmendUkPropertyAnnualSubmissionRequestBodySpec.scala b/test/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/Def2_CreateAmendUkPropertyAnnualSubmissionRequestBodySpec.scala index a5a84c9b3..2098e1c6d 100644 --- a/test/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/Def2_CreateAmendUkPropertyAnnualSubmissionRequestBodySpec.scala +++ b/test/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/Def2_CreateAmendUkPropertyAnnualSubmissionRequestBodySpec.scala @@ -81,7 +81,7 @@ class Def2_CreateAmendUkPropertyAnnualSubmissionRequestBodySpec extends UnitSpec | "zeroEmissionsGoodsVehicleAllowance": 2000.60, | "businessPremisesRenovationAllowance": 2000.70, | "otherCapitalAllowance": 2000.80, - | "costOfReplacingDomesticGoods": 2000.90, + | "costOfReplacingDomesticItems": 2000.90, | "structuredBuildingAllowance": [ | { | "amount": 3000.30, diff --git a/test/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/UkPropertySpec.scala b/test/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/UkPropertySpec.scala index 409677940..214f53ff1 100644 --- a/test/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/UkPropertySpec.scala +++ b/test/v5/createAmendUkPropertyAnnualSubmission/def2/model/request/UkPropertySpec.scala @@ -78,7 +78,7 @@ class UkPropertySpec extends UnitSpec { | "zeroEmissionsGoodsVehicleAllowance": 2000.60, | "businessPremisesRenovationAllowance": 2000.70, | "otherCapitalAllowance": 2000.80, - | "costOfReplacingDomesticGoods": 2000.90, + | "costOfReplacingDomesticItems": 2000.90, | "structuredBuildingAllowance": [ | { | "amount": 3000.30, diff --git a/test/v5/retrieveUkPropertyAnnualSubmission/RetrieveUkPropertyAnnualSubmissionControllerSpec.scala b/test/v5/retrieveUkPropertyAnnualSubmission/RetrieveUkPropertyAnnualSubmissionControllerSpec.scala index 81b885681..f060da327 100644 --- a/test/v5/retrieveUkPropertyAnnualSubmission/RetrieveUkPropertyAnnualSubmissionControllerSpec.scala +++ b/test/v5/retrieveUkPropertyAnnualSubmission/RetrieveUkPropertyAnnualSubmissionControllerSpec.scala @@ -142,7 +142,7 @@ class RetrieveUkPropertyAnnualSubmissionControllerSpec zeroEmissionsGoodsVehicleAllowance = Some(456.34), businessPremisesRenovationAllowance = Some(573.45), otherCapitalAllowance = Some(452.34), - costOfReplacingDomesticGoods = Some(567.34), + costOfReplacingDomesticItems = Some(567.34), propertyIncomeAllowance = None, electricChargePointAllowance = Some(454.34), structuredBuildingAllowance = Some( @@ -228,7 +228,7 @@ class RetrieveUkPropertyAnnualSubmissionControllerSpec | "zeroEmissionsGoodsVehicleAllowance":456.34, | "businessPremisesRenovationAllowance":573.45, | "otherCapitalAllowance":452.34, - | "costOfReplacingDomesticGoods":567.34, + | "costOfReplacingDomesticItems":567.34, | "electricChargePointAllowance":454.34, | "structuredBuildingAllowance":[ | { diff --git a/test/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/Def1_RetrieveUkPropertyAnnualSubmissionResponseSpec.scala b/test/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/Def1_RetrieveUkPropertyAnnualSubmissionResponseSpec.scala index d44479137..36d8adea6 100644 --- a/test/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/Def1_RetrieveUkPropertyAnnualSubmissionResponseSpec.scala +++ b/test/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/Def1_RetrieveUkPropertyAnnualSubmissionResponseSpec.scala @@ -225,7 +225,7 @@ class Def1_RetrieveUkPropertyAnnualSubmissionResponseSpec extends UnitSpec with zeroEmissionsGoodsVehicleAllowance = Some(456.34), businessPremisesRenovationAllowance = Some(573.45), otherCapitalAllowance = Some(452.34), - costOfReplacingDomesticGoods = Some(567.34), + costOfReplacingDomesticItems = Some(567.34), propertyIncomeAllowance = Some(342.34), electricChargePointAllowance = Some(454.34), structuredBuildingAllowance = Some( @@ -298,7 +298,7 @@ class Def1_RetrieveUkPropertyAnnualSubmissionResponseSpec extends UnitSpec with | "zeroEmissionsGoodsVehicleAllowance":456.34, | "businessPremisesRenovationAllowance":573.45, | "otherCapitalAllowance":452.34, - | "costOfReplacingDomesticGoods":567.34, + | "costOfReplacingDomesticItems":567.34, | "propertyIncomeAllowance":342.34, | "electricChargePointAllowance":454.34, | "structuredBuildingAllowance":[ diff --git a/test/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/ukProperty/RetrieveUkPropertyAllowancesSpec.scala b/test/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/ukProperty/RetrieveUkPropertyAllowancesSpec.scala index 9a5b682a7..00499f180 100644 --- a/test/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/ukProperty/RetrieveUkPropertyAllowancesSpec.scala +++ b/test/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/ukProperty/RetrieveUkPropertyAllowancesSpec.scala @@ -67,7 +67,7 @@ class RetrieveUkPropertyAllowancesSpec extends UnitSpec { zeroEmissionsGoodsVehicleAllowance = Some(456.34), businessPremisesRenovationAllowance = Some(573.45), otherCapitalAllowance = Some(452.34), - costOfReplacingDomesticGoods = Some(567.34), + costOfReplacingDomesticItems = Some(567.34), propertyIncomeAllowance = Some(342.34), electricChargePointAllowance = Some(454.34), structuredBuildingAllowance = Some( @@ -113,7 +113,7 @@ class RetrieveUkPropertyAllowancesSpec extends UnitSpec { | "zeroEmissionsGoodsVehicleAllowance":456.34, | "businessPremisesRenovationAllowance":573.45, | "otherCapitalAllowance":452.34, - | "costOfReplacingDomesticGoods":567.34, + | "costOfReplacingDomesticItems":567.34, | "propertyIncomeAllowance":342.34, | "electricChargePointAllowance":454.34, | "structuredBuildingAllowance":[ diff --git a/test/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/ukProperty/RetrieveUkPropertySpec.scala b/test/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/ukProperty/RetrieveUkPropertySpec.scala index 8004dae41..290b324cd 100644 --- a/test/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/ukProperty/RetrieveUkPropertySpec.scala +++ b/test/v5/retrieveUkPropertyAnnualSubmission/def1/model/response/ukProperty/RetrieveUkPropertySpec.scala @@ -92,7 +92,7 @@ class RetrieveUkPropertySpec extends UnitSpec { zeroEmissionsGoodsVehicleAllowance = Some(456.34), businessPremisesRenovationAllowance = Some(573.45), otherCapitalAllowance = Some(452.34), - costOfReplacingDomesticGoods = Some(567.34), + costOfReplacingDomesticItems = Some(567.34), propertyIncomeAllowance = Some(342.34), electricChargePointAllowance = Some(454.34), structuredBuildingAllowance = Some( @@ -141,7 +141,7 @@ class RetrieveUkPropertySpec extends UnitSpec { | "zeroEmissionsGoodsVehicleAllowance":456.34, | "businessPremisesRenovationAllowance":573.45, | "otherCapitalAllowance":452.34, - | "costOfReplacingDomesticGoods":567.34, + | "costOfReplacingDomesticItems":567.34, | "propertyIncomeAllowance":342.34, | "electricChargePointAllowance":454.34, | "structuredBuildingAllowance":[ diff --git a/test/v5/retrieveUkPropertyAnnualSubmission/def2/response/Def2_RetrieveUkPropertyAnnualSubmissionResponseSpec.scala b/test/v5/retrieveUkPropertyAnnualSubmission/def2/response/Def2_RetrieveUkPropertyAnnualSubmissionResponseSpec.scala index 4ae69b23e..dfde895f5 100644 --- a/test/v5/retrieveUkPropertyAnnualSubmission/def2/response/Def2_RetrieveUkPropertyAnnualSubmissionResponseSpec.scala +++ b/test/v5/retrieveUkPropertyAnnualSubmission/def2/response/Def2_RetrieveUkPropertyAnnualSubmissionResponseSpec.scala @@ -100,7 +100,7 @@ class Def2_RetrieveUkPropertyAnnualSubmissionResponseSpec extends UnitSpec with zeroEmissionsGoodsVehicleAllowance = Some(456.34), businessPremisesRenovationAllowance = Some(573.45), otherCapitalAllowance = Some(452.34), - costOfReplacingDomesticGoods = Some(567.34), + costOfReplacingDomesticItems = Some(567.34), propertyIncomeAllowance = Some(342.34), structuredBuildingAllowance = Some( List( @@ -152,7 +152,7 @@ class Def2_RetrieveUkPropertyAnnualSubmissionResponseSpec extends UnitSpec with | "zeroEmissionsGoodsVehicleAllowance":456.34, | "businessPremisesRenovationAllowance":573.45, | "otherCapitalAllowance":452.34, - | "costOfReplacingDomesticGoods":567.34, + | "costOfReplacingDomesticItems":567.34, | "propertyIncomeAllowance":342.34, | "structuredBuildingAllowance":[ | { diff --git a/test/v5/retrieveUkPropertyAnnualSubmission/def2/response/ukProperty/RetrieveUkPropertyAllowancesSpec.scala b/test/v5/retrieveUkPropertyAnnualSubmission/def2/response/ukProperty/RetrieveUkPropertyAllowancesSpec.scala index e701c82d7..aafd715f8 100644 --- a/test/v5/retrieveUkPropertyAnnualSubmission/def2/response/ukProperty/RetrieveUkPropertyAllowancesSpec.scala +++ b/test/v5/retrieveUkPropertyAnnualSubmission/def2/response/ukProperty/RetrieveUkPropertyAllowancesSpec.scala @@ -67,7 +67,7 @@ class RetrieveUkPropertyAllowancesSpec extends UnitSpec { zeroEmissionsGoodsVehicleAllowance = Some(456.34), businessPremisesRenovationAllowance = Some(573.45), otherCapitalAllowance = Some(452.34), - costOfReplacingDomesticGoods = Some(567.34), + costOfReplacingDomesticItems = Some(567.34), propertyIncomeAllowance = Some(342.34), structuredBuildingAllowance = Some( List( @@ -112,7 +112,7 @@ class RetrieveUkPropertyAllowancesSpec extends UnitSpec { | "zeroEmissionsGoodsVehicleAllowance":456.34, | "businessPremisesRenovationAllowance":573.45, | "otherCapitalAllowance":452.34, - | "costOfReplacingDomesticGoods":567.34, + | "costOfReplacingDomesticItems":567.34, | "propertyIncomeAllowance":342.34, | "structuredBuildingAllowance":[ | { diff --git a/test/v5/retrieveUkPropertyAnnualSubmission/def2/response/ukProperty/RetrieveUkPropertySpec.scala b/test/v5/retrieveUkPropertyAnnualSubmission/def2/response/ukProperty/RetrieveUkPropertySpec.scala index 5fad340bf..f6f2a0f41 100644 --- a/test/v5/retrieveUkPropertyAnnualSubmission/def2/response/ukProperty/RetrieveUkPropertySpec.scala +++ b/test/v5/retrieveUkPropertyAnnualSubmission/def2/response/ukProperty/RetrieveUkPropertySpec.scala @@ -92,7 +92,7 @@ class RetrieveUkPropertySpec extends UnitSpec { zeroEmissionsGoodsVehicleAllowance = Some(456.34), businessPremisesRenovationAllowance = Some(573.45), otherCapitalAllowance = Some(452.34), - costOfReplacingDomesticGoods = Some(567.34), + costOfReplacingDomesticItems = Some(567.34), propertyIncomeAllowance = Some(342.34), structuredBuildingAllowance = Some( List( @@ -140,7 +140,7 @@ class RetrieveUkPropertySpec extends UnitSpec { | "zeroEmissionsGoodsVehicleAllowance":456.34, | "businessPremisesRenovationAllowance":573.45, | "otherCapitalAllowance":452.34, - | "costOfReplacingDomesticGoods":567.34, + | "costOfReplacingDomesticItems":567.34, | "propertyIncomeAllowance":342.34, | "structuredBuildingAllowance":[ | { From efb42bd7796b2bd86334f05193bc4d7c05e9448e Mon Sep 17 00:00:00 2001 From: naglisr <18595726+naglisr@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:35:15 +0000 Subject: [PATCH 2/2] Update OAS --- .../def1/all_other_allowances_request.json | 2 +- .../def2/all_other_allowances_request.json | 2 +- .../def1/all_other_allowances_response.json | 2 +- .../def2/all_other_allowances_response.json | 2 +- .../def1/request.json | 2 +- .../def2/request.json | 2 +- .../uk_property_annual_submission_retrieve/def1/response.json | 2 +- .../uk_property_annual_submission_retrieve/def2/response.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/public/api/conf/5.0/examples/uk_property_annual_submission_create_and_amend/def1/all_other_allowances_request.json b/resources/public/api/conf/5.0/examples/uk_property_annual_submission_create_and_amend/def1/all_other_allowances_request.json index db2e76a23..aa76c0412 100644 --- a/resources/public/api/conf/5.0/examples/uk_property_annual_submission_create_and_amend/def1/all_other_allowances_request.json +++ b/resources/public/api/conf/5.0/examples/uk_property_annual_submission_create_and_amend/def1/all_other_allowances_request.json @@ -24,7 +24,7 @@ "zeroEmissionsGoodsVehicleAllowance": 456.34, "businessPremisesRenovationAllowance": 573.45, "otherCapitalAllowance": 452.34, - "costOfReplacingDomesticGoods": 567.34, + "costOfReplacingDomesticItems": 567.34, "electricChargePointAllowance": 454.34, "structuredBuildingAllowance": [ { diff --git a/resources/public/api/conf/5.0/examples/uk_property_annual_submission_create_and_amend/def2/all_other_allowances_request.json b/resources/public/api/conf/5.0/examples/uk_property_annual_submission_create_and_amend/def2/all_other_allowances_request.json index 276e68394..86ea806e5 100644 --- a/resources/public/api/conf/5.0/examples/uk_property_annual_submission_create_and_amend/def2/all_other_allowances_request.json +++ b/resources/public/api/conf/5.0/examples/uk_property_annual_submission_create_and_amend/def2/all_other_allowances_request.json @@ -5,7 +5,7 @@ "zeroEmissionsGoodsVehicleAllowance": 456.34, "businessPremisesRenovationAllowance": 573.45, "otherCapitalAllowance": 452.34, - "costOfReplacingDomesticGoods": 567.34, + "costOfReplacingDomesticItems": 567.34, "structuredBuildingAllowance": [ { "amount": 234.34, diff --git a/resources/public/api/conf/5.0/examples/uk_property_annual_submission_retrieve/def1/all_other_allowances_response.json b/resources/public/api/conf/5.0/examples/uk_property_annual_submission_retrieve/def1/all_other_allowances_response.json index 965c67041..157c90fd5 100644 --- a/resources/public/api/conf/5.0/examples/uk_property_annual_submission_retrieve/def1/all_other_allowances_response.json +++ b/resources/public/api/conf/5.0/examples/uk_property_annual_submission_retrieve/def1/all_other_allowances_response.json @@ -34,7 +34,7 @@ "zeroEmissionsGoodsVehicleAllowance":456.34, "businessPremisesRenovationAllowance":573.45, "otherCapitalAllowance":452.34, - "costOfReplacingDomesticGoods":567.34, + "costOfReplacingDomesticItems":567.34, "electricChargePointAllowance":454.34, "structuredBuildingAllowance":[ { diff --git a/resources/public/api/conf/5.0/examples/uk_property_annual_submission_retrieve/def2/all_other_allowances_response.json b/resources/public/api/conf/5.0/examples/uk_property_annual_submission_retrieve/def2/all_other_allowances_response.json index a55592ebb..77677bbc5 100644 --- a/resources/public/api/conf/5.0/examples/uk_property_annual_submission_retrieve/def2/all_other_allowances_response.json +++ b/resources/public/api/conf/5.0/examples/uk_property_annual_submission_retrieve/def2/all_other_allowances_response.json @@ -15,7 +15,7 @@ "zeroEmissionsGoodsVehicleAllowance":456.34, "businessPremisesRenovationAllowance":573.45, "otherCapitalAllowance":452.34, - "costOfReplacingDomesticGoods":567.34, + "costOfReplacingDomesticItems":567.34, "structuredBuildingAllowance":[ { "amount":234.34, diff --git a/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_create_and_amend/def1/request.json b/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_create_and_amend/def1/request.json index 294aec9e8..53217a3a2 100644 --- a/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_create_and_amend/def1/request.json +++ b/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_create_and_amend/def1/request.json @@ -219,7 +219,7 @@ "maximum": 99999999999.99, "example": "5000.99" }, - "costOfReplacingDomesticGoods": { + "costOfReplacingDomesticItems": { "type": "number", "description": "Cost of Replacing Domestic Items - formerly Wear and Tear allowance. The value must be between 0 and 99999999999.99 up to 2 decimal places.", "multipleOf": 0.01, diff --git a/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_create_and_amend/def2/request.json b/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_create_and_amend/def2/request.json index 28867ae9e..78d338ea1 100644 --- a/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_create_and_amend/def2/request.json +++ b/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_create_and_amend/def2/request.json @@ -97,7 +97,7 @@ "maximum": 99999999999.99, "example": "5000.99" }, - "costOfReplacingDomesticGoods": { + "costOfReplacingDomesticItems": { "type": "number", "description": "Cost of Replacing Domestic Items - formerly Wear and Tear allowance. The value must be between 0 and 99999999999.99 up to 2 decimal places.", "multipleOf": 0.01, diff --git a/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_retrieve/def1/response.json b/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_retrieve/def1/response.json index b0e103b77..bbd580340 100644 --- a/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_retrieve/def1/response.json +++ b/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_retrieve/def1/response.json @@ -175,7 +175,7 @@ "description": "All other capital allowances. The value must be between 0 and 99999999999.99 up to 2 decimal places.", "example": "5000.99" }, - "costOfReplacingDomesticGoods": { + "costOfReplacingDomesticItems": { "type": "number", "description": "Cost of Replacing Domestic Items - formerly Wear and Tear allowance. The value must be between 0 and 99999999999.99 up to 2 decimal places.", "example": "5000.99" diff --git a/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_retrieve/def2/response.json b/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_retrieve/def2/response.json index 24614d025..686b975c7 100644 --- a/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_retrieve/def2/response.json +++ b/resources/public/api/conf/5.0/schemas/uk_property_annual_submission_retrieve/def2/response.json @@ -81,7 +81,7 @@ "description": "All other capital allowances. The value must be between 0 and 99999999999.99 up to 2 decimal places.", "example": "5000.99" }, - "costOfReplacingDomesticGoods": { + "costOfReplacingDomesticItems": { "type": "number", "description": "Cost of Replacing Domestic Items - formerly Wear and Tear allowance. The value must be between 0 and 99999999999.99 up to 2 decimal places.", "example": "5000.99"