From e7a3b98fff7a847c8e520f345afbc2680e9e31bf Mon Sep 17 00:00:00 2001 From: Andrew Shumway Date: Mon, 20 Nov 2023 10:39:39 -0700 Subject: [PATCH] Refactor list comprehension --- app/main/views/send.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index 8ce91ed98..dab41646e 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -268,19 +268,27 @@ def remove_notify_from_sender_options(sender_details): # Remove US Notify/Notify.gov from users list of sender # options during message send flow sender_details = [ - sender - for sender in sender_details - if sender.get("sms_sender") in ["Notify.gov", "US Notify"] - and sender["is_default"] - or sender.get("sms_sender") not in ["Notify.gov", "US Notify"] - and not sender["is_default"] - or sender.get("sms_sender") not in ["Notify.gov", "US Notify"] - and sender["is_default"] + sender for sender in sender_details if verify_sender_options(sender) ] return sender_details +def verify_sender_options(sender): + if sender.get("sms_sender") in ["Notify.gov", "US Notify"] and sender["is_default"]: + return True + if ( + sender.get("sms_sender") not in ["Notify.gov", "US Notify"] + and not sender["is_default"] + ): + return True + if ( + sender.get("sms_sender") not in ["Notify.gov", "US Notify"] + and sender["is_default"] + ): + return True + + def get_sender_context(sender_details, template_type): context = { "email": {