darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 01:41:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replaced first queries with one queries, which throws a NoResultFound.

Browse Source 
Able to remove many of the None checks as a result of this.
Fixed the tests were needed.
This commit is contained in:
Rebecca Law
2016-03-11 15:34:20 +00:00
parent ef5969be77
commit 123b0ead3a
14 changed files with 26 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/invite/rest.py
View File

@@ -43,16 +43,13 @@ def get_invited_users_by_service(service_id):
@invite.route('/<invited_user_id>', methods=['GET'])
def get_invited_user_by_service_and_id(service_id, invited_user_id):
invited_user = get_invited_user(service_id=service_id, invited_user_id=invited_user_id)
if not invited_user:
return _invited_user_not_found(service_id, invited_user_id)
return jsonify(data=invited_user_schema.dump(invited_user).data), 200
@invite.route('/<invited_user_id>', methods=['POST'])
def update_invited_user(service_id, invited_user_id):
fetched = get_invited_user(service_id=service_id, invited_user_id=invited_user_id)
if not fetched:
return _invited_user_not_found(service_id=service_id, invited_user_id=invited_user_id)
current_data = dict(invited_user_schema.dump(fetched).data.items())
current_data.update(request.get_json())
@@ -63,12 +60,6 @@ def update_invited_user(service_id, invited_user_id):
return jsonify(data=invited_user_schema.dump(fetched).data), 200
def _invited_user_not_found(service_id, invited_user_id):
message = 'Invited user not found for service id: {} and invited user id: {}'.format(service_id,
invited_user_id)
return jsonify(result='error', message=message), 404
def _create_invitation(invited_user):
from utils.url_safe_token import generate_token
token = generate_token(str(invited_user.id), current_app.config['SECRET_KEY'], current_app.config['DANGEROUS_SALT'])