SASS-7368: Fix loading of prior data for employment pensions

app/models/Dividends.scala

@@ -23,6 +23,8 @@ case class Dividends(ukDividends: Option[BigDecimal] = None, otherUkDividends: O
 
 object Dividends {
   implicit val formats: OFormat[Dividends] = Json.format[Dividends]
+
+  val empty: Dividends = Dividends(None, None)
 }
 
 case class EncryptedDividends(ukDividends: Option[EncryptedValue] = None, otherUkDividends: Option[EncryptedValue] = None)

app/models/Interest.scala

@@ -16,17 +16,16 @@
 
 package models
 
+import cats.implicits.catsSyntaxOptionId
 import play.api.libs.json.{Format, Json, OFormat}
 import uk.gov.hmrc.crypto.EncryptedValue
 
-case class Interest(accountName: String,
-                    incomeSourceId: String,
-                    taxedUkInterest: Option[BigDecimal],
-                    untaxedUkInterest: Option[BigDecimal])
-
+case class Interest(accountName: String, incomeSourceId: String, taxedUkInterest: Option[BigDecimal], untaxedUkInterest: Option[BigDecimal])
 
 object Interest {
   implicit val formats: OFormat[Interest] = Json.format[Interest]
+
+  val empty: Interest = Interest("", "", BigDecimal(0).some, BigDecimal(0).some)
 }
 
 case class EncryptedInterest(accountName: EncryptedValue,

app/models/SavingsIncomeDataModel.scala

@@ -19,16 +19,22 @@ package models
 import play.api.libs.json.{Format, Json, OFormat}
 import uk.gov.hmrc.crypto.EncryptedValue
 
-case class SavingsIncomeDataModel(submittedOn: Option[String], securities: Option[SecuritiesModel], foreignInterest: Option[Seq[ForeignInterestModel]])
+case class SavingsIncomeDataModel(submittedOn: Option[String],
+                                  securities: Option[SecuritiesModel],
+                                  foreignInterest: Option[Seq[ForeignInterestModel]])
+
+object SavingsIncomeDataModel {
+  val empty: SavingsIncomeDataModel = SavingsIncomeDataModel(None, None, None)
 
-object SavingsIncomeDataModel{
   implicit val formats: OFormat[SavingsIncomeDataModel] = Json.format[SavingsIncomeDataModel]
 }
 
-case class EncryptedSavingsIncomeDataModel(submittedOn: Option[EncryptedValue], securities: Option[EncryptedSecuritiesModel], foreignInterest: Option[Seq[EncryptedForeignInterestModel]])
+case class EncryptedSavingsIncomeDataModel(submittedOn: Option[EncryptedValue],
+                                           securities: Option[EncryptedSecuritiesModel],
+                                           foreignInterest: Option[Seq[EncryptedForeignInterestModel]])
 
-object EncryptedSavingsIncomeDataModel{
+object EncryptedSavingsIncomeDataModel {
   implicit lazy val encryptedValueOFormat: OFormat[EncryptedValue] = Json.format[EncryptedValue]
 
   implicit val formats: Format[EncryptedSavingsIncomeDataModel] = Json.format[EncryptedSavingsIncomeDataModel]
-}
+}

app/models/StockDividends.scala

@@ -30,6 +30,7 @@ case class StockDividends(
                          )
 
 object StockDividends {
+  val empty: StockDividends = StockDividends()
   implicit val formats: OFormat[StockDividends] = Json.format[StockDividends]
 }
 

app/models/cis/CISSource.scala

@@ -36,6 +36,7 @@ case class CISSource(totalDeductionAmount: Option[BigDecimal],
 }
 
 object CISSource {
+  val empty: CISSource = CISSource(None, None, None, Seq.empty)
   implicit val format: OFormat[CISSource] = Json.format[CISSource]
 }
 

app/models/employment/AllEmploymentData.scala

@@ -76,6 +76,8 @@ case class AllEmploymentData(hmrcEmploymentData: Seq[HmrcEmploymentSource],
 
 object AllEmploymentData {
   implicit val format: OFormat[AllEmploymentData] = Json.format[AllEmploymentData]
+
+  val empty: AllEmploymentData = AllEmploymentData(Seq.empty, None, Seq.empty, None, None)
 }
 
 case class EncryptedAllEmploymentData(hmrcEmploymentData: Seq[EncryptedHmrcEmploymentSource],

app/models/gains/InsurancePoliciesModel.scala

@@ -16,16 +16,7 @@
 
 package models.gains
 
-import models.{
-  CapitalRedemptionModel,
-  EncryptedCapitalRedemptionModel,
-  EncryptedForeignModel,
-  EncryptedLifeInsuranceModel,
-  EncryptedVoidedIsaModel,
-  ForeignModel,
-  LifeInsuranceModel,
-  VoidedIsaModel
-}
+import models._
 import play.api.libs.json.{Format, Json, OFormat}
 import uk.gov.hmrc.crypto.EncryptedValue
 
@@ -37,6 +28,8 @@ case class InsurancePoliciesModel(submittedOn: Option[String],
                                   foreign: Option[Seq[ForeignModel]])
 
 object InsurancePoliciesModel {
+  val empty: InsurancePoliciesModel = InsurancePoliciesModel(None, None, None, None, None, None)
+
   implicit val formats: OFormat[InsurancePoliciesModel] = Json.format[InsurancePoliciesModel]
 }
 
@@ -51,4 +44,4 @@ object EncryptedInsurancePoliciesModel {
   implicit lazy val encryptedValueOFormat: OFormat[EncryptedValue] = Json.format[EncryptedValue]
 
   implicit val formats: Format[EncryptedInsurancePoliciesModel] = Json.format[EncryptedInsurancePoliciesModel]
-}
+}

app/models/gifts/GiftAid.scala

@@ -22,12 +22,12 @@ case class GiftAid(giftAidPayments: Option[GiftAidPayments], gifts: Option[Gifts
 
 object GiftAid {
   implicit val format: OFormat[GiftAid] = Json.format[GiftAid]
+
+  val empty: GiftAid = GiftAid(None, None)
 }
 
-case class EncryptedGiftAid(giftAidPayments: Option[EncryptedGiftAidPayments],
-                            gifts: Option[EncryptedGifts])
+case class EncryptedGiftAid(giftAidPayments: Option[EncryptedGiftAidPayments], gifts: Option[EncryptedGifts])
 
 object EncryptedGiftAid {
   implicit val format: OFormat[EncryptedGiftAid] = Json.format[EncryptedGiftAid]
 }
-

app/models/pensions/Pensions.scala

@@ -17,8 +17,8 @@
 package models.pensions
 
 import models.pensions.charges.{EncryptedPensionCharges, PensionCharges}
-import models.pensions.income.{EncryptedPensionIncomeModel, PensionIncomeModel}
 import models.pensions.employmentPensions.{EmploymentPensions, EncryptedEmploymentPensions}
+import models.pensions.income.{EncryptedPensionIncomeModel, PensionIncomeModel}
 import models.pensions.reliefs.{EncryptedPensionReliefs, PensionReliefs}
 import models.statebenefits.{AllStateBenefitsData, EncryptedAllStateBenefitsData}
 import play.api.libs.json.{Json, OFormat}
@@ -27,21 +27,20 @@ case class Pensions(pensionReliefs: Option[PensionReliefs],
                     pensionCharges: Option[PensionCharges],
                     stateBenefits: Option[AllStateBenefitsData],
                     employmentPensions: Option[EmploymentPensions],
-                    pensionIncome: Option[PensionIncomeModel]
-                   )
+                    pensionIncome: Option[PensionIncomeModel])
 
 object Pensions {
   implicit val formats: OFormat[Pensions] = Json.format[Pensions]
+
+  val empty: Pensions = Pensions(None, None, None, None, None)
 }
 
 case class EncryptedPensions(pensionReliefs: Option[EncryptedPensionReliefs],
                              pensionCharges: Option[EncryptedPensionCharges],
                              stateBenefits: Option[EncryptedAllStateBenefitsData],
                              employmentPensions: Option[EncryptedEmploymentPensions],
-                             pensionIncome: Option[EncryptedPensionIncomeModel]
-                            )
+                             pensionIncome: Option[EncryptedPensionIncomeModel])
 
 object EncryptedPensions {
   implicit val formats: OFormat[EncryptedPensions] = Json.format[EncryptedPensions]
 }
-

app/models/statebenefits/AllStateBenefitsData.scala

@@ -31,6 +31,7 @@ case class AllStateBenefitsData(stateBenefitsData: Option[StateBenefitsData],
 }
 
 object AllStateBenefitsData {
+  val empty: AllStateBenefitsData = AllStateBenefitsData(None, None)
 
   implicit val allStateBenefitsDataWrites: OWrites[AllStateBenefitsData] = (data: AllStateBenefitsData) => {
     jsonObjNoNulls(