Move 2PT match and allocate logic to own folder (#1471)

https://eaflood.atlassian.net/browse/WATER-4739 Following on from our work in [Tidy up two-part tariff review code and routes](#1443), this change moves the two-part tariff match and allocate logic into its own folder. This will hopefully help us distinguish what aspect of the two-part tariff engine a module relates to. Unlike the previous change, though, we're having to ignore any issues or ways to clean things up. Time is not on our side! So, it's just moving the modules.
DEFRA · Nov 10, 2024 · 1bb1202 · 1bb1202
1 parent e22357a
commit 1bb1202
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 21 deletions.
diff --git a/...cate-returns-to-charge-element.service.js → ...cate-returns-to-charge-element.service.js b/...cate-returns-to-charge-element.service.js → ...cate-returns-to-charge-element.service.js
diff --git a/...ariff/determine-licence-issues.service.js → ...match/determine-licence-issues.service.js b/...ariff/determine-licence-issues.service.js → ...match/determine-licence-issues.service.js
diff --git a/...t-tariff/fetch-charge-versions.service.js → ...ns/match/fetch-charge-versions.service.js b/...t-tariff/fetch-charge-versions.service.js → ...ns/match/fetch-charge-versions.service.js
diff --git a/...two-part-tariff/fetch-licences.service.js → ...bill-runs/match/fetch-licences.service.js b/...two-part-tariff/fetch-licences.service.js → ...bill-runs/match/fetch-licences.service.js
diff --git a/.../fetch-return-logs-for-licence.service.js → .../fetch-return-logs-for-licence.service.js b/.../fetch-return-logs-for-licence.service.js → .../fetch-return-logs-for-licence.service.js
diff --git a/...part-tariff/match-and-allocate.service.js → ...-runs/match/match-and-allocate.service.js b/...part-tariff/match-and-allocate.service.js → ...-runs/match/match-and-allocate.service.js
diff --git a/...atch-returns-to-charge-element.service.js → ...atch-returns-to-charge-element.service.js b/...atch-returns-to-charge-element.service.js → ...atch-returns-to-charge-element.service.js
diff --git a/...t-allocated-licence-to-results.service.js → ...t-allocated-licence-to-results.service.js b/...t-allocated-licence-to-results.service.js → ...t-allocated-licence-to-results.service.js
diff --git a/...-tariff/prepare-charge-version.service.js → ...s/match/prepare-charge-version.service.js b/...-tariff/prepare-charge-version.service.js → ...s/match/prepare-charge-version.service.js
diff --git a/...art-tariff/prepare-return-logs.service.js → ...runs/match/prepare-return-logs.service.js b/...art-tariff/prepare-return-logs.service.js → ...runs/match/prepare-return-logs.service.js
diff --git a/app/services/bill-runs/two-part-tariff/process-bill-run.service.js b/app/services/bill-runs/two-part-tariff/process-bill-run.service.js
@@ -8,7 +8,7 @@
 const BillRunModel = require('../../../models/bill-run.model.js')
 const { calculateAndLogTimeTaken, currentTimeInNanoseconds } = require('../../../lib/general.lib.js')
 const HandleErroredBillRunService = require('../handle-errored-bill-run.service.js')
-const MatchAndAllocateService = require('./match-and-allocate.service.js')
+const MatchAndAllocateService = require('../match/match-and-allocate.service.js')
 
 /**
  * Matches and allocates licences to returns for a two-part tariff bill run

diff --git a/...returns-to-charge-element.service.test.js → ...returns-to-charge-element.service.test.js b/...returns-to-charge-element.service.test.js → ...returns-to-charge-element.service.test.js
@@ -8,7 +8,7 @@ const { describe, it, beforeEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Thing under test
-const AllocateReturnsToChargeElementService = require('../../../../app/services/bill-runs/two-part-tariff/allocate-returns-to-charge-element.service.js')
+const AllocateReturnsToChargeElementService = require('../../../../app/services/bill-runs/match/allocate-returns-to-charge-element.service.js')
 
 describe('Allocate Returns to Charge Element Service', () => {
   describe('when there are records to process', () => {

diff --git a/.../determine-licence-issues.service.test.js → .../determine-licence-issues.service.test.js b/.../determine-licence-issues.service.test.js → .../determine-licence-issues.service.test.js
@@ -8,7 +8,7 @@ const { describe, it, beforeEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Thing under test
-const DetermineLicenceIssuesService = require('../../../../app/services/bill-runs/two-part-tariff/determine-licence-issues.service.js')
+const DetermineLicenceIssuesService = require('../../../../app/services/bill-runs/match/determine-licence-issues.service.js')
 
 describe('Determine Licence Issues Service', () => {
   describe('when given a licence', () => {

diff --git a/...iff/fetch-charge-versions.service.test.js → ...tch/fetch-charge-versions.service.test.js b/...iff/fetch-charge-versions.service.test.js → ...tch/fetch-charge-versions.service.test.js
@@ -21,7 +21,7 @@ const RegionHelper = require('../../../support/helpers/region.helper.js')
 const WorkflowHelper = require('../../../support/helpers/workflow.helper.js')
 
 // Thing under test
-const FetchChargeVersionsService = require('../../../../app/services/bill-runs/two-part-tariff/fetch-charge-versions.service.js')
+const FetchChargeVersionsService = require('../../../../app/services/bill-runs/match/fetch-charge-versions.service.js')
 
 const CHANGE_NEW_AGREEMENT_INDEX = 2
 const PURPOSE_SPRAY_IRRIGATION_INDEX = 41

diff --git a/...art-tariff/fetch-licences.service.test.js → ...runs/match/fetch-licences.service.test.js b/...art-tariff/fetch-licences.service.test.js → ...runs/match/fetch-licences.service.test.js
@@ -9,10 +9,10 @@ const { describe, it, beforeEach, afterEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Things we need to stub
-const FetchChargeVersionsService = require('../../../../app/services/bill-runs/two-part-tariff/fetch-charge-versions.service.js')
+const FetchChargeVersionsService = require('../../../../app/services/bill-runs/match/fetch-charge-versions.service.js')
 
 // Thing under test
-const FetchLicencesService = require('../../../../app/services/bill-runs/two-part-tariff/fetch-licences.service.js')
+const FetchLicencesService = require('../../../../app/services/bill-runs/match/fetch-licences.service.js')
 
 describe('Fetch Licences service', () => {
   const regionId = '64924759-8142-4a08-9d1e-1e902cd9d316'

diff --git a/...h-return-logs-for-licence.service.test.js → ...h-return-logs-for-licence.service.test.js b/...h-return-logs-for-licence.service.test.js → ...h-return-logs-for-licence.service.test.js
@@ -13,7 +13,7 @@ const ReturnSubmissionHelper = require('../../../support/helpers/return-submissi
 const ReturnSubmissionLineHelper = require('../../../support/helpers/return-submission-line.helper.js')
 
 // Thing under test
-const FetchReturnLogsForLicenceService = require('../../../../app/services/bill-runs/two-part-tariff/fetch-return-logs-for-licence.service.js')
+const FetchReturnLogsForLicenceService = require('../../../../app/services/bill-runs/match/fetch-return-logs-for-licence.service.js')
 
 describe('Fetch Return Logs for Licence service', () => {
   const billingPeriod = { startDate: new Date('2022-04-01'), endDate: new Date('2023-03-31') }

diff --git a/...tariff/match-and-allocate.service.test.js → .../match/match-and-allocate.service.test.js b/...tariff/match-and-allocate.service.test.js → .../match/match-and-allocate.service.test.js
@@ -9,16 +9,16 @@ const { describe, it, beforeEach, afterEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Things we need to stub
-const AllocateReturnsToChargeElementService = require('../../../../app/services/bill-runs/two-part-tariff/allocate-returns-to-charge-element.service.js')
-const DetermineLicenceIssuesService = require('../../../../app/services/bill-runs/two-part-tariff/determine-licence-issues.service.js')
-const FetchLicencesService = require('../../../../app/services/bill-runs/two-part-tariff/fetch-licences.service.js')
-const MatchReturnsToChargeElementService = require('../../../../app/services/bill-runs/two-part-tariff/match-returns-to-charge-element.service.js')
-const PrepareChargeVersionService = require('../../../../app/services/bill-runs/two-part-tariff/prepare-charge-version.service.js')
-const PrepareReturnLogsService = require('../../../../app/services/bill-runs/two-part-tariff/prepare-return-logs.service.js')
-const PersistAllocatedLicenceToResultsService = require('../../../../app/services/bill-runs/two-part-tariff/persist-allocated-licence-to-results.service.js')
+const AllocateReturnsToChargeElementService = require('../../../../app/services/bill-runs/match/allocate-returns-to-charge-element.service.js')
+const DetermineLicenceIssuesService = require('../../../../app/services/bill-runs/match/determine-licence-issues.service.js')
+const FetchLicencesService = require('../../../../app/services/bill-runs/match/fetch-licences.service.js')
+const MatchReturnsToChargeElementService = require('../../../../app/services/bill-runs/match/match-returns-to-charge-element.service.js')
+const PrepareChargeVersionService = require('../../../../app/services/bill-runs/match/prepare-charge-version.service.js')
+const PrepareReturnLogsService = require('../../../../app/services/bill-runs/match/prepare-return-logs.service.js')
+const PersistAllocatedLicenceToResultsService = require('../../../../app/services/bill-runs/match/persist-allocated-licence-to-results.service.js')
 
 // Thing under test
-const MatchAndAllocateService = require('../../../../app/services/bill-runs/two-part-tariff/match-and-allocate.service.js')
+const MatchAndAllocateService = require('../../../../app/services/bill-runs/match/match-and-allocate.service.js')
 
 describe('Match And Allocate Service', () => {
   let determineLicenceIssuesServiceStub

diff --git a/...returns-to-charge-element.service.test.js → ...returns-to-charge-element.service.test.js b/...returns-to-charge-element.service.test.js → ...returns-to-charge-element.service.test.js
@@ -8,7 +8,7 @@ const { describe, it, beforeEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Thing under test
-const MatchReturnsToChargeElementService = require('../../../../app/services/bill-runs/two-part-tariff/match-returns-to-charge-element.service.js')
+const MatchReturnsToChargeElementService = require('../../../../app/services/bill-runs/match/match-returns-to-charge-element.service.js')
 
 describe('Match Returns To Charge Element Service', () => {
   let chargeElement

diff --git a/...ocated-licence-to-results.service.test.js → ...ocated-licence-to-results.service.test.js b/...ocated-licence-to-results.service.test.js → ...ocated-licence-to-results.service.test.js
@@ -13,7 +13,7 @@ const { generateReturnLogId } = require('../../../support/helpers/return-log.hel
 const ReviewLicenceModel = require('../../../../app/models/review-licence.model.js')
 
 // Thing under test
-const PersistAllocatedLicenceToResultsService = require('../../../../app/services/bill-runs/two-part-tariff/persist-allocated-licence-to-results.service.js')
+const PersistAllocatedLicenceToResultsService = require('../../../../app/services/bill-runs/match/persist-allocated-licence-to-results.service.js')
 
 describe('Persist Allocated Licence to Results service', () => {
   const billRunId = generateUUID()

diff --git a/...ff/prepare-charge-version.service.test.js → ...ch/prepare-charge-version.service.test.js b/...ff/prepare-charge-version.service.test.js → ...ch/prepare-charge-version.service.test.js
@@ -8,7 +8,7 @@ const { describe, it, beforeEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Thing under test
-const PrepareChargeVersionService = require('../../../../app/services/bill-runs/two-part-tariff/prepare-charge-version.service.js')
+const PrepareChargeVersionService = require('../../../../app/services/bill-runs/match/prepare-charge-version.service.js')
 
 describe('Prepare Charge Version Service', () => {
   const billingPeriod = {

diff --git a/...ariff/prepare-return-logs.service.test.js → ...match/prepare-return-logs.service.test.js b/...ariff/prepare-return-logs.service.test.js → ...match/prepare-return-logs.service.test.js
@@ -9,10 +9,10 @@ const { describe, it, beforeEach, afterEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Things we need to stub
-const FetchReturnLogsForLicenceService = require('../../../../app/services/bill-runs/two-part-tariff/fetch-return-logs-for-licence.service.js')
+const FetchReturnLogsForLicenceService = require('../../../../app/services/bill-runs/match/fetch-return-logs-for-licence.service.js')
 
 // Thing under test
-const PrepareReturnLogService = require('../../../../app/services/bill-runs/two-part-tariff/prepare-return-logs.service.js')
+const PrepareReturnLogService = require('../../../../app/services/bill-runs/match/prepare-return-logs.service.js')
 
 describe('Prepare Return Logs Service', () => {
   const billingPeriod = {

diff --git a/test/services/bill-runs/two-part-tariff/process-bill-run.service.test.js b/test/services/bill-runs/two-part-tariff/process-bill-run.service.test.js
@@ -14,7 +14,7 @@ const BillRunModel = require('../../../../app/models/bill-run.model.js')
 
 // Things we need to stub
 const HandleErroredBillRunService = require('../../../../app/services/bill-runs/handle-errored-bill-run.service.js')
-const MatchAndAllocateService = require('../../../../app/services/bill-runs/two-part-tariff/match-and-allocate.service.js')
+const MatchAndAllocateService = require('../../../../app/services/bill-runs/match/match-and-allocate.service.js')
 
 // Thing under test
 const TwoPartTariffProcessBillRunService = require('../../../../app/services/bill-runs/two-part-tariff/process-bill-run.service.js')