From 140e8c919a6d6dfd38ed96bdba1285fec7de5799 Mon Sep 17 00:00:00 2001
From: Jason Claxton <30830544+Jozzey@users.noreply.github.com>
Date: Wed, 16 Aug 2023 11:13:07 +0100
Subject: [PATCH] Match returns to chargePurpose (#356)

https://eaflood.atlassian.net/browse/WATER-4046

Assign matched returns directly to the `chargePurpose` instead of grouping them and assigning them to the `chargeElement`.

We are now a little unsure which is required but this makes it easier to see why we matched the return.
---
 app/services/check/two-part.service.js | 42 ++++++++++++--------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/app/services/check/two-part.service.js b/app/services/check/two-part.service.js
index 495c70b11d..771b1cf2d4 100644
--- a/app/services/check/two-part.service.js
+++ b/app/services/check/two-part.service.js
@@ -90,32 +90,28 @@ async function _fetchAndApplyReturns (billingPeriod, chargeVersion) {
   const { licenceRef, chargeElements } = chargeVersion
 
   for (const chargeElement of chargeElements) {
-    const purposeUseLegacyIds = _extractPurposeUseLegacyIds(chargeElement)
-
-    chargeElement.returns = await ReturnModel.query()
-      .select([
-        'returnId',
-        'returnRequirement',
-        'startDate',
-        'endDate',
-        'metadata'
-      ])
-      .where('licenceRef', licenceRef)
-      // water-abstraction-service filters out old returns in this way: `src/lib/services/returns/api-connector.js`
-      .where('startDate', '>=', '2008-04-01')
-      .where('startDate', '<=', billingPeriod.endDate)
-      .where('endDate', '>=', billingPeriod.startDate)
-      .whereJsonPath('metadata', '$.isTwoPartTariff', '=', true)
-      .whereIn(ref('metadata:purposes[0].tertiary.code').castInt(), purposeUseLegacyIds)
+    const { chargePurposes } = chargeElement
+    for (const chargePurpose of chargePurposes) {
+      const legacyId = chargePurpose.purposesUse.legacyId
+      chargePurpose.returns = await ReturnModel.query()
+        .select([
+          'returnId',
+          'returnRequirement',
+          'startDate',
+          'endDate',
+          'metadata'
+        ])
+        .where('licenceRef', licenceRef)
+        // water-abstraction-service filters out old returns in this way: `src/lib/services/returns/api-connector.js`
+        .where('startDate', '>=', '2008-04-01')
+        .where('startDate', '<=', billingPeriod.endDate)
+        .where('endDate', '>=', billingPeriod.startDate)
+        .whereJsonPath('metadata', '$.isTwoPartTariff', '=', true)
+        .where(ref('metadata:purposes[0].tertiary.code').castInt(), legacyId)
+    }
   }
 }
 
-function _extractPurposeUseLegacyIds (chargeElement) {
-  return chargeElement.chargePurposes.map((chargePurpose) => {
-    return chargePurpose.purposesUse.legacyId
-  })
-}
-
 function _matchChargeVersions (chargeVersions) {
   const allLicenceIds = chargeVersions.map((chargeVersion) => {
     return chargeVersion.licenceId