-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Allocate returns to licence service #628
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
https://eaflood.atlassian.net/browse/WATER-4188 As part of the work we have been doing, we've been hacking away at a branch in a mob to build the two-part-tariff service. As a result of this, we have some refactoring to do to tidy up the work we have done in our mob. We are keeping track of the refactoring to do in this issue DEFRA/water-abstraction-team#105. This PR will extract the allocateReturnsToLicenceService out of our hacky branch and into its own PR along with unit tests.
Beckyrose200
commented
Jan 16, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Few comments to discuss :)
app/services/bill-runs/two-part-tariff/allocate-returns-to-charge-element.service.js
Outdated
Show resolved
Hide resolved
app/services/bill-runs/two-part-tariff/allocate-returns-to-charge-element.service.js
Show resolved
Hide resolved
app/services/bill-runs/two-part-tariff/allocate-returns-to-charge-element.service.js
Outdated
Show resolved
Hide resolved
test/services/bill-runs/two-part-tariff/allocate-returns-to-charge-element.service.test.js
Show resolved
Hide resolved
test/services/bill-runs/two-part-tariff/allocate-returns-to-charge-element.service.test.js
Outdated
Show resolved
Hide resolved
test/services/bill-runs/two-part-tariff/allocate-returns-to-charge-element.service.test.js
Show resolved
Hide resolved
Co-authored-by: Becky Ransome <[email protected]>
Co-authored-by: Becky Ransome <[email protected]> Co-authored-by: Alan Cruikshanks <[email protected]>
Jozzey
approved these changes
Jan 16, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://eaflood.atlassian.net/browse/WATER-4188
This pull request refactors the 'AllocateReturnsToLicenceService' as part of our ongoing effort to enhance the two-part tariff service. Initially, we began by creating a 'hack' branch to build and iterate on the two-part-tariff functionality. In the process of working on these branches, we identified a cleaner and more performant approach to implement the overall service. We realised that the AllocateReturnsToLicenceService would be much cleaner and easier to follow if it was split into two services the AllocateReturnsToLicenceService and the MatchReturnsToChargeElementService.
We have also refactored the allocation service to only allocate one charge element at a time from a licence, rather than iterating through every licence and every charge element. This also makes it easier for testing.