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.

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 18 commits into from
Jan 17, 2024

Conversation

Beckyrose200
Copy link
Contributor

@Beckyrose200 Beckyrose200 commented Jan 3, 2024

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.

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 Beckyrose200 self-assigned this Jan 3, 2024
@Beckyrose200 Beckyrose200 added the enhancement New feature or request label Jan 3, 2024
@Jozzey Jozzey marked this pull request as ready for review January 16, 2024 15:17
@Jozzey Jozzey requested review from Cruikshanks and Jozzey January 16, 2024 15:17
Copy link
Contributor Author

@Beckyrose200 Beckyrose200 left a 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 :)

Jozzey and others added 3 commits January 16, 2024 16:35
Co-authored-by: Becky Ransome <[email protected]>
Co-authored-by: Becky Ransome <[email protected]>
Co-authored-by: Alan Cruikshanks <[email protected]>
Copy link
Contributor

@Jozzey Jozzey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Beckyrose200 Beckyrose200 merged commit 34c1453 into main Jan 17, 2024
6 checks passed
@Beckyrose200 Beckyrose200 deleted the allocate-returns-to-licence-service branch January 17, 2024 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants