SIV-951: Super secure psc should show verification start and end dates in streaming (#217)

* SIV-951: Super secure psc should show verification start and end dates in streaming

* Revert "SIV-951: Super secure psc should show verification start and end dates in streaming"

This reverts commit 2a1c350.

* SIV-951: Modify CompanyPscTransformer

* SIV-951: Update private-api-sdk-java to 4.0.407

* SIV-951: Add unit tests

Author: rbromfield-ch

pom.xml

@@ -36,7 +36,7 @@
         <commons-lang3.version>3.18.0</commons-lang3.version>
         <!-- Internal -->
         <structured-logging.version>3.0.43</structured-logging.version>
-        <private-api-sdk-java.version>4.0.404</private-api-sdk-java.version>
+        <private-api-sdk-java.version>4.0.407</private-api-sdk-java.version>
         <api-sdk-java.version>6.4.11</api-sdk-java.version>
         <api-security-java.version>2.0.16</api-security-java.version>
 

src/main/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformer.java

@@ -27,6 +27,7 @@
 import uk.gov.companieshouse.api.psc.SensitiveData;
 import uk.gov.companieshouse.api.psc.SuperSecure;
 import uk.gov.companieshouse.api.psc.SuperSecureBeneficialOwner;
+import uk.gov.companieshouse.api.psc.SuperSecureIdentityVerificationDetails;
 import uk.gov.companieshouse.logging.Logger;
 import uk.gov.companieshouse.logging.LoggerFactory;
 import uk.gov.companieshouse.pscdataapi.data.IndividualPscRoles;
@@ -287,6 +288,29 @@ public SuperSecure transformPscDocToSuperSecure(PscDocument pscDocument) {
             }
             superSecure.setLinks(pscData.getLinks());
         }
+
+        PscIdentityVerificationDetails pscIdentityVerificationDetails = Optional.ofNullable(pscDocument)
+                .map(PscDocument::getData)
+                .map(PscData::getIdentityVerificationDetails)
+                .orElse(null);
+
+        if (pscIdentityVerificationDetails != null && (pscIdentityVerificationDetails.getAppointmentVerificationEndOn() != null
+                || pscIdentityVerificationDetails.getAppointmentVerificationStartOn() != null)) {
+            SuperSecureIdentityVerificationDetails superSecureIdentityVerificationDetails =
+                    Optional.ofNullable(superSecure.getIdentityVerificationDetails())
+                            .orElseGet(() -> {
+                                SuperSecureIdentityVerificationDetails s = new SuperSecureIdentityVerificationDetails();
+                                superSecure.setIdentityVerificationDetails(s);
+                                return s;
+                            });
+
+            superSecureIdentityVerificationDetails.setAppointmentVerificationStartOn(
+                    pscIdentityVerificationDetails.getAppointmentVerificationStartOn());
+
+            superSecureIdentityVerificationDetails.setAppointmentVerificationEndOn(
+                    pscIdentityVerificationDetails.getAppointmentVerificationEndOn());
+        }
+
         return superSecure;
     }
 

src/test/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformerTest.java

@@ -325,6 +325,72 @@ void testPscDocumentShouldSetIdentityVerificationDetailsWhenPopulated() {
         Assertions.assertNotNull(result.getIdentityVerificationDetails());
     }
 
+    @Test
+    void testIdvDatesPresentInSuperSecureWhenExistsInPscDocument() {
+        // Arrange
+        var pscDocument = TestHelper.buildPscDocument("individual");
+        var pscData = new PscData();
+
+        PscIdentityVerificationDetails idv = new PscIdentityVerificationDetails();
+        idv.setIdentityVerifiedOn(LocalDate.now());
+        var startOnDate = LocalDate.of(2023, 1, 1);
+        var endOnDate = LocalDate.of(2023, 1, 1);
+        idv.setAppointmentVerificationStartOn(startOnDate);
+        idv.setAppointmentVerificationEndOn(endOnDate);
+        pscData.setIdentityVerificationDetails(idv);
+        pscDocument.setData(pscData);
+        // Act
+        Individual result = pscTransformer.transformPscDocToIndividual(pscDocument, false);
+        var resultStartOnDate = result.getIdentityVerificationDetails().getAppointmentVerificationStartOn();
+        var resultEndOnDate = result.getIdentityVerificationDetails().getAppointmentVerificationEndOn();
+        // Assert
+        Assertions.assertNotNull(result.getIdentityVerificationDetails());
+        Assertions.assertEquals(startOnDate, resultStartOnDate);
+        Assertions.assertEquals(endOnDate, resultEndOnDate);
+    }
+
+    @Test
+    void testAppointmentVerificationStartOnInSuperSecureWhenExistsInPscDocument() {
+        // Arrange
+        var pscDocument = TestHelper.buildPscDocument("individual");
+        var pscData = new PscData();
+
+        PscIdentityVerificationDetails idv = new PscIdentityVerificationDetails();
+        idv.setIdentityVerifiedOn(LocalDate.now());
+        var startOnDate = LocalDate.of(2023, 1, 1);
+        idv.setAppointmentVerificationStartOn(startOnDate);
+        pscData.setIdentityVerificationDetails(idv);
+        pscDocument.setData(pscData);
+        // Act
+        Individual result = pscTransformer.transformPscDocToIndividual(pscDocument, false);
+        var resultStartOnDate = result.getIdentityVerificationDetails().getAppointmentVerificationStartOn();
+        // Assert
+        Assertions.assertNotNull(result.getIdentityVerificationDetails());
+        Assertions.assertEquals(startOnDate, resultStartOnDate);
+        Assertions.assertNull(result.getIdentityVerificationDetails().getAppointmentVerificationEndOn());
+    }
+
+    @Test
+    void testAppointmentVerificationEndOnInSuperSecureWhenExistsInPscDocument() {
+        // Arrange
+        var pscDocument = TestHelper.buildPscDocument("individual");
+        var pscData = new PscData();
+
+        PscIdentityVerificationDetails idv = new PscIdentityVerificationDetails();
+        idv.setIdentityVerifiedOn(LocalDate.now());
+        var endOnDate = LocalDate.of(2023, 1, 1);
+        idv.setAppointmentVerificationEndOn(endOnDate);
+        pscData.setIdentityVerificationDetails(idv);
+        pscDocument.setData(pscData);
+        // Act
+        Individual result = pscTransformer.transformPscDocToIndividual(pscDocument, false);
+        var resultEndOnDate = result.getIdentityVerificationDetails().getAppointmentVerificationEndOn();
+        // Assert
+        Assertions.assertNotNull(result.getIdentityVerificationDetails());
+        Assertions.assertEquals(endOnDate, resultEndOnDate);
+        Assertions.assertNull(result.getIdentityVerificationDetails().getAppointmentVerificationStartOn());
+    }
+
     @Test
     void testEmptyPscIndividualBeneficialOwnerTransform() {
         IndividualBeneficialOwner individualBeneficialOwner = pscTransformer