From 9ed096fb194dd3f386dea49ff5fe0e6a945a094d Mon Sep 17 00:00:00 2001
From: Jason Claxton <jason.claxton@defra.gov.uk>
Date: Tue, 11 Apr 2023 14:09:10 +0100
Subject: [PATCH 1/2] Fix `fetch-charge-versions` service

Whilst reading the code a small bug has been spotted in `app/services/supplementary-billing/fetch-charge-versions.service.js`. the `includeInSrocSupplementaryBilling` column is being filtered using the string `yes` in the `where` clause where it should have been a boolean.

From b4900b62f654da4ad8fb6811693bec243f706e50 Mon Sep 17 00:00:00 2001
From: Jason Claxton <jason.claxton@defra.gov.uk>
Date: Tue, 11 Apr 2023 14:14:53 +0100
Subject: [PATCH 2/2] Fix bug

---
 .../fetch-charge-versions.service.js             |  2 +-
 .../fetch-charge-versions.service.test.js        | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/services/supplementary-billing/fetch-charge-versions.service.js b/app/services/supplementary-billing/fetch-charge-versions.service.js
index fab599c1ba..75aabb1df9 100644
--- a/app/services/supplementary-billing/fetch-charge-versions.service.js
+++ b/app/services/supplementary-billing/fetch-charge-versions.service.js
@@ -38,7 +38,7 @@ async function _fetch (regionId, billingPeriod) {
     ])
     .innerJoinRelated('licence')
     .where('scheme', 'sroc')
-    .where('includeInSrocSupplementaryBilling', 'yes')
+    .where('includeInSrocSupplementaryBilling', true)
     .where('regionId', regionId)
     .where('chargeVersions.status', 'current')
     .where('chargeVersions.startDate', '>=', billingPeriod.startDate)
diff --git a/test/services/supplementary-billing/fetch-charge-versions.service.test.js b/test/services/supplementary-billing/fetch-charge-versions.service.test.js
index 0dcd568863..399cef3ffb 100644
--- a/test/services/supplementary-billing/fetch-charge-versions.service.test.js
+++ b/test/services/supplementary-billing/fetch-charge-versions.service.test.js
@@ -53,14 +53,14 @@ describe('Fetch Charge Versions service', () => {
       // This creates an SROC charge version linked to a licence marked for supplementary billing
       const srocChargeVersion = await ChargeVersionHelper.add(
         { changeReasonId: changeReason.changeReasonId },
-        { regionId, isWaterUndertaker: true, includeInSrocSupplementaryBilling: 'yes' }
+        { regionId, isWaterUndertaker: true, includeInSrocSupplementaryBilling: true }
       )
 
       // This creates an SROC charge version linked to a licence marked for supplementary billing
       // with a status of 'superseded'
       const srocSupersededChargeVersion = await ChargeVersionHelper.add(
         { changeReasonId: changeReason.changeReasonId, status: 'superseded' },
-        { regionId, isWaterUndertaker: true, includeInSrocSupplementaryBilling: 'yes' }
+        { regionId, isWaterUndertaker: true, includeInSrocSupplementaryBilling: true }
       )
 
       // This creates an ALCS (presroc) charge version linked to a licence marked for supplementary billing
@@ -167,11 +167,11 @@ describe('Fetch Charge Versions service', () => {
 
         const srocSupersededChargeVersion = await ChargeVersionHelper.add(
           { status: 'superseded' },
-          { regionId, isWaterUndertaker: true, includeInSrocSupplementaryBilling: 'yes' }
+          { regionId, isWaterUndertaker: true, includeInSrocSupplementaryBilling: true }
         )
         const srocDraftChargeVersion = await ChargeVersionHelper.add(
           { status: 'draft' },
-          { regionId, isWaterUndertaker: true, includeInSrocSupplementaryBilling: 'yes' }
+          { regionId, isWaterUndertaker: true, includeInSrocSupplementaryBilling: true }
         )
         testRecords = [srocSupersededChargeVersion, srocDraftChargeVersion]
       })
@@ -217,7 +217,7 @@ describe('Fetch Charge Versions service', () => {
           // picked up by a previous bill run
           const alcsChargeVersion = await ChargeVersionHelper.add(
             { startDate: new Date(2022, 2, 31) }, // 2022-03-01 - Months are zero indexed :-)
-            { includeInSrocSupplementaryBilling: 'yes' }
+            { includeInSrocSupplementaryBilling: true }
           )
           testRecords = [alcsChargeVersion]
         })
@@ -240,7 +240,7 @@ describe('Fetch Charge Versions service', () => {
           // next years bill runs
           const alcsChargeVersion = await ChargeVersionHelper.add(
             { startDate: new Date(2023, 3, 1) }, // 2023-04-01 - Months are zero indexed :-)
-            { includeInSrocSupplementaryBilling: 'yes' }
+            { includeInSrocSupplementaryBilling: true }
           )
           testRecords = [alcsChargeVersion]
         })
@@ -264,7 +264,7 @@ describe('Fetch Charge Versions service', () => {
         const otherRegionChargeVersion = await ChargeVersionHelper.add(
           {},
           {
-            includeInSrocSupplementaryBilling: 'yes',
+            includeInSrocSupplementaryBilling: true,
             regionId: 'e117b501-e3c1-4337-ad35-21c60ed9ad73'
           }
         )
@@ -288,7 +288,7 @@ describe('Fetch Charge Versions service', () => {
         const chargeVersion = await ChargeVersionHelper.add(
           {},
           {
-            includeInSrocSupplementaryBilling: 'yes',
+            includeInSrocSupplementaryBilling: true,
             regionId
           }
         )