Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions services/ads/python/ads.py
Original file line number Diff line number Diff line change
Expand Up @@ -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':

Expand Down