Add logic 2 determine billable abstraction periods #81
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-3834 In [Implement abstraction period query using Objection](#66) we amended the query used in `test/services/supplementary-billing/fetch-charge-versions.service.test.js` to include abstraction period information for each charge version candidate. We're aiming to get to a 'billable days' value but the next step is determining for each abstraction period, is it relevant to the current billing period, and if so, how much of it. This change implements a service which can be used to answer both those questions.
It's not calculating the billable days or limiting the results to periods to be considered. But it is implementing the logic we outlined in https://eaflood.atlassian.net/browse/WATER-3834 to give us the raw data we'll need.
Jozzey
approved these changes
Jan 19, 2023
Jozzey
deleted the
add-logic-to-determine-billable-abstraction-periods
branch
Cruikshanks
commented
Jan 19, 2023
Comment on lines
+18
to
+51
| function _abstractionPeriods (billingPeriod, chargePurpose) { | ||
| const billingPeriodStartYear = billingPeriod.startDate.getFullYear() | ||
| const billingPeriodEndYear = billingPeriod.endDate.getFullYear() | ||
| const { | ||
| abstractionPeriodStartDay: startDay, | ||
| abstractionPeriodStartMonth: startMonth, | ||
| abstractionPeriodEndDay: endDay, | ||
| abstractionPeriodEndMonth: endMonth | ||
| } = chargePurpose | ||
| const firstPeriod = {} | ||
|
|
||
| if (endMonth === startMonth) { | ||
| if (endDay >= startDay) { | ||
| firstPeriod.startDate = new Date(billingPeriodEndYear, startMonth - 1, startDay) | ||
| firstPeriod.endDate = new Date(billingPeriodEndYear, endMonth - 1, endDay) | ||
| } else { | ||
| firstPeriod.startDate = new Date(billingPeriodStartYear, startMonth - 1, startDay) | ||
| firstPeriod.endDate = new Date(billingPeriodEndYear, endMonth - 1, endDay) | ||
| } | ||
| } else if (endMonth >= startMonth) { | ||
| firstPeriod.startDate = new Date(billingPeriodEndYear, startMonth - 1, startDay) | ||
| firstPeriod.endDate = new Date(billingPeriodEndYear, endMonth - 1, endDay) | ||
| } else { | ||
| firstPeriod.startDate = new Date(billingPeriodStartYear, startMonth - 1, startDay) | ||
| firstPeriod.endDate = new Date(billingPeriodEndYear, endMonth - 1, endDay) | ||
| } | ||
|
|
||
| const previousPeriod = { | ||
| startDate: _subtractOneYear(firstPeriod.startDate), | ||
| endDate: _subtractOneYear(firstPeriod.endDate) | ||
| } | ||
|
|
||
| return [previousPeriod, firstPeriod] | ||
| } |
There was a problem hiding this comment.
I look at this function and go 🤮 . But I have a stinkin' cold and it's the end of the day, so don't know how I'd go about improving it.
But I definitely need to add some documentation to give some context as to what on earth it is trying to achieve.
Let me at least do that and then we're all good IMHO (though any suggestions for improvement I'm open to!)
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-3834
In Implement abstraction period query using Objection we amended the query used in
test/services/supplementary-billing/fetch-charge-versions.service.test.jsto include abstraction period information for each charge version candidate.We're aiming to get to a 'billable days' value but the next step is determining for each abstraction period whether it is relevant to the current billing period, and if so, how much of it.
This change implements a service which can be used to answer both those questions.