Merge pull request #1686 from companieshouse/feat/roe-2675/app-data-f…

…rom-api-for-check-your-answers-page

feat/roe-2675: add change links with entity IDs in url

src/app.ts

@@ -12,14 +12,21 @@ import {
 import { v4 as uuidv4 } from 'uuid';
 import { prepareCSPConfig } from "./middleware/content.security.policy.middleware";
 import nocache from "nocache";
-
 import * as config from "./config";
 import { logger } from "./utils/logger";
 import router from "./routes";
 import errorHandler from "./controllers/error.controller";
-import { createChangeLinkConfig, createSummaryListLink } from "./utils/change.link";
 import { countryFilter } from "./utils/country.filter";
 import { ErrorMessages } from "./validation/error.messages";
+import { isActiveFeature } from "./utils/feature.flag";
+import {
+  getTransactionIdAndSubmissionIdFromOriginalUrl,
+  getUrlWithTransactionIdAndSubmissionId
+} from "./utils/url";
+import {
+  createChangeLinkConfig,
+  createSummaryListLink,
+} from "./utils/change.link";
 
 const app = express();
 
@@ -39,6 +46,7 @@ const nunjucksEnv = nunjucks.configure([
   autoescape: true,
   express: app,
 });
+
 nunjucksEnv.addGlobal("CDN_HOST", config.CDN_HOST);
 nunjucksEnv.addGlobal("SERVICE_NAME", config.SERVICE_NAME);
 nunjucksEnv.addGlobal("UPDATE_SERVICE_NAME", config.UPDATE_SERVICE_NAME);
@@ -47,7 +55,9 @@ nunjucksEnv.addGlobal("OE_CONFIGS", config);
 nunjucksEnv.addGlobal("ERROR_MESSAGES", ErrorMessages);
 nunjucksEnv.addGlobal("COUNTRY_FILTER", countryFilter );
 nunjucksEnv.addGlobal("CREATE_CHANGE_LINK", createChangeLinkConfig);
+nunjucksEnv.addGlobal("CREATE_CHANGE_LINK_WITH_IDS", getUrlWithTransactionIdAndSubmissionId);
 nunjucksEnv.addGlobal("SUMMARY_LIST_LINK", createSummaryListLink);
+nunjucksEnv.addGlobal("IS_REDIS_REMOVAL_ENABLED", isActiveFeature(config.FEATURE_FLAG_ENABLE_REDIS_REMOVAL));
 nunjucksEnv.addGlobal("PIWIK_URL", config.PIWIK_URL);
 nunjucksEnv.addGlobal("PIWIK_SITE_ID", config.PIWIK_SITE_ID);
 nunjucksEnv.addGlobal("PIWIK_START_GOAL_ID", config.PIWIK_START_GOAL_ID);
@@ -61,6 +71,13 @@ app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 
+app.use((req, res, next) => {
+  const ids = getTransactionIdAndSubmissionIdFromOriginalUrl(req);
+  nunjucksEnv.addGlobal("OE_TRANSACTION_ID", ids?.transactionId);
+  nunjucksEnv.addGlobal("OE_SUBMISSION_ID", ids?.submissionId);
+  next();
+});
+
 const nonce: string = uuidv4();
 app.use(helmet(prepareCSPConfig(nonce)));
 app.use(nocache());

src/config/index.ts

@@ -351,9 +351,11 @@ export const CHANGE_RESIDENTIAL_ADDRESS = "#usual_residential_address_property_n
 export const IS_SERVICE_ADDRESS_SAME_AS_USUAL_RESIDENTIAL_ADDRESS = "#is_service_address_same_as_usual_residential_address";
 export const IDENTITY_ADDRESS = "#identity_address_property_name_number";
 export const NAME = "#name";
+export const FULL_NAME = "#full_name";
 export const HAS_FORMER_NAMES = "#has_former_names";
 export const FORMER_NAMES = "#former_names";
 export const EMAIL = "#email";
+export const WHO_IS_MAKING_FILING = "#who_is_registering";
 export const LEGAL_FORM = "#legal_form";
 export const LAW_GOVERNED = "#law_governed";
 export const FIRST_NAME = "#first_name";
@@ -403,8 +405,9 @@ export const REGISTRABLE_BENEFICIAL_OWNER = "#registrable_beneficial_owner";
 export const TRUST_STILL_INVOLVED = "#stillInvolved";
 export const TRUST_CEASED_DATE = "#ceasedDateDay";
 
+export const WHO_IS_MAKING_FILING_CHANGE = WHO_IS_MAKING_FILING_URL + WHO_IS_MAKING_FILING;
 export const ENTITY_CHANGE_NAME = OVERSEAS_NAME_URL + ENTITY_NAME;
-export const PRESENTER_CHANGE_FULL_NAME = PRESENTER_URL + "#full_name";
+export const PRESENTER_CHANGE_FULL_NAME = PRESENTER_URL + FULL_NAME;
 export const PRESENTER_CHANGE_EMAIL = PRESENTER_URL + EMAIL;
 export const ENTITY_CHANGE_COUNTRY = ENTITY_URL + "#incorporation_country";
 export const ENTITY_CHANGE_PRINCIPAL_ADDRESS = ENTITY_URL + CHANGE_PRINCIPAL_ADDRESS;
@@ -451,8 +454,8 @@ export const UPDATE_OVERSEAS_ENTITY_DUE_DILIGENCE_CHANGE_SUPERVISORY_NAME = UPDA
 export const UPDATE_OVERSEAS_ENTITY_DUE_DILIGENCE_CHANGE_AML_NUMBER = UPDATE_DUE_DILIGENCE_OVERSEAS_ENTITY_URL + AML_NUMBER;
 export const UPDATE_OVERSEAS_ENTITY_DUE_DILIGENCE_CHANGE_PARTNER_NAME = UPDATE_DUE_DILIGENCE_OVERSEAS_ENTITY_URL + PARTNER_NAME;
 
-export const UPDATE_PRESENTER_CHANGE_FULL_NAME = OVERSEAS_ENTITY_PRESENTER_URL + "#full_name";
-export const UPDATE_PRESENTER_CHANGE_EMAIL = OVERSEAS_ENTITY_PRESENTER_URL + "#email";
+export const UPDATE_PRESENTER_CHANGE_FULL_NAME = OVERSEAS_ENTITY_PRESENTER_URL + FULL_NAME;
+export const UPDATE_PRESENTER_CHANGE_EMAIL = OVERSEAS_ENTITY_PRESENTER_URL + EMAIL;
 export const SECURE_UPDATE_FILTER_CHANGELINK = SECURE_UPDATE_FILTER_URL + SECURE_FILTER;
 export const UPDATE_FILING_DATE_CHANGELINK = UPDATE_FILING_DATE_URL + FILING_DATE;
 export const UPDATE_DO_YOU_WANT_TO_MAKE_OE_CHANGE_CHANGELINK = UPDATE_DO_YOU_WANT_TO_MAKE_OE_CHANGE_URL + NO_CHANGE;
@@ -497,3 +500,26 @@ export const TRUST_ENTRY_WITH_PARAMS_URL = REGISTER_AN_OVERSEAS_ENTITY_WITH_PARA
 export const TRUST_INFO_WITH_PARAMS_URL = REGISTER_AN_OVERSEAS_ENTITY_WITH_PARAMS_URL + TRUST_INFO_PAGE;
 export const TRANSACTION_ID_URL_KEY = "/transaction/";
 export const SUBMISSION_ID_URL_KEY = "/submission/";
+
+// Check-your-answers page links
+export const ENTITY_CHANGE_NAME_WITH_PARAMS = OVERSEAS_NAME_WITH_PARAMS_URL + ENTITY_NAME;
+export const PRESENTER_CHANGE_FULL_NAME_WITH_PARAMS = PRESENTER_WITH_PARAMS_URL + FULL_NAME;
+export const PRESENTER_CHANGE_EMAIL_WITH_PARAMS = PRESENTER_WITH_PARAMS_URL + EMAIL;
+export const WHO_IS_MAKING_FILING_CHANGE_WITH_PARAMS = WHO_IS_MAKING_FILING_WITH_PARAMS_URL + WHO_IS_MAKING_FILING;
+export const DUE_DILIGENCE_CHANGE_AGENT_CODE_WITH_PARAMS = DUE_DILIGENCE_WITH_PARAMS_URL + AGENT_CODE;
+export const DUE_DILIGENCE_CHANGE_IDENTITY_DATE_WITH_PARAMS = DUE_DILIGENCE_WITH_PARAMS_URL + IDENTITY_DATE;
+export const DUE_DILIGENCE_CHANGE_NAME_WITH_PARAMS = DUE_DILIGENCE_WITH_PARAMS_URL + NAME;
+export const DUE_DILIGENCE_CHANGE_IDENTITY_ADDRESS_WITH_PARAMS = DUE_DILIGENCE_WITH_PARAMS_URL + IDENTITY_ADDRESS;
+export const DUE_DILIGENCE_CHANGE_EMAIL_WITH_PARAMS = DUE_DILIGENCE_WITH_PARAMS_URL + EMAIL;
+export const DUE_DILIGENCE_CHANGE_SUPERVISORY_NAME_WITH_PARAMS = DUE_DILIGENCE_WITH_PARAMS_URL + SUPERVISORY_NAME;
+export const DUE_DILIGENCE_CHANGE_AML_NUMBER_WITH_PARAMS = DUE_DILIGENCE_WITH_PARAMS_URL + AML_NUMBER;
+export const DUE_DILIGENCE_CHANGE_PARTNER_NAME_WITH_PARAMS = DUE_DILIGENCE_WITH_PARAMS_URL + PARTNER_NAME;
+export const OVERSEAS_ENTITY_DUE_DILIGENCE_CHANGE_AGENT_CODE_WITH_PARAMS = OVERSEAS_ENTITY_DUE_DILIGENCE_WITH_PARAMS_URL + AGENT_CODE;
+export const OVERSEAS_ENTITY_DUE_DILIGENCE_CHANGE_IDENTITY_DATE_WITH_PARAMS = OVERSEAS_ENTITY_DUE_DILIGENCE_WITH_PARAMS_URL + IDENTITY_DATE;
+export const OVERSEAS_ENTITY_DUE_DILIGENCE_CHANGE_NAME_WITH_PARAMS = OVERSEAS_ENTITY_DUE_DILIGENCE_WITH_PARAMS_URL + NAME;
+export const OVERSEAS_ENTITY_DUE_DILIGENCE_CHANGE_IDENTITY_ADDRESS_WITH_PARAMS = OVERSEAS_ENTITY_DUE_DILIGENCE_WITH_PARAMS_URL + IDENTITY_ADDRESS;
+export const OVERSEAS_ENTITY_DUE_DILIGENCE_CHANGE_EMAIL_WITH_PARAMS = OVERSEAS_ENTITY_DUE_DILIGENCE_WITH_PARAMS_URL + EMAIL;
+export const OVERSEAS_ENTITY_DUE_DILIGENCE_CHANGE_SUPERVISORY_NAME_WITH_PARAMS = OVERSEAS_ENTITY_DUE_DILIGENCE_WITH_PARAMS_URL + SUPERVISORY_NAME;
+export const OVERSEAS_ENTITY_DUE_DILIGENCE_CHANGE_AML_NUMBER_WITH_PARAMS = OVERSEAS_ENTITY_DUE_DILIGENCE_WITH_PARAMS_URL + AML_NUMBER;
+export const OVERSEAS_ENTITY_DUE_DILIGENCE_CHANGE_PARTNER_NAME_WITH_PARAMS = OVERSEAS_ENTITY_DUE_DILIGENCE_WITH_PARAMS_URL + PARTNER_NAME;
+

src/controllers/check.your.answers.controller.ts

@@ -9,10 +9,10 @@ import { ApplicationData } from "../model";
 import { startPaymentsSession } from "../service/payment.service";
 import { RoleWithinTrustType } from "../model/role.within.trust.type.model";
 import { fetchApplicationData } from "../utils/application.data";
-
+import { OverseasEntityKey, Transactionkey } from "../model/data.types.model";
 import { getUrlWithParamsToPath, isRegistrationJourney } from "../utils/url";
 import { checkEntityRequiresTrusts, getTrustLandingUrl } from "../utils/trusts";
-import { OverseasEntityKey, Transactionkey } from "../model/data.types.model";
+import { mapTrustApiToWebWhenFlagsAreSet } from "../utils/trust/api.to.web.mapper";
 
 export const get = async (req: Request, res: Response, next: NextFunction) => {
 
@@ -22,6 +22,7 @@ export const get = async (req: Request, res: Response, next: NextFunction) => {
 
     const isRegistration = isRegistrationJourney(req);
     const appData: ApplicationData = await fetchApplicationData(req, isRegistration);
+    mapTrustApiToWebWhenFlagsAreSet (appData, isRegistration);
     const requiresTrusts: boolean = checkEntityRequiresTrusts(appData);
     const changeLinkUrl: string = config.ENTITY_URL;
     const overseasEntityHeading: string = config.OVERSEAS_ENTITY_SECTION_HEADING;

src/controllers/shared/common.resume.submission.controller.ts

@@ -3,21 +3,16 @@ import { v4 as uuidv4 } from "uuid";
 import { Session } from "@companieshouse/node-session-handler";
 
 import * as config from "../../config";
-
 import { ApplicationData } from "../../model";
 import { createAndLogErrorRequest, logger } from "../../utils/logger";
 import { setExtraData } from "../../utils/application.data";
 import { isActiveFeature } from "../../utils/feature.flag";
 import { getOverseasEntity } from "../../service/overseas.entities.service";
+import { startPaymentsSession } from "../../service/payment.service";
+import { getTransaction } from "../../service/transaction.service";
+import { mapTrustApiReturnModelToWebModel } from "../../utils/trusts";
+import { isRegistrationJourney } from "../../utils/url";
 
-import {
-  HasSoldLandKey,
-  ID,
-  NonLegalFirmNoc,
-  IsSecureRegisterKey,
-  OverseasEntityKey,
-  Transactionkey
-} from "../../model/data.types.model";
 import { WhoIsRegisteringKey, WhoIsRegisteringType } from "../../model/who.is.making.filing.model";
 import { OverseasEntityDueDiligenceKey } from "../../model/overseas.entity.due.diligence.model";
 import { DueDiligenceKey } from "../../model/due.diligence.model";
@@ -27,17 +22,22 @@ import { BeneficialOwnerOther, BeneficialOwnerOtherKey } from "../../model/benef
 import { ManagingOfficerCorporate, ManagingOfficerCorporateKey } from "../../model/managing.officer.corporate.model";
 import { ManagingOfficerIndividual, ManagingOfficerKey } from "../../model/managing.officer.model";
 
-import { startPaymentsSession } from "../../service/payment.service";
-import { getTransaction } from "../../service/transaction.service";
-import { mapTrustApiReturnModelToWebModel } from "../../utils/trusts";
+import {
+  ID,
+  HasSoldLandKey,
+  NonLegalFirmNoc,
+  IsSecureRegisterKey,
+  OverseasEntityKey,
+  Transactionkey
+} from "../../model/data.types.model";
 
 export const getResumePage = async (req: Request, res: Response, next: NextFunction, resumePage: string) => {
   try {
     logger.debugRequest(req, `GET a saved OE submission`);
 
     const { transactionId, overseaEntityId } = req.params;
     const infoMsg = `Transaction ID: ${transactionId}, OverseasEntity ID: ${overseaEntityId}`;
-    const isRegistration: boolean = req.path.startsWith(config.LANDING_URL);
+    const isRegistration: boolean = isRegistrationJourney(req);
 
     logger.infoRequest(req, `Resuming OE - ${infoMsg}`);
 
@@ -48,7 +48,7 @@ export const getResumePage = async (req: Request, res: Response, next: NextFunct
     }
 
     const session = req.session as Session;
-    setWebApplicationData(session, appData, transactionId, overseaEntityId);
+    setWebApplicationData(session, appData, transactionId, overseaEntityId, isRegistration);
 
     const transactionResource = await getTransaction(req, transactionId);
 
@@ -85,28 +85,33 @@ export const getResumePage = async (req: Request, res: Response, next: NextFunct
  * @param transactionId
  * @param overseaEntityId
  */
-const setWebApplicationData = (session: Session, appData: ApplicationData, transactionId: string, overseaEntityId: string) => {
+const setWebApplicationData = (session: Session, appData: ApplicationData, transactionId: string, overseaEntityId: string, isRegistration: boolean) => {
+
   appData[BeneficialOwnerIndividualKey] = (appData[BeneficialOwnerIndividualKey] as BeneficialOwnerIndividual[])
-    .map( boi => { return { ...boi, [ID]: uuidv4() }; } );
-  appData[BeneficialOwnerOtherKey] = (appData[BeneficialOwnerOtherKey] as BeneficialOwnerOther[] )
-    .map( boo => { return { ...boo, [ID]: uuidv4() }; } );
+    .map(boi => { return { ...boi, [ID]: uuidv4() }; });
+  appData[BeneficialOwnerOtherKey] = (appData[BeneficialOwnerOtherKey] as BeneficialOwnerOther[])
+    .map(boo => { return { ...boo, [ID]: uuidv4() }; });
   appData[BeneficialOwnerGovKey] = (appData[BeneficialOwnerGovKey] as BeneficialOwnerGov[])
-    .map( bog => { return { ...bog, [ID]: uuidv4() }; } );
+    .map(bog => { return { ...bog, [ID]: uuidv4() }; });
   appData[ManagingOfficerKey] = (appData[ManagingOfficerKey] as ManagingOfficerIndividual[])
-    .map( moi => { return { ...moi, [ID]: uuidv4() }; } );
+    .map(moi => { return { ...moi, [ID]: uuidv4() }; });
   appData[ManagingOfficerCorporateKey] = (appData[ManagingOfficerCorporateKey] as ManagingOfficerCorporate[])
-    .map( moc => { return { ...moc, [ID]: uuidv4() }; } );
+    .map(moc => { return { ...moc, [ID]: uuidv4() }; });
 
-  appData[HasSoldLandKey] = '0';
-  appData[IsSecureRegisterKey] = '0';
-  appData[Transactionkey] = transactionId;
-  appData[OverseasEntityKey] = overseaEntityId;
+  if (!isRegistration || !isActiveFeature(config.FEATURE_FLAG_ENABLE_REDIS_REMOVAL)) {
 
-  if (appData[OverseasEntityDueDiligenceKey] && Object.keys(appData[OverseasEntityDueDiligenceKey]).length) {
-    appData[WhoIsRegisteringKey] = WhoIsRegisteringType.SOMEONE_ELSE;
-  } else if (appData[DueDiligenceKey] && Object.keys(appData[DueDiligenceKey]).length){
-    appData[WhoIsRegisteringKey] = WhoIsRegisteringType.AGENT;
+    appData[HasSoldLandKey] = '0';
+    appData[IsSecureRegisterKey] = '0';
+    appData[Transactionkey] = transactionId;
+    appData[OverseasEntityKey] = overseaEntityId;
+
+    if (appData[OverseasEntityDueDiligenceKey] && Object.keys(appData[OverseasEntityDueDiligenceKey]).length) {
+      appData[WhoIsRegisteringKey] = WhoIsRegisteringType.SOMEONE_ELSE;
+    } else if (appData[DueDiligenceKey] && Object.keys(appData[DueDiligenceKey]).length) {
+      appData[WhoIsRegisteringKey] = WhoIsRegisteringType.AGENT;
+    }
   }
+
   if (isActiveFeature(config.FEATURE_FLAG_ENABLE_TRUSTS_WEB)) {
     mapTrustApiReturnModelToWebModel(appData);
   }

src/service/payment.service.ts

@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { Session } from "@companieshouse/node-session-handler";
 import ApiClient from "@companieshouse/api-sdk-node/dist/client";
 import { isActiveFeature } from "../utils/feature.flag";
-import { ApplicationData } from "model";
+import { ApplicationData } from "../model";
 import { createAndLogErrorRequest, logger } from "../utils/logger";
 import { createOAuthApiClient } from "./api.service";
 

src/utils/trust.former.bo.ts

@@ -16,10 +16,16 @@ import { getUrlWithParamsToPath, isRegistrationJourney } from './url';
 import { checkTrustLegalEntityBeneficialOwnerStillInvolved } from '../validation/stillInvolved.validation';
 import { fetchApplicationData, setExtraData } from '../utils/application.data';
 import { FormattedValidationErrors, formatValidationError } from '../middleware/validation.middleware';
-import { getTrustByIdFromApp, saveHistoricalBoInTrust, saveTrustInApp } from '../utils/trusts';
 import { mapBeneficialOwnerToSession, mapFormerTrusteeByIdFromSessionToPage } from '../utils/trust/historical.beneficial.owner.mapper';
 import { filingPeriodTrustCeaseDateValidations, filingPeriodTrustStartDateValidations } from '../validation/async';
 import { updateOverseasEntity } from "../service/overseas.entities.service";
+import { mapTrustApiToWebWhenFlagsAreSet } from "../utils/trust/api.to.web.mapper";
+
+import {
+  getTrustByIdFromApp,
+  saveHistoricalBoInTrust,
+  saveTrustInApp
+} from '../utils/trusts';
 
 export const HISTORICAL_BO_TEXTS = {
   title: 'Tell us about the former beneficial owner',
@@ -76,10 +82,11 @@ export const getTrustFormerBo = async (req: Request, res: Response, next: NextFu
 
     logger.debugRequest(req, `${req.method} ${req.route.path}`);
 
-    const isRegistration = isRegistrationJourney(req);
-    const appData: ApplicationData = await fetchApplicationData(req, isRegistration);
     const trustId = req.params[config.ROUTE_PARAM_TRUST_ID];
     const trusteeId = req.params[config.ROUTE_PARAM_TRUSTEE_ID];
+    const isRegistration = isRegistrationJourney(req);
+    const appData: ApplicationData = await fetchApplicationData(req, isRegistration);
+    mapTrustApiToWebWhenFlagsAreSet(appData, isRegistration);
     const formData: PageModel.TrustHistoricalBeneficialOwnerForm = mapFormerTrusteeByIdFromSessionToPage(
       appData,
       trustId,

src/utils/trust.individual.beneficial.owner.ts

@@ -1,23 +1,28 @@
 import { NextFunction, Request, Response } from 'express';
+import { Session } from '@companieshouse/node-session-handler';
 import { logger } from './logger';
 import * as config from '../config';
 import * as CommonTrustDataMapper from './trust/common.trust.data.mapper';
 import { RoleWithinTrustType } from '../model/role.within.trust.type.model';
 import * as PageModel from '../model/trust.page.model';
 import { ApplicationData } from '../model';
 import { safeRedirect } from './http.ext';
-import { Session } from '@companieshouse/node-session-handler';
 import { saveAndContinue } from './save.and.continue';
+import { updateOverseasEntity } from "../service/overseas.entities.service";
 import { isActiveFeature } from './feature.flag';
-import { getUrlWithParamsToPath, isRegistrationJourney } from './url';
 import { checkTrustIndividualCeasedDate } from '../validation/async';
 import { checkTrustIndividualBeneficialOwnerStillInvolved } from '../validation/stillInvolved.validation';
+import { getUrlWithParamsToPath, isRegistrationJourney } from './url';
+import { mapTrustApiToWebWhenFlagsAreSet } from "../utils/trust/api.to.web.mapper";
 import { ValidationError, validationResult } from 'express-validator';
 import { fetchApplicationData, setExtraData } from './application.data';
-import { getTrustByIdFromApp, saveTrustInApp, saveIndividualTrusteeInTrust } from './trusts';
 import { mapIndividualTrusteeToSession, mapIndividualTrusteeByIdFromSessionToPage } from './trust/individual.trustee.mapper';
 import { FormattedValidationErrors, formatValidationError } from '../middleware/validation.middleware';
-import { updateOverseasEntity } from "../service/overseas.entities.service";
+import {
+  getTrustByIdFromApp,
+  saveTrustInApp,
+  saveIndividualTrusteeInTrust,
+} from './trusts';
 
 export const INDIVIDUAL_BO_TEXTS = {
   title: 'Tell us about the individual',
@@ -89,6 +94,7 @@ export const getTrustIndividualBo = async (req: Request, res: Response, next: Ne
     const trusteeId = req.params[config.ROUTE_PARAM_TRUSTEE_ID];
     const isRegistration = isRegistrationJourney(req);
     const appData: ApplicationData = await fetchApplicationData(req, isRegistration);
+    mapTrustApiToWebWhenFlagsAreSet(appData, isRegistration);
     const isRelevantPeriod = req.query['relevant-period'];
     const formData: PageModel.IndividualTrusteesFormCommon = mapIndividualTrusteeByIdFromSessionToPage(
       appData,
@@ -104,7 +110,8 @@ export const getTrustIndividualBo = async (req: Request, res: Response, next: Ne
     } else {
       const pagePropertiesRelevantPeriod = await getPagePropertiesRelevantPeriod(
         isRelevantPeriod,
-        req, trustId,
+        req,
+        trustId,
         isUpdate,
         formData,
         appData.entity_name