WIP // Adjust PaymentPlan model to contain informations coming from TP and HS #4372
+369
−11
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
MarekBiczysko
requested changes
Nov 4, 2024
| updates = [] | ||
| with transaction.atomic(): | ||
| payment: Payment | ||
| for payment in payment_plan.eligible_payments: |
There was a problem hiding this comment.
for payment in payment_plan.payment_items.all()
| with transaction.atomic(): | ||
| payment: Payment | ||
| for payment in payment_plan.eligible_payments: | ||
| result = rule.execute( |
There was a problem hiding this comment.
rules should be also refactored to handle payment_plan instead of targeting right?
| @@ -564,17 +653,43 @@ class Action(models.TextChoices): | |||
| "self", null=True, blank=True, on_delete=models.CASCADE, related_name="follow_ups" | |||
| ) | |||
| is_follow_up = models.BooleanField(default=False) | |||
| excluded_ids = models.TextField(blank=True) | |||
There was a problem hiding this comment.
please add comment that this is a 'targeting level' exclusion
| @@ -610,6 +725,29 @@ def excluded_beneficiaries_ids(self) -> List[str]: | |||
| ) | |||
| return beneficiaries_ids | |||
|
|
|||
| @property | |||
| def excluded_household_ids(self) -> List: | |||
| # TODO: moved from TP, maybe remove because we have excluded_beneficiaries_ids() | |||
There was a problem hiding this comment.
we have 2 exclusions, on targeting level and on payment plan level, let's rename these properties to avoid confusion
| "program_cycle": "program_cycle", | ||
| "targeting_criteria": "targeting_criteria", | ||
| "sent_to_datahub": "internal_data__sent_to_datahub", | ||
| "steficon_rule": "steficon_rule", |
There was a problem hiding this comment.
we need 2 separate fields for steficon rules. One for targeting steficon rule (calculate vulnerabilities), second for payment plan rule (calculate entitlement)
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.
AB#215785: Adjust PaymentPlan model to contain informations coming from TP and HS