diff --git a/app/models/service.py b/app/models/service.py index 2931b0de8..6e3bb9794 100644 --- a/app/models/service.py +++ b/app/models/service.py @@ -50,9 +50,6 @@ class Service(): def update(self, **kwargs): return service_api_client.update_service(self.id, **kwargs) - def update_with_properties(self, properties): - return service_api_client.update_service_with_properties(self.id, properties) - def switch_permission(self, permission): return self.force_permission( permission, @@ -68,12 +65,10 @@ class Service(): ) def update_permissions(self, permissions): - return self.update_with_properties({'permissions': list(permissions)}) + return self.update(permissions=list(permissions)) def toggle_research_mode(self): - self.update_with_properties({ - 'research_mode': not self.research_mode, - }) + self.update(research_mode=not self.research_mode) @property def trial_mode(self): diff --git a/tests/app/main/views/service_settings/test_inbound_sms_setting.py b/tests/app/main/views/service_settings/test_inbound_sms_setting.py index dfbb7abfd..8114c4faf 100644 --- a/tests/app/main/views/service_settings/test_inbound_sms_setting.py +++ b/tests/app/main/views/service_settings/test_inbound_sms_setting.py @@ -12,7 +12,7 @@ def test_set_inbound_sms_sets_a_number_for_service( mock_no_inbound_number_for_service, mocker ): - mocker.patch('app.service_api_client.update_service_with_properties') + mocker.patch('app.service_api_client.update_service') data = { "inbound_number": "781d9c60-7a7e-46b7-9896-7b045b992fa5", } diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 7a33f4d6d..cb45e6ef0 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -1933,7 +1933,7 @@ def test_switch_service_from_research_mode_to_normal( research_mode=True ) mocker.patch('app.service_api_client.get_service', return_value={"data": service}) - update_service_mock = mocker.patch('app.service_api_client.update_service_with_properties', return_value=service) + update_service_mock = mocker.patch('app.service_api_client.update_service', return_value=service) response = logged_in_platform_admin_client.get( url_for('main.service_switch_research_mode', service_id=service['id']) @@ -1941,7 +1941,7 @@ def test_switch_service_from_research_mode_to_normal( assert response.status_code == 302 assert response.location == url_for('main.service_settings', service_id=service['id'], _external=True) update_service_mock.assert_called_with( - service['id'], {"research_mode": False} + service['id'], research_mode=False ) @@ -1956,7 +1956,7 @@ def test_shows_research_mode_indicator( mock_get_service_settings_page_common, ): service_one['research_mode'] = True - mocker.patch('app.service_api_client.update_service_with_properties', return_value=service_one) + mocker.patch('app.service_api_client.update_service', return_value=service_one) response = logged_in_client.get(url_for('main.service_settings', service_id=service_one['id'])) assert response.status_code == 200 @@ -2444,7 +2444,7 @@ def test_switch_service_enable_letters( initial_permissions, expected_updated_permissions, ): - mocked_fn = mocker.patch('app.service_api_client.update_service_with_properties', return_value=service_one) + mocked_fn = mocker.patch('app.service_api_client.update_service', return_value=service_one) service_one['permissions'] = initial_permissions page = client_request.get( @@ -2465,8 +2465,7 @@ def test_switch_service_enable_letters( _external=True ) ) - - assert set(mocked_fn.call_args[0][1]['permissions']) == set(expected_updated_permissions) + assert set(mocked_fn.call_args[1]['permissions']) == set(expected_updated_permissions) assert mocked_fn.call_args[0][0] == service_one['id'] @@ -2505,7 +2504,7 @@ def test_switch_service_enable_international_sms( post_value, international_sms_permission_expected_in_api_call, ): - mocked_fn = mocker.patch('app.service_api_client.update_service_with_properties', return_value=service_one) + mocked_fn = mocker.patch('app.service_api_client.update_service', return_value=service_one) client_request.post( 'main.service_set_international_sms', service_id=service_one['id'], @@ -2516,9 +2515,9 @@ def test_switch_service_enable_international_sms( ) if international_sms_permission_expected_in_api_call: - assert 'international_sms' in mocked_fn.call_args[0][1]['permissions'] + assert 'international_sms' in mocked_fn.call_args[1]['permissions'] else: - assert 'international_sms' not in mocked_fn.call_args[0][1]['permissions'] + assert 'international_sms' not in mocked_fn.call_args[1]['permissions'] assert mocked_fn.call_args[0][0] == service_one['id']