From 0db28db19dd6aebf9efe0caef1b55ea8b8d30267 Mon Sep 17 00:00:00 2001
From: Zain Kassam <zkassam@ukexportfinance.gov.uk>
Date: Wed, 26 Jun 2024 14:31:13 +0100
Subject: [PATCH] fix(EMS-3515): index fixes

---
 src/api/.keystone/config.js                               | 7 +++++--
 ...ex-multiple-contract-policy-need-credit-period.test.ts | 4 ++--
 ...ndex-single-contract-policy-need-credit-period.test.ts | 4 ++--
 src/api/constants/XLSX-CONFIG/index.ts                    | 8 ++++++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/api/.keystone/config.js b/src/api/.keystone/config.js
index 51da0c6166..a76ef356fe 100644
--- a/src/api/.keystone/config.js
+++ b/src/api/.keystone/config.js
@@ -944,10 +944,10 @@ var XLSX_ROW_INDEXES = (application2) => {
     indexes.TITLES.EXPORT_CONTRACT += 3;
   }
   if (needPreCreditPeriodCover) {
-    indexes.BROKER_ADDRESS += 1;
+    indexes.BROKER_ADDRESS += 2;
     indexes.BUYER_ADDRESS += 1;
     indexes.LOSS_PAYEE_ADDRESS += 1;
-    indexes.TITLES.BUYER += 3;
+    indexes.TITLES.BUYER += 1;
     indexes.TITLES.DECLARATIONS += 1;
     indexes.TITLES.EXPORT_CONTRACT += 1;
   }
@@ -975,6 +975,9 @@ var XLSX_ROW_INDEXES = (application2) => {
   if (isUsingAgent) {
     indexes.TITLES.DECLARATIONS += 5;
     indexes.AGENT_ADDRESS = 75;
+    if (needPreCreditPeriodCover) {
+      indexes.AGENT_ADDRESS += 1;
+    }
     if (isMultiplePolicy) {
       indexes.AGENT_ADDRESS += 1;
       indexes.TITLES.DECLARATIONS += 1;
diff --git a/src/api/constants/XLSX-CONFIG/index-multiple-contract-policy-need-credit-period.test.ts b/src/api/constants/XLSX-CONFIG/index-multiple-contract-policy-need-credit-period.test.ts
index a8dff9823c..77da56d113 100644
--- a/src/api/constants/XLSX-CONFIG/index-multiple-contract-policy-need-credit-period.test.ts
+++ b/src/api/constants/XLSX-CONFIG/index-multiple-contract-policy-need-credit-period.test.ts
@@ -28,12 +28,12 @@ describe(`api/constants/XLSX-CONFIG - XLSX_ROW_INDEXES - ${APPLICATION.POLICY_TY
 
     const expected = {
       ...indexes,
-      BROKER_ADDRESS: indexes.BROKER_ADDRESS + 1,
+      BROKER_ADDRESS: indexes.BROKER_ADDRESS + 2,
       BUYER_ADDRESS: indexes.BUYER_ADDRESS + 1,
       LOSS_PAYEE_ADDRESS: indexes.LOSS_PAYEE_ADDRESS + 1,
       TITLES: {
         ...indexes.TITLES,
-        BUYER: indexes.TITLES.BUYER + 3,
+        BUYER: indexes.TITLES.BUYER + 1,
         DECLARATIONS: indexes.TITLES.DECLARATIONS + 1,
         EXPORT_CONTRACT: indexes.TITLES.EXPORT_CONTRACT + 1,
       },
diff --git a/src/api/constants/XLSX-CONFIG/index-single-contract-policy-need-credit-period.test.ts b/src/api/constants/XLSX-CONFIG/index-single-contract-policy-need-credit-period.test.ts
index dc87ffc3ef..e03fd9e95f 100644
--- a/src/api/constants/XLSX-CONFIG/index-single-contract-policy-need-credit-period.test.ts
+++ b/src/api/constants/XLSX-CONFIG/index-single-contract-policy-need-credit-period.test.ts
@@ -28,12 +28,12 @@ describe(`api/constants/XLSX-CONFIG - XLSX_ROW_INDEXES - ${APPLICATION.POLICY_TY
 
     const expected = {
       ...indexes,
-      BROKER_ADDRESS: indexes.BROKER_ADDRESS + 1,
+      BROKER_ADDRESS: indexes.BROKER_ADDRESS + 2,
       BUYER_ADDRESS: indexes.BUYER_ADDRESS + 1,
       LOSS_PAYEE_ADDRESS: indexes.LOSS_PAYEE_ADDRESS + 1,
       TITLES: {
         ...indexes.TITLES,
-        BUYER: indexes.TITLES.BUYER + 3,
+        BUYER: indexes.TITLES.BUYER + 1,
         DECLARATIONS: indexes.TITLES.DECLARATIONS + 1,
         EXPORT_CONTRACT: indexes.TITLES.EXPORT_CONTRACT + 1,
       },
diff --git a/src/api/constants/XLSX-CONFIG/index.ts b/src/api/constants/XLSX-CONFIG/index.ts
index b56541e71a..66c2402e84 100644
--- a/src/api/constants/XLSX-CONFIG/index.ts
+++ b/src/api/constants/XLSX-CONFIG/index.ts
@@ -126,11 +126,11 @@ export const XLSX_ROW_INDEXES = (application: Application): XLSXRowIndexes => {
   }
 
   if (needPreCreditPeriodCover) {
-    indexes.BROKER_ADDRESS += 1;
+    indexes.BROKER_ADDRESS += 2;
     indexes.BUYER_ADDRESS += 1;
     indexes.LOSS_PAYEE_ADDRESS += 1;
 
-    indexes.TITLES.BUYER += 3;
+    indexes.TITLES.BUYER += 1;
     indexes.TITLES.DECLARATIONS += 1;
     indexes.TITLES.EXPORT_CONTRACT += 1;
   }
@@ -174,6 +174,10 @@ export const XLSX_ROW_INDEXES = (application: Application): XLSXRowIndexes => {
     indexes.TITLES.DECLARATIONS += 5;
     indexes.AGENT_ADDRESS = 75;
 
+    if (needPreCreditPeriodCover) {
+      indexes.AGENT_ADDRESS += 1;
+    }
+
     if (isMultiplePolicy) {
       indexes.AGENT_ADDRESS += 1;