Merge pull request #91 from companieshouse/IDVA5-467-which-name-is-re…

…gistered-with-AML

IDVA5-467 which name is registered with AML

locales/cy/name-registered-with-aml.json

@@ -0,0 +1,10 @@
+{
+    "nameRegisteredWithAmlTitle" : "Which name is registered with your Anti-Money Laundering (AML) supervisory body? welsh",
+    "nameRegisteredWithAmlBody": "We'll check this matches what the AML supervisory body holds welsh",
+    "nameRegisteredWithAmlNameOfTheBusinessOption": "Name of the business welsh",
+    "nameRegisteredWithAmlYourNameOption": "Your name welsh",
+    "nameRegisteredWithAmlBothOption": "Both welsh",
+    "nameRegisteredWithAmlContinueBtn": "Continue welsh",
+
+    "error-nameRegisteredWithAmlSelectRadio" : "Select which name is registered welsh"
+}

locales/en/name-registered-with-aml.json

@@ -0,0 +1,10 @@
+{
+    "nameRegisteredWithAmlTitle" : "Which name is registered with your Anti-Money Laundering (AML) supervisory body?",
+    "nameRegisteredWithAmlBody": "We'll check this matches what the AML supervisory body holds",
+    "nameRegisteredWithAmlNameOfTheBusinessOption": "Name of the business",
+    "nameRegisteredWithAmlYourNameOption": "Your name",
+    "nameRegisteredWithAmlBothOption": "Both",
+    "nameRegisteredWithAmlContinueBtn": "Continue",
+
+    "error-nameRegisteredWithAmlSelectRadio" : "Select which name is registered"
+}

src/main/config/index.ts

@@ -1,5 +1,6 @@
 const BASE_VIEWS_URL = "../views/features";
 const BASE_SOLE_TRADER_URL = `${BASE_VIEWS_URL}/sole-trader`;
+const BASE_LIMITED_TRADER_URL = `${BASE_VIEWS_URL}/limited`;
 export const HOME = `${BASE_SOLE_TRADER_URL}/index/home`;
 export const SOLE_TRADER_DOB = `${BASE_SOLE_TRADER_URL}/date-of-birth/capture-date-of-birth`;
 export const SOLE_TRADER_NAME = `${BASE_SOLE_TRADER_URL}/name/capture-name`;
@@ -14,3 +15,4 @@ export const SOLE_TRADER_CORRESPONDENCE_ADDRESS_CONFIRM = `${BASE_SOLE_TRADER_UR
 export const SOLE_TRADER_WHAT_IS_YOUR_NATIONALITY = `${BASE_SOLE_TRADER_URL}/nationality/nationality`;
 export const SOLE_TRADER_TYPE_OF_BUSINESS = `${BASE_SOLE_TRADER_URL}/type-of-business/type-of-business`;
 export const SOLE_TRADER_OTHER_TYPE_OFBUSINESS = `${BASE_SOLE_TRADER_URL}/other-type-of-business/other-type-of-business`;
+export const LIMITED_NAME_REGISTERED_WITH_AML = `${BASE_LIMITED_TRADER_URL}/name-registered-with-aml/name-registered-with-aml`;

src/main/controllers/features/limited/nameRegisteredWithAmlController.ts

@@ -0,0 +1,44 @@
+import { NextFunction, Request, Response, Router } from "express";
+import { validationResult } from "express-validator";
+import * as config from "../../../config";
+import { FormattedValidationErrors, formatValidationError } from "../../../validation/validation";
+import { selectLang, addLangToUrl, getLocalesService, getLocaleInfo } from "../../../utils/localise";
+import { SOLE_TRADER_SECTOR_YOU_WORK_IN, LIMITED_NAME_REGISTERED_WITH_AML, LIMITED_WHAT_IS_YOUR_ROLE, BASE_URL } from "../../../types/pageURL";
+
+export const get = async (req: Request, res: Response, next: NextFunction) => {
+    const lang = selectLang(req.query.lang);
+    const locales = getLocalesService();
+    res.render(config.LIMITED_NAME_REGISTERED_WITH_AML, {
+        previousPage: addLangToUrl(BASE_URL + LIMITED_WHAT_IS_YOUR_ROLE, lang),
+        title: "Which name is registered with your AML supervisory body?",
+        ...getLocaleInfo(locales, lang),
+        currentUrl: BASE_URL + LIMITED_NAME_REGISTERED_WITH_AML
+    });
+};
+
+export const post = async (req: Request, res: Response, next: NextFunction) => {
+    try {
+        const lang = selectLang(req.query.lang);
+        const locales = getLocalesService();
+        const errorList = validationResult(req);
+        if (!errorList.isEmpty()) {
+            const pageProperties = getPageProperties(formatValidationError(errorList.array(), lang));
+            res.status(400).render(config.LIMITED_NAME_REGISTERED_WITH_AML, {
+                previousPage: addLangToUrl(BASE_URL + LIMITED_WHAT_IS_YOUR_ROLE, lang),
+                title: "Which name is registered with your AML supervisory body?",
+                ...getLocaleInfo(locales, lang),
+                currentUrl: BASE_URL + LIMITED_NAME_REGISTERED_WITH_AML,
+                ...pageProperties
+            });
+        } else {
+            const nextPageUrl = addLangToUrl(BASE_URL + SOLE_TRADER_SECTOR_YOU_WORK_IN, lang);
+            res.redirect(nextPageUrl);
+        }
+    } catch (error) {
+        next(error);
+    }
+};
+
+const getPageProperties = (errors?: FormattedValidationErrors) => ({
+    errors
+});

src/main/controllers/index.ts

@@ -13,3 +13,4 @@ export * as soleTraderNationalityController from "./features/SoleTrader/soleTrad
 export * as typeOfBusinessController from "./features/SoleTrader/typeOfBusinessController";
 export * as OtherTypeOfBusinessController from "./features/SoleTrader/otherTypeOfBusinessController";
 export * as healthCheckController from "./healthCheckController";
+export * as nameRegisteredWithAmlController from "./features/limited/nameRegisteredWithAmlController";

src/main/routes/index.ts

@@ -4,7 +4,7 @@ import {
     statementRelevantOfficerController, stopNotRelevantOfficerController, sectorYouWorkInController,
     soleTraderCorrespondenceAddressManualController, soleTraderWhereDoYouLiveController,
     soleTraderNationalityController, typeOfBusinessController, healthCheckController, OtherTypeOfBusinessController, soleTraderCorrespondenceAddressAutoLookupController,
-    soleTraderCorrespodanceAddressDetailsController, soleTraderCorrespondenceAddressConfirmController
+    soleTraderCorrespodanceAddressDetailsController, soleTraderCorrespondenceAddressConfirmController, nameRegisteredWithAmlController
 
 } from "../controllers";
 
@@ -19,6 +19,7 @@ import { nationalityValidator } from "../../../lib/validation/nationality";
 import { typeOfBusinessValidator } from "../validation/typeOfBusiness";
 import { otherTypeOfBusinessValidator } from "../validation/otherTypeOfBusiness";
 import * as urls from "../types/pageURL";
+import { nameRegisteredWithAmlValidator } from "../validation/nameRegisteredWithAml";
 
 const routes = Router();
 
@@ -62,6 +63,9 @@ routes.post(urls.SOLE_TRADER_TYPE_OF_BUSINESS, typeOfBusinessValidator, typeOfBu
 routes.get(urls.SOLE_TRADER_OTHER_TYPE_OFBUSINESS, OtherTypeOfBusinessController.get);
 routes.post(urls.SOLE_TRADER_OTHER_TYPE_OFBUSINESS, otherTypeOfBusinessValidator, OtherTypeOfBusinessController.post);
 
+routes.get(urls.LIMITED_NAME_REGISTERED_WITH_AML, nameRegisteredWithAmlController.get);
+routes.post(urls.LIMITED_NAME_REGISTERED_WITH_AML, nameRegisteredWithAmlValidator, nameRegisteredWithAmlController.post);
+
 routes.get(urls.HEALTHCHECK, healthCheckController.get);
 
 export default routes;

src/main/types/pageURL.ts

@@ -1,6 +1,7 @@
 const SEPARATOR = "/";
 
 const SOLE_TRADER = "/sole-trader";
+const LIMITED = "/limited";
 
 export const BASE_URL = "/register-acsp";
 
@@ -26,3 +27,7 @@ export const SOLE_TRADER_TYPE_OF_BUSINESS = SOLE_TRADER + "/type-of-business";
 export const SOLE_TRADER_OTHER_TYPE_OFBUSINESS = SOLE_TRADER + "/other-type-of-business";
 
 export const HEALTHCHECK = "/healthcheck";
+
+export const LIMITED_NAME_REGISTERED_WITH_AML = LIMITED + "/name-registered-with-aml";
+
+export const LIMITED_WHAT_IS_YOUR_ROLE = LIMITED + "/what-is-your-role";

src/main/validation/nameRegisteredWithAml.ts

@@ -0,0 +1,5 @@
+import { body } from "express-validator";
+
+export const nameRegisteredWithAmlValidator = [
+    body("nameRegisteredWithAml", "nameRegisteredWithAmlSelectRadio").notEmpty()
+];

src/main/views/features/limited/name-registered-with-aml/name-registered-with-aml.njk

@@ -0,0 +1,58 @@
+{% from "govuk/components/radios/macro.njk"              import govukRadios %}
+{% extends "layouts/default.njk" %}
+
+{% block main_content %}
+
+<main>
+    <form action="" method="POST">
+        {% include "partials/user_name.njk" %}
+        <div class="govuk-form-group">
+            {{ govukRadios({
+                errorMessage: errors.nameRegisteredWithAml if errors,
+                classes: "govuk-radios",
+                id: "name-registered-with-aml-radios",
+                name: "nameRegisteredWithAml",
+                fieldset: {
+                    legend: {   
+                        text: i18n.nameRegisteredWithAmlTitle,
+                        isPageHeading: true,
+                        classes: "govuk-fieldset__legend--l"
+                    }
+                    },
+                    hint: {
+                         text: i18n.nameRegisteredWithAmlBody
+                    },
+                items: [
+                    {
+                        value: "NAME_OF_THE_BUSINESS",
+                        text: i18n.nameRegisteredWithAmlNameOfTheBusinessOption,
+                        checked: name-registered-with-aml == NAME_OF_THE_BUSINESS,
+                        attributes: {
+                            "data-event-id": "name-of-the-business-option"
+                        }
+                    },
+                    {
+                        value: "YOUR_NAME",
+                        text: i18n.nameRegisteredWithAmlYourNameOption,
+                        checked: name-registered-with-aml == YOUR_NAME,
+                        attributes: {
+                            "data-event-id": "your-company-option"
+                        }
+                    },
+                    {
+                        value: "BOTH",
+                        text: i18n.nameRegisteredWithAmlBothOption,
+                        checked: name-registered-with-aml == BOTH,
+                        attributes: {
+                            "data-event-id": "both-option"
+                        }
+                    }
+                ]
+                }) }}
+        </div>
+        <button class="govuk-button">{{i18n.nameRegisteredWithAmlContinueBtn}}</button>
+    </form>
+</main>
+
+
+{% endblock main_content %}

src/test/src/controllers/nameRegisteredWithAmlController.test.ts

@@ -0,0 +1,23 @@
+import supertest from "supertest";
+import app from "../../../main/app";
+import { LIMITED_NAME_REGISTERED_WITH_AML, BASE_URL } from "../../../main/types/pageURL";
+const router = supertest(app);
+
+describe("GET" + LIMITED_NAME_REGISTERED_WITH_AML, () => {
+    it("should return status 200", async () => {
+        await router.get(BASE_URL + LIMITED_NAME_REGISTERED_WITH_AML).expect(200);
+    });
+});
+
+// Test when radio btn selected, will return 302 after redirecting to the next page.
+describe("POST" + LIMITED_NAME_REGISTERED_WITH_AML, () => {
+    it("should return status 302 after redirect", async () => {
+        await router.post(BASE_URL + LIMITED_NAME_REGISTERED_WITH_AML).send({ nameRegisteredWithAml: "NAME_OF_THE_BUSINESS" }).expect(302);
+    });
+});
+// Test for no radio btn value selected, will return 400.
+describe("POST" + LIMITED_NAME_REGISTERED_WITH_AML, () => {
+    it("should return status 400 after incorrect data entered", async () => {
+        await router.post(BASE_URL + LIMITED_NAME_REGISTERED_WITH_AML).send({ nameRegisteredWithAml: "" }).expect(400);
+    });
+});