Merge branch 'main' into feat/FN-3675/fix-facility-id-correction

Author: RLavender98

dtfs-central-api/src/v1/swagger-definitions/portal/portal-amendments.js

@@ -32,6 +32,44 @@
  *           - IN_PROGRESS
  *           - COMPLETED
  *         description: The current status of the amendment.
+ *       createdBy:
+ *         type: object
+ *         properties:
+ *           username:
+ *             type: string
+ *             description: The username of the creator.
+ *           name:
+ *             type: string
+ *             description: The name of the creator.
+ *           email:
+ *             type: string
+ *             description: The email of the creator.
+ *       eligibilityCriteria:
+ *         type: object
+ *         properties:
+ *           version:
+ *             type: integer
+ *             description: The version number of the eligibility criteria.
+ *           criteria:
+ *             type: array
+ *             items:
+ *               type: object
+ *               properties:
+ *                 id:
+ *                   type: integer
+ *                   description: The ID of the criteria.
+ *                 text:
+ *                   type: string
+ *                   description: The text of the criteria.
+ *                 textList:
+ *                   type: array
+ *                   items:
+ *                     type: string
+ *                   description: The list of text items for the criteria.
+ *                 answer:
+ *                   type: boolean
+ *                   nullable: true
+ *                   description: The answer to the criteria.
  *       version:
  *         type: integer
  *         description: The version number of the amendment.
@@ -106,6 +144,10 @@
  *       effectiveDate:
  *         type: integer
  *         description: The effective date of the amendment in seconds.
+ *       effectiveFrom:
+ *         type: integer
+ *         format: int64
+ *         description: The effective from date of the amendment in seconds.
  *       createdBy:
  *         type: object
  *         properties:
@@ -129,11 +171,6 @@
  *         format: int64
  *         nullable: true
  *         description: The new cover end date in seconds.
- *       currentCoverEndDate:
- *         type: integer
- *         format: int64
- *         nullable: true
- *         description: The current cover end date in seconds.
  *       isUsingFacilityEndDate:
  *         type: boolean
  *         description: Indicates if the facility end date is being used.
@@ -152,10 +189,6 @@
  *         type: number
  *         nullable: true
  *         description: The new value of the facility.
- *       currentValue:
- *         type: number
- *         nullable: true
- *         description: The current value of the facility.
  *       currency:
  *         type: string
  *         enum:
@@ -165,11 +198,29 @@
  *           - JPY
  *         nullable: true
  *         description: The currency of the facility value.
- *       ukefExposure:
- *         type: number
- *         nullable: true
- *         description: The UKEF exposure amount.
- *       coveredPercentage:
- *         type: number
- *         description: The percentage of the facility covered.
+ *       eligibilityCriteria:
+ *         type: object
+ *         properties:
+ *           version:
+ *             type: integer
+ *             description: The version number of the eligibility criteria.
+ *           criteria:
+ *             type: array
+ *             items:
+ *               type: object
+ *               properties:
+ *                 id:
+ *                   type: integer
+ *                   description: The ID of the criteria.
+ *                 text:
+ *                   type: string
+ *                   description: The text of the criteria.
+ *                 textList:
+ *                   type: array
+ *                   items:
+ *                     type: string
+ *                   description: The list of text items for the criteria.
+ *                 answer:
+ *                   type: boolean
+ *                   description: The answer to the criteria.
  */

e2e-tests/tfm/cypress/e2e/journeys/case-amendments/add-bank-decision/add-bank-decision-proceed.spec.js

@@ -5,21 +5,37 @@ import facilityPage from '../../../pages/facilityPage';
 import amendmentsPage from '../../../pages/amendments/amendmentsPage';
 import caseDealPage from '../../../pages/caseDealPage';
 import MOCK_DEAL_AIN from '../../../../fixtures/deal-AIN';
-import { oneMonth, tomorrow, yearWithZeroLetter } from '../../../../../../e2e-fixtures/dateConstants';
+import { oneMonth, tomorrow, twoYearsAgo, yearWithZeroLetter } from '../../../../../../e2e-fixtures/dateConstants';
 import { ADMIN, BANK1_MAKER1, PIM_USER_1, UNDERWRITER_MANAGER_1, UNDERWRITER_MANAGER_DECISIONS } from '../../../../../../e2e-fixtures';
 import pages from '../../../pages';
 import { CURRENCY } from '../../../../../../e2e-fixtures/constants.fixture';
 
 context('Amendments underwriting - add banks decision - proceed', () => {
-  // If the expiry & commencement date are the same day of the month then we add one to the month
-  // difference for BS (but not for EWCS)
-  // BUT... If the commencement date is end of month and the expiry date isn't then we don't add one
-  //
-  // In these tests, the mock start date is two years ago today & the mock end date is a month today.
-  // Therefore if today is EOM and a month from now is not EOM we need to NOT add one to the tenor
-  const todayIsEndOfMonth = add(new Date(), { days: 1 }).getDate() === 1;
-  const aMonthFromNowIsEndOfMonth = add(new Date(), { months: 1, days: 1 }).getDate() === 1;
-  const facilityTenor = todayIsEndOfMonth && !aMonthFromNowIsEndOfMonth ? '25 months' : '26 months';
+  /**
+   * The deal in the test is a BSS deal.
+   *
+   * The tenor is calculated using a SQL function used by MDM.
+   *
+   * In these tests, the mock start date is two years ago from today
+   * & the mock end date is a month from today.
+   *
+   * So in this case it boils down to the tenor being 25 months except for:
+   * - if expiry and commencement dates are the same date of month then you add one
+   * - if commencement is end of month and expiry is also end of month you add one
+   */
+  let facilityTenor = '25 months';
+
+  if (twoYearsAgo.date.getDate() === oneMonth.date.getDate()) {
+    facilityTenor = '26 months';
+  }
+
+  const isCommencementDateEndOfMonth = add(twoYearsAgo.date, { days: 1 }).getDate() === 1;
+  const isExpiryDateEndOFMonth = add(oneMonth.date, { days: 1 }).getDate() === 1;
+
+  if (isCommencementDateEndOfMonth && isExpiryDateEndOFMonth) {
+    facilityTenor = '26 months';
+  }
+
   const updatedFacilityTenor = '25 months';
 
   let dealId;

e2e-tests/tfm/cypress/e2e/journeys/case-amendments/user-flow/7. amendment-details-automatic-approval.spec.js

@@ -5,19 +5,34 @@ import facilityPage from '../../../pages/facilityPage';
 import amendmentsPage from '../../../pages/amendments/amendmentsPage';
 import caseDealPage from '../../../pages/caseDealPage';
 import MOCK_DEAL_AIN from '../../../../fixtures/deal-AIN';
-import { fourDaysAgo, oneMonth, today, twoMonths, yearWithZeroLetter } from '../../../../../../e2e-fixtures/dateConstants';
+import { fourDaysAgo, oneMonth, today, twoMonths, yearWithZeroLetter, twoYearsAgo } from '../../../../../../e2e-fixtures/dateConstants';
 import { PIM_USER_1, UNDERWRITER_MANAGER_DECISIONS, BANK1_MAKER1, ADMIN, CURRENCY } from '../../../../../../e2e-fixtures';
 
 context('Amendments - automatic approval journey', () => {
-  // If the expiry & commencement date are the same day of the month then we add one to the month
-  // difference for BS (but not for EWCS)
-  // BUT... If the commencement date is end of month and the expiry date isn't then we don't add one
-  //
-  // In these tests, the mock start date is two years ago today & the mock end date is a month today.
-  // Therefore if today is EOM and a month from now is not EOM we need to NOT add one to the tenor
-  const todayIsEndOfMonth = add(new Date(), { days: 1 }).getDate() === 1;
-  const aMonthFromNowIsEndOfMonth = add(new Date(), { months: 1, days: 1 }).getDate() === 1;
-  const facilityTenor = todayIsEndOfMonth && !aMonthFromNowIsEndOfMonth ? '25 months' : '26 months';
+  /**
+   * The deal in the test is a BSS deal.
+   *
+   * The tenor is calculated using a SQL function used by MDM.
+   *
+   * In these tests, the mock start date is two years ago from today
+   * & the mock end date is a month from today.
+   *
+   * So in this case it boils down to the tenor being 25 months except for:
+   * - if expiry and commencement dates are the same date of month then you add one
+   * - if commencement is end of month and expiry is also end of month you add one
+   */
+  let facilityTenor = '25 months';
+
+  if (twoYearsAgo.date.getDate() === oneMonth.date.getDate()) {
+    facilityTenor = '26 months';
+  }
+
+  const isCommencementDateEndOfMonth = add(twoYearsAgo.date, { days: 1 }).getDate() === 1;
+  const isExpiryDateEndOFMonth = add(oneMonth.date, { days: 1 }).getDate() === 1;
+
+  if (isCommencementDateEndOfMonth && isExpiryDateEndOFMonth) {
+    facilityTenor = '26 months';
+  }
 
   describe('Amendment details - Change the Cover end date AND Facility value', () => {
     let dealId;

e2e-tests/tfm/cypress/e2e/journeys/case-amendments/user-flow/8. amendment-details-manual-approval.spec.js

@@ -3,21 +3,36 @@ import relative from '../../../relativeURL';
 import facilityPage from '../../../pages/facilityPage';
 import amendmentsPage from '../../../pages/amendments/amendmentsPage';
 import MOCK_DEAL_AIN from '../../../../fixtures/deal-AIN';
-import { oneMonth, today, tomorrow } from '../../../../../../e2e-fixtures/dateConstants';
+import { oneMonth, today, twoYearsAgo, tomorrow } from '../../../../../../e2e-fixtures/dateConstants';
 import { NOT_ADDED } from '../../../../fixtures/constants';
 import { PIM_USER_1, UNDERWRITER_MANAGER_DECISIONS, BANK1_MAKER1, ADMIN, CURRENCY } from '../../../../../../e2e-fixtures';
 import caseDealPage from '../../../pages/caseDealPage';
 
 context('Amendments - Manual approval journey', () => {
-  // If the expiry & commencement date are the same day of the month then we add one to the month
-  // difference for BS (but not for EWCS)
-  // BUT... If the commencement date is end of month and the expiry date isn't then we don't add one
-  //
-  // In these tests, the mock start date is two years ago today & the mock end date is a month today.
-  // Therefore if today is EOM and a month from now is not EOM we need to NOT add one to the tenor
-  const todayIsEndOfMonth = add(new Date(), { days: 1 }).getDate() === 1;
-  const aMonthFromNowIsEndOfMonth = add(new Date(), { months: 1, days: 1 }).getDate() === 1;
-  const facilityTenor = todayIsEndOfMonth && !aMonthFromNowIsEndOfMonth ? '25 months' : '26 months';
+  /**
+   * The deal in the test is a BSS deal.
+   *
+   * The tenor is calculated using a SQL function used by MDM.
+   *
+   * In these tests, the mock start date is two years ago from today
+   * & the mock end date is a month from today.
+   *
+   * So in this case it boils down to the tenor being 25 months except for:
+   * - if expiry and commencement dates are the same date of month then you add one
+   * - if commencement is end of month and expiry is also end of month you add one
+   */
+  let facilityTenor = '25 months';
+
+  if (twoYearsAgo.date.getDate() === oneMonth.date.getDate()) {
+    facilityTenor = '26 months';
+  }
+
+  const isCommencementDateEndOfMonth = add(twoYearsAgo.date, { days: 1 }).getDate() === 1;
+  const isExpiryDateEndOFMonth = add(oneMonth.date, { days: 1 }).getDate() === 1;
+
+  if (isCommencementDateEndOfMonth && isExpiryDateEndOFMonth) {
+    facilityTenor = '26 months';
+  }
 
   describe('Amendment details - Change the Cover end date AND Facility value', () => {
     let dealId;