darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #139 from alphagov/make-service-id-a-uuid

Browse Source 
Update service_id to a UUID from an integer.
This commit is contained in:
Adam Shimali
2016-02-02 14:53:00 +00:00
parent bf10800c12 a4cb35ad3b
commit 658045e6d7
10 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/main/views/api_keys.py
View File

@@ -5,13 +5,13 @@ from app.main.forms import CreateKeyForm
from app import api_key_api_client from app import api_key_api_client
@main.route("/services/<int:service_id>/documentation") @main.route("/services/<service_id>/documentation")
@login_required @login_required
def documentation(service_id): def documentation(service_id):
return render_template('views/documentation.html', service_id=service_id) return render_template('views/documentation.html', service_id=service_id)
@main.route("/services/<int:service_id>/api-keys") @main.route("/services/<service_id>/api-keys")
@login_required @login_required
def api_keys(service_id): def api_keys(service_id):
return render_template( return render_template(
@@ -21,7 +21,7 @@ def api_keys(service_id):
) )
@main.route("/services/<int:service_id>/api-keys/create", methods=['GET', 'POST']) @main.route("/services/<service_id>/api-keys/create", methods=['GET', 'POST'])
@login_required @login_required
def create_api_key(service_id): def create_api_key(service_id):
key_names = [ key_names = [
@@ -39,7 +39,7 @@ def create_api_key(service_id):
) )
@main.route("/services/<int:service_id>/api-keys/revoke/<int:key_id>", methods=['GET', 'POST']) @main.route("/services/<service_id>/api-keys/revoke/<int:key_id>", methods=['GET', 'POST'])
@login_required @login_required
def revoke_api_key(service_id, key_id): def revoke_api_key(service_id, key_id):
key_name = api_key_api_client.get_api_keys(service_id=service_id, key_id=key_id)['apiKeys'][0]['name'] key_name = api_key_api_client.get_api_keys(service_id=service_id, key_id=key_id)['apiKeys'][0]['name']

4
app/main/views/dashboard.py
View File

@@ -7,7 +7,7 @@ from client.errors import HTTPError
from ._jobs import jobs from ._jobs import jobs
@main.route("/services/<int:service_id>/dashboard") @main.route("/services/<service_id>/dashboard")
@login_required @login_required
def service_dashboard(service_id): def service_dashboard(service_id):
try: try:
@@ -31,4 +31,4 @@ def service_dashboard(service_id):
free_text_messages_remaining='25,000', free_text_messages_remaining='25,000',
spent_this_month='0.00', spent_this_month='0.00',
has_templates=bool(len(templates)), has_templates=bool(len(templates)),
service_id=service_id) service_id=str(service_id))

6
app/main/views/index.py
View File

@@ -24,19 +24,19 @@ def verify_mobile():
return render_template('views/verify-mobile.html') return render_template('views/verify-mobile.html')
@main.route("/services/<int:service_id>/send-email") @main.route("/services/<service_id>/send-email")
@login_required @login_required
def send_email(service_id): def send_email(service_id):
return render_template('views/send-email.html', service_id=service_id) return render_template('views/send-email.html', service_id=service_id)
@main.route("/services/<int:service_id>/check-email") @main.route("/services/<service_id>/check-email")
@login_required @login_required
def check_email(service_id): def check_email(service_id):
return render_template('views/check-email.html') return render_template('views/check-email.html')
@main.route("/services/<int:service_id>/manage-users") @main.route("/services/<service_id>/manage-users")
@login_required @login_required
def manage_users(service_id): def manage_users(service_id):
return render_template('views/manage-users.html', service_id=service_id) return render_template('views/manage-users.html', service_id=service_id)

6
app/main/views/jobs.py
View File

@@ -15,7 +15,7 @@ from app.main import main
now = time.strftime('%H:%M') now = time.strftime('%H:%M')
@main.route("/services/<int:service_id>/jobs") @main.route("/services/<service_id>/jobs")
@login_required @login_required
def view_jobs(service_id): def view_jobs(service_id):
try: try:
@@ -32,7 +32,7 @@ def view_jobs(service_id):
raise e raise e
@main.route("/services/<int:service_id>/jobs/<job_id>") @main.route("/services/<service_id>/jobs/<job_id>")
@login_required @login_required
def view_job(service_id, job_id): def view_job(service_id, job_id):
try: try:
@@ -64,7 +64,7 @@ def view_job(service_id, job_id):
raise e raise e
@main.route("/services/<int:service_id>/jobs/<job_id>/notification/<string:notification_id>") @main.route("/services/<service_id>/jobs/<job_id>/notification/<string:notification_id>")
@login_required @login_required
def view_notification(service_id, job_id, notification_id): def view_notification(service_id, job_id, notification_id):
return render_template( return render_template(

16
app/main/views/service_settings.py
View File

@@ -10,7 +10,7 @@ from app.main.forms import ConfirmPasswordForm, ServiceNameForm
from client.errors import HTTPError from client.errors import HTTPError
@main.route("/services/<int:service_id>/service-settings") @main.route("/services/<service_id>/service-settings")
@login_required @login_required
def service_settings(service_id): def service_settings(service_id):
try: try:
@@ -27,7 +27,7 @@ def service_settings(service_id):
) )
@main.route("/services/<int:service_id>/service-settings/name", methods=['GET', 'POST']) @main.route("/services/<service_id>/service-settings/name", methods=['GET', 'POST'])
@login_required @login_required
def service_name_change(service_id): def service_name_change(service_id):
try: try:
@@ -51,7 +51,7 @@ def service_name_change(service_id):
service_id=service_id) service_id=service_id)
@main.route("/services/<int:service_id>/service-settings/name/confirm", methods=['GET', 'POST']) @main.route("/services/<service_id>/service-settings/name/confirm", methods=['GET', 'POST'])
@login_required @login_required
def service_name_change_confirm(service_id): def service_name_change_confirm(service_id):
try: try:
@@ -80,7 +80,7 @@ def service_name_change_confirm(service_id):
service_id=service_id) service_id=service_id)
@main.route("/services/<int:service_id>/service-settings/request-to-go-live", methods=['GET', 'POST']) @main.route("/services/<service_id>/service-settings/request-to-go-live", methods=['GET', 'POST'])
@login_required @login_required
def service_request_to_go_live(service_id): def service_request_to_go_live(service_id):
try: try:
@@ -102,7 +102,7 @@ def service_request_to_go_live(service_id):
return redirect(url_for('.service_settings', service_id=service_id)) return redirect(url_for('.service_settings', service_id=service_id))
@main.route("/services/<int:service_id>/service-settings/status", methods=['GET', 'POST']) @main.route("/services/<service_id>/service-settings/status", methods=['GET', 'POST'])
@login_required @login_required
def service_status_change(service_id): def service_status_change(service_id):
try: try:
@@ -123,7 +123,7 @@ def service_status_change(service_id):
return redirect(url_for('.service_status_change_confirm', service_id=service_id)) return redirect(url_for('.service_status_change_confirm', service_id=service_id))
@main.route("/services/<int:service_id>/service-settings/status/confirm", methods=['GET', 'POST']) @main.route("/services/<service_id>/service-settings/status/confirm", methods=['GET', 'POST'])
@login_required @login_required
def service_status_change_confirm(service_id): def service_status_change_confirm(service_id):
try: try:
@@ -151,7 +151,7 @@ def service_status_change_confirm(service_id):
service_id=service_id) service_id=service_id)
@main.route("/services/<int:service_id>/service-settings/delete", methods=['GET', 'POST']) @main.route("/services/<service_id>/service-settings/delete", methods=['GET', 'POST'])
@login_required @login_required
def service_delete(service_id): def service_delete(service_id):
try: try:
@@ -172,7 +172,7 @@ def service_delete(service_id):
return redirect(url_for('.service_delete_confirm', service_id=service_id)) return redirect(url_for('.service_delete_confirm', service_id=service_id))
@main.route("/services/<int:service_id>/service-settings/delete/confirm", methods=['GET', 'POST']) @main.route("/services/<service_id>/service-settings/delete/confirm", methods=['GET', 'POST'])
@login_required @login_required
def service_delete_confirm(service_id): def service_delete_confirm(service_id):
try: try:

4
app/main/views/sms.py
View File

@@ -31,7 +31,7 @@ from app.main.utils import (
) )
@main.route("/services/<int:service_id>/sms/send", methods=['GET', 'POST']) @main.route("/services/<service_id>/sms/send", methods=['GET', 'POST'])
@login_required @login_required
def send_sms(service_id): def send_sms(service_id):
form = CsvUploadForm() form = CsvUploadForm()
@@ -67,7 +67,7 @@ def send_sms(service_id):
service_id=service_id) service_id=service_id)
@main.route("/services/<int:service_id>/sms/check/<upload_id>", @main.route("/services/<service_id>/sms/check/<upload_id>",
methods=['GET', 'POST']) methods=['GET', 'POST'])
@login_required @login_required
def check_sms(service_id, upload_id): def check_sms(service_id, upload_id):

8
app/main/views/templates.py
View File

@@ -9,7 +9,7 @@ from app.main.dao import services_dao as sdao
from client.errors import HTTPError from client.errors import HTTPError
@main.route("/services/<int:service_id>/templates") @main.route("/services/<service_id>/templates")
@login_required @login_required
def manage_service_templates(service_id): def manage_service_templates(service_id):
try: try:
@@ -25,7 +25,7 @@ def manage_service_templates(service_id):
templates=[tdao.TemplatesBrowsableItem(x) for x in templates]) templates=[tdao.TemplatesBrowsableItem(x) for x in templates])
@main.route("/services/<int:service_id>/templates/add", methods=['GET', 'POST']) @main.route("/services/<service_id>/templates/add", methods=['GET', 'POST'])
@login_required @login_required
def add_service_template(service_id): def add_service_template(service_id):
try: try:
@@ -50,7 +50,7 @@ def add_service_template(service_id):
service_id=service_id) service_id=service_id)
@main.route("/services/<int:service_id>/templates/<int:template_id>", methods=['GET', 'POST']) @main.route("/services/<service_id>/templates/<int:template_id>", methods=['GET', 'POST'])
@login_required @login_required
def edit_service_template(service_id, template_id): def edit_service_template(service_id, template_id):
try: try:
@@ -78,7 +78,7 @@ def edit_service_template(service_id, template_id):
template_id=template_id) template_id=template_id)
@main.route("/services/<int:service_id>/templates/<int:template_id>/delete", methods=['GET', 'POST']) @main.route("/services/<service_id>/templates/<int:template_id>/delete", methods=['GET', 'POST'])
@login_required @login_required
def delete_service_template(service_id, template_id): def delete_service_template(service_id, template_id):
try: try:

35
tests/app/main/views/test_api_keys.py
View File

@@ -1,3 +1,4 @@
import uuid
from datetime import date from datetime import date
from flask import url_for from flask import url_for
@@ -10,7 +11,7 @@ def test_should_show_api_keys_and_documentation_page(app_,
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(api_user_active)
response = client.get(url_for('main.documentation', service_id=123)) response = client.get(url_for('main.documentation', service_id=uuid.uuid4()))
assert response.status_code == 200 assert response.status_code == 200
@@ -24,12 +25,13 @@ def test_should_show_empty_api_keys_page(app_,
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(api_user_active)
response = client.get(url_for('main.api_keys', service_id=123)) service_id = str(uuid.uuid4())
response = client.get(url_for('main.api_keys', service_id=service_id))
assert response.status_code == 200 assert response.status_code == 200
assert 'You haven’t created any API keys yet' in response.get_data(as_text=True) assert 'You haven’t created any API keys yet' in response.get_data(as_text=True)
assert 'Create a new API key' in response.get_data(as_text=True) assert 'Create a new API key' in response.get_data(as_text=True)
mock_get_no_api_keys.assert_called_once_with(service_id=123) mock_get_no_api_keys.assert_called_once_with(service_id=service_id)
def test_should_show_api_keys_page(app_, def test_should_show_api_keys_page(app_,
@@ -41,13 +43,14 @@ def test_should_show_api_keys_page(app_,
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(api_user_active)
response = client.get(url_for('main.api_keys', service_id=123)) service_id = str(uuid.uuid4())
response = client.get(url_for('main.api_keys', service_id=service_id))
assert response.status_code == 200 assert response.status_code == 200
assert 'some key name' in response.get_data(as_text=True) assert 'some key name' in response.get_data(as_text=True)
assert 'another key name' in response.get_data(as_text=True) assert 'another key name' in response.get_data(as_text=True)
assert 'Revoked Thursday 01 January 1970 at 00:00' in response.get_data(as_text=True) assert 'Revoked Thursday 01 January 1970 at 00:00' in response.get_data(as_text=True)
mock_get_api_keys.assert_called_once_with(service_id=123) mock_get_api_keys.assert_called_once_with(service_id=service_id)
def test_should_show_name_api_key_page(app_, def test_should_show_name_api_key_page(app_,
@@ -59,7 +62,8 @@ def test_should_show_name_api_key_page(app_,
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(api_user_active)
response = client.get(url_for('main.create_api_key', service_id=123)) service_id = str(uuid.uuid4())
response = client.get(url_for('main.create_api_key', service_id=service_id))
assert response.status_code == 200 assert response.status_code == 200
@@ -74,12 +78,13 @@ def test_should_render_show_api_key(app_,
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(api_user_active)
response = client.post(url_for('main.create_api_key', service_id=123), service_id = str(uuid.uuid4())
response = client.post(url_for('main.create_api_key', service_id=service_id),
data={'key_name': 'some default key name'}) data={'key_name': 'some default key name'})
assert response.status_code == 200 assert response.status_code == 200
assert 'some default key name' in response.get_data(as_text=True) assert 'some default key name' in response.get_data(as_text=True)
mock_create_api_key.assert_called_once_with(service_id=123, key_name='some default key name') mock_create_api_key.assert_called_once_with(service_id=service_id, key_name='some default key name')
def test_should_show_confirm_revoke_api_key(app_, def test_should_show_confirm_revoke_api_key(app_,
@@ -91,11 +96,12 @@ def test_should_show_confirm_revoke_api_key(app_,
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(api_user_active)
response = client.get(url_for('main.revoke_api_key', service_id=123, key_id=321)) service_id = str(uuid.uuid4())
response = client.get(url_for('main.revoke_api_key', service_id=service_id, key_id=321))
assert response.status_code == 200 assert response.status_code == 200
assert 'some key name' in response.get_data(as_text=True) assert 'some key name' in response.get_data(as_text=True)
mock_get_api_keys.assert_called_once_with(service_id=123, key_id=321) mock_get_api_keys.assert_called_once_with(service_id=service_id, key_id=321)
def test_should_redirect_after_revoking_api_key(app_, def test_should_redirect_after_revoking_api_key(app_,
@@ -108,9 +114,10 @@ def test_should_redirect_after_revoking_api_key(app_,
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(api_user_active)
response = client.post(url_for('main.revoke_api_key', service_id=123, key_id=321)) service_id = str(uuid.uuid4())
response = client.post(url_for('main.revoke_api_key', service_id=service_id, key_id=321))
assert response.status_code == 302 assert response.status_code == 302
assert response.location == url_for('.api_keys', service_id=123, _external=True) assert response.location == url_for('.api_keys', service_id=service_id, _external=True)
mock_revoke_api_key.assert_called_once_with(service_id=123, key_id=321) mock_revoke_api_key.assert_called_once_with(service_id=service_id, key_id=321)
mock_get_api_keys.assert_called_once_with(service_id=123, key_id=321) mock_get_api_keys.assert_called_once_with(service_id=service_id, key_id=321)

12
tests/app/main/views/test_templates.py
View File

@@ -1,4 +1,6 @@
import json import json
import uuid
from flask import url_for from flask import url_for
@@ -11,7 +13,7 @@ def test_should_return_list_of_all_templates(app_,
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(api_user_active)
service_id = 123 service_id = str(uuid.uuid4())
response = client.get(url_for( response = client.get(url_for(
'.manage_service_templates', service_id=service_id)) '.manage_service_templates', service_id=service_id))
@@ -28,7 +30,7 @@ def test_should_show_page_for_one_templates(app_,
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(api_user_active)
service_id = 123 service_id = str(uuid.uuid4())
template_id = 456 template_id = 456
response = client.get(url_for( response = client.get(url_for(
'.edit_service_template', '.edit_service_template',
@@ -52,7 +54,7 @@ def test_should_redirect_when_saving_a_template(app_,
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(api_user_active)
service_id = 123 service_id = str(uuid.uuid4())
template_id = 456 template_id = 456
name = "new name" name = "new name"
type_ = "sms" type_ = "sms"
@@ -85,7 +87,7 @@ def test_should_show_delete_template_page(app_,
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(api_user_active)
service_id = 123 service_id = str(uuid.uuid4())
template_id = 456 template_id = 456
response = client.get(url_for( response = client.get(url_for(
'.delete_service_template', '.delete_service_template',
@@ -108,7 +110,7 @@ def test_should_redirect_when_deleting_a_template(app_,
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(api_user_active)
service_id = 123 service_id = str(uuid.uuid4())
template_id = 456 template_id = 456
name = "new name" name = "new name"
type_ = "sms" type_ = "sms"

8
tests/conftest.py
View File

@@ -30,7 +30,8 @@ def app_(request):
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def service_one(request, api_user_active): def service_one(request, api_user_active):
return service_json(1, 'service one', [api_user_active.id]) import uuid
return service_json(str(uuid.uuid4()), 'service one', [api_user_active.id])
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
@@ -89,10 +90,11 @@ def mock_get_services(mocker, user=None):
user = api_user_active() user = api_user_active()
def _create(user_id=None): def _create(user_id=None):
import uuid
service_one = service_json( service_one = service_json(
1, "service_one", [user.id], 1000, True, False) uuid.uuid4(), "service_one", [user.id], 1000, True, False)
service_two = service_json( service_two = service_json(
2, "service_two", [user.id], 1000, True, False) uuid.uuid4(), "service_two", [user.id], 1000, True, False)
return {'data': [service_one, service_two]} return {'data': [service_one, service_two]}
return mocker.patch( return mocker.patch(