Skip to content

fix(donate): Set .edu membership payment status to succeeded #7211

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
albertisfu merged 3 commits into from
Apr 10, 2026
+52 −0
Merged

fix(donate): Set .edu membership payment status to succeeded #7211

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d914d4e
fix(donate): Set `.edu` membership payment status to succeeded
ERosendo Apr 10, 2026
4977f2d
feat(donate): Log unexpected payment status for .edu memberships
ERosendo Apr 10, 2026
460f74a
Merge branch 'main' into fix-edu-membership-payment-status
ERosendo Apr 10, 2026
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
15 changes: 11 additions & 4 deletions cl/donate/api_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,17 @@ def _handle_membership_creation(self, webhook_data) -> None:
email["from_email"],
[user.email],
)

payment_status = self._map_payment_status_value(
membership_data["paymentStatus"]
)
# .edu memberships are free. If Neon didn't send payment info,
# treat them as succeeded rather than pending.
if (
membership_level == NeonMembershipLevel.EDU
and not membership_data["paymentStatus"]
):
payment_status = MembershipPaymentStatus.SUCCEEDED
Copy link
Copy Markdown
Contributor

@albertisfu albertisfu Apr 10, 2026

Choose a reason for hiding this comment

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

In case Neon’s logic changes in the future and it starts sending payment info with a failed status, It seems like a good idea to log an error so we can review the membership manually and update the logic accordingly.

else:
payment_status = self._map_payment_status_value(
membership_data["paymentStatus"]
)

try:
neon_membership = user.membership
Expand Down
35 changes: 35 additions & 0 deletions cl/donate/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,41 @@ async def test_create_edu_membership_for_valid_user(

membership = await query.afirst()
self.assertEqual(membership.level, NeonMembershipLevel.EDU)
self.assertEqual(
membership.payment_status, MembershipPaymentStatus.SUCCEEDED
)

@patch.object(
MembershipWebhookViewSet, "_store_webhook_payload", return_value=None
)
async def test_edu_membership_with_explicit_payment_status(
self, mock_store_webhook
) -> None:
"""EDU webhooks with explicit payment info should respect that value."""
self.user_profile.user.email = "test@university.edu"
await self.user_profile.user.asave()

self.user_profile.email_confirmed = True
await self.user_profile.asave()

self.data["eventTrigger"] = "createMembership"
self.data["data"]["membership"]["membershipName"] = "EDU Membership"
self.data["data"]["membership"]["payments"] = [
{"paymentStatus": "Failed"}
]
r = await self.async_client.post(
reverse("membership-webhooks-list", kwargs={"version": "v4"}),
data=self.data,
content_type="application/json",
)
self.assertEqual(r.status_code, HTTPStatus.CREATED)

membership = await NeonMembership.objects.filter(
neon_id="12345"
).afirst()
self.assertEqual(
membership.payment_status, MembershipPaymentStatus.FAILED
)

@patch.object(
MembershipWebhookViewSet, "_store_webhook_payload", return_value=None
Expand Down
Loading