Merge pull request #13 from companieshouse/feature/update-fields

made changes in line with updated fields in fullRecordPsc object

Author: JpLuuCH

pom.xml

@@ -26,7 +26,7 @@
 
         <!-- Internal -->
         <structured-logging.version>1.9.12</structured-logging.version>
-        <private-api-sdk-java.version>2.0.237</private-api-sdk-java.version>
+        <private-api-sdk-java.version>2.0.247</private-api-sdk-java.version>
         <api-sdk-manager-java-library.version>1.0.4</api-sdk-manager-java-library.version>
         <api-helper-java-library.version>1.4.5</api-helper-java-library.version>
 

src/main/java/uk/gov/companieshouse/pscdataapi/models/Address.java

@@ -35,7 +35,7 @@ public Address(uk.gov.companieshouse.api.psc.Address address) {
         this.country = address.getCountry();
         this.locality = address.getLocality();
         this.postalCode = address.getPostalCode();
-        this.premises = address.getPremises();
+        this.premises = address.getPremise();
         this.region = address.getRegion();
         this.careOf = address.getCareOf();
         this.poBox = address.getPoBox();
@@ -51,7 +51,7 @@ public Address(uk.gov.companieshouse.api.psc.UsualResidentialAddress address) {
         this.country = address.getCountry();
         this.locality = address.getLocality();
         this.postalCode = address.getPostalCode();
-        this.premises = address.getPremises();
+        this.premises = address.getPremise();
         this.region = address.getRegion();
         this.careOf = address.getCareOf();
         this.poBox = address.getPoBox();

src/main/java/uk/gov/companieshouse/pscdataapi/models/NameElements.java

@@ -17,6 +17,19 @@ public class NameElements {
     @Field("middle_name")
     private String middleName;
 
+    public NameElements() {}
+
+    /**
+     * Contructor using SDK NameElements.
+     * @param nameElements API NameElements object.
+     */
+    public NameElements(uk.gov.companieshouse.api.psc.NameElements nameElements) {
+        this.forename = nameElements.getForename();
+        this.surname = nameElements.getSurname();
+        this.middleName = nameElements.getMiddleName();
+        this.title = nameElements.getTitle();
+    }
+
     public String getTitle() {
         return title;
     }

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

@@ -13,6 +13,7 @@
 import uk.gov.companieshouse.pscdataapi.exceptions.FailedToTransformException;
 import uk.gov.companieshouse.pscdataapi.models.Address;
 import uk.gov.companieshouse.pscdataapi.models.DateOfBirth;
+import uk.gov.companieshouse.pscdataapi.models.NameElements;
 import uk.gov.companieshouse.pscdataapi.models.PscData;
 import uk.gov.companieshouse.pscdataapi.models.PscDocument;
 import uk.gov.companieshouse.pscdataapi.models.PscSensitiveData;
@@ -93,15 +94,16 @@ private PscData transformDataFields(FullRecordCompanyPSCApi requestBody) {
         data.setNationality(requestBody.getExternalData().getData().getNationality());
         data.setNaturesOfControl(requestBody.getExternalData().getData().getNaturesOfControl());
         data.setResidentialAddressIsSameAsServiceAddress(requestBody.getExternalData()
-                    .getData().getResidentialAddressIsSameAsServiceAddress());
+                    .getSensitiveData().getResidentialAddressSameAsServiceAddress());
         data.setSanctioned(requestBody.getExternalData().getData().getIsSanctioned());
         data.setServiceAddressIsSameAsRegisteredOfficeAddress(requestBody.getExternalData()
                     .getData().getServiceAddressSameAsRegisteredOfficeAddress());
         return data;
     }
 
     private void handleIndividualFields(FullRecordCompanyPSCApi requestBody, PscData data) {
-        data.setNameElements(PscTransformationHelper.createNameElements(requestBody));
+        data.setNameElements(new NameElements(
+                requestBody.getExternalData().getData().getNameElements()));
         data.setCountryOfResidence(requestBody.getExternalData().getData().getCountryOfResidence());
     }
 

src/main/java/uk/gov/companieshouse/pscdataapi/util/PscTransformationHelper.java

@@ -44,18 +44,4 @@ public static Links createLinks(FullRecordCompanyPSCApi requestBody) {
         links.setStatements(itemLinkTypes.getStatements());
         return links;
     }
-
-    /**
-     * Creates NameElements field.
-     * @param requestBody request payload.
-     * @return NameElements object.
-     */
-    public static NameElements createNameElements(FullRecordCompanyPSCApi requestBody) {
-        NameElements nameElements = new NameElements();
-        nameElements.setTitle(requestBody.getExternalData().getData().getTitle());
-        nameElements.setForename(requestBody.getExternalData().getData().getForename());
-        nameElements.setMiddleName(requestBody.getExternalData().getData().getOtherForenames());
-        nameElements.setSurname(requestBody.getExternalData().getData().getSurname());
-        return nameElements;
-    }
 }

src/test/java/uk/gov/companieshouse/pscdataapi/util/TestHelper.java

@@ -50,7 +50,10 @@ public static FullRecordCompanyPSCApi buildFullRecordPsc(String kind) {
         if(kind.contains("individual")) {
             UsualResidentialAddress address = new UsualResidentialAddress();
             sensitiveData.setUsualResidentialAddress(address);
-            data.setSurname("surname");
+            uk.gov.companieshouse.api.psc.NameElements nameElements =
+                    new uk.gov.companieshouse.api.psc.NameElements();
+            nameElements.setSurname("surname");
+            data.setNameElements(nameElements);
         } else if(kind.contains("secure")) {
             data.setCeasedOn(LocalDate.now());
         }