diff --git a/services/ads/python/ads.py b/services/ads/python/ads.py index 6db7a88c..68518694 100644 --- a/services/ads/python/ads.py +++ b/services/ads/python/ads.py @@ -50,31 +50,25 @@ def weighted_image(weight): def status(): if flask_request.method == 'GET': - if flask_request.headers['X-Throw-Error'] == 'true': + if 'X-Throw-Error' in flask_request.headers and 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 + elif flask_request.method == 'POST':