Merge pull request #789 from uw-it-aca/task/handle-itbill-404-exception

Task/handle itbill 404 exception

Author: mikeseibel

endorsement/dao/itbill.py

@@ -123,6 +123,12 @@ def load_itbill_subscription(record):
     """
     Update the subscription record with the latest ITBill data
     """
-    record.update_subscription(
-        get_subscription_by_key_remote(record.subscription.key_remote)
-    )
+    try:
+        record.update_subscription(
+            get_subscription_by_key_remote(record.subscription.key_remote)
+        )
+    except DataFailureException as ex:
+        if ex.status == 404:
+            raise ITBillSubscriptionNotFound(record.subscription.key_remote)
+
+        raise ex

endorsement/dao/shared_drive.py

@@ -284,9 +284,19 @@ def load_or_update_subscription(sdr: SharedDriveRecord):
     """
     # Do we already have an ITBillSubscription on file?
     if sdr.subscription is not None:
-        load_itbill_subscription(sdr)
-        sdr.subscription.save()
-        return sdr.subscription
+        try:
+            load_itbill_subscription(sdr)
+            sdr.subscription.save()
+            return sdr.subscription
+        except ITBillSubscriptionNotFound as ex:
+            sub = sdr.subscription
+            if sub.state == ITBillSubscription.SUBSCRIPTION_DEPLOYED:
+                logger.error(f"Remote key not found in itbill: {ex} "
+                             "for drive in deployed state")
+            else:
+                logger.info("Remote key not found in itbill for drive "
+                            f"{ex} in {sub.get_state_display} state.")
+            return None
 
     # Does an ITBill subscription exist remotely and we just have to get it?
     key_remote = sdr.get_itbill_key_remote()