LP-486 Choose principal place of business page

locales/cy/translations.json

@@ -52,6 +52,11 @@
         "payment" : "WELSH - Continue to payment"
     },
 
+    "choosePrincipalPlaceOfBusinessPage" : {
+        "title": "WELSH - Choose the principal place of business",
+        "addressLink": "WELSH - The address is not on the list"
+    },
+
     "chooseRegisteredOfficeAddressPage" : {
         "title": "WELSH - Choose the registered office address",
         "addressLink": "WELSH - The address is not on the list"    

locales/en/translations.json

@@ -52,6 +52,11 @@
         "payment" : "Continue to payment"
     },
 
+    "choosePrincipalPlaceOfBusinessPage" : {
+        "title": "Choose the principal place of business",
+         "addressLink": "The address is not on the list"
+    },
+
     "chooseRegisteredOfficeAddressPage" : {
         "title": "Choose the registered office address",
         "addressLink": "The address is not on the list"

src/presentation/controller/addressLookUp/Controller.ts

@@ -79,7 +79,9 @@ class AddressLookUpController extends AbstractController {
   }
 
   private isAddressListRequired(pageType: string): boolean {
-    return pageType === AddressLookUpPageType.chooseRegisteredOfficeAddress;
+
+    return pageType === AddressLookUpPageType.chooseRegisteredOfficeAddress ||
+           pageType === AddressLookUpPageType.choosePrincipalPlaceOfBusinessAddress ;
   }
 
   postcodeValidation(): RequestHandler {

src/presentation/controller/addressLookUp/PageType.ts

@@ -4,7 +4,8 @@ enum AddressPageType {
   enterRegisteredOfficeAddress = "enter-registered-office-address",
   confirmRegisteredOfficeAddress = "confirm-registered-office-address",
 
-  postcodePrincipalPlaceOfBusinessAddress = "postcode-principal-place-of-business-address"
+  postcodePrincipalPlaceOfBusinessAddress = "postcode-principal-place-of-business-address",
+  choosePrincipalPlaceOfBusinessAddress = "choose-principal-place-of-business-address"
 }
 
 export default AddressPageType;

src/presentation/controller/addressLookUp/Routing.ts

@@ -11,7 +11,8 @@ import {
   CHOOSE_REGISTERED_OFFICE_ADDRESS_URL,
   ENTER_REGISTERED_OFFICE_ADDRESS_URL,
   CONFIRM_REGISTERED_OFFICE_ADDRESS_URL,
-  POSTCODE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL
+  POSTCODE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL,
+  CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL
 } from "./url";
 
 // Registered Office Address
@@ -62,16 +63,27 @@ const registeredOfficeAddress = [
 const addressRoutingPostcodePrincipalPlaceOfBusinessAddress = {
   previousUrl: CONFIRM_REGISTERED_OFFICE_ADDRESS_URL,
   currentUrl: POSTCODE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL,
-  nextUrl: GENERAL_PARTNERS_URL,
+  nextUrl: CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL,
   pageType: AddressPageType.postcodePrincipalPlaceOfBusinessAddress,
   data: {
     enterManualAddressPageType: "#",
     confirmAddressUrl: "#"
   }
 };
 
+const addressRoutingChoosePrincipalPlaceOfBusinessAddress = {
+  previousUrl: POSTCODE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL,
+  currentUrl: CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL,
+  nextUrl: GENERAL_PARTNERS_URL,
+  pageType: AddressPageType.choosePrincipalPlaceOfBusinessAddress,
+  data: {
+
+  }
+};
+
 const principalPlaceOfBusinessAddress = [
-  addressRoutingPostcodePrincipalPlaceOfBusinessAddress
+  addressRoutingPostcodePrincipalPlaceOfBusinessAddress,
+  addressRoutingChoosePrincipalPlaceOfBusinessAddress
 ];
 
 export const addressLookUpRouting: PagesRouting = new Map<

src/presentation/controller/addressLookUp/template.ts

@@ -13,3 +13,5 @@ export const CONFIRM_REGISTERED_OFFICE_ADDRESS_TEMPLATE =
 // principal place of business
 export const POSTCODE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_TEMPLATE =
   AddressPageType.postcodePrincipalPlaceOfBusinessAddress;
+export const CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_TEMPLATE =
+  AddressPageType.choosePrincipalPlaceOfBusinessAddress;

src/presentation/controller/addressLookUp/url.ts

@@ -10,3 +10,4 @@ export const CONFIRM_REGISTERED_OFFICE_ADDRESS_URL = `${BASE_WITH_IDS_URL}/${tem
 
 // principal place of business
 export const POSTCODE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL = `${BASE_WITH_IDS_URL}/${template.POSTCODE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_TEMPLATE}`;
+export const CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL = `${BASE_WITH_IDS_URL}/${template.CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_TEMPLATE}`;

src/presentation/controller/registration/Routing.ts

@@ -4,7 +4,7 @@ import RegistrationPageType from "./PageType";
 import PageType from "../PageType";
 import * as url from "./url";
 import {
-  POSTCODE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL,
+  CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL,
   POSTCODE_REGISTERED_OFFICE_ADDRESS_URL
 } from "../addressLookUp/url";
 
@@ -41,7 +41,7 @@ const registrationRoutingJurisdiction = {
 // principal place of business
 
 const registrationRoutingGeneralPartners = {
-  previousUrl: POSTCODE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL,
+  previousUrl: CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL,
   currentUrl: url.GENERAL_PARTNERS_URL,
   nextUrl: url.GENERAL_PARTNER_CHOICE_URL,
   pageType: RegistrationPageType.generalPartners

src/presentation/test/integration/registration/address/choose-principal-place-of-business-address.test.ts

@@ -0,0 +1,130 @@
+import request from "supertest";
+import enTranslationText from "../../../../../../locales/en/translations.json";
+import cyTranslationText from "../../../../../../locales/cy/translations.json";
+import app from "../../app";
+import {
+  CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL
+} from "presentation/controller/addressLookUp/url";
+import { GENERAL_PARTNERS_URL } from "../../../../controller/registration/url";
+import { getUrl, setLocalesEnabled, testTranslations } from "../../../utils";
+import { appDevDependencies } from "config/dev-dependencies";
+import * as config from "config";
+import AddressPageType from "presentation/controller/addressLookUp/PageType";
+
+describe("Choose Principal Place Of Business Address Page", () => {
+  const URL = getUrl(CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL);
+  const REDIRECT_URL = getUrl(GENERAL_PARTNERS_URL);
+
+  beforeEach(() => {
+    setLocalesEnabled(false);
+    appDevDependencies.addressLookUpGateway.setError(false);
+    appDevDependencies.cacheRepository.feedCache({
+      [`${config.APPLICATION_CACHE_KEY_PREFIX_REGISTRATION}registered_office_address`]:
+        {
+          postal_code: "ST6 3LJ",
+          premises: "",
+          address_line_1: "",
+          address_line_2: "",
+          locality: "",
+          country: ""
+        }
+    });
+  });
+
+  describe("GET Choose Principal Place Of Business Address Page", () => {
+    it("should load the choose principal place of business address page with Welsh text", async () => {
+      setLocalesEnabled(true);
+
+      const res = await request(app).get(URL + "?lang=cy");
+
+      expect(res.status).toBe(200);
+      testTranslations(
+        res.text,
+        cyTranslationText.choosePrincipalPlaceOfBusinessPage
+      );
+    });
+
+    it("should load the choose principal place of business address page with English text", async () => {
+      setLocalesEnabled(true);
+
+      const res = await request(app).get(URL + "?lang=en");
+
+      expect(res.status).toBe(200);
+      testTranslations(
+        res.text,
+        enTranslationText.choosePrincipalPlaceOfBusinessPage
+      );
+    });
+
+    it("should populate the address list", async () => {
+      const res = await request(app).get(URL);
+
+      expect(res.status).toBe(200);
+      expect(res.text).toContain("2 Duncalf street, Stoke-on-trent, ST6 3LJ");
+      expect(res.text).toContain(
+        "The lodge Duncalf street, Castle hill, Stoke-on-trent, ST6 3LJ"
+      );
+      expect(res.text).toContain("4 Duncalf street, Stoke-on-trent, ST6 3LJ");
+      expect(res.text).toContain("6 Duncalf street, Stoke-on-trent, ST6 3LJ");
+    });
+
+    it("should return error page when gateway getListOfValidPostcodeAddresses throws an error", async () => {
+      appDevDependencies.addressLookUpGateway.setError(true);
+
+      const res = await request(app).get(URL);
+
+      expect(res.status).toBe(500);
+      expect(res.text).toContain(enTranslationText.errorPage.title);
+    });
+  });
+
+  describe("POST Choose Principal Place Of Business Page", () => {
+    it("should redirect to the next page and add select address to cache", async () => {
+      const res = await request(app)
+        .post(URL)
+        .send({
+          pageType: AddressPageType.choosePrincipalPlaceOfBusinessAddress,
+          selected_address: `{
+          "postal_code": "ST6 3LJ",
+          "premises": "4",
+          "address_line_1": "DUNCALF STREET",
+          "address_line_2": "",
+          "locality": "STOKE-ON-TRENT",
+          "country": "GB-ENG"
+        }`
+        });
+
+      expect(res.status).toBe(302);
+      expect(res.text).toContain(`Redirecting to ${REDIRECT_URL}`);
+
+      // Will need to be uncommented when the confirm page is introduced
+      /* const cache = appDevDependencies.cacheRepository.cache;
+      expect(cache?.[`${config.APPLICATION_CACHE_KEY}`]).toHaveProperty(
+        `${config.APPLICATION_CACHE_KEY_PREFIX_REGISTRATION}principal_place_of_business_address`,
+          {
+            postal_code: "ST6 3LJ",
+            premises: "4",
+            address_line_1: "DUNCALF STREET",
+            address_line_2: "",
+            locality: "STOKE-ON-TRENT",
+            country: "GB-ENG"
+          }
+        ); */
+    });
+
+    it("should redirect to the error page if address can't be deserialised", async () => {
+      const res = await request(app).post(URL).send({
+        pageType: AddressPageType.choosePrincipalPlaceOfBusinessAddress,
+        selected_address: `some address`
+      });
+
+      expect(res.status).toBe(500);
+      expect(res.text).toContain(enTranslationText.errorPage.title);
+
+      const cache = appDevDependencies.cacheRepository.cache;
+      expect(cache?.[`${config.APPLICATION_CACHE_KEY}`]).not.toHaveProperty(
+        `${config.APPLICATION_CACHE_KEY_PREFIX_REGISTRATION}${AddressPageType.choosePrincipalPlaceOfBusinessAddress}`
+      );
+    });
+  });
+});

src/presentation/test/integration/registration/choose-registered-office-address.test.ts → src/presentation/test/integration/registration/address/choose-registered-office-address.test.ts

@@ -1,12 +1,12 @@
 import request from "supertest";
-import enTranslationText from "../../../../../locales/en/translations.json";
-import cyTranslationText from "../../../../../locales/cy/translations.json";
-import app from "../app";
+import enTranslationText from "../../../../../../locales/en/translations.json";
+import cyTranslationText from "../../../../../../locales/cy/translations.json";
+import app from "../../app";
 import {
   CHOOSE_REGISTERED_OFFICE_ADDRESS_URL,
   CONFIRM_REGISTERED_OFFICE_ADDRESS_URL
 } from "presentation/controller/addressLookUp/url";
-import { getUrl, setLocalesEnabled, testTranslations } from "../../utils";
+import { getUrl, setLocalesEnabled, testTranslations } from "../../../utils";
 import { appDevDependencies } from "config/dev-dependencies";
 import * as config from "config";
 import AddressPageType from "presentation/controller/addressLookUp/PageType";

src/presentation/test/integration/registration/address/postcode-principal-place-of-business-address.test.ts

@@ -7,10 +7,9 @@ import cyTranslationText from "../../../../../../locales/cy/translations.json";
 import { appDevDependencies } from "../../../../../config/dev-dependencies";
 import app from "../../app";
 
-import { POSTCODE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL } from "../../../../controller/addressLookUp/url";
+import { POSTCODE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL, CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL } from "../../../../controller/addressLookUp/url";
 import { getUrl, setLocalesEnabled, testTranslations } from "../../../utils";
 import LimitedPartnershipBuilder from "../../../builder/LimitedPartnershipBuilder";
-import { GENERAL_PARTNERS_URL } from "../../../../controller/registration/url";
 import AddressPageType from "../../../../controller/addressLookUp/PageType";
 import {
   APPLICATION_CACHE_KEY,
@@ -20,7 +19,7 @@ import { PartnershipType } from "@companieshouse/api-sdk-node/dist/services/limi
 
 describe("Postcode Principal Place Of Business Address Page", () => {
   const URL = getUrl(POSTCODE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL);
-  const REDIRECT_URL = getUrl(GENERAL_PARTNERS_URL);
+  const REDIRECT_URL = getUrl(CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL);
   const addresses: UKAddress[] =
     appDevDependencies.addressLookUpGateway.addresses;
 

src/routes/addressLookUp.ts

@@ -9,7 +9,8 @@ import {
   CONFIRM_REGISTERED_OFFICE_ADDRESS_URL,
   ENTER_REGISTERED_OFFICE_ADDRESS_URL,
   POSTCODE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL,
-  POSTCODE_REGISTERED_OFFICE_ADDRESS_URL
+  POSTCODE_REGISTERED_OFFICE_ADDRESS_URL,
+  CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL
 } from "../presentation/controller/addressLookUp/url";
 
 export const addressLookUpEndpoints = (
@@ -67,6 +68,17 @@ export const addressLookUpEndpoints = (
     authentication,
     dependencies.addressLookUpController.postcodeValidation()
   );
+
+  router.get(
+    CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL,
+    authentication,
+    dependencies.addressLookUpController.getPageRouting()
+  );
+  router.post(
+    CHOOSE_PRINCIPAL_PLACE_OF_BUSINESS_ADDRESS_URL,
+    authentication,
+    dependencies.addressLookUpController.selectAddress()
+  );
 };
 
 export default addressLookUpEndpoints;

src/views/choose-principal-place-of-business-address.njk

@@ -0,0 +1,57 @@
+{% extends "layout.njk" %}
+
+{% import 'includes/macros.njk' as macros %}
+
+{% set pageTitle = i18n.choosePrincipalPlaceOfBusinessPage.title %}
+
+{% set addressItems = [] %}
+{% for address in props.data.addressList %}
+  {% set newItem = {
+    value: address | dump,
+    text: macros.formatAddress(address),
+    attributes: {
+      required: true,
+      "radio-event-id": "address-radio-selected"
+    }
+  } %}
+  {% set addressItems = addressItems.concat([newItem]) %}
+{% endfor %}
+
+{% block content %}
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+      <form class="form" action={{ props.currentUrl }} method="post">
+        <input type="hidden" name="pageType" value={{ props.pageType }}>
+        {% include "includes/csrf_token.njk" %}
+
+        {% include "includes/proposed-name.njk" %}  
+
+        {{ govukRadios({
+          classes: "govuk-radios",
+          name: "selected_address",
+          value: props.data.cache['registration_choose-principal-place-of-business-address'] | dump,
+          fieldset: {
+            legend: {
+              text: i18n.choosePrincipalPlaceOfBusinessPage.title,
+              isPageHeading: true,
+              classes: "govuk-fieldset__legend--xl"
+            }
+          },
+          items: addressItems
+        }) }}
+
+        <p>
+          <a href="{{ props.currentUrl | replace(props.pageType, props.data.enterPrincipalPlaceOfBusinessPageType) }}" class="govuk-body-m govuk-link" data-event-id="address-not-on-list">{{ i18n.choosePrincipalPlaceOfBusinessPage.addressLink }}</a>
+        <p>
+
+       {{ govukButton({
+          text: i18n.buttons.continue,
+          attributes: {
+            "id": "submit",
+            "onclick": "_paq.push(['trackEvent', 'Limited Partnerships', '" + props.pageType + "', document.querySelector('input[name=selected_address]:checked').getAttribute('radio-event-id')])"
+          }
+        }) }}
+      </form>
+    </div>
+  </div>
+{% endblock %}