New endpoint to fetch a single reply-to email address by id

This commit is contained in:
Rebecca Law
2017-09-21 17:02:58 +01:00
parent e6d6b6f985
commit 795bd4271c
4 changed files with 49 additions and 2 deletions

View File

@@ -13,6 +13,16 @@ def dao_get_reply_to_by_service_id(service_id):
return reply_to return reply_to
def dao_get_reply_to_by_id(service_id, reply_to_id):
reply_to = db.session.query(
ServiceEmailReplyTo
).filter(
ServiceEmailReplyTo.service_id == service_id,
ServiceEmailReplyTo.id == reply_to_id
).order_by(ServiceEmailReplyTo.created_at).one()
return reply_to
def create_or_update_email_reply_to(service_id, email_address): def create_or_update_email_reply_to(service_id, email_address):
reply_to = dao_get_reply_to_by_service_id(service_id) reply_to = dao_get_reply_to_by_service_id(service_id)
if len(reply_to) == 0: if len(reply_to) == 0:

View File

@@ -47,7 +47,7 @@ from app.dao.service_whitelist_dao import (
dao_remove_service_whitelist dao_remove_service_whitelist
) )
from app.dao.service_email_reply_to_dao import create_or_update_email_reply_to, dao_get_reply_to_by_service_id, \ from app.dao.service_email_reply_to_dao import create_or_update_email_reply_to, dao_get_reply_to_by_service_id, \
add_reply_to_email_address_for_service, update_reply_to_email_address add_reply_to_email_address_for_service, update_reply_to_email_address, dao_get_reply_to_by_id
from app.dao.provider_statistics_dao import get_fragment_count from app.dao.provider_statistics_dao import get_fragment_count
from app.dao.users_dao import get_user_by_id from app.dao.users_dao import get_user_by_id
from app.errors import ( from app.errors import (
@@ -531,6 +531,12 @@ def get_email_reply_to_addresses(service_id):
return jsonify([i.serialize() for i in result]), 200 return jsonify([i.serialize() for i in result]), 200
@service_blueprint.route('/<uuid:service_id>/email-reply-to/<uuid:reply_to_id>', methods=["GET"])
def get_email_reply_to_address(service_id, reply_to_id):
result = dao_get_reply_to_by_id(service_id=service_id, reply_to_id=reply_to_id)
return jsonify(result.serialize()), 200
@service_blueprint.route('/<uuid:service_id>/email-reply-to', methods=['POST']) @service_blueprint.route('/<uuid:service_id>/email-reply-to', methods=['POST'])
def add_service_reply_to_email_address(service_id): def add_service_reply_to_email_address(service_id):
# validate the service exists, throws ResultNotFound exception. # validate the service exists, throws ResultNotFound exception.

View File

@@ -1,9 +1,12 @@
import uuid
import pytest import pytest
from sqlalchemy.exc import SQLAlchemyError
from app.dao.service_email_reply_to_dao import ( from app.dao.service_email_reply_to_dao import (
create_or_update_email_reply_to, create_or_update_email_reply_to,
dao_get_reply_to_by_service_id, dao_get_reply_to_by_service_id,
add_reply_to_email_address_for_service, update_reply_to_email_address) add_reply_to_email_address_for_service, update_reply_to_email_address, dao_get_reply_to_by_id)
from app.errors import InvalidRequest from app.errors import InvalidRequest
from app.models import ServiceEmailReplyTo from app.models import ServiceEmailReplyTo
from tests.app.db import create_reply_to_email, create_service from tests.app.db import create_reply_to_email, create_service
@@ -191,3 +194,20 @@ def test_update_reply_to_email_address_raises_exception_if_single_reply_to_and_s
reply_to_id=first_reply_to.id, reply_to_id=first_reply_to.id,
email_address='should@fail.com', email_address='should@fail.com',
is_default=False) is_default=False)
def test_dao_get_reply_to_by_id(sample_service):
reply_to = create_reply_to_email(service=sample_service, email_address='email@address.com')
result = dao_get_reply_to_by_id(service_id=sample_service.id, reply_to_id=reply_to.id)
assert result == reply_to
def test_dao_get_reply_to_by_id_raises_sqlalchemy_error_when_reply_to_does_not_exist(sample_service):
with pytest.raises(SQLAlchemyError):
dao_get_reply_to_by_id(service_id=sample_service.id, reply_to_id=uuid.uuid4())
def test_dao_get_reply_to_by_id_raises_sqlalchemy_error_when_service_does_not_exist(sample_service):
reply_to = create_reply_to_email(service=sample_service, email_address='email@address.com')
with pytest.raises(SQLAlchemyError):
dao_get_reply_to_by_id(service_id=uuid.uuid4(), reply_to_id=reply_to.id)

View File

@@ -2290,3 +2290,14 @@ def test_update_service_reply_to_email_address_404s_when_invalid_service_id(clie
result = json.loads(response.get_data(as_text=True)) result = json.loads(response.get_data(as_text=True))
assert result['result'] == 'error' assert result['result'] == 'error'
assert result['message'] == 'No result found' assert result['message'] == 'No result found'
def test_get_email_reply_to_address(client, notify_db, notify_db_session):
service = create_service(notify_db=notify_db, notify_db_session=notify_db_session)
reply_to = create_reply_to_email(service, 'test_a@mail.com')
response = client.get('/service/{}/email-reply-to/{}'.format(service.id, reply_to.id),
headers=[('Content-Type', 'application/json'), create_authorization_header()])
assert response.status_code == 200
assert json.loads(response.get_data(as_text=True)) == reply_to.serialize()