Merge pull request #132 from companieshouse/IDVA5-586-radio-buttons-d…

…on't-go-to-correct-page Idva5-586-radio buttons don't go to correct page
companieshouse · Mar 7, 2024 · dd268c1 · dd268c1
2 parents 3020194 + f523afa
commit dd268c1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/main/controllers/features/SoleTrader/typeOfBusinessController.ts b/src/main/controllers/features/SoleTrader/typeOfBusinessController.ts
@@ -3,7 +3,7 @@ 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 { TYPE_OF_BUSINESS, START, OTHER_TYPE_OFBUSINESS, SOLE_TRADER_WHAT_IS_YOUR_ROLE, BASE_URL } from "../../../types/pageURL";
+import { TYPE_OF_BUSINESS, START, OTHER_TYPE_OFBUSINESS, SOLE_TRADER_WHAT_IS_YOUR_ROLE, BASE_URL, LIMITED_WHAT_IS_THE_COMPANY_NUMBER, UNINCORPORATED_NAME_REGISTERED_WITH_AML, HOME_URL } from "../../../types/pageURL";
 
 export const get = async (req: Request, res: Response, next: NextFunction) => {
     const lang = selectLang(req.query.lang);
@@ -22,21 +22,34 @@ export const post = async (req: Request, res: Response, next: NextFunction) => {
         const lang = selectLang(req.query.lang);
         const locales = getLocalesService();
         const errorList = validationResult(req);
+        const selectedOption = req.body.typeOfBusinessRadio;
         if (!errorList.isEmpty()) {
             const pageProperties = getPageProperties(formatValidationError(errorList.array(), lang));
             res.status(400).render(config.SOLE_TRADER_TYPE_OF_BUSINESS, {
-                previousPage: addLangToUrl(START, lang),
+                previousPage: addLangToUrl(HOME_URL, lang),
                 title: "What type of business are you registering?",
                 ...getLocaleInfo(locales, lang),
                 currentUrl: BASE_URL + TYPE_OF_BUSINESS,
                 ...pageProperties
             });
         } else {
-            var nextPageUrl = addLangToUrl(BASE_URL + SOLE_TRADER_WHAT_IS_YOUR_ROLE, lang);
-            if (req.body.typeOfBusinessRadio === "OTHER") {
-                nextPageUrl = addLangToUrl(BASE_URL + OTHER_TYPE_OFBUSINESS, lang);
+
+            switch (selectedOption) {
+            case "LIMITED_COMPANY":
+            case "LIMITED_PARTNERSHIP":
+            case "LIMITED_LIABILITY_PARTNERSHIP":
+                res.redirect(addLangToUrl(BASE_URL + LIMITED_WHAT_IS_THE_COMPANY_NUMBER, lang));
+                break;
+            case "PARTNERSHIP":
+                res.redirect(addLangToUrl(BASE_URL + UNINCORPORATED_NAME_REGISTERED_WITH_AML, lang));
+                break;
+            case "SOLE_TRADER":
+                res.redirect(addLangToUrl(BASE_URL + SOLE_TRADER_WHAT_IS_YOUR_ROLE, lang));
+                break;
+            case "OTHER":
+                res.redirect(addLangToUrl(BASE_URL + OTHER_TYPE_OFBUSINESS, lang));
+                break;
             }
-            res.redirect(nextPageUrl);
         }
     } catch (error) {
         next(error);

diff --git a/src/main/types/pageURL.ts b/src/main/types/pageURL.ts
@@ -80,3 +80,5 @@ export const AML_REGISTRATION = "https://www.gov.uk/anti-money-laundering-regist
 export const UNINCORPORATED_WHAT_IS_THE_BUSINESS_NAME = UNINCORPORATED + "/what-is-the-business-name";
 
 export const SOLE_TRADER_HOW_ARE_YOU_AML_SUPERVISED = LIMITED + "/how-are-you-aml-supervised";
+
+export const UNINCORPORATED_NAME_REGISTERED_WITH_AML = UNINCORPORATED + "/name-registered-with-aml";
Original file line number	Diff line number	Diff line change
Expand Up		@@ -80,3 +80,5 @@ export const AML_REGISTRATION = "https://www.gov.uk/anti-money-laundering-regist
		export const UNINCORPORATED_WHAT_IS_THE_BUSINESS_NAME = UNINCORPORATED + "/what-is-the-business-name";

		export const SOLE_TRADER_HOW_ARE_YOU_AML_SUPERVISED = LIMITED + "/how-are-you-aml-supervised";

		export const UNINCORPORATED_NAME_REGISTERED_WITH_AML = UNINCORPORATED + "/name-registered-with-aml";