From 2d1a6e27fccba4a30848de428517a1e3001a92e7 Mon Sep 17 00:00:00 2001 From: Moeez Zahid Date: Mon, 19 Jun 2023 14:07:24 +0500 Subject: [PATCH] refactor: Add exception handling to Apple migration commands (#32500) * refactor: Add exception handling to Apple migration commands * refactor: Remove extra import --- .../commands/generate_and_store_apple_transfer_ids.py | 3 +++ .../management/commands/generate_and_store_new_apple_ids.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/common/djangoapps/third_party_auth/management/commands/generate_and_store_apple_transfer_ids.py b/common/djangoapps/third_party_auth/management/commands/generate_and_store_apple_transfer_ids.py index 00177ec76c..73e2a7aa1f 100644 --- a/common/djangoapps/third_party_auth/management/commands/generate_and_store_apple_transfer_ids.py +++ b/common/djangoapps/third_party_auth/management/commands/generate_and_store_apple_transfer_ids.py @@ -148,6 +148,9 @@ class Command(BaseCommand): except BadRequestException: log.info('Bad request for uid %s.', apple_id) transfer_id = '' + except (requests.exceptions.JSONDecodeError, AttributeError): + log.info('JSONDecodeError/AttributeError for uid %s.', apple_id) + transfer_id = '' return transfer_id diff --git a/common/djangoapps/third_party_auth/management/commands/generate_and_store_new_apple_ids.py b/common/djangoapps/third_party_auth/management/commands/generate_and_store_new_apple_ids.py index 94882d1803..6a06a88533 100644 --- a/common/djangoapps/third_party_auth/management/commands/generate_and_store_new_apple_ids.py +++ b/common/djangoapps/third_party_auth/management/commands/generate_and_store_new_apple_ids.py @@ -145,6 +145,9 @@ class Command(BaseCommand): except BadRequestException: log.info('Bad request for transfer_id %s.', transfer_id) new_apple_id = '' + except (requests.exceptions.JSONDecodeError, AttributeError): + log.info('JSONDecodeError/AttributeError for transfer_id %s.', transfer_id) + transfer_id = '' return new_apple_id