Merge pull request #608 from companieshouse/feature/lp-1378-urls

Feature/lp 1378 urls

Author: lduranteau

locales/cy/translations.json

@@ -777,7 +777,7 @@
         }
     },
 
-    "whichTypePage": {
+    "partnershipTypePage": {
         "title": "WELSH - Which type of partnership do you want to register?"
     },
 

locales/en/translations.json

@@ -778,7 +778,7 @@
         }
     },
 
-    "whichTypePage": {
+    "partnershipTypePage": {
         "title": "Which type of partnership do you want to register?"
     },
 

src/infrastructure/gateway/incorporation/IncorporationInMemoryGateway.ts

@@ -18,7 +18,10 @@ class IncorporationGateway implements IIncorporationGateway {
     transactionId: string,
     kind: IncorporationKind
   ): Promise<string> {
-    if (pageType !== RegistrationPageType.name && pageType !== TransitionPageType.confirmLimitedPartnership) {
+    if (
+      pageType !== RegistrationPageType.partnershipName &&
+      pageType !== TransitionPageType.confirmLimitedPartnership
+    ) {
       throw new Error("Wrong page type to create a new incorporation");
     }
 

src/middlewares/authentication.middleware.ts

@@ -2,14 +2,14 @@ import { Request, Response, NextFunction } from "express";
 
 import { logger, checkUserSignedIn, getLoggedInUserEmail } from "../utils";
 import { SIGN_OUT_URL } from "../presentation/controller/global/url";
-import { WHICH_TYPE_URL } from "../presentation/controller/registration/url";
+import { PARTNERSHIP_TYPE_URL } from "../presentation/controller/registration/url";
 
 export const authentication = (req: Request, res: Response, next: NextFunction): void => {
   try {
     if (!checkUserSignedIn(req.session)) {
       logger.infoRequest(req, "User not authenticated, redirecting to sign in page, status_code=302");
 
-      const returnToUrl = req.originalUrl === SIGN_OUT_URL ? WHICH_TYPE_URL : req.originalUrl;
+      const returnToUrl = req.originalUrl === SIGN_OUT_URL ? PARTNERSHIP_TYPE_URL : req.originalUrl;
 
       return res.redirect(`/signin?return_to=${returnToUrl}`);
     }

src/middlewares/error.middleware.ts

@@ -3,7 +3,7 @@ import { CsrfError } from "@companieshouse/web-security-node";
 
 import { getLoggedInUserEmail, logger } from "../utils";
 import * as config from "../config/constants";
-import { WHICH_TYPE_URL } from "../presentation/controller/registration/url";
+import { PARTNERSHIP_TYPE_URL } from "../presentation/controller/registration/url";
 
 const pageNotFound = (req: Request, res: Response) => {
   const headerData = getHeaderData(req);
@@ -55,7 +55,7 @@ const errorHandler = [pageNotFound, csrfErrorHandler, globalErrorHandler];
 export { errorHandler };
 
 const getHeaderData = (req: Request) => {
-  const previous = req.get("Referrer") ?? WHICH_TYPE_URL;
+  const previous = req.get("Referrer") ?? PARTNERSHIP_TYPE_URL;
   const userEmail = getLoggedInUserEmail(req.session);
 
   return {

src/presentation/controller/AbstractController.ts

@@ -14,7 +14,7 @@ import {
 } from "../../config/constants";
 import { PageRouting, pageRoutingDefault, PagesRouting } from "./PageRouting";
 import PageType from "./PageType";
-import { WHICH_TYPE_URL } from "./registration/url";
+import { PARTNERSHIP_TYPE_URL } from "./registration/url";
 import UIErrors from "../../domain/entities/UIErrors";
 import { Ids, Tokens } from "../../domain/types";
 
@@ -208,7 +208,7 @@ abstract class AbstractController {
       return previousPageUrlPostTransition.substring(startingIndexOfRelativePath);
     }
 
-    return WHICH_TYPE_URL;
+    return PARTNERSHIP_TYPE_URL;
   }
 }
 

src/presentation/controller/addressLookUp/PageType.ts

@@ -8,29 +8,29 @@ enum AddressPageType {
   confirmRegisteredOfficeAddress = "confirm-registered-office-address",
 
   // principal place of business
-  postcodePrincipalPlaceOfBusinessAddress = "postcode-principal-place-of-business-address",
-  choosePrincipalPlaceOfBusinessAddress = "choose-principal-place-of-business-address",
-  enterPrincipalPlaceOfBusinessAddress = "enter-principal-place-of-business-address",
-  confirmPrincipalPlaceOfBusinessAddress = "confirm-principal-place-of-business-address",
+  postcodePrincipalPlaceOfBusinessAddress = "postcode-principal-place-of-business",
+  choosePrincipalPlaceOfBusinessAddress = "choose-principal-place-of-business",
+  enterPrincipalPlaceOfBusinessAddress = "enter-principal-place-of-business",
+  confirmPrincipalPlaceOfBusinessAddress = "confirm-principal-place-of-business",
 
   // GENERAL PARTNER
 
   // usual residential address - Person
-  territoryChoiceGeneralPartnerUsualResidentialAddress = "territory-choice-general-partner-usual-residential-address",
+  territoryChoiceGeneralPartnerUsualResidentialAddress = "uk-or-overseas-general-partner-usual-residential-address",
   postcodeGeneralPartnerUsualResidentialAddress = "postcode-general-partner-usual-residential-address",
   chooseGeneralPartnerUsualResidentialAddress = "choose-general-partner-usual-residential-address",
   enterGeneralPartnerUsualResidentialAddress = "enter-general-partner-usual-residential-address",
   confirmGeneralPartnerUsualResidentialAddress = "confirm-general-partner-usual-residential-address",
 
   // correspondence address - Person
-  territoryChoiceGeneralPartnerCorrespondenceAddress = "territory-choice-general-partner-correspondence-address",
+  territoryChoiceGeneralPartnerCorrespondenceAddress = "uk-or-overseas-general-partner-correspondence-address",
   postcodeGeneralPartnerCorrespondenceAddress = "postcode-general-partner-correspondence-address",
   chooseGeneralPartnerCorrespondenceAddress = "choose-general-partner-correspondence-address",
   enterGeneralPartnerCorrespondenceAddress = "enter-general-partner-correspondence-address",
   confirmGeneralPartnerCorrespondenceAddress = "confirm-general-partner-correspondence-address",
 
   // principal office address - Legal Entity
-  territoryChoiceGeneralPartnerPrincipalOfficeAddress = "territory-choice-general-partner-principal-office-address",
+  territoryChoiceGeneralPartnerPrincipalOfficeAddress = "uk-or-overseas-general-partner-principal-office-address",
   postcodeGeneralPartnerPrincipalOfficeAddress = "postcode-general-partner-principal-office-address",
   chooseGeneralPartnerPrincipalOfficeAddress = "choose-general-partner-principal-office-address",
   enterGeneralPartnerPrincipalOfficeAddress = "enter-general-partner-principal-office-address",
@@ -39,17 +39,18 @@ enum AddressPageType {
   // LIMITED PARTNER
 
   // usual residential address - Person
-  territoryChoiceLimitedPartnerUsualResidentialAddress = "territory-choice-limited-partner-usual-residential-address",
+  territoryChoiceLimitedPartnerUsualResidentialAddress = "uk-or-overseas-limited-partner-usual-residential-address",
   postcodeLimitedPartnerUsualResidentialAddress = "postcode-limited-partner-usual-residential-address",
   chooseLimitedPartnerUsualResidentialAddress = "choose-limited-partner-usual-residential-address",
   enterLimitedPartnerUsualResidentialAddress = "enter-limited-partner-usual-residential-address",
   confirmLimitedPartnerUsualResidentialAddress = "confirm-limited-partner-usual-residential-address",
 
   // principal office address - Legal entity
-  territoryChoiceLimitedPartnerPrincipalOfficeAddress = "territory-choice-limited-partner-principal-office-address",
+  territoryChoiceLimitedPartnerPrincipalOfficeAddress = "uk-or-overseas-limited-partner-principal-office-address",
   postcodeLimitedPartnerPrincipalOfficeAddress = "postcode-limited-partner-principal-office-address",
   chooseLimitedPartnerPrincipalOfficeAddress = "choose-limited-partner-principal-office-address",
   enterLimitedPartnerPrincipalOfficeAddress = "enter-limited-partner-principal-office-address",
   confirmLimitedPartnerPrincipalOfficeAddress = "confirm-limited-partner-principal-office-address"
 }
+
 export default AddressPageType;

src/presentation/controller/common/PartnerController.ts

@@ -141,7 +141,7 @@ abstract class PartnerController extends AbstractController {
     };
   }
 
-  partnerChoice(urls: { addPersonUrl: string; addLegalEntityUrl: string }) {
+  partnerType(urls: { addPersonUrl: string; addLegalEntityUrl: string }) {
     return (request: Request, response: Response, next: NextFunction) => {
       try {
         const { ids } = this.extractRequestData(request);

src/presentation/controller/global/resumeUrlMapping.ts

@@ -1,6 +1,6 @@
 import { TransactionKind } from "../../../domain/entities/TransactionTypes";
 import { Journey } from "../../../domain/entities/journey";
-import { WHICH_TYPE_WITH_IDS_URL } from "../registration/url";
+import { PARTNERSHIP_TYPE_WITH_IDS_URL } from "../registration/url";
 import { EMAIL_URL } from "../transition/url";
 import { PartnerKind, PartnershipKind } from "@companieshouse/api-sdk-node/dist/services/limited-partnerships/types";
 import {
@@ -17,7 +17,7 @@ import {
 export const RESUME_REGISTRATION_OR_TRANSITION_URL_MAP: Record<string, { journey: string; resumeUrl: string }> = {
   [TransactionKind.registration]: {
     journey: Journey.registration,
-    resumeUrl: WHICH_TYPE_WITH_IDS_URL
+    resumeUrl: PARTNERSHIP_TYPE_WITH_IDS_URL
   },
   [TransactionKind.transition]: {
     journey: Journey.transition,

src/presentation/controller/postTransition/GeneralPartnerController.ts

@@ -36,7 +36,7 @@ class GeneralPartnerPostTransitionController extends PartnerController {
   }
 
   generalPartnerChoice() {
-    return super.partnerChoice({
+    return super.partnerType({
       addPersonUrl: ADD_GENERAL_PARTNER_PERSON_URL,
       addLegalEntityUrl: ADD_GENERAL_PARTNER_LEGAL_ENTITY_URL
     });