From 67542280f5cc28785d23bfa05f6274f8cb4686e2 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Fri, 15 Jul 2016 15:46:12 +0100 Subject: [PATCH] remove unused user_id option from GET /service/ --- app/service/rest.py | 7 +------ tests/app/dao/test_services_dao.py | 22 ---------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/app/service/rest.py b/app/service/rest.py index 94d3aabd8..5ac83c3e0 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -14,7 +14,6 @@ from app.dao.api_key_dao import ( get_unsigned_secret, expire_api_key) from app.dao.services_dao import ( - dao_fetch_service_by_id_and_user, dao_fetch_service_by_id, dao_fetch_all_services, dao_create_service, @@ -58,11 +57,7 @@ def get_services(): @service.route('/', methods=['GET']) def get_service_by_id(service_id): - user_id = request.args.get('user_id', None) - if user_id: - fetched = dao_fetch_service_by_id_and_user(service_id, user_id) - else: - fetched = dao_fetch_service_by_id(service_id) + fetched = dao_fetch_service_by_id(service_id) data = service_schema.dump(fetched).data return jsonify(data=data) diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py index 435d7aa35..ca0bbc41f 100644 --- a/tests/app/dao/test_services_dao.py +++ b/tests/app/dao/test_services_dao.py @@ -7,7 +7,6 @@ from app.dao.services_dao import ( dao_fetch_all_services, dao_fetch_service_by_id, dao_fetch_all_services_by_user, - dao_fetch_service_by_id_and_user, dao_update_service, delete_service_and_all_associated_db_objects ) @@ -212,27 +211,6 @@ def test_get_service_by_id_returns_service(service_factory): assert dao_fetch_service_by_id(service.id).name == 'testing' -def test_can_get_service_by_id_and_user(service_factory, sample_user): - service = service_factory.get('service 1', sample_user, email_from='service.1') - assert dao_fetch_service_by_id_and_user(service.id, sample_user.id).name == 'service 1' - - -def test_cannot_get_service_by_id_and_owned_by_different_user(service_factory, sample_user): - service1 = service_factory.get('service 1', sample_user, email_from='service.1') - new_user = User( - name='Test User', - email_address='new_user@digital.cabinet-office.gov.uk', - password='password', - mobile_number='+447700900986' - ) - save_model_user(new_user) - service2 = service_factory.get('service 2', new_user, email_from='service.2') - assert dao_fetch_service_by_id_and_user(service1.id, sample_user.id).name == 'service 1' - with pytest.raises(NoResultFound) as e: - dao_fetch_service_by_id_and_user(service2.id, sample_user.id) - assert 'No row was found for one()' in str(e) - - def test_create_service_creates_a_history_record_with_current_data(sample_user): assert Service.query.count() == 0 assert Service.get_history_model().query.count() == 0