Implement possible fix

Though have confirmed manually locally via a number of scenarios this does the trick.
DEFRA · Apr 18, 2023 · 821c4f6 · 821c4f6
1 parent caaa896
commit 821c4f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/app/services/supplementary-billing/fetch-charge-versions.service.js b/app/services/supplementary-billing/fetch-charge-versions.service.js
@@ -34,13 +34,14 @@ async function _fetch (regionId, billingPeriod) {
       'scheme',
       'chargeVersions.startDate',
       'chargeVersions.endDate',
-      'invoiceAccountId'
+      'invoiceAccountId',
+      'status'
     ])
     .innerJoinRelated('licence')
     .where('scheme', 'sroc')
     .where('includeInSrocSupplementaryBilling', true)
     .where('regionId', regionId)
-    .where('chargeVersions.status', 'current')
+    // .where('chargeVersions.status', 'current')
     .where('chargeVersions.startDate', '>=', billingPeriod.startDate)
     .where('chargeVersions.startDate', '<=', billingPeriod.endDate)
     .whereNotExists(

diff --git a/app/services/supplementary-billing/process-billing-batch.service.js b/app/services/supplementary-billing/process-billing-batch.service.js
@@ -73,12 +73,14 @@ async function go (billingBatch, billingPeriod) {
       currentBillingData.billingInvoice = billingInvoice
       currentBillingData.billingInvoiceLicence = billingInvoiceLicence
 
-      const calculatedTransactions = _generateCalculatedTransactions(billingPeriod, chargeVersion, billingBatchId, billingInvoiceLicence)
-      currentBillingData.calculatedTransactions.push(...calculatedTransactions)
+      if (chargeVersion.status === 'current') {
+        const calculatedTransactions = _generateCalculatedTransactions(billingPeriod, chargeVersion, billingBatchId, billingInvoiceLicence)
+        currentBillingData.calculatedTransactions.push(...calculatedTransactions)
+      }
     }
     await _finaliseCurrentInvoiceLicence(currentBillingData, billingPeriod, billingBatch)
 
-    await _processReplacedChargeVersions(currentBillingData, billingBatch, billingPeriod)
+    // await _processReplacedChargeVersions(currentBillingData, billingBatch, billingPeriod)
 
     await _finaliseBillingBatch(billingBatch, chargeVersions, currentBillingData.isEmpty)