Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle soft deleted workflow in supp. billing #213

Merged
merged 5 commits into from
May 5, 2023
Merged

Handle soft deleted workflow in supp. billing #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a0c116
Handle soft deleted workflow in supp. billing
Cruikshanks May 4, 2023
988fa6b
Merge branch 'main' into handle-soft-deleted-workflow-records
Cruikshanks May 5, 2023
6184b60
Add test
Cruikshanks May 5, 2023
926ef73
Implement fix
Cruikshanks May 5, 2023
f8f823c
Destructure instead of apply
Cruikshanks May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/services/supplementary-billing/fetch-charge-versions.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ async function _fetch (regionId, billingPeriod) {
ChargeVersionWorkflow.query()
.select(1)
.whereColumn('chargeVersions.licenceId', 'chargeVersionWorkflows.licenceId')
.whereNull('chargeVersionWorkflows.dateDeleted')
)
.orderBy([
{ column: 'chargeVersions.invoiceAccountId' },
Expand Down
18 changes: 17 additions & 1 deletion test/services/supplementary-billing/fetch-charge-versions.service.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,21 @@ describe('Fetch Charge Versions service', () => {
let chargeElement
let chargePurpose
let changeReason
let licence

beforeEach(async () => {
billingPeriod = {
startDate: new Date('2022-04-01'),
endDate: new Date('2023-03-31')
}

const { licenceId } = await LicenceHelper.add({
licence = await LicenceHelper.add({
regionId,
isWaterUndertaker: true,
includeInSrocSupplementaryBilling: true,
includeInSupplementaryBilling: 'yes'
})
const { licenceId } = licence
changeReason = await ChangeReasonHelper.add({ triggersMinimumCharge: true })

// This creates a 'current' SROC charge version
Expand Down Expand Up @@ -87,6 +89,20 @@ describe('Fetch Charge Versions service', () => {
})
})

describe('including those linked to soft-deleted workflow records', () => {
beforeEach(async () => {
await ChargeVersionWorkflowHelper.add({ licenceId: licence.licenceId, dateDeleted: new Date('2022-04-01') })
})

it('returns the SROC charge versions that are applicable', async () => {
const result = await FetchChargeVersionsService.go(regionId, billingPeriod)

expect(result).to.have.length(2)
expect(result[0].chargeVersionId).to.equal(testRecords[0].chargeVersionId)
expect(result[1].chargeVersionId).to.equal(testRecords[1].chargeVersionId)
})
})

it("returns both 'current' and 'superseded' SROC charge versions that are applicable", async () => {
const result = await FetchChargeVersionsService.go(regionId, billingPeriod)

Expand Down