Updates to template endpoints:

- moved into templates rest class
- updated dao
- removed delete methods
- constraint on subject line
This commit is contained in:
Martyn Inglis
2016-02-22 12:55:18 +00:00
parent 443691402f
commit 9bb95a53ec
7 changed files with 540 additions and 383 deletions

View File

@@ -1,9 +1,8 @@
import json
import uuid
from flask import url_for
from app.dao.users_dao import save_model_user
from app.models import User, Template, Service
from app.models import User
from tests import create_authorization_header
@@ -342,261 +341,3 @@ def test_update_service_should_404_if_id_is_invalid(notify_api, notify_db):
headers=[('Content-Type', 'application/json'), auth_header]
)
assert resp.status_code == 404
def test_create_template(notify_api, notify_db, notify_db_session, sample_service):
"""
Tests POST endpoint '/<service_id>/template' a template can be created
from a service.
"""
with notify_api.test_request_context():
with notify_api.test_client() as client:
assert Template.query.count() == 0
template_name = "template name"
template_type = "sms"
template_content = "This is a template"
data = {
'name': template_name,
'template_type': template_type,
'content': template_content,
'service': str(sample_service.id)
}
auth_header = create_authorization_header(path=url_for('service.create_template',
service_id=sample_service.id),
method='POST',
request_body=json.dumps(data))
resp = client.post(
url_for('service.create_template', service_id=sample_service.id),
data=json.dumps(data),
headers=[('Content-Type', 'application/json'), auth_header])
assert resp.status_code == 201
assert Template.query.count() == 1
json_resp = json.loads(resp.get_data(as_text=True))
assert json_resp['data']['name'] == template_name
assert json_resp['data']['template_type'] == template_type
assert json_resp['data']['content'] == template_content
def test_create_template_service_not_exists(notify_api, notify_db, notify_db_session, sample_service):
"""
Tests POST endpoint '/<service_id>/template' a template can be created
from a service.
"""
with notify_api.test_request_context():
with notify_api.test_client() as client:
assert Template.query.count() == 0
template_name = "template name"
template_type = "sms"
template_content = "This is a template"
data = {
'name': template_name,
'template_type': template_type,
'content': template_content,
'service': str(sample_service.id)
}
missing_service_id = uuid.uuid4()
auth_header = create_authorization_header(path=url_for('service.create_template',
service_id=missing_service_id),
method='POST',
request_body=json.dumps(data))
resp = client.post(
url_for('service.create_template', service_id=missing_service_id),
data=json.dumps(data),
headers=[('Content-Type', 'application/json'), auth_header])
assert resp.status_code == 404
assert Template.query.count() == 0
json_resp = json.loads(resp.get_data(as_text=True))
assert "Service not found" in json_resp['message']
def test_update_template(notify_api, notify_db, notify_db_session, sample_template):
"""
Tests PUT endpoint '/<service_id>/template/<template_id>' a template can be
updated.
"""
with notify_api.test_request_context():
with notify_api.test_client() as client:
assert Template.query.count() == 1
sample_service = Service.query.first()
old_name = sample_template.name
template_name = "new name"
template_type = "sms"
template_content = "content has been changed"
data = {
'name': template_name,
'template_type': template_type,
'content': template_content,
'service': str(sample_service.id)
}
auth_header = create_authorization_header(path=url_for('service.update_template',
service_id=sample_service.id,
template_id=sample_template.id),
method='PUT',
request_body=json.dumps(data))
resp = client.put(
url_for('service.update_template',
service_id=sample_service.id,
template_id=sample_template.id),
data=json.dumps(data),
headers=[('Content-Type', 'application/json'), auth_header])
assert resp.status_code == 200
assert Template.query.count() == 1
json_resp = json.loads(resp.get_data(as_text=True))
assert json_resp['data']['name'] == template_name
assert json_resp['data']['template_type'] == template_type
assert json_resp['data']['content'] == template_content
assert old_name != template_name
def test_update_template_service_not_exists(notify_api, notify_db, notify_db_session,
sample_template):
"""
Tests PUT endpoint '/<service_id>/template/<template_id>' a 404 if service
doesn't exist.
"""
with notify_api.test_request_context():
with notify_api.test_client() as client:
assert Template.query.count() == 1
template_name = "new name"
template_type = "sms"
template_content = "content has been changed"
data = {
'name': template_name,
'template_type': template_type,
'content': template_content,
'service': str(sample_template.service_id)
}
missing_service_id = uuid.uuid4()
auth_header = create_authorization_header(path=url_for('service.update_template',
service_id=missing_service_id,
template_id=sample_template.id),
method='PUT',
request_body=json.dumps(data))
resp = client.put(
url_for('service.update_template',
service_id=missing_service_id,
template_id=sample_template.id),
data=json.dumps(data),
headers=[('Content-Type', 'application/json'), auth_header])
assert resp.status_code == 404
json_resp = json.loads(resp.get_data(as_text=True))
assert "Service not found" in json_resp['message']
assert template_name != sample_template.name
def test_update_template_template_not_exists(notify_api, notify_db, notify_db_session,
sample_template):
"""
Tests PUT endpoint '/<service_id>/template/<template_id>' a 404 if template
doesn't exist.
"""
with notify_api.test_request_context():
with notify_api.test_client() as client:
assert Template.query.count() == 1
sample_service = Service.query.first()
template_name = "new name"
template_type = "sms"
template_content = "content has been changed"
data = {
'name': template_name,
'template_type': template_type,
'content': template_content,
'service': str(sample_service.id)
}
auth_header = create_authorization_header(path=url_for('service.update_template',
service_id=sample_service.id,
template_id="123"),
method='PUT',
request_body=json.dumps(data))
resp = client.put(
url_for('service.update_template',
service_id=sample_service.id,
template_id="123"),
data=json.dumps(data),
headers=[('Content-Type', 'application/json'), auth_header])
assert resp.status_code == 404
json_resp = json.loads(resp.get_data(as_text=True))
assert "Template not found" in json_resp['message']
assert template_name != sample_template.name
def test_create_template_unicode_content(notify_api, notify_db, notify_db_session, sample_service):
"""
Tests POST endpoint '/<service_id>/template/<template_id>' a template is
created and the content encoding is respected after saving and loading
from the db.
"""
with notify_api.test_request_context():
with notify_api.test_client() as client:
assert Template.query.count() == 0
template_name = "template name"
template_type = "sms"
template_content = 'Россия'
data = {
'name': template_name,
'template_type': template_type,
'content': template_content,
'service': str(sample_service.id)
}
auth_header = create_authorization_header(path=url_for('service.create_template',
service_id=sample_service.id),
method='POST',
request_body=json.dumps(data))
resp = client.post(
url_for('service.create_template', service_id=sample_service.id),
data=json.dumps(data),
headers=[('Content-Type', 'application/json'), auth_header])
assert resp.status_code == 201
assert Template.query.count() == 1
json_resp = json.loads(resp.get_data(as_text=True))
assert json_resp['data']['name'] == template_name
assert json_resp['data']['template_type'] == template_type
assert json_resp['data']['content'] == template_content
def test_get_template_list(notify_api, notify_db, notify_db_session, sample_template):
"""
Tests GET endpoint '/' to retrieve entire template list.
"""
with notify_api.test_request_context():
with notify_api.test_client() as client:
auth_header = create_authorization_header(
service_id=sample_template.service_id,
path=url_for(
'service.get_service_template',
service_id=sample_template.service_id),
method='GET')
response = client.get(
url_for(
'service.get_service_template',
service_id=sample_template.service_id),
headers=[auth_header])
assert response.status_code == 200
json_resp = json.loads(response.get_data(as_text=True))
assert len(json_resp['data']) == 1
assert json_resp['data'][0]['name'] == sample_template.name
assert json_resp['data'][0]['id'] == sample_template.id
def test_get_template(notify_api, notify_db, notify_db_session, sample_template):
"""
Tests GET endpoint '/<template_id>' to retrieve a single template.
"""
with notify_api.test_request_context():
with notify_api.test_client() as client:
auth_header = create_authorization_header(
service_id=sample_template.service_id,
path=url_for(
'service.get_service_template',
template_id=sample_template.id,
service_id=sample_template.service_id),
method='GET')
resp = client.get(url_for(
'service.get_service_template',
template_id=sample_template.id,
service_id=sample_template.service_id),
headers=[auth_header])
assert resp.status_code == 200
json_resp = json.loads(resp.get_data(as_text=True))
assert json_resp['data']['name'] == sample_template.name
assert json_resp['data']['id'] == sample_template.id