Merge pull request #55 from hmrc/PSR-1398

PSR-1398 applying Changed status to changed transactions for a member
hmrc · Oct 1, 2024 · 0742425 · 0742425
2 parents 865eaf4 + b0e0937
commit 0742425
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 13 deletions.
diff --git a/app/uk/gov/hmrc/pensionschemereturnsipp/services/SippPsrSubmissionService.scala b/app/uk/gov/hmrc/pensionschemereturnsipp/services/SippPsrSubmissionService.scala
@@ -37,7 +37,11 @@ import uk.gov.hmrc.pensionschemereturnsipp.models.etmp.response.SippPsrSubmissio
 import uk.gov.hmrc.pensionschemereturnsipp.models.etmp.{MemberDetails, _}
 import uk.gov.hmrc.pensionschemereturnsipp.models.{Journey, JourneyType, MinimalDetails, PensionSchemeId}
 import uk.gov.hmrc.pensionschemereturnsipp.transformations._
-import uk.gov.hmrc.pensionschemereturnsipp.transformations.sipp.{PSRAssetsExistenceTransformer, PSRMemberDetailsTransformer, PSRSubmissionTransformer}
+import uk.gov.hmrc.pensionschemereturnsipp.transformations.sipp.{
+  PSRAssetsExistenceTransformer,
+  PSRMemberDetailsTransformer,
+  PSRSubmissionTransformer
+}
 
 import java.time.LocalDate
 import scala.concurrent.{ExecutionContext, Future}

diff --git a/...k/gov/hmrc/pensionschemereturnsipp/transformations/EtmpMemberAndTransactionsUpdater.scala b/...k/gov/hmrc/pensionschemereturnsipp/transformations/EtmpMemberAndTransactionsUpdater.scala
@@ -22,7 +22,7 @@ import cats.implicits.{catsKernelStdOrderForOption, catsKernelStdOrderForString,
 import uk.gov.hmrc.pensionschemereturnsipp.models.api.MemberKey
 import uk.gov.hmrc.pensionschemereturnsipp.models.etmp.EtmpMemberAndTransactions
 import uk.gov.hmrc.pensionschemereturnsipp.models.etmp.common.SectionStatus
-import uk.gov.hmrc.pensionschemereturnsipp.models.etmp.common.SectionStatus.Deleted
+import uk.gov.hmrc.pensionschemereturnsipp.models.etmp.common.SectionStatus.{Changed, Deleted}
 
 import java.time.LocalDate
 import scala.util.chaining.scalaUtilChainingOps
@@ -64,10 +64,10 @@ object EtmpMemberAndTransactionsUpdater {
               if (areJourneysEmpty(modified))
                 modified.copy(status = Deleted, version = None)
               else
-                modified
+                modified.copy(status = Changed, version = None)
             }
         } else {
-          etmpTxsByMember
+          etmpTxsByMember // No changes to transactions, leaving `status` as is
         }
     }.toList
 

diff --git a/...mrc/pensionschemereturnsipp/transformations/AssetsFromConnectedPartyTransformerSpec.scala b/...mrc/pensionschemereturnsipp/transformations/AssetsFromConnectedPartyTransformerSpec.scala
@@ -19,8 +19,8 @@ package uk.gov.hmrc.pensionschemereturnsipp.transformations
 import cats.data.NonEmptyList
 import uk.gov.hmrc.pensionschemereturnsipp.models.api.AssetsFromConnectedPartyApi
 import uk.gov.hmrc.pensionschemereturnsipp.models.api.common._
-import uk.gov.hmrc.pensionschemereturnsipp.models.common.YesNo.{No, Yes}
 import uk.gov.hmrc.pensionschemereturnsipp.models.common.SharesCompanyDetails
+import uk.gov.hmrc.pensionschemereturnsipp.models.common.YesNo.{No, Yes}
 import uk.gov.hmrc.pensionschemereturnsipp.models.etmp.common.SectionStatus
 import uk.gov.hmrc.pensionschemereturnsipp.models.etmp.common.SectionStatus.Deleted
 import uk.gov.hmrc.pensionschemereturnsipp.models.etmp.{
@@ -113,6 +113,7 @@ class AssetsFromConnectedPartyTransformerSpec extends BaseSpec with SippEtmpDumm
 
       result mustBe List(
         etmpData.copy(
+          status = SectionStatus.Changed,
           otherAssetsConnectedParty = Some(
             SippOtherAssetsConnectedParty(
               1,
@@ -165,6 +166,7 @@ class AssetsFromConnectedPartyTransformerSpec extends BaseSpec with SippEtmpDumm
 
       result mustBe List(
         etmpData.copy(
+          status = SectionStatus.Changed,
           otherAssetsConnectedParty = Some(
             SippOtherAssetsConnectedParty(
               1,
@@ -208,7 +210,8 @@ class AssetsFromConnectedPartyTransformerSpec extends BaseSpec with SippEtmpDumm
       val result = transformer.merge(NonEmptyList.of(testData), List(etmpData))
 
       result mustBe List(
-        etmpData.copy(otherAssetsConnectedParty = None, status = Deleted), // No more tx for first member :/
+        etmpData
+          .copy(otherAssetsConnectedParty = None, status = Deleted), // No more tx for first member :/
         etmpData.copy(
           memberDetails = MemberDetails(
             firstName = "firstName",

diff --git a/test/uk/gov/hmrc/pensionschemereturnsipp/transformations/LandArmsLengthTransformerSpec.scala b/test/uk/gov/hmrc/pensionschemereturnsipp/transformations/LandArmsLengthTransformerSpec.scala
@@ -107,13 +107,14 @@ class LandArmsLengthTransformerSpec extends BaseSpec with SippEtmpDummyTestValue
   )
 
   "merge" should {
-    "update LandArms data for a single member when member match is found" in {
+    "add LandArms data for a single member when member match is found" in {
       val testEtmpData = etmpData.copy(landArmsLength = None)
 
       val result = transformer.merge(NonEmptyList.of(landArmsDataRow1), List(testEtmpData))
 
       result mustBe List(
         etmpData.copy(
+          status = SectionStatus.Changed,
           landArmsLength = Some(
             SippLandArmsLength(
               1,
@@ -146,13 +147,14 @@ class LandArmsLengthTransformerSpec extends BaseSpec with SippEtmpDummyTestValue
 
     }
 
-    "replace LandArms data for a single member when member match is found" in {
+    "update LandArms data for a single member when member match is found" in {
 
       val testLandArmsDataRow1 = landArmsDataRow1.copy(acquiredFromName = "test2")
       val result = transformer.merge(NonEmptyList.of(testLandArmsDataRow1), List(etmpData))
 
       result mustBe List(
         etmpData.copy(
+          status = SectionStatus.Changed,
           landArmsLength = Some(
             SippLandArmsLength(
               1,

diff --git a/.../gov/hmrc/pensionschemereturnsipp/transformations/LandConnectedPartyTransformerSpec.scala b/.../gov/hmrc/pensionschemereturnsipp/transformations/LandConnectedPartyTransformerSpec.scala
@@ -21,6 +21,7 @@ import uk.gov.hmrc.pensionschemereturnsipp.models.api.LandOrConnectedPropertyApi
 import uk.gov.hmrc.pensionschemereturnsipp.models.api.common._
 import uk.gov.hmrc.pensionschemereturnsipp.models.common.YesNo.{No, Yes}
 import uk.gov.hmrc.pensionschemereturnsipp.models.common.{AddressDetails, RegistryDetails}
+import uk.gov.hmrc.pensionschemereturnsipp.models.etmp.common.SectionStatus
 import uk.gov.hmrc.pensionschemereturnsipp.models.etmp.common.SectionStatus.Deleted
 import uk.gov.hmrc.pensionschemereturnsipp.models.etmp.{MemberDetails, SippLandConnectedParty}
 import uk.gov.hmrc.pensionschemereturnsipp.utils.{BaseSpec, SippEtmpDummyTestValues}
@@ -32,13 +33,14 @@ class LandConnectedPartyTransformerSpec extends BaseSpec with SippEtmpDummyTestV
   private val transformer: LandConnectedPartyTransformer = new LandConnectedPartyTransformer()
 
   "merge" should {
-    "update LandArms data for a single member when member match is found" in {
+    "add LandArms data for a single member when member match is found" in {
       val testEtmpData = etmpDataWithLandConnectedTx.copy(landConnectedParty = None)
 
       val result = transformer.merge(NonEmptyList.of(landConnectedTransaction), List(testEtmpData))
 
       result mustBe List(
         etmpDataWithLandConnectedTx.copy(
+          status = SectionStatus.Changed,
           landConnectedParty = Some(
             SippLandConnectedParty(
               1,
@@ -71,13 +73,14 @@ class LandConnectedPartyTransformerSpec extends BaseSpec with SippEtmpDummyTestV
 
     }
 
-    "replace LandArms data for a single member when member match is found" in {
+    "update LandArms data for a single member when member match is found" in {
 
       val testLandArmsDataRow1 = landConnectedTransaction.copy(acquiredFromName = "test2")
       val result = transformer.merge(NonEmptyList.of(testLandArmsDataRow1), List(etmpDataWithLandConnectedTx))
 
       result mustBe List(
         etmpDataWithLandConnectedTx.copy(
+          status = SectionStatus.Changed,
           landConnectedParty = Some(
             SippLandConnectedParty(
               1,

diff --git a/...ov/hmrc/pensionschemereturnsipp/transformations/OutstandingLoansTransformationsSpec.scala b/...ov/hmrc/pensionschemereturnsipp/transformations/OutstandingLoansTransformationsSpec.scala
@@ -90,13 +90,14 @@ class OutstandingLoansTransformationsSpec extends BaseSpec with SippEtmpDummyTes
   )
 
   "merge" should {
-    "update data for a single member when member match is found" in {
+    "add data for a single member when member match is found" in {
       val testData = etmpData.copy(loanOutstanding = None)
 
       val result = transformer.merge(NonEmptyList.of(sippOutstandingLoansApi), List(testData))
 
       result mustBe List(
         etmpData.copy(
+          status = SectionStatus.Changed,
           loanOutstanding = Some(
             SippLoanOutstanding(
               1,
@@ -132,6 +133,7 @@ class OutstandingLoansTransformationsSpec extends BaseSpec with SippEtmpDummyTes
 
       result mustBe List(
         etmpData.copy(
+          status = SectionStatus.Changed,
           loanOutstanding = Some(
             SippLoanOutstanding(
               1,

diff --git a/...mrc/pensionschemereturnsipp/transformations/TangibleMoveablePropertyTransformerSpec.scala b/...mrc/pensionschemereturnsipp/transformations/TangibleMoveablePropertyTransformerSpec.scala
@@ -72,12 +72,13 @@ class TangibleMoveablePropertyTransformerSpec extends BaseSpec with SippEtmpDumm
 
   "merge" should {
     "put new member data if there is no previous data" in {
-      val testEtmpData = etmpData.copy(otherAssetsConnectedParty = None)
+      val testEtmpData = etmpData.copy(tangibleProperty = None)
 
       val result = transformer.merge(NonEmptyList.of(sippTangibleApi), List(testEtmpData))
 
       result mustBe List(
         etmpData.copy(
+          status = SectionStatus.Changed,
           tangibleProperty = Some(
             SippTangibleProperty(
               1,
@@ -105,14 +106,15 @@ class TangibleMoveablePropertyTransformerSpec extends BaseSpec with SippEtmpDumm
 
     }
 
-    "replace data for a single member when member match is found" in {
+    "update data for a single member when member match is found" in {
       val updateValues = sippTangibleApi.copy(
         acquiredFromName = "test2"
       )
       val result = transformer.merge(NonEmptyList.of(updateValues), List(etmpData))
 
       result mustBe List(
         etmpData.copy(
+          status = SectionStatus.Changed,
           tangibleProperty = Some(
             SippTangibleProperty(
               1,