Merge pull request #1742 from companieshouse/origin/feature/roecct-723-bug-fix-mo-correspondence-address

ROECCT-723: Bugfix- Correspondence address for Individual managing officer doesn't reflect in CHS

Author: amalviyach

src/controllers/update/update.review.individual.managing.officer.ts

@@ -1,38 +1,34 @@
 import { UPDATE_BENEFICIAL_OWNER_BO_MO_REVIEW_URL, UPDATE_BENEFICIAL_OWNER_TYPE_URL, UPDATE_REVIEW_INDIVIDUAL_MANAGING_OFFICER_PAGE, RELEVANT_PERIOD_QUERY_PARAM } from "../../config";
 import { NextFunction, Request, Response } from "express";
-import { getApplicationData, mapDataObjectToFields, removeFromApplicationData, setApplicationData } from "../../utils/application.data";
+import { getApplicationData, removeFromApplicationData, setApplicationData } from "../../utils/application.data";
 import { logger } from "../../utils/logger";
 import { ManagingOfficerKey } from "../../model/managing.officer.model";
 import { setReviewedDateOfBirth } from "./update.review.beneficial.owner.individual";
 import { Session } from "@companieshouse/node-session-handler";
 import { ApplicationDataType } from "../../model";
 import { v4 as uuidv4 } from "uuid";
 import { saveAndContinue } from "../../utils/save.and.continue";
-import { AddressKeys, InputDate } from "../../model/data.types.model";
+import { InputDate } from "../../model/data.types.model";
 import { setOfficerData } from "../../utils/managing.officer.individual";
 import { HaveDayOfBirthKey, ResignedOnKey } from "../../model/date.model";
 import { addResignedDateToTemplateOptions } from "../../utils/update/ceased_date_util";
-import { UsualResidentialAddressKey, UsualResidentialAddressKeys } from "../../model/address.model";
 import { checkRelevantPeriod } from "../../utils/relevant.period";
+import { fetchIndividualMOAddress } from "../../utils/update/review.managing.officer";
 
 export const get = async (req: Request, res: Response, next: NextFunction) => {
   try {
     logger.debugRequest(req, `${req.method} ${req.route.path}`);
     const appData = await getApplicationData(req.session);
-    const index = req.query.index;
+    const index = Number(req.query.index);
 
-    let dataToReview = {}, residentialAddress = {};
-
-    if (appData?.managing_officers_individual){
-      dataToReview = appData?.managing_officers_individual[Number(index)];
-      residentialAddress = (dataToReview) ? mapDataObjectToFields(dataToReview[UsualResidentialAddressKey], UsualResidentialAddressKeys, AddressKeys) : {};
-    }
+    const { dataToReview, residentialAddress, serviceAddress } = fetchIndividualMOAddress(appData, index);
 
     const templateOptions = {
       backLinkUrl: UPDATE_BENEFICIAL_OWNER_BO_MO_REVIEW_URL,
       templateName: UPDATE_REVIEW_INDIVIDUAL_MANAGING_OFFICER_PAGE,
       ...dataToReview,
-      ...residentialAddress
+      ...residentialAddress,
+      ...serviceAddress
     };
 
     if (ResignedOnKey in dataToReview) {

src/utils/update/review.managing.officer.ts

@@ -1,9 +1,12 @@
+import { mapDataObjectToFields } from "../../utils/application.data";
 import { REVIEW_OWNER_INDEX_PARAM, UPDATE_AN_OVERSEAS_ENTITY_URL, UPDATE_REVIEW_INDIVIDUAL_MANAGING_OFFICER_PAGE, UPDATE_REVIEW_MANAGING_OFFICER_CORPORATE_PAGE } from "../../config";
 import { ApplicationData } from "../../model";
 import { ManagingOfficerCorporateKey } from "../../model/managing.officer.corporate.model";
 import { ManagingOfficerKey } from "../../model/managing.officer.model";
 import { Update } from "../../model/update.type.model";
 import { reviewAllOwnwers } from "./review.beneficial.owner";
+import { ServiceAddressKey, ServiceAddressKeys, UsualResidentialAddressKey, UsualResidentialAddressKeys } from "../../model/address.model";
+import { AddressKeys } from "../../model/data.types.model";
 
 const AllMoTypes = {
   moIndividualOfficerReview: "review_managing_officers_individual",
@@ -64,3 +67,14 @@ export const checkAndReviewManagingOfficers = (appData: ApplicationData): string
 
   return "";
 };
+
+export function fetchIndividualMOAddress(appData: any, index: number) {
+  let dataToReview = {}, residentialAddress = {}, serviceAddress = {};
+
+  if (appData?.managing_officers_individual){
+    dataToReview = appData?.managing_officers_individual[Number(index)];
+    residentialAddress = (dataToReview) ? mapDataObjectToFields(dataToReview[UsualResidentialAddressKey], UsualResidentialAddressKeys, AddressKeys) : {};
+    serviceAddress = (dataToReview) ? mapDataObjectToFields(dataToReview[ServiceAddressKey], ServiceAddressKeys, AddressKeys) : {};
+  }
+  return { dataToReview, residentialAddress, serviceAddress };
+}

test/controllers/update/update.review.managing.officer.individual.spec.ts

@@ -30,6 +30,7 @@ import {
   UPDATE_REVIEW_MANAGING_OFFICER_MOCK_STILL_MO,
   RESIDENTIAL_ADDRESS_MOCK,
   UPDATE_MANAGING_OFFICER_HAVE_DAY_OF_BIRTH_MOCK,
+  SERVICE_ADDRESS_MOCK,
 } from "../../__mocks__/session.mock";
 import { hasUpdatePresenter } from "../../../src/middleware/navigation/update/has.presenter.middleware";
 import { ANY_MESSAGE_ERROR, SERVICE_UNAVAILABLE, UPDATE_REVIEW_INDIVIDUAL_MANAGING_OFFICER_HEADING } from '../../__mocks__/text.mock';
@@ -106,6 +107,29 @@ describe('Test review managing officer', () => {
       expect(resp.status).toEqual(500);
       expect(resp.text).toContain(SERVICE_UNAVAILABLE);
     });
+
+    test(`render the ${config.UPDATE_REVIEW_INDIVIDUAL_MANAGING_OFFICER_PAGE} page and verifies service and residential address`, async () => {
+      mockGetApplicationData.mockReturnValueOnce({
+        ...APPLICATION_DATA_EMPTY_BO_MOCK,
+      });
+      mockMapDataObjectToFields.mockReturnValueOnce(SERVICE_ADDRESS_MOCK);
+      mockMapDataObjectToFields.mockReturnValueOnce(RESIDENTIAL_ADDRESS_MOCK);
+      const resp = await request(app).get(UPDATE_REVIEW_INDIVIDUAL_MANAGING_OFFICER_WITH_PARAM_URL_TEST);
+      expect(resp.status).toEqual(200);
+      expect(resp.text).toContain(config.UPDATE_BENEFICIAL_OWNER_BO_MO_REVIEW_URL);
+      expect(resp.text).toContain("addressLine1");
+      expect(resp.text).toContain("residential address addressLine1");
+    });
+
+    test('service and residential address not displayed when no address returned', async () => {
+      mockGetApplicationData.mockReturnValueOnce({
+        ...APPLICATION_DATA_EMPTY_BO_MOCK,
+      });
+      const resp = await request(app).get(UPDATE_REVIEW_INDIVIDUAL_MANAGING_OFFICER_WITH_PARAM_URL_TEST);
+      expect(resp.status).toEqual(200);
+      expect(resp.text).not.toContain("addressLine1");
+      expect(resp.text).not.toContain("residential address addressLine1");
+    });
   });
 
   describe(`POST tests`, () => {