Update service free allowance when organisation type change #4371
Conversation
This file contains hidden or 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
spatel033
force-pushed
the
update-service-free-allowance
branch
from
ac2f126 to
bbcad60
Compare
klssmith
reviewed
Feb 4, 2025
| @@ -158,6 +160,11 @@ def _update_organisation_services(organisation, attribute, only_where_none=True) | |||
| db.session.add(service) | |||
|
|
|||
|
|
|||
| def _update_organisation_services_free_allowance(organisation): | |||
| for service in organisation.services: | |||
| set_default_free_allowance_for_service(service, year_start=None) | |||
There was a problem hiding this comment.
This function only keeps the manual free allowances if they're 0, but not if they're any other value - it sounds like this isn't what we want to happen?
There was a problem hiding this comment.
Tested the changes with #4375. set_default_free_allowance_for_service has been refactored so allowance would be updated for any value.
spatel033
force-pushed
the
update-service-free-allowance
branch
from
bbcad60 to
d73a406
Compare
spatel033
force-pushed
the
update-service-free-allowance
branch
from
48e8cca to
c4d2267
Compare
Update the free allowance when updating organisation type. If the service free allowance has been updated manually then it should keep the manual allowance.
fact_billing_dao is imported into multiple other dao, creating circular dependency for to get live services and free allowance for org. So moving dao_get_organisation_live_services_and_their_free_allowance into fact_billing_dao to break circular dependancy.
spatel033
force-pushed
the
update-service-free-allowance
branch
from
c4d2267 to
c7252b7
Compare
klssmith
approved these changes
Feb 26, 2025
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.
Update the free allowance when updating organisation type. If the service free allowance has been updated manually then it should keep the manual allowance, this requirement should be handled as part of this story. More details on this card.
This PR needs to be merged after #4375