Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions cl/donate/api_views.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import datetime
import logging
from collections import defaultdict
from http import HTTPStatus
from typing import Any
Expand Down Expand Up @@ -29,6 +30,8 @@
emails,
)

logger = logging.getLogger(__name__)


class NeonMembershipWebhookSerializer(serializers.Serializer):
eventTrigger = serializers.CharField(required=True)
Expand Down Expand Up @@ -367,6 +370,20 @@ def _handle_membership_creation(self, webhook_data) -> None:
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:
if not membership_data["paymentStatus"]:
payment_status = MembershipPaymentStatus.SUCCEEDED
else:
logger.error(
"EDU membership %s for account %s has unexpected "
"payment status: %s. Review manually.",
membership_data["membershipId"],
membership_data["accountId"],
membership_data["paymentStatus"],
)

try:
neon_membership = user.membership
except ObjectDoesNotExist:
Expand Down
35 changes: 35 additions & 0 deletions cl/donate/tests.py
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