Merge branch 'main' into lp-1432-update-general-partner-person-template-changes

Author: markpit

src/presentation/controller/common/PartnerController.ts

@@ -379,7 +379,7 @@ abstract class PartnerController extends AbstractController {
   // PATCH *******************************************************
   sendPageData(
     partner: PartnerType,
-    urls: {
+    urls?: {
       confirmPartnerUsualResidentialAddressUrl: string;
       confirmPartnerPrincipalOfficeAddressUrl: string;
     }
@@ -421,10 +421,12 @@ abstract class PartnerController extends AbstractController {
           return;
         }
 
-        await this.conditionalPatchPartner(pageRouting, request, {
-          confirmPartnerUsualResidentialAddressUrl: urls.confirmPartnerUsualResidentialAddressUrl,
-          confirmPartnerPrincipalOfficeAddressUrl: urls.confirmPartnerPrincipalOfficeAddressUrl
-        });
+        if (urls){
+          await this.conditionalPatchPartner(pageRouting, request, {
+            confirmPartnerUsualResidentialAddressUrl: urls.confirmPartnerUsualResidentialAddressUrl,
+            confirmPartnerPrincipalOfficeAddressUrl: urls.confirmPartnerPrincipalOfficeAddressUrl
+          });
+        }
 
         response.redirect(pageRouting.nextUrl);
       } catch (error) {

src/presentation/controller/postTransition/GeneralPartnerController.ts

@@ -67,6 +67,10 @@ class GeneralPartnerPostTransitionController extends PartnerController {
     });
   }
 
+  sendUpdatePageData() {
+    return super.sendPageData(PartnerType.generalPartner);
+  }
+
   getCeaseDate() {
     return this.postTransitionPartnerController.getCeaseDate();
   }

src/presentation/test/builder/AbstractPartnerBuilder.ts

@@ -94,6 +94,12 @@ abstract class AbstractPartnerBuilder {
     this.data.legal_entity_registration_location = legalEntityRegistrationLocation;
     return this;
   }
+
+  withKind(kind: string) {
+    this.data.kind = kind;
+    return this;
+  }
+
 }
 
 export default AbstractPartnerBuilder;

src/presentation/test/integration/postTransition/generalPartner/update-general-partner-person.test.ts

@@ -116,11 +116,28 @@ describe("Update General Partner Legal Entity Page", () => {
     });
 
     describe("POST general partner cease date page", () => {
-
-      it("should send the general partner person details to API", async () => {
+      it.each([
+        ["with appointment id", URL],
+        ["with general partner id", URL_WITH_IDS],
+      ])("should send the general partner person details to API %s", async (_description: string, url: string) => {
         expect(appDevDependencies.generalPartnerGateway.generalPartners).toHaveLength(0);
 
-        const res = await request(app).post(URL).send({
+        if (url.includes("/general-partner/")) {
+          const generalPartner = new GeneralPartnerBuilder()
+            .withId(appDevDependencies.generalPartnerGateway.generalPartnerId)
+            .isPerson()
+            .withNotDisqualifiedStatementChecked(true)
+            .withNationality1("British")
+            .withNationality2("Irish")
+            .withKind(PartnerKind.UPDATE_GENERAL_PARTNER_PERSON)
+            .build();
+
+          appDevDependencies.generalPartnerGateway.feedGeneralPartners([
+            generalPartner,
+          ]);
+        }
+
+        const res = await request(app).post(url).send({
           pageType: PostTransitionPageType.updateGeneralPartnerPerson,
           "forename": "John",
           "surname": "Doe",

src/routes/postTransition.ts

@@ -644,6 +644,12 @@ const postTransitionEndpoints = (router: Router, dependencies: IDependencies): v
     companyAuthentication,
     dependencies.generalPartnerPostTransitionController.getUpdatePageRouting()
   );
+
+  router.post(
+    UPDATE_GENERAL_PARTNER_PERSON_WITH_IDS_URL,
+    companyAuthentication,
+    dependencies.generalPartnerPostTransitionController.sendUpdatePageData()
+  );
 };
 
 export default postTransitionEndpoints;