Skip to content

T2240 no money hold extension reminders #2066

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.

Sign up for GitHub

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

Merged
ecino merged 4 commits into from
Jan 15, 2026
Merged

T2240 no money hold extension reminders #2066

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15e4bc4
Restirct notif. to only hold of type SUB_CHILD_HOLD
Shayan105 Oct 6, 2025
17eb3e6
Run precommit
Shayan105 Oct 6, 2025
4194347
Correct wrong type of Hold
Shayan105 Oct 6, 2025
093dacd
Fix typo
Shayan105 Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions child_compassion/models/compassion_hold.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,24 +486,28 @@ def postpone_no_money_hold(self, additional_text=None):
}
hold.write(hold_vals)

body = (
"The no money hold for child {local_id} was expiring on "
"{old_expiration} and was extended to {new_expiration} "
"({extension_description} extension).{additional_text}"
)
hold.message_post(
body=_(body.format(**values)),
subject=_("No money hold extension"),
subtype_xmlid="mail.mt_comment",
)

else:
body = _(
"The no money hold for child {local_id} is expiring on "
"{old_expiration} and will not be extended since "
"no sponsorship exists for this child."
)
hold.message_post(body=body.format(**values))
# ----------------------------------------------------
# NOTIFICATION (Only for NO_MONEY_HOLD)
# ----------------------------------------------------
if hold.type == HoldType.NO_MONEY_HOLD.value:
if hold.child_id.sponsor_id:
body = (
"The no money hold for child {local_id} was expiring on "
"{old_expiration} and was extended to {new_expiration} "
"({extension_description} extension).{additional_text}"
)
hold.message_post(
body=_(body.format(**values)),
subject=_("No money hold extension"),
subtype_xmlid="mail.mt_comment",
)
else:
body = _(
"The no money hold for child {local_id} is expiring on "
"{old_expiration} and will not be extended since "
"no sponsorship exists for this child."
)
hold.message_post(body=body.format(**values))
Comment on lines +492 to +510
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Jan 15, 2026

Choose a reason for hiding this comment

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

medium

This change correctly restricts notifications to NO_MONEY_HOLD types. However, it introduces a duplicated check for hold.child_id.sponsor_id (first at line 479, then again at line 493). This makes the code less efficient and harder to maintain.

Consider refactoring the postpone_no_money_hold method to avoid this duplication. A better structure would be:

if hold.child_id.sponsor_id:  # Check that a sponsorship exists
    # ... (logic to extend the hold)
    hold.write(hold_vals)

    if hold.type == HoldType.NO_MONEY_HOLD.value:
        body = (
            "The no money hold for child {local_id} was expiring on "
            "{old_expiration} and was extended to {new_expiration} "
            "({extension_description} extension).{additional_text}"
        )
        hold.message_post(
            body=_(body.format(**values)),
            subject=_("No money hold extension"),
            subtype_xmlid="mail.mt_comment",
        )
else:
    if hold.type == HoldType.NO_MONEY_HOLD.value:
        body = _(
            "The no money hold for child {local_id} is expiring on "
            "{old_expiration} and will not be extended since "
            "no sponsorship exists for this child."
        )
        hold.message_post(body=body.format(**values))

This would require restructuring the logic starting from line 479.


##########################################################################
# Mapping METHOD #
Expand Down