Skip to content

Commit 4acb8ae

Browse files
authored
fix: fixing 500 error with null values
fix: fixing 500 error with null values
2 parents 30c3d85 + 5545061 commit 4acb8ae

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

enterprise_access/apps/api/serializers/customer_billing.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,16 +283,19 @@ class StripeSubscriptionPlanInfoResponseSerializer(serializers.Serializer):
283283
Response serializer for response body from GET /api/v1/stripe-event-summary/get-stripe-subscription-plan-info
284284
"""
285285
upcoming_invoice_amount_due = serializers.CharField(
286+
allow_null=True,
286287
required=False,
287288
help_text='Upcoming invoice amount due related to this event/subscription',
288289
)
289290

290291
currency = serializers.CharField(
292+
allow_null=True,
291293
required=False,
292294
help_text='Three-letter ISO currency code associated with the subscription.',
293295
)
294296

295297
canceled_date = serializers.DateTimeField(
298+
allow_null=True,
296299
required=False,
297300
help_text='Timestamp when the subscription is scheduled to be canceled',
298301
)

enterprise_access/apps/api/v1/views/customer_billing.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,6 @@ def get_stripe_subscription_plan_info(self, request, *args, **kwargs):
624624
subscription_plan_uuid = self.request.query_params.get('subscription_plan_uuid')
625625
if not subscription_plan_uuid:
626626
raise exceptions.ValidationError(detail='subscription_plan_uuid query param is required')
627-
subscription_plan_uuid = self.request.query_params.get('subscription_plan_uuid')
628627
created_event_summary = StripeEventSummary.objects.filter(
629628
event_type='customer.subscription.created',
630629
subscription_plan_uuid=subscription_plan_uuid,
@@ -650,8 +649,9 @@ def get_stripe_subscription_plan_info(self, request, *args, **kwargs):
650649
'canceled_date': canceled_date,
651650
},
652651
)
653-
if not (subscription_plan_uuid and (updated_event_summary or created_event_summary)):
654-
return Response({})
655-
if not response_serializer.is_valid():
656-
return HttpResponseServerError()
652+
if not subscription_plan_uuid:
653+
raise exceptions.NotFound("No associated subscription plan uuid was found")
654+
if not (updated_event_summary or created_event_summary):
655+
raise exceptions.NotFound("No Stripe subscription data found for this plan")
656+
response_serializer.is_valid(raise_exception=True)
657657
return Response(response_serializer.data, status=status.HTTP_200_OK)

0 commit comments

Comments
 (0)