Fix FetchMatchingBillRunService for PRESROC 2PT

app/services/bill-runs/fetch-matching-bill-run.service.js

@@ -2,11 +2,13 @@
 
 /**
  * Fetch bill run(s) that match the options provided
- * @module ExistsService
+ * @module FetchMatchingBillRunService
  */
 
 const BillRunModel = require('../../models/bill-run.model.js')
 
+const LAST_PRESROC_YEAR = 2022
+
 /**
  * Fetch bill run(s) that match the options provided
  *
@@ -52,7 +54,7 @@ async function go (regionId, batchType, financialYearEnding, summer = false) {
     .where('regionId', regionId)
     .where('batchType', batchType)
 
-  _applyWhereClauses(baseQuery, batchType, summer, financialYearEnding)
+  _applyWhereClauses(baseQuery, batchType, financialYearEnding, summer)
 
   return _fetch(baseQuery)
 }
@@ -70,7 +72,7 @@ function _applySupplementaryWhereClauses (query) {
 }
 
 function _applyTwoPartTariffWhereClauses (query, financialYearEnding, summer) {
-  if (['2022', '2021'].includes(financialYearEnding)) {
+  if (financialYearEnding <= LAST_PRESROC_YEAR) {
     query.where('summer', summer)
   }
 
@@ -80,7 +82,7 @@ function _applyTwoPartTariffWhereClauses (query, financialYearEnding, summer) {
     .limit(1)
 }
 
-function _applyWhereClauses (baseQuery, batchType, summer, financialYearEnding) {
+function _applyWhereClauses (baseQuery, batchType, financialYearEnding, summer) {
   if (batchType === 'annual') {
     _applyAnnualWhereClauses(baseQuery, financialYearEnding)
   } else if (batchType === 'supplementary') {

test/services/bill-runs/fetch-matching-bill-run.service.test.js

@@ -89,36 +89,37 @@ describe('Fetch Matching Bill Run service', () => {
         })
 
         describe('and the financial year is in the PRESROC period', () => {
-          describe("and 'summer' is set to false", () => {
-            describe('and a bill run for the same financial year exists', () => {
-              beforeEach(async () => {
-                const billRun = await BillRunHelper.add({
-                  regionId, batchType: 'two_part_tariff', status: 'sent', toFinancialYearEnding: 2022, summer: false
-                })
-                matchingBillRunId = billRun.id
-              })
+          let matchingSummerBillRunId
+          let matchingWinterBillRunId
 
-              it('returns the matching bill run', async () => {
-                const results = await FetchMatchingBillRunService.go(regionId, 'two_part_tariff', 2022, false)
+          beforeEach(async () => {
+            let billRun = await BillRunHelper.add({
+              regionId, batchType: 'two_part_tariff', status: 'sent', toFinancialYearEnding: 2022, summer: true
+            })
+            matchingSummerBillRunId = billRun.id
 
-                expect(results[0].id).to.equal(matchingBillRunId)
-              })
+            billRun = await BillRunHelper.add({
+              regionId, batchType: 'two_part_tariff', status: 'sent', toFinancialYearEnding: 2022, summer: false
             })
+            matchingWinterBillRunId = billRun.id
           })
 
           describe("and 'summer' is set to true", () => {
             describe('and a bill run for the same financial year exists', () => {
-              beforeEach(async () => {
-                const billRun = await BillRunHelper.add({
-                  regionId, batchType: 'two_part_tariff', status: 'sent', toFinancialYearEnding: 2022, summer: true
-                })
-                matchingBillRunId = billRun.id
+              it('returns the matching bill run', async () => {
+                const results = await FetchMatchingBillRunService.go(regionId, 'two_part_tariff', 2022, true)
+
+                expect(results[0].id).to.equal(matchingSummerBillRunId)
               })
+            })
+          })
 
+          describe("and 'summer' is set to false", () => {
+            describe('and a bill run for the same financial year exists', () => {
               it('returns the matching bill run', async () => {
-                const results = await FetchMatchingBillRunService.go(regionId, 'two_part_tariff', 2022, true)
+                const results = await FetchMatchingBillRunService.go(regionId, 'two_part_tariff', 2022, false)
 
-                expect(results[0].id).to.equal(matchingBillRunId)
+                expect(results[0].id).to.equal(matchingWinterBillRunId)
               })
             })
           })