remove duplicate dao invite fns and improve naming

This commit is contained in:
Leo Hemsted
2021-03-12 12:50:07 +00:00
parent 58896e194d
commit ebd4eda8bd
6 changed files with 11 additions and 32 deletions

View File

@@ -3,9 +3,9 @@ from itsdangerous import BadData, SignatureExpired
from notifications_utils.url_safe_token import check_token, generate_token
from app.config import QueueNames
from app.dao.invited_user_dao import get_invited_user as dao_get_invited_user
from app.dao.invited_user_dao import (
get_invited_user_by_id,
get_invited_user_by_service_and_id,
get_invited_users_for_service,
save_invited_user,
)
@@ -69,13 +69,13 @@ def get_invited_users_by_service(service_id):
@service_invite.route('/service/<service_id>/invite/<invited_user_id>', methods=['GET'])
def get_invited_user_by_service(service_id, invited_user_id):
invited_user = dao_get_invited_user(service_id, invited_user_id)
invited_user = get_invited_user_by_service_and_id(service_id, invited_user_id)
return jsonify(data=invited_user_schema.dump(invited_user).data), 200
@service_invite.route('/service/<service_id>/invite/<invited_user_id>', methods=['POST'])
def update_invited_user(service_id, invited_user_id):
fetched = dao_get_invited_user(service_id=service_id, invited_user_id=invited_user_id)
fetched = get_invited_user_by_service_and_id(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())