Refactor: reduce nesting

We can reduce cyclomatic complexity (how far we indented) by checking for a negative condition and exiting early, instead of checking for a positive condition and continuing
This commit is contained in:
trwnh 2022-11-30 10:45:52 -06:00 committed by GitHub
parent 5838f15b1c
commit 420d954568
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 26 deletions

View File

@ -12,12 +12,19 @@ def handle_redeem(message, user_id):
else: else:
note = split_message[1] note = split_message[1]
if redeem in current_app.config['REDEEMS']: if redeem not in current_app.config['REDEEMS']:
send_chat("Can't redeem, redeem not found.")
return
db = get_db() db = get_db()
price = current_app.config['REDEEMS'][redeem]["price"] price = current_app.config['REDEEMS'][redeem]["price"]
redeem_type = current_app.config['REDEEMS'][redeem]["type"] redeem_type = current_app.config['REDEEMS'][redeem]["type"]
points = read_users_points(db, user_id) points = read_users_points(db, user_id)
if points is not None and points >= price:
if not points or points < price:
send_chat(f"Can't redeem {redeem}, you don't have enough points.")
return
if redeem_type == "counter": if redeem_type == "counter":
add_to_counter(db, redeem) add_to_counter(db, redeem)
use_points(db, user_id, price) use_points(db, user_id, price)
@ -27,15 +34,11 @@ def handle_redeem(message, user_id):
use_points(db, user_id, price) use_points(db, user_id, price)
send_chat(f"{redeem} redeemed for {price} points.") send_chat(f"{redeem} redeemed for {price} points.")
elif redeem_type == "note": elif redeem_type == "note":
if note is not None: if not note:
send_chat(f"Cannot redeem {redeem}, no note included.")
return
add_to_redeem_queue(db, user_id, redeem, note) add_to_redeem_queue(db, user_id, redeem, note)
use_points(db, user_id, price) use_points(db, user_id, price)
send_chat(f"{redeem} redeemed for {price} points.") send_chat(f"{redeem} redeemed for {price} points.")
else:
send_chat(f"Cannot redeem {redeem}, no note included.")
else: else:
send_chat(f"{redeem} not redeemed because of an error.") send_chat(f"{redeem} not redeemed because of an error.")
else:
send_chat(f"Can't redeem {redeem}, you don't have enough points.")
else:
send_chat("Can't redeem, redeem not found.")