Handle SubscriptionParseError in UpgradeView and

process_pending_registrations_user
Signed-off-by: Birin Sanchez <birin.sanchez@puri.sm>

bundlechange/views.py

@@ -6,7 +6,7 @@ from .forms import ChooseBundleForm
 from .models import BundleChange
 from limitmonitor.common import get_user_subscriptions, parse_subscription, \
     set_subscription_status, get_user_external_credit, get_available_bundles, \
-    get_user_upgrade_choices
+    get_user_upgrade_choices, SubscriptionParseError
 from limitmonitor.task_resources.subscription import upgrade_user_subscription
 
 
@@ -60,9 +60,14 @@ class UpgradeView(LoginRequiredMixin, FormView):
 
         variation_id = form.cleaned_data['bundle']
         subs = get_user_subscriptions(self.request.user)
-        # We assume the user has only 1 subscription!
+        # We assume the user has only 1 active subscription!
         if subs:
-            parsed_sub = parse_subscription(subs[0])
+            try:
+                parsed_sub = parse_subscription(subs[0])
+            except SubscriptionParseError as e:
+                print('Error processing bundle_change for user {}: {}'.format(
+                    self.request.user, repr(e)))
+                return super(UpgradeView, self).form_valid(form)
             order = upgrade_user_subscription(self.request.user,
                                               variation_id)
             pay_url = settings.WOO_UPGRADE_PAY_URL.format(order['id'],

limitmonitor/task_resources/subscription.py

@@ -4,7 +4,8 @@ from cart.models import ChosenReward
 from bundlechange.models import BundleChange
 from limitmonitor.common import parse_subscription, get_user_subscriptions, \
     subscription_was_processed, get_services_from_bundle, forced_update, \
-    get_users_expired_subs, order_paid, set_subscription_status
+    get_users_expired_subs, order_paid, set_subscription_status, \
+    SubscriptionParseError
 
 logger = get_task_logger(__name__)
 
@@ -17,7 +18,11 @@ def process_pending_registrations_user(user):
         logger.info('User {} has no subscriptions.'.format(user.username))
         return
     for sub in subscriptions:
-        parsed_sub = parse_subscription(sub)
+        try:
+            parsed_sub = parse_subscription(sub)
+        except SubscriptionParseError as parse_e:
+            logger.info(repr(parse_e))
+            continue
 
         if parsed_sub['bundle_key'] not in settings.WOOSUB1_PRODUCT_LIST:
             continue  # Skip this subscription as is not a product we care of