Merge pull request #126 from companieshouse/feature/DSND-2798

mapped ceased on field
companieshouse · Jul 15, 2024 · 1a56cb5 · 1a56cb5
2 parents 72728a8 + a4fd19e
commit 1a56cb5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/src/main/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformer.java b/src/main/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformer.java
@@ -69,6 +69,7 @@ public Individual transformPscDocToIndividual(
             individual.setNationality(pscData.getNationality());
             individual.setLinks(pscData.getLinks());
             individual.setNotifiedOn(pscData.getNotifiedOn());
+            individual.setCeasedOn(pscData.getCeasedOn());
         }
         if (pscDocument.getSensitiveData() != null) {
             individual.setDateOfBirth(mapDateOfBirth(
@@ -100,6 +101,7 @@ public IndividualBeneficialOwner transformPscDocToIndividualBeneficialOwner(
             individualBo.setNationality(pscData.getNationality());
             individualBo.setIsSanctioned(pscData.getSanctioned());
             individualBo.setNotifiedOn(pscData.getNotifiedOn());
+            individualBo.setCeasedOn(pscData.getCeasedOn());
         }
         if (pscDocument.getSensitiveData() != null) {
             individualBo.setDateOfBirth(mapDateOfBirth(
@@ -161,6 +163,7 @@ public CorporateEntityBeneficialOwner transformPscDocToCorporateEntityBeneficial
             corporateEntityBo.setNotifiedOn(pscData.getNotifiedOn());
             corporateEntityBo.setPrincipalOfficeAddress(mapPrincipleAddress(
                     pscData.getPrincipalOfficeAddress()));
+            corporateEntityBo.setCeasedOn(pscData.getCeasedOn());
         }
         return corporateEntityBo;
     }

diff --git a/src/test/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformerTest.java b/src/test/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformerTest.java
@@ -114,6 +114,7 @@ void testInsertCorporateEntityPscIsTransformedSuccessfully() throws FailedToTran
         Assertions.assertNotNull(result.getData().getAddress());
         Assertions.assertNotNull(result.getData().getIdentification().getLegalForm());
         Assertions.assertNotNull(result.getData().getIdentification().getCountryRegistered());
+        Assertions.assertNotNull(result.getData().getCeasedOn());
 
         pscInsertAssertions(expectedDocument, result);
     }
@@ -131,6 +132,7 @@ void testInsertLegalPersonPscIsTransformedSuccessfully() throws FailedToTransfor
         Assertions.assertNotNull(result.getData().getAddress());
         Assertions.assertNotNull(result.getData().getIdentification().getLegalForm());
         Assertions.assertNull(result.getData().getIdentification().getCountryRegistered());
+        Assertions.assertNotNull(result.getData().getCeasedOn());
 
         pscInsertAssertions(expectedDocument, result);
     }
@@ -171,6 +173,7 @@ void testInsertIndividualBeneficialOwnerPscIsTransformedSuccessfully() throws Fa
         Assertions.assertNotNull(result.getData().getName());
         Assertions.assertNotNull(result.getData().getNationality());
         Assertions.assertNotNull(result.getData().getCountryOfResidence());
+        Assertions.assertNotNull(result.getData().getCeasedOn());
 
         pscInsertAssertions(expectedDocument, result);
     }
@@ -195,6 +198,7 @@ void testInsertIndividualBeneficialOwnerPscIsTransformedSuccessfullyNoPscStateme
         Assertions.assertNotNull(result.getData().getNationality());
         Assertions.assertNotNull(result.getData().getCountryOfResidence());
         Assertions.assertNull(result.getData().getLinks().getStatements());
+        Assertions.assertNotNull(result.getData().getCeasedOn());
 
         pscInsertAssertions(expectedDocument, result);
     }
@@ -215,6 +219,7 @@ void testInsertCorporateEntityBeneficialOwnerPscIsTransformedSuccessfully() thro
         Assertions.assertNotNull(result.getData().getIdentification().getLegalForm());
         Assertions.assertNotNull(result.getData().getIdentification().getCountryRegistered());
         Assertions.assertNotNull(result.getData().getPrincipalOfficeAddress());
+        Assertions.assertNotNull(result.getData().getCeasedOn());
 
         pscInsertAssertions(expectedDocument, result);
     }
@@ -234,6 +239,7 @@ void testInsertLegalPersonBeneficialOwnerPscIsTransformedSuccessfully() throws F
         Assertions.assertNotNull(result.getData().getIdentification().getLegalForm());
         Assertions.assertNull(result.getData().getIdentification().getCountryRegistered());
         Assertions.assertNotNull(result.getData().getPrincipalOfficeAddress());
+        Assertions.assertNotNull(result.getData().getCeasedOn());
 
         pscInsertAssertions(expectedDocument, result);
     }

diff --git a/src/test/java/uk/gov/companieshouse/pscdataapi/util/TestHelper.java b/src/test/java/uk/gov/companieshouse/pscdataapi/util/TestHelper.java
@@ -73,6 +73,7 @@ public static FullRecordCompanyPSCApi buildFullRecordPsc(String kind, boolean sh
         output.setInternalData(internalData);
 
         data.setKind(kind);
+        data.setCeasedOn(LocalDate.of(2012,12,12));
         data.setNotifiedOn(LocalDate.of(2000,12,12));
         data.setEtag("etag");
         data.setName("wholeName");
@@ -213,6 +214,7 @@ public static PscDocument buildPscDocument(String kind, boolean showFullDateOfBi
         output.setUpdatedBy("user");
 
         pscData.setKind(kind);
+        pscData.setCeasedOn(LocalDate.of(2012,12,12));
         pscData.setNotifiedOn(LocalDate.of(2000,12,12));
         pscData.setEtag("etag");
         pscData.setName("wholeName");