feat(FN-3669): map reported fees amount to monetary value

libs/common/src/test-helpers/fee-record-correction-review-information.ts

@@ -7,7 +7,7 @@ export const aFeeRecordCorrectionReviewInformation = (): FeeRecordCorrectionRevi
     exporter: 'An exporter',
     reportedFees: {
       currency: 'GBP',
-      amount: 123,
+      amount: 1234.56,
     },
   },
   reasons: [RECORD_CORRECTION_REASON.FACILITY_ID_INCORRECT, RECORD_CORRECTION_REASON.REPORTED_CURRENCY_INCORRECT, RECORD_CORRECTION_REASON.OTHER],

portal/component-tests/utilisation-report-service/record-correction/check-the-information.component-test.js

@@ -64,17 +64,15 @@ describe('page', () => {
 
   it('should render the original reported fees paid', () => {
     // Arrange
-    const reportedFees = 12345.67;
+    const reportedFeesPaid = '12,345.67';
     const viewModel = aUtilisationReportCorrectionInformationViewModel();
-    viewModel.feeRecord.reportedFees.amount = reportedFees;
-
-    const expectedReportedFees = '12345.67';
+    viewModel.feeRecord.reportedFees.formattedAmount = reportedFeesPaid;
 
     // Act
     const wrapper = render(viewModel);
 
     // Assert
-    wrapper.expectText(definitionDescriptionSelector(originalValuesSelector, 'Reported fees paid')).toRead(expectedReportedFees);
+    wrapper.expectText(definitionDescriptionSelector(originalValuesSelector, 'Reported fees paid')).toRead(reportedFeesPaid);
   });
 
   it('should render the record correction details table heading', () => {

portal/server/controllers/utilisation-report-service/record-correction/check-the-information/index.test.ts

@@ -4,7 +4,9 @@
   aFeeRecordCorrectionReviewInformation,
   aPortalSessionBank,
   aPortalSessionUser,
+  CURRENCY,
   FeeRecordCorrectionReviewInformation,
+  getFormattedMonetaryValue,
   mapReasonsToDisplayValues,
   PORTAL_LOGIN_STATUS,
 } from '@ukef/dtfs2-common';
@@ -59,19 +61,38 @@
 
   describe('getUtilisationReportCorrectionReview', () => {
     it('should render the "utilisation report correction - check the information" page', async () => {
-      // Arrange,
+      // Arrange
+      const exporter = 'An exporter';
+      const reportedFeesCurrency = CURRENCY.GBP;
+      const reportedFeesAmount = 1234.56;
       const bankCommentary = 'Some bank commentary';
+
       const feeRecordCorrectionReviewResponse = {
         ...aFeeRecordCorrectionReviewInformation(),
         bankCommentary,
+        feeRecord: {
+          exporter,
+          reportedFees: {
+            currency: reportedFeesCurrency,
+            amount: reportedFeesAmount,
+          },
+        },
       };
 
       jest.mocked(api.getFeeRecordCorrectionReview).mockResolvedValue(feeRecordCorrectionReviewResponse);
 
-      const { errorSummary, feeRecord, formattedOldValues, formattedNewValues, reasons } = feeRecordCorrectionReviewResponse;
+      const { errorSummary, formattedOldValues, formattedNewValues, reasons } = feeRecordCorrectionReviewResponse;
 
       const expectedFormattedReasons = mapReasonsToDisplayValues(reasons).join(', ');
 
+      const expectedFeeRecord = {
+        exporter,
+        reportedFees: {
+          currency: reportedFeesCurrency,
+          formattedAmount: getFormattedMonetaryValue(reportedFeesAmount),
+        },
+      };
+
       // Act
       await getUtilisationReportCorrectionReview(req, res);
 
@@ -80,7 +101,7 @@
         user: mockUser,
         primaryNav: PRIMARY_NAV_KEY.UTILISATION_REPORT_UPLOAD,
         backLinkHref: `/utilisation-reports/provide-correction/${correctionId}`,
-        feeRecord,
+        feeRecord: expectedFeeRecord,
         formattedReasons: expectedFormattedReasons,
         errorSummary,
         formattedOldValues,

portal/server/controllers/utilisation-report-service/record-correction/check-the-information/index.ts

@@ -1,5 +1,5 @@
 import { Response, Request } from 'express';
-import { mapReasonsToDisplayValues } from '@ukef/dtfs2-common';
+import { getFormattedMonetaryValue, mapReasonsToDisplayValues } from '@ukef/dtfs2-common';
 import api from '../../../../api';
 import { asLoggedInUserSession, LoggedInUserSession } from '../../../../helpers/express-session';
 import { PRIMARY_NAV_KEY } from '../../../../constants';
@@ -34,11 +34,22 @@
 
     const backLinkHref = `/utilisation-reports/provide-correction/${correctionId}`;
 
+    const { exporter, reportedFees } = feeRecord;
+    const { currency, amount } = reportedFees;
+
+    const mappedFeeRecord = {
+      exporter,
+      reportedFees: {
+        currency,
+        formattedAmount: getFormattedMonetaryValue(amount),
+      },
+    };
+
     const viewModel: UtilisationReportCorrectionInformationViewModel = {
       user,
       primaryNav: PRIMARY_NAV_KEY.UTILISATION_REPORT_UPLOAD,
       backLinkHref,
-      feeRecord,
+      feeRecord: mappedFeeRecord,
       formattedReasons: mapReasonsToDisplayValues(reasons).join(', '),
       errorSummary,
       formattedOldValues,

portal/server/types/view-models/record-correction/utilisation-report-correction-information.ts

@@ -1,11 +1,14 @@
-import { CurrencyAndAmount } from '@ukef/dtfs2-common';
+import { Currency } from '@ukef/dtfs2-common';
 import { BaseViewModel } from '../base-view-model';
 
 export type UtilisationReportCorrectionInformationViewModel = BaseViewModel & {
   backLinkHref: string;
   feeRecord: {
     exporter: string;
-    reportedFees: CurrencyAndAmount;
+    reportedFees: {
+      currency: Currency;
+      formattedAmount: string;
+    };
   };
   formattedReasons: string;
   errorSummary: string;

portal/templates/utilisation-report-service/record-correction/check-the-information.njk

@@ -36,7 +36,7 @@
             text: "Reported fees paid"
           },
           value: {
-            text: feeRecord.reportedFees.amount
+            text: feeRecord.reportedFees.formattedAmount
           }
         }
       ],

portal/test-helpers/test-data/view-models/record-corrections/utilisation-report-correction-information-view-model.ts

@@ -10,7 +10,7 @@ export const aUtilisationReportCorrectionInformationViewModel = (): UtilisationR
     exporter: 'An exporter',
     reportedFees: {
       currency: 'GBP',
-      amount: 123,
+      formattedAmount: '1,234.56',
     },
   },
   formattedReasons: 'Facility ID is incorrect, Reported currency is incorrect',