Merge pull request #1753 from companieshouse/feature/FEE-320

feature/FEE-320

Author: wdhda-ch

README.md

@@ -92,8 +92,8 @@ REMOVE_LANDING_PAGE_URL | Remove OE landing Page | `/update-an-overseas-entity/c
 LOG_LEVEL | LOG level | DEBUG
 OAUTH2_CLIENT_ID | OAUTH2 client ID | client ID
 OAUTH2_CLIENT_SECRET | OAUTH2 client secret | secret
-PAYMENT_FEE | Payment Fee | config value
-UPDATE_PAYMENT_FEE | Update Payment Fee | config value
+OE01_PAYMENT_FEE | Payment Fee | config value
+OE02_UPDATE_PAYMENT_FEE | Update Payment Fee | config value
 PIWIK_URL | Matomo URL | `https://matomo.platform.aws.chdev.org`
 PIWIK_SITE_ID | Matomo Site ID | 24
 PIWIK_START_GOAL_ID | Matomo Start goal ID | 3

src/config/index.ts

@@ -21,8 +21,8 @@ export const PIWIK_UPDATE_START_GOAL_ID = getEnvironmentValue("PIWIK_UPDATE_STAR
 export const PIWIK_REMOVE_START_GOAL_ID = getEnvironmentValue("PIWIK_REMOVE_START_GOAL_ID");
 export const PIWIK_RELEVANT_PERIOD_START_GOAL_ID = getEnvironmentValue("PIWIK_RELEVANT_PERIOD_START_GOAL_ID");
 export const PIWIK_CHS_DOMAIN = getEnvironmentValue("PIWIK_CHS_DOMAIN");
-export const PAYMENT_FEE = getEnvironmentValue("PAYMENT_FEE");
-export const UPDATE_PAYMENT_FEE = getEnvironmentValue("UPDATE_PAYMENT_FEE");
+export const OE01_PAYMENT_FEE = getEnvironmentValue("OE01_PAYMENT_FEE");
+export const OE02_UPDATE_PAYMENT_FEE = getEnvironmentValue("OE02_UPDATE_PAYMENT_FEE");
 export const LANDING_PAGE_URL = getEnvironmentValue("LANDING_PAGE_URL");
 export const LANDING_PAGE_STARTING_NEW_URL = getEnvironmentValue("LANDING_PAGE_STARTING_NEW_URL");
 export const UPDATE_LANDING_PAGE_URL = getEnvironmentValue("UPDATE_LANDING_PAGE_URL");

src/controllers/confirmation.controller.ts

@@ -6,7 +6,7 @@ import { WhoIsRegisteringType } from "../model/who.is.making.filing.model";
 import { isRegistrationJourney } from "../utils/url";
 import { deleteApplicationData, fetchApplicationData } from "../utils/application.data";
 import { Transactionkey } from "../model/data.types.model";
-import { CONFIRMATION_PAGE, PAYMENT_FEE } from "../config";
+import { CONFIRMATION_PAGE, OE01_PAYMENT_FEE } from "../config";
 
 export const get = async (req: Request, res: Response, next: NextFunction) => {
 
@@ -26,7 +26,7 @@ export const get = async (req: Request, res: Response, next: NextFunction) => {
       entityEmail: appData.entity?.email,
       userEmail: getLoggedInUserEmail(req.session),
       verificationCheckDays: 14,
-      paymentFee: PAYMENT_FEE,
+      paymentFee: OE01_PAYMENT_FEE,
       templateName: CONFIRMATION_PAGE
     });
   } catch (error: any) {

test/controllers/confirmation.controller.spec.ts

@@ -25,7 +25,7 @@ import {
 } from '../../src/utils/application.data';
 
 import {
-  PAYMENT_FEE,
+  OE01_PAYMENT_FEE,
   CONFIRMATION_URL,
   CONFIRMATION_WITH_PARAMS_URL,
 } from "../../src/config";
@@ -93,7 +93,7 @@ describe("Confirmation controller tests", () => {
     expect(resp.text).toContain(CONFIRMATION_NUMBER_OF_DAYS);
     expect(resp.text).toContain(CONFIRMATION_WHAT_YOU_NEED_TO_DO_NOW);
     expect(resp.text).toContain(ENTITY_OBJECT_MOCK.email);
-    expect(resp.text).toContain(`£${PAYMENT_FEE}`);
+    expect(resp.text).toContain(`£${OE01_PAYMENT_FEE}`);
     expect(resp.text).toContain(userMail);
     expect(resp.text).toContain(config.VF01_FORM_DOWNLOAD_URL);
     expect(mockDeleteApplicationData).toHaveBeenCalledTimes(1);
@@ -125,7 +125,7 @@ describe("Confirmation controller tests", () => {
     expect(resp.text).toContain(CONFIRMATION_NUMBER_OF_DAYS);
     expect(resp.text).toContain(CONFIRMATION_WHAT_YOU_NEED_TO_DO_NOW);
     expect(resp.text).toContain(ENTITY_OBJECT_MOCK.email);
-    expect(resp.text).toContain(`£${PAYMENT_FEE}`);
+    expect(resp.text).toContain(`£${OE01_PAYMENT_FEE}`);
     expect(resp.text).toContain(userMail);
     expect(resp.text).toContain(config.VF01_FORM_DOWNLOAD_URL);
     expect(mockDeleteApplicationData).toHaveBeenCalledTimes(1);

test/setup.ts

@@ -16,8 +16,8 @@ export default () => {
   process.env.PIWIK_REMOVE_START_GOAL_ID = "test";
   process.env.PIWIK_RELEVANT_PERIOD_START_GOAL_ID = "test";
   process.env.PIWIK_CHS_DOMAIN = "*.chs.local";
-  process.env.PAYMENT_FEE = "234.00";
-  process.env.UPDATE_PAYMENT_FEE = "234.00";
+  process.env.OE01_PAYMENT_FEE = "234.00";
+  process.env.OE02_UPDATE_PAYMENT_FEE = "234.00";
   process.env.LANDING_PAGE_URL = "/register-an-overseas-entity/sold-land-filter?start=0";
   process.env.LANDING_PAGE_STARTING_NEW_URL = "/register-an-overseas-entity/starting-new";
   process.env.UPDATE_LANDING_PAGE_URL = "/update-an-overseas-entity/overseas-entity-query";