Merge pull request #624 from companieshouse/lp-1467-post-update-general-partner-person

markpit · web-flow · commit b0c2a977565f · 2025-12-10T10:39:33.000Z
LP-1467 post update general partner person with appointment id
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # limited-partnerships-web
 Web front-end for the Limited Partnerships service
 
-Requires >= Node v20
-         >= npm v10
+Requires >= Node v24
+         >= npm v11
 
 ## Local build instructions
 1. run 'npm i' to install packages
@@ -52,4 +52,4 @@ $ npm run test
 all tests watch mode:
 ```
 $ npm run test:watch
-```
+```
diff --git a/src/config/constants.ts b/src/config/constants.ts
@@ -52,6 +52,8 @@ export const TRANSACTION_DESCRIPTION_REMOVE_GENERAL_PARTNER_PERSON = "Remove a g
 export const TRANSACTION_DESCRIPTION_REMOVE_GENERAL_PARTNER_LEGAL_ENTITY = "Remove a general partner (legal entity)";
 export const TRANSACTION_DESCRIPTION_REMOVE_LIMITED_PARTNER_PERSON = "Remove a limited partner (person)";
 export const TRANSACTION_DESCRIPTION_REMOVE_LIMITED_PARTNER_LEGAL_ENTITY = "Remove a limited partner (legal entity)";
+export const TRANSACTION_DESCRIPTION_UPDATE_GENERAL_PARTNER_PERSON = "Update a general partner's details (person)";
+export const TRANSACTION_DESCRIPTION_UPDATE_GENERAL_PARTNER_LEGAL_ENTITY = "Update a general partner's details (legal entity)";
 export const TRANSACTION_DESCRIPTION_DESIGNATE_AS_PRIVATE_FUND_PARTNERSHIP = "Designate as a private fund limited partnership";
 
 // Templates
diff --git a/src/presentation/controller/postTransition/PostTransitionPartnerController.ts b/src/presentation/controller/postTransition/PostTransitionPartnerController.ts
@@ -112,7 +112,8 @@ class PostTransitionPartnerController extends PartnerController {
           pageType === PostTransitionPageType.addGeneralPartnerLegalEntity ||
           pageType === PostTransitionPageType.whenDidTheGeneralPartnerLegalEntityCease ||
           pageType === PostTransitionPageType.addLimitedPartnerLegalEntity ||
-          pageType === PostTransitionPageType.whenDidTheLimitedPartnerLegalEntityCease;
+          pageType === PostTransitionPageType.whenDidTheLimitedPartnerLegalEntityCease ||
+          pageType === PostTransitionPageType.updateGeneralPartnerLegalEntity;
 
         const limitedPartnershipData = limitedPartnershipResult?.limitedPartnership?.data;
 
@@ -210,14 +211,14 @@ class PostTransitionPartnerController extends PartnerController {
     const { tokens, ids } = super.extract(request);
 
     const dataToSend = {
-      ...request.body,
-
       forename: resultAppointment?.partner.data?.forename,
       surname: resultAppointment?.partner.data?.surname,
       legal_entity_name: resultAppointment?.partner.data?.legal_entity_name,
       date_of_birth: resultAppointment?.partner.data?.date_of_birth,
-      appointment_id: ids.appointmentId,
 
+      ...request.body,
+
+      appointment_id: ids.appointmentId,
       kind: isLegalEntity ? data?.legalEntity.kind : data?.person.kind
     };
 
diff --git a/src/presentation/controller/postTransition/pageType.ts b/src/presentation/controller/postTransition/pageType.ts
@@ -49,7 +49,10 @@ enum PostTransitionPageType {
 
   redesignateToPflp = "redesignate-to-pflp",
 
-  updateGeneralPartnerPerson = "update-general-partner-person"
+  updateGeneralPartnerPerson = "update-general-partner-person",
+  updateGeneralPartnerLegalEntity = "update-general-partner-legal-entity",
+
+  updateUsualResidentialAddressYesNo = "update-usual-residential-address-yes-no"
 }
 
 const CeaseDatePageTypes: string[] = [
diff --git a/src/presentation/controller/postTransition/routing/generalPartner.ts b/src/presentation/controller/postTransition/routing/generalPartner.ts
@@ -85,7 +85,7 @@ const postTransitionRoutingRemoveGeneralPartnerLegalEntityCheckYourAnswers = {
 const postTransitionRoutingUpdateGeneralPartnerPerson = {
   previousUrl: url.LANDING_PAGE_URL,
   currentUrl: url.UPDATE_GENERAL_PARTNER_PERSON_URL,
-  nextUrl: "/", // not defined yet
+  nextUrl: url.UPDATE_USUAL_RESIDENTIAL_ADDRESS_YES_NO_URL,
   pageType: PostTransitionPageType.updateGeneralPartnerPerson
 };
 
diff --git a/src/presentation/controller/postTransition/template.ts b/src/presentation/controller/postTransition/template.ts
@@ -60,3 +60,4 @@ export const REMOVE_LIMITED_PARTNER_LEGAL_ENTITY_CHECK_YOUR_ANSWERS_TEMPLATE =
 export const REDESIGNATE_TO_PFLP_TEMPLATE = PostTransitionPageType.redesignateToPflp;
 
 export const UPDATE_GENERAL_PARTNER_PERSON_TEMPLATE = PostTransitionPageType.updateGeneralPartnerPerson;
+export const UPDATE_USUAL_RESIDENTIAL_ADDRESS_YES_NO_TEMPLATE = PostTransitionPageType.updateUsualResidentialAddressYesNo;
diff --git a/src/presentation/controller/postTransition/url.ts b/src/presentation/controller/postTransition/url.ts
@@ -22,6 +22,7 @@ export const ADD_GENERAL_PARTNER_LEGAL_ENTITY_WITH_IDS_URL = `${POST_TRANSITION_
 export const GENERAL_PARTNER_CHECK_YOUR_ANSWERS_URL = `${POST_TRANSITION_WITH_IDS_URL}${GENERAL_PARTNER_WITH_ID_URL}/${template.GENERAL_PARTNER_CHECK_YOUR_ANSWERS_TEMPLATE}`;
 export const UPDATE_GENERAL_PARTNER_PERSON_URL = `${POST_TRANSITION_WITH_ID_URL}${APPOINTMENT_ID_URL}/${template.UPDATE_GENERAL_PARTNER_PERSON_TEMPLATE}`;
 export const UPDATE_GENERAL_PARTNER_PERSON_WITH_IDS_URL = `${POST_TRANSITION_WITH_IDS_URL}${GENERAL_PARTNER_WITH_ID_URL}/${template.UPDATE_GENERAL_PARTNER_PERSON_TEMPLATE}`;
+export const UPDATE_USUAL_RESIDENTIAL_ADDRESS_YES_NO_URL = `${POST_TRANSITION_WITH_IDS_URL}${GENERAL_PARTNER_WITH_ID_URL}/${template.UPDATE_USUAL_RESIDENTIAL_ADDRESS_YES_NO_TEMPLATE}`;
 
 // limited partner
 export const LIMITED_PARTNER_CHOICE_URL = `${POST_TRANSITION_WITH_ID_URL}/${template.LIMITED_PARTNER_CHOICE_TEMPLATE}`;
diff --git a/src/presentation/test/integration/postTransition/generalPartner/update-general-partner-person.test.ts b/src/presentation/test/integration/postTransition/generalPartner/update-general-partner-person.test.ts
@@ -1,20 +1,26 @@
+import { PartnerKind } from "@companieshouse/api-sdk-node/dist/services/limited-partnerships";
+
 import request from "supertest";
 import enTranslationText from "../../../../../../locales/en/translations.json";
 import cyTranslationText from "../../../../../../locales/cy/translations.json";
 import app from "../../app";
 import {
   UPDATE_GENERAL_PARTNER_PERSON_URL,
   UPDATE_GENERAL_PARTNER_PERSON_WITH_IDS_URL,
+  UPDATE_USUAL_RESIDENTIAL_ADDRESS_YES_NO_URL,
 } from "../../../../controller/postTransition/url";
 import { getUrl, setLocalesEnabled, testTranslations } from "../../../utils";
 import CompanyProfileBuilder from "../../../builder/CompanyProfileBuilder";
 import CompanyAppointmentBuilder from "../../../builder/CompanyAppointmentBuilder";
 import { appDevDependencies } from "../../../../../config/dev-dependencies";
 import GeneralPartnerBuilder from "../../../../../presentation/test/builder/GeneralPartnerBuilder";
+import PostTransitionPageType from "../../../../../presentation/controller/postTransition/pageType";
+import { ApiErrors } from "../../../../../domain/entities/UIErrors";
 
 describe("Update General Partner Legal Entity Page", () => {
   const URL = getUrl(UPDATE_GENERAL_PARTNER_PERSON_URL);
   const URL_WITH_IDS = getUrl(UPDATE_GENERAL_PARTNER_PERSON_WITH_IDS_URL);
+  const REDIRECT = getUrl(UPDATE_USUAL_RESIDENTIAL_ADDRESS_YES_NO_URL);
 
   let companyProfile;
   let companyAppointment;
@@ -32,97 +38,131 @@ describe("Update General Partner Legal Entity Page", () => {
     appDevDependencies.companyGateway.feedCompanyAppointments([]);
   });
 
-  describe("Get update general partner person page", () => {
-    it("should load the update general partner legal entity page with English text", async () => {
-      setLocalesEnabled(true);
-
-      const res = await request(app).get(URL + "?lang=en");
-
-      expect(res.status).toBe(200);
-
-      expect(res.text).toContain(
-        `${companyProfile.data.companyName?.toUpperCase()} (${companyProfile.data.companyNumber?.toUpperCase()})`
-      );
-
-      testTranslations(res.text, enTranslationText.updatePartnerPersonPage, [
-        "limitedPartner",
-        "errorMessages",
-      ]);
-
-      expect(res.text).not.toContain("WELSH -");
-    });
-
-    it("should load the update general partner person page with Welsh text", async () => {
-      setLocalesEnabled(true);
-
-      const res = await request(app).get(URL + "?lang=cy");
-
-      expect(res.status).toBe(200);
-
-      expect(res.text).toContain(
-        `${companyProfile.data.companyName?.toUpperCase()} (${companyProfile.data.companyNumber?.toUpperCase()})`
-      );
-
-      testTranslations(res.text, cyTranslationText.updatePartnerPersonPage, [
-        "limitedPartner",
-        "errorMessages",
-      ]);
+  describe("Update general partner person page", () => {
+
+    describe("GET general partner cease date page", () => {
+
+      it.each([
+        ["English", "en", enTranslationText],
+        ["Welsh", "cy", cyTranslationText]
+      ])("should load the update general partner legal entity page with %s text", async (_description: string, lang: string, translationText: any) => {
+        setLocalesEnabled(true);
+
+        const res = await request(app).get(`${URL}?lang=${lang}`);
+
+        expect(res.status).toBe(200);
+
+        expect(res.text).toContain(
+          `${companyProfile.data.companyName?.toUpperCase()} (${companyProfile.data.companyNumber?.toUpperCase()})`
+        );
+
+        testTranslations(res.text, translationText.updatePartnerPersonPage, [
+          "limitedPartner",
+          "errorMessages",
+        ]);
+
+        if (lang === "cy") {
+          expect(res.text).toContain("WELSH - ");
+        } else {
+          expect(res.text).not.toContain("WELSH -");
+        }
+      });
+
+      it("should contain the partnership name", async () => {
+        const res = await request(app).get(URL);
+
+        expect(res.status).toBe(200);
+        expect(res.text).toContain(
+          `${companyProfile.data.companyName.toUpperCase()} (${companyProfile.data.companyNumber.toUpperCase()})`
+        );
+      });
+
+      it.each([
+        ["with appointment id", URL],
+        ["with general partner id", URL_WITH_IDS]
+      ])("should load the update general partner person page and replay saved data %s", async (_description: string, url: string) => {
+        if (url.includes("/appointment/")) {
+          companyAppointment = new CompanyAppointmentBuilder()
+            .withOfficerRole("general-partner-in-a-limited-partnership")
+            .withName("Doe - GP, Joe - GP")
+            .withNationality("British,Irish")
+            .build();
+          appDevDependencies.companyGateway.feedCompanyAppointments([
+            companyAppointment,
+          ]);
+        } else {
+          const generalPartner = new GeneralPartnerBuilder()
+            .withId(appDevDependencies.generalPartnerGateway.generalPartnerId)
+            .isPerson()
+            .withNotDisqualifiedStatementChecked(true)
+            .withNationality1("British")
+            .withNationality2("Irish")
+            .build();
+
+          appDevDependencies.generalPartnerGateway.feedGeneralPartners([
+            generalPartner,
+          ]);
+        }
+
+        setLocalesEnabled(true);
+        const res = await request(app).get(url);
+
+        expect(res.status).toBe(200);
+        expect(res.text).toContain("Joe - GP");
+        expect(res.text).toContain("Doe - GP");
+        expect(res.text).toContain('<option value="British" selected>British</option>');
+        expect(res.text).toContain('<option value="Irish" selected>Irish</option>');
+      });
     });
 
-    it("should contain the partnership name", async () => {
-      const res = await request(app).get(URL);
-
-      expect(res.status).toBe(200);
-      expect(res.text).toContain(
-        `${companyProfile.data.companyName.toUpperCase()} (${companyProfile.data.companyNumber.toUpperCase()})`
-      );
-    });
-
-    it("should load the update general partner person page and replay saved data from CHS appointment", async () => {
-      companyAppointment = new CompanyAppointmentBuilder()
-        .withOfficerRole("general-partner-in-a-limited-partnership")
-        .withName("Doe - GP, Joe - GP")
-        .withNationality("British,Irish")
-        .build();
-      appDevDependencies.companyGateway.feedCompanyAppointments([
-        companyAppointment,
-      ]);
-
-      setLocalesEnabled(true);
-      const res = await request(app).get(URL);
-
-      expect(res.status).toBe(200);
-      expect(res.text).toContain("Joe - GP");
-      expect(res.text).toContain("Doe - GP");
-      expect(res.text).toContain(
-        '<option value="British" selected>British</option>'
-      );
-      expect(res.text).toContain(
-        '<option value="Irish" selected>Irish</option>'
-      );
+    describe("POST general partner cease date page", () => {
+
+      it("should send the general partner person details to API", async () => {
+        expect(appDevDependencies.generalPartnerGateway.generalPartners).toHaveLength(0);
+
+        const res = await request(app).post(URL).send({
+          pageType: PostTransitionPageType.updateGeneralPartnerPerson,
+          "forename": "John",
+          "surname": "Doe",
+          "nationality1": "British",
+          "nationality2": "Irish"
+        });
+
+        expect(res.status).toBe(302);
+        expect(res.text).toContain(`Redirecting to ${REDIRECT}`);
+
+        expect(appDevDependencies.generalPartnerGateway.generalPartners).toHaveLength(1);
+        expect(appDevDependencies.generalPartnerGateway.generalPartners[0].data?.kind).toEqual(
+          PartnerKind.UPDATE_GENERAL_PARTNER_PERSON
+        );
+        expect(appDevDependencies.generalPartnerGateway.generalPartners[0].data?.forename).toEqual("John");
+        expect(appDevDependencies.generalPartnerGateway.generalPartners[0].data?.surname).toEqual("Doe");
+        expect(appDevDependencies.generalPartnerGateway.generalPartners[0].data?.nationality1).toEqual("British");
+        expect(appDevDependencies.generalPartnerGateway.generalPartners[0].data?.nationality2).toEqual("Irish");
+      });
+
+      it("should replay entered data when a validation error occurs", async () => {
+        const apiErrors: ApiErrors = {
+          errors: { forename: "forename is invalid" }
+        };
+        appDevDependencies.generalPartnerGateway.feedErrors(apiErrors);
+
+        const res = await request(app).post(URL).send({
+          pageType: PostTransitionPageType.updateGeneralPartnerPerson,
+          "forename": "INVALID-FORENAME",
+          "surname": "Doe",
+          "nationality1": "British",
+          "nationality2": "Irish"
+        });
+
+        expect(res.status).toBe(200);
+        expect(res.text).toContain("forename is invalid");
+        expect(res.text).toContain("INVALID-FORENAME");
+        expect(res.text).toContain("Doe");
+        expect(res.text).toContain('<option value="British" selected>British</option>');
+        expect(res.text).toContain('<option value="Irish" selected>Irish</option>');
+      });
     });
 
-    it("should load the update general partner person page and replay saved general partner data", async () => {
-      const generalPartner = new GeneralPartnerBuilder()
-        .withId(appDevDependencies.generalPartnerGateway.generalPartnerId)
-        .isPerson()
-        .withNotDisqualifiedStatementChecked(true)
-        .withNationality1("British")
-        .build();
-
-      appDevDependencies.generalPartnerGateway.feedGeneralPartners([
-        generalPartner,
-      ]);
-
-      setLocalesEnabled(true);
-      const res = await request(app).get(URL_WITH_IDS);
-
-      expect(res.status).toBe(200);
-      expect(res.text).toContain("Joe - GP");
-      expect(res.text).toContain("Doe - GP");
-      expect(res.text).toContain(
-        '<option value="British" selected>British</option>'
-      );
-    });
   });
 });
diff --git a/src/routes/postTransition.ts b/src/routes/postTransition.ts
@@ -61,7 +61,9 @@ import {
   TRANSACTION_DESCRIPTION_REMOVE_GENERAL_PARTNER_LEGAL_ENTITY,
   TRANSACTION_DESCRIPTION_REMOVE_GENERAL_PARTNER_PERSON,
   TRANSACTION_DESCRIPTION_REMOVE_LIMITED_PARTNER_LEGAL_ENTITY,
-  TRANSACTION_DESCRIPTION_REMOVE_LIMITED_PARTNER_PERSON
+  TRANSACTION_DESCRIPTION_REMOVE_LIMITED_PARTNER_PERSON,
+  TRANSACTION_DESCRIPTION_UPDATE_GENERAL_PARTNER_LEGAL_ENTITY,
+  TRANSACTION_DESCRIPTION_UPDATE_GENERAL_PARTNER_PERSON
 } from "../config/constants";
 
 const postTransitionEndpoints = (router: Router, dependencies: IDependencies): void => {
@@ -621,6 +623,21 @@ const postTransitionEndpoints = (router: Router, dependencies: IDependencies): v
     companyAuthentication,
     dependencies.generalPartnerPostTransitionController.getUpdatePageRouting()
   );
+  router.post(
+    UPDATE_GENERAL_PARTNER_PERSON_URL,
+    companyAuthentication,
+    dependencies.generalPartnerPostTransitionController.createGeneralPartner({
+      person: {
+        description: TRANSACTION_DESCRIPTION_UPDATE_GENERAL_PARTNER_PERSON,
+        kind: PartnerKind.UPDATE_GENERAL_PARTNER_PERSON
+      },
+      legalEntity: {
+        description: TRANSACTION_DESCRIPTION_UPDATE_GENERAL_PARTNER_LEGAL_ENTITY,
+        kind: PartnerKind.UPDATE_GENERAL_PARTNER_LEGAL_ENTITY
+      },
+      needAppointment: true
+    })
+  );
 
   router.get(
     UPDATE_GENERAL_PARTNER_PERSON_WITH_IDS_URL,

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,10 @@ enum PostTransitionPageType {`
`49`	`49`
`50`	`50`	`redesignateToPflp = "redesignate-to-pflp",`
`51`	`51`
`52`		`- updateGeneralPartnerPerson = "update-general-partner-person"`
	`52`	`+ updateGeneralPartnerPerson = "update-general-partner-person",`
	`53`	`+ updateGeneralPartnerLegalEntity = "update-general-partner-legal-entity",`
	`54`	`+`
	`55`	`+ updateUsualResidentialAddressYesNo = "update-usual-residential-address-yes-no"`
`53`	`56`	`}`
`54`	`57`
`55`	`58`	`const CeaseDatePageTypes: string[] = [`
Original file line number	Diff line number	Diff line change
`@@ -60,3 +60,4 @@ export const REMOVE_LIMITED_PARTNER_LEGAL_ENTITY_CHECK_YOUR_ANSWERS_TEMPLATE =`
`60`	`60`	`export const REDESIGNATE_TO_PFLP_TEMPLATE = PostTransitionPageType.redesignateToPflp;`
`61`	`61`
`62`	`62`	`export const UPDATE_GENERAL_PARTNER_PERSON_TEMPLATE = PostTransitionPageType.updateGeneralPartnerPerson;`
	`63`	`+export const UPDATE_USUAL_RESIDENTIAL_ADDRESS_YES_NO_TEMPLATE = PostTransitionPageType.updateUsualResidentialAddressYesNo;`