Generate the email_from from the service name.

This commit is contained in:
Martyn Inglis
2016-02-19 17:07:59 +00:00
parent dc294c32ae
commit 98314485d3
3 changed files with 16 additions and 12 deletions

View File

@@ -149,11 +149,8 @@ def send_user_code(user_id):
@user.route('/<int:user_id>', methods=['GET'])
@user.route('', methods=['GET'])
def get_user(user_id=None):
try:
users = get_model_users(user_id=user_id)
except DataError:
return jsonify(result="error", message="Invalid user id"), 400
except NoResultFound:
return jsonify(result="error", message="User not found"), 404
users = get_model_users(user_id=user_id)
if not users:
return jsonify(result="error", message="not found"), 404
result = users_schema.dump(users) if isinstance(users, list) else user_schema.dump(users)
return jsonify(data=result.data)