From ca9abd8d81696f74d6ce3d8bdc0d4a24c73d8608 Mon Sep 17 00:00:00 2001 From: Colin Cole Date: Thu, 6 Apr 2023 09:54:54 -0400 Subject: [PATCH 1/2] add header check --- services/ads/python/ads.py | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/services/ads/python/ads.py b/services/ads/python/ads.py index 6db7a88c..b2a6dc9f 100644 --- a/services/ads/python/ads.py +++ b/services/ads/python/ads.py @@ -50,31 +50,32 @@ def weighted_image(weight): def status(): if flask_request.method == 'GET': - if flask_request.headers['X-Throw-Error'] == 'true': + if flask_request.headers['X-Throw-Error']: + + if flask_request.headers['X-Throw-Error'] == 'true': - try: advertisements = Advertisement.query.all() result.status_code = 200 # attempt to set property of null object return result - - except: - app.logger.error("An error occurred while getting ad.") - err = jsonify({'error': 'Internal Server Error'}) - err.status_code = 500 - return err + + else: + + try: + advertisements = Advertisement.query.all() + log.info(f"Total advertisements available: {len(advertisements)}") + return jsonify([b.serialize() for b in advertisements]) + + except: + log.error("An error occurred while getting ad.") + err = jsonify({'error': 'Internal Server Error'}) + err.status_code = 500 + return err else: - try: - advertisements = Advertisement.query.all() - log.info(f"Total advertisements available: {len(advertisements)}") - return jsonify([b.serialize() for b in advertisements]) - - except: - log.error("An error occurred while getting ad.") - err = jsonify({'error': 'Internal Server Error'}) - err.status_code = 500 - return err + advertisements = Advertisement.query.all() + log.info(f"Total advertisements available: {len(advertisements)}") + return jsonify([b.serialize() for b in advertisements]) elif flask_request.method == 'POST': From 164f28d01afa1aa2453cbeb45978266c18dc9db2 Mon Sep 17 00:00:00 2001 From: Colin Cole Date: Thu, 6 Apr 2023 15:31:59 -0400 Subject: [PATCH 2/2] change cond --- services/ads/python/ads.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/services/ads/python/ads.py b/services/ads/python/ads.py index b2a6dc9f..68518694 100644 --- a/services/ads/python/ads.py +++ b/services/ads/python/ads.py @@ -50,9 +50,7 @@ def weighted_image(weight): def status(): if flask_request.method == 'GET': - if flask_request.headers['X-Throw-Error']: - - if flask_request.headers['X-Throw-Error'] == 'true': + if 'X-Throw-Error' in flask_request.headers and flask_request.headers['X-Throw-Error'] == 'true': advertisements = Advertisement.query.all() result.status_code = 200 # attempt to set property of null object @@ -70,12 +68,7 @@ def status(): err = jsonify({'error': 'Internal Server Error'}) err.status_code = 500 return err - - else: - - advertisements = Advertisement.query.all() - log.info(f"Total advertisements available: {len(advertisements)}") - return jsonify([b.serialize() for b in advertisements]) + elif flask_request.method == 'POST':