Merge pull request #249 from companieshouse/ncs-323-update-psc-service-address-model

NCS-323 - update psc service address model

Author: CHJSkinner

src/services/confirmation-statement/service.ts

@@ -336,6 +336,11 @@ export default class {
                 serviceAddressLine1: pscResource.service_address_line_1,
                 serviceAddressPostCode: pscResource.service_address_post_code,
                 serviceAddressPostTown: pscResource.service_address_post_town,
+                serviceAddressArea: pscResource.service_address_area,
+                serviceAddressRegion: pscResource.service_address_region,
+                serviceAddressCareOf: pscResource.service_address_care_of,
+                serviceAddressPoBox: pscResource.service_address_po_box,
+                serviceAddressCountryName: pscResource.service_address_country_name,
                 companyName: pscResource.company_name,
                 registrationNumber: pscResource.registration_number,
                 lawGoverned: pscResource.law_governed,
@@ -373,6 +378,11 @@ export default class {
                 service_address_line_1: psc.serviceAddressLine1,
                 service_address_post_code: psc.serviceAddressPostCode,
                 service_address_post_town: psc.serviceAddressPostTown,
+                service_address_po_box: psc.serviceAddressPoBox,
+                service_address_area: psc.serviceAddressArea,
+                service_address_country_name: psc.serviceAddressCountryName,
+                service_address_care_of: psc.serviceAddressCareOf,
+                service_address_region: psc.serviceAddressRegion,
                 company_name: psc.companyName,
                 registration_number: psc.registrationNumber,
                 law_governed: psc.lawGoverned,

src/services/confirmation-statement/types.ts

@@ -196,6 +196,11 @@ export interface PersonOfSignificantControl {
     serviceAddressLine1?: string;
     serviceAddressPostCode?: string;
     serviceAddressPostTown?: string;
+    serviceAddressPoBox?: string;
+    serviceAddressCountryName?: string;
+    serviceAddressCareOf?: string;
+    serviceAddressRegion?: string;
+    serviceAddressArea?: string;
     companyName?: string;
     registrationNumber?: string;
     lawGoverned?: string;
@@ -239,6 +244,11 @@ export interface PersonOfSignificantControlResource {
     service_address_line_1?: string;
     service_address_post_code?: string;
     service_address_post_town?: string;
+    service_address_po_box?: string;
+    service_address_country_name?: string;
+    service_address_care_of?: string;
+    service_address_region?: string;
+    service_address_area?: string;
     company_name?: string;
     registration_number?: string;
     law_governed?: string;

test/services/confirmation-statement/confirmation.statement.mock.ts

@@ -120,6 +120,11 @@ export const mockPersonsWithSignificantControlList: PersonOfSignificantControlRe
         service_address_line_1: "1 Nowhere road",
         service_address_post_code: "NO1 0AA",
         service_address_post_town: "Nowhere",
+        service_address_po_box: "po box",
+        service_address_country_name: "country name",
+        service_address_care_of: "care of",
+        service_address_region: "region",
+        service_address_area: "area",
         company_name: "Company1",
         registration_number: "67890",
         law_governed: "ENGLISH",

test/services/confirmation-statement/confirmation.statement.spec.ts

@@ -275,6 +275,11 @@ describe("persons with significant control GET", () => {
         expect(data.resource[1].naturesOfControl).to.be.undefined;
         expect(data.resource[0].dateOfBirthIso).to.equal("1984-01-23");
         expect(data.resource[1].dateOfBirthIso).to.be.undefined;
+        expect(data.resource[0].serviceAddressArea).to.equal("area");
+        expect(data.resource[0].serviceAddressCareOf).to.equal("care of");
+        expect(data.resource[0].serviceAddressCountryName).to.equal("country name");
+        expect(data.resource[0].serviceAddressPoBox).to.equal("po box");
+        expect(data.resource[0].serviceAddressRegion).to.equal("region");
     });
 
     it("should not map missing address or names", async () => {