diff --git a/app/models/service.py b/app/models/service.py index 6408ebdba..844bcaaae 100644 --- a/app/models/service.py +++ b/app/models/service.py @@ -142,7 +142,6 @@ class Service(): @cached_property def all_templates(self): - templates = service_api_client.get_service_templates(self.id)['data'] return [ @@ -154,6 +153,13 @@ class Service(): def all_template_ids(self): return {template['id'] for template in self.all_templates} + def get_templates_for_folder(self, template_type, all_templates, folder_id): + return [ + template for template in all_templates + if (set([template_type]) & {'all', template['template_type']}) + and (template.get('folder') == folder_id) + ] + def get_templates(self, template_type='all', template_folder_id=None, user_id=None): if user_id and template_folder_id and self.has_permission('edit_folder_permissions'): folder = self.get_template_folder(template_folder_id) @@ -164,11 +170,17 @@ class Service(): template_type = [template_type] if template_folder_id: template_folder_id = str(template_folder_id) - return [ - template for template in self.all_templates - if (set(template_type) & {'all', template['template_type']}) - and template.get('folder') == template_folder_id - ] + return self.get_templates_for_folder(template_type, self.all_templates, template_folder_id) + + def get_user_templates_across_folders(self, user_id, template_type='all'): + folders = self.all_template_folders + all_templates = self.all_templates + user_templates = [] + for folder in folders: + if user_id in folder.get("users_with_permission", []): + user_templates += self.get_templates_for_folder(template_type, all_templates, folder["id"]) + user_templates += self.get_templates_for_folder(template_type, all_templates, None) + return user_templates @property def available_template_types(self): diff --git a/tests/app/models/test_service.py b/tests/app/models/test_service.py index 3ba9063b4..bd7ce2d1f 100644 --- a/tests/app/models/test_service.py +++ b/tests/app/models/test_service.py @@ -67,6 +67,15 @@ def _get_all_folders(active_user_with_permissions): ] +def _template(template_type, name, parent=None, template_id=None): + return { + 'id': template_id or str(uuid.uuid4()), + 'name': name, + 'template_type': template_type, + 'folder': parent, + } + + def test_get_user_template_folders_only_returns_folders_visible_to_user( mock_get_template_folders, service_one, @@ -172,3 +181,49 @@ def test_get_template_folders_shows_all_folders_when_user_id_not_passed_in( 'users_with_permission': [active_user_with_permissions.id] } ] + + +def test_get_user_templates_across_folders( + mock_get_template_folders, + service_one, + active_user_with_permissions, + mocker +): + all_templates = {'data': [ + _template('sms', 'sms_template_one', parent=INV_CHILD_1_FOLDER_ID), + _template('sms', 'sms_template_two'), + _template('email', 'email_template_one', parent=VIS_PARENT_FOLDER_ID), + _template('letter', 'letter_template_one') + ]} + mock_get_template_folders.return_value = _get_all_folders(active_user_with_permissions) + mocker.patch('app.service_api_client.get_service_templates', return_value=all_templates) + service_one['permissions'] = ['edit_folder_permissions', 'letter', 'email', 'sms'] + service = Service(service_one) + result = service.get_user_templates_across_folders(active_user_with_permissions.id) + assert result == [ + {'folder': 'bbbb222b-2b22-2b22-222b-b222b22b2222', 'id': mocker.ANY, + 'name': 'email_template_one', 'template_type': 'email'}, + {'folder': None, 'id': mocker.ANY, + 'name': 'sms_template_two', 'template_type': 'sms'}, + {'folder': None, 'id': mocker.ANY, + 'name': 'letter_template_one', 'template_type': 'letter'}] + + +def test_get_user_templates_across_folders_sms_only( + mock_get_template_folders, + service_one, + active_user_with_permissions, + mocker +): + all_templates = {'data': [ + _template('sms', 'sms_template_one', parent=INV_CHILD_1_FOLDER_ID), + _template('sms', 'sms_template_two'), + _template('email', 'email_template_one', parent=VIS_PARENT_FOLDER_ID), + _template('letter', 'letter_template_one') + ]} + mock_get_template_folders.return_value = _get_all_folders(active_user_with_permissions) + mocker.patch('app.service_api_client.get_service_templates', return_value=all_templates) + service_one['permissions'] = ['edit_folder_permissions', 'letter', 'email', 'sms'] + service = Service(service_one) + result = service.get_user_templates_across_folders(active_user_with_permissions.id, template_type='sms') + assert result == [{'folder': None, 'id': mocker.ANY, 'name': 'sms_template_two', 'template_type': 'sms'}]