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

@@ -7,10 +7,10 @@ from app.dao.invited_org_user_dao import (
get_invited_org_user as dao_get_invited_org_user,
)
from app.dao.invited_org_user_dao import (
get_invited_org_user_by_id,
get_invited_org_users_for_organisation,
save_invited_org_user,
)
from app.dao.organisation_dao import dao_get_invited_organisation_user
from app.dao.templates_dao import dao_get_template_by_id
from app.errors import InvalidRequest, register_errors
from app.models import EMAIL_TYPE, KEY_TYPE_NORMAL, InvitedOrganisationUser
@@ -117,7 +117,7 @@ def invited_org_user_url(invited_org_user_id, invite_link_host=None):
@organisation_invite_blueprint.route('/invite/organisation/<uuid:invited_org_user_id>', methods=['GET'])
def get_invited_org_user(invited_org_user_id):
invited_user = dao_get_invited_organisation_user(invited_org_user_id)
invited_user = get_invited_org_user_by_id(invited_org_user_id)
return jsonify(data=invited_user.serialize()), 200
@@ -141,5 +141,5 @@ def validate_invitation_token(token):
errors = {'invitation': 'Somethings wrong with this link. Make sure youve copied the whole thing.'}
raise InvalidRequest(errors, status_code=400)
invited_user = dao_get_invited_organisation_user(invited_user_id)
invited_user = get_invited_org_user_by_id(invited_user_id)
return jsonify(data=invited_user.serialize()), 200