Fixed.
', + )) + session.commit() + + ticket_model = Ticket(id=1, name='Issue', connection_id=connection_id) + stream.convertor.process(ticket_model, session, context) + + assert ticket_model.assignee_id == 101 + assert ticket_model.assignee_name == 'Tech User' + assert ticket_model.solution_content == 'Fixed.
' + + + +def _parent_ticket_ids_from_link( + context, + *, + link_type: int, + tickets_id_1: int, + tickets_id_2: int, + ticket_ids: list[int], +) -> dict[int, Optional[int]]: + connection_id = context.connection.id + stream = TicketDomain(GlpiPlugin().name) + for model in (TicketUser, TicketLink, ITILSolution, *stream.domain_models): + model.__table__.create(context.engine, checkfirst=True) + + parent_ids: dict[int, Optional[int]] = {} + with Session(context.engine) as session: + session.add(TicketLink( + id=1, + connection_id=connection_id, + link=link_type, + tickets_id_1=tickets_id_1, + tickets_id_2=tickets_id_2, + )) + session.commit() + for ticket_id in ticket_ids: + ticket_model = Ticket(id=ticket_id, name='Issue', connection_id=connection_id) + stream.convertor.process(ticket_model, session, context) + parent_ids[ticket_id] = ticket_model.parent_ticket_id + return parent_ids + + +@pytest.mark.parametrize('link_type,tickets_id_1,tickets_id_2,ticket_id,expected', [ + (3, 1, 10, 1, 10), + (3, 1, 10, 10, None), + (4, 10, 1, 1, 10), + (4, 10, 1, 10, None), +]) +def test_parent_ticket_id_from_links(link_type, tickets_id_1, tickets_id_2, ticket_id, expected): + context = collect_context() + parent_ids = _parent_ticket_ids_from_link( + context, + link_type=link_type, + tickets_id_1=tickets_id_1, + tickets_id_2=tickets_id_2, + ticket_ids=[ticket_id], + ) + assert parent_ids[ticket_id] == expected + + +@pytest.mark.parametrize('old_value,new_value,expected_from,expected_to', [ + ('', 'New', None, 'TODO'), + ('', 'Solved', None, 'DONE'), + ('', 'Processing (assigned)', None, 'IN_PROGRESS'), + ('', '2', None, 'IN_PROGRESS'), + ('', '5', None, 'DONE'), + ('2', '3', 'IN_PROGRESS', 'IN_PROGRESS'), +]) +def test_ticket_log_status_changelog(old_value, new_value, expected_from, expected_to): + context = collect_context() + log = TicketLog( + id=1, + tickets_id=1, + linked_action=0, + id_search_option=12, + old_value=old_value, + new_value=new_value, + ) + changelogs = list(TicketLogs(GlpiPlugin().name).convert(log, context)) + assert len(changelogs) == 1 + changelog = changelogs[0] + assert changelog.field_name == 'status' + assert changelog.from_value == expected_from + assert changelog.to_value == expected_to + assert changelog.original_from_value == (old_value or None) + assert changelog.original_to_value == new_value + + +def test_ticket_log_assignee_user_relation(): + context = collect_context() + log = TicketLog( + id=6, + tickets_id=1, + linked_action=15, + itemtype_link='User', + id_search_option=5, + old_value='', + new_value='glpi (2)', + ) + changelogs = list(TicketLogs(GlpiPlugin().name).convert(log, context)) + assert len(changelogs) == 1 + changelog = changelogs[0] + assert changelog.field_name == 'assignee' + assert changelog.to_value == domain_id(User, context.connection.id, 2) + + +def test_ticket_log_assignee_group_relation(): + context = collect_context() + log = TicketLog( + id=6, + tickets_id=1, + linked_action=15, + itemtype_link='Group', + old_value='', + new_value='Support Team (5)', + ) + changelogs = list(TicketLogs(GlpiPlugin().name).convert(log, context)) + assert len(changelogs) == 1 + changelog = changelogs[0] + assert changelog.field_name == 'assignee' + assert changelog.to_value == domain_id(Group, context.connection.id, 5) + + +def test_ticket_log_assignee_field_change(): + context = collect_context() + log = TicketLog( + id=7, + tickets_id=1, + linked_action=0, + id_search_option=5, + old_value='', + new_value='Jane Smith (103)', + ) + changelogs = list(TicketLogs(GlpiPlugin().name).convert(log, context)) + assert len(changelogs) == 1 + changelog = changelogs[0] + assert changelog.field_name == 'assignee' + assert changelog.from_value is None + assert changelog.to_value == domain_id(User, context.connection.id, 103) + assert changelog.original_to_value == '103' + + +def test_ticket_log_requester_field_change(): + context = collect_context() + log = TicketLog( + id=104, + tickets_id=1, + linked_action=0, + id_search_option=4, + old_value='', + new_value='Jane Smith (103)', + ) + changelogs = list(TicketLogs(GlpiPlugin().name).convert(log, context)) + assert len(changelogs) == 1 + changelog = changelogs[0] + assert changelog.field_name == 'requester' + assert changelog.from_value is None + assert changelog.to_value == domain_id(User, context.connection.id, 103) + assert changelog.original_to_value == '103' + + +def test_ticket_log_priority_change(): + context = collect_context() + log = TicketLog( + id=4, + tickets_id=1, + linked_action=0, + id_search_option=3, + old_value='3', + new_value='High', + ) + changelogs = list(TicketLogs(GlpiPlugin().name).convert(log, context)) + assert len(changelogs) == 1 + changelog = changelogs[0] + assert changelog.field_name == 'priority' + assert changelog.from_value == 'Medium' + assert changelog.to_value == 'High' + + +def test_ticket_log_type_change(): + context = collect_context() + log = TicketLog( + id=5, + tickets_id=1, + linked_action=0, + id_search_option=14, + old_value='Incident', + new_value='Request', + ) + changelogs = list(TicketLogs(GlpiPlugin().name).convert(log, context)) + assert len(changelogs) == 1 + changelog = changelogs[0] + assert changelog.field_name == 'type' + assert changelog.from_value == 'INCIDENT' + assert changelog.to_value == 'TASK' diff --git a/backend/python/plugins/glpi/tests/parsing_test.py b/backend/python/plugins/glpi/tests/parsing_test.py new file mode 100644 index 00000000000..7be23b8554b --- /dev/null +++ b/backend/python/plugins/glpi/tests/parsing_test.py @@ -0,0 +1,49 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from glpi.parsing import on_demand_id_from_url, parse_glpi_dropdown, parse_glpi_user + + +def test_parse_glpi_dropdown_with_name_and_id(): + name, user_id = parse_glpi_dropdown('Jane Smith (103)') + assert name == 'Jane Smith' + assert user_id == 103 + + +def test_parse_glpi_dropdown_with_numeric_id(): + name, user_id = parse_glpi_dropdown(101) + assert name is None + assert user_id == 101 + + +def test_parse_glpi_user_with_id(): + name, user_id = parse_glpi_user('John Doe (101)') + assert name == 'John Doe' + assert user_id == '101' + + +def test_parse_glpi_user_without_id(): + name, user_id = parse_glpi_user('John Doe') + assert name == 'John Doe' + assert user_id is None + + +def test_on_demand_id_from_url_uses_raw_id(): + assert on_demand_id_from_url({'id': 7}, 'User') == 7 + + +def test_on_demand_id_from_url_parses_request_url(): + raw = {'x_request_url': 'http://glpi.example.com/apirest.php/User/7'} + assert on_demand_id_from_url(raw, 'User') == 7 diff --git a/backend/python/plugins/glpi/tests/plugin_test.py b/backend/python/plugins/glpi/tests/plugin_test.py new file mode 100644 index 00000000000..56b8a46b24e --- /dev/null +++ b/backend/python/plugins/glpi/tests/plugin_test.py @@ -0,0 +1,45 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import pytest + +from pydevlake.testing import assert_valid_plugin, assert_plugin_run + +from glpi.main import GlpiPlugin +from glpi.models import Connection, ScopeConfig + + +def test_valid_plugin(): + assert_valid_plugin(GlpiPlugin()) + + +def test_valid_plugin_and_connection(): + endpoint = os.environ.get('GLPI_ENDPOINT') + token = os.environ.get('GLPI_TOKEN') + secret_key = os.environ.get('GLPI_SECRET_KEY') + if not (endpoint and token and secret_key): + pytest.skip("GLPI_ENDPOINT, GLPI_TOKEN, and GLPI_SECRET_KEY env vars required") + + connection = Connection( + id=1, + name='test_connection', + endpoint=endpoint, + token=token, + secret_key=secret_key, + timezone='UTC', + ) + scope_config = ScopeConfig(id=1, name='test_config') + assert_plugin_run(GlpiPlugin(), connection, scope_config) diff --git a/backend/python/plugins/glpi/tests/remote_scopes_test.py b/backend/python/plugins/glpi/tests/remote_scopes_test.py new file mode 100644 index 00000000000..b58e5689786 --- /dev/null +++ b/backend/python/plugins/glpi/tests/remote_scopes_test.py @@ -0,0 +1,52 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import glpi.main as glpi_main +from pydevlake.message import RemoteScope + +from glpi.main import GlpiPlugin, ROOT_GROUP_ID +from tests.common import collect_context, glpi_api_mock + + +def test_remote_scopes_returns_all_entities_sorted(): + plugin = GlpiPlugin() + with glpi_api_mock(glpi_main) as api: + api.entities.return_value = [ + {'id': 2, 'name': 'Y', 'completename': 'Root entity > X > Y', 'entities_id': 1}, + {'id': 0, 'name': 'Root entity', 'completename': 'Root entity', 'entities_id': 0}, + {'id': 1, 'name': 'X', 'completename': 'Root entity > X', 'entities_id': 0}, + ] + entities = list(plugin.remote_scopes(collect_context().connection, ROOT_GROUP_ID)) + + assert [entity.completename for entity in entities] == [ + 'Root entity', + 'Root entity > X', + 'Root entity > X > Y', + ] + + +def test_make_remote_scopes_under_root_group(): + plugin = GlpiPlugin() + with glpi_api_mock(glpi_main) as api: + api.entities.return_value = [ + {'id': 0, 'name': 'Root entity', 'completename': 'Root entity', 'entities_id': 0}, + {'id': 1, 'name': 'X', 'completename': 'Root entity > X', 'entities_id': 0}, + ] + scopes = list(plugin.make_remote_scopes(collect_context().connection, ROOT_GROUP_ID)) + + assert len(scopes) == 2 + assert all(isinstance(scope, RemoteScope) for scope in scopes) + assert all(scope.parent_id == ROOT_GROUP_ID for scope in scopes) + assert [scope.name for scope in scopes] == ['Root entity', 'X'] diff --git a/backend/python/plugins/glpi/tests/streams_test.py b/backend/python/plugins/glpi/tests/streams_test.py new file mode 100644 index 00000000000..db94ab65f8b --- /dev/null +++ b/backend/python/plugins/glpi/tests/streams_test.py @@ -0,0 +1,463 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import datetime + +import pytest + +import pydevlake.domain_layer.crossdomain as crossdomain +import pydevlake.domain_layer.ticket as ticket +from pydevlake.model import domain_id +from pydevlake.testing import assert_stream_convert + +from glpi.main import GlpiPlugin +from glpi.models import ( + Followup, + Group, + Ticket, + TicketGroup, + TicketLink, + TicketLog, + TicketTask, + TicketUser, + User, +) +from glpi.streams.ticket_domain import TicketDomain +from tests.common import GLPI_API_BASE_URL, collect_context + + +@pytest.fixture +def context(): + return collect_context(scope_completename='Root > Test Entity') + + +def test_tickets_stream(context): + ticket_model = Ticket( + id=1, + name='Network connectivity issue', + content='Cannot connect to the server.
', + date=datetime.datetime(2024, 1, 15, 8, 0, 0), + date_creation=datetime.datetime(2024, 1, 15, 10, 0, 0), + date_mod=datetime.datetime(2024, 1, 16, 12, 0, 0), + solvedate=datetime.datetime(2024, 1, 17, 9, 0, 0), + status=5, + type=1, + urgency=3, + impact=3, + priority=4, + entities_id='1', + itilcategories_id=99, + category_name='Network', + users_id_recipient=101, + requester_name='Requester User', + assignee_id=101, + assignee_name='Tech User', + parent_ticket_id=10, + solution_content='Replaced cable.
', + time_to_resolve=datetime.datetime(2024, 1, 20, 17, 0, 0), + actiontime=3600, + solve_delay_stat=7200, + takeintoaccount_delay_stat=600, + connection_id=context.connection.id, + ) + + issue = ticket.Issue( + url=f'{GLPI_API_BASE_URL}/front/ticket.form.php?id=1', + issue_key='1', + title='Network connectivity issue', + description='Cannot connect to the server.
\n\n--- Solution ---\nReplaced cable.
', + type='INCIDENT', + original_type='Incident', + status='DONE', + original_status='Solved', + created_date='2024-01-15 08:00:00', + updated_date='2024-01-16 12:00:00', + resolution_date='2024-01-17 09:00:00', + due_date='2024-01-20 17:00:00', + creator_id=domain_id(User, context.connection.id, 101), + creator_name='Requester User', + assignee_id=domain_id(User, context.connection.id, 101), + assignee_name='Tech User', + parent_issue_id=domain_id(Ticket, context.connection.id, 10), + is_subtask=True, + priority='High', + urgency='Medium', + severity='Medium', + component='Network', + original_project='1', + lead_time_minutes=120, + ) + issue_id = domain_id(Ticket, context.connection.id, 1) + domain_models = list(TicketDomain(GlpiPlugin().name).convert(ticket_model, context)) + assert domain_models == [ + issue, + ticket.BoardIssue(board_id=context.scope.domain_id(), issue_id=None), + ticket.IssueLabel(issue_id=issue_id, label_name='Network'), + ] + + +def test_tickets_stream_extract_returns_tool_model(context): + raw = { + 'id': 1, + 'name': 'Network connectivity issue', + 'entities_id': 'Root > Test Entity (1)', + 'itilcategories_id': 'Network (99)', + 'users_id_recipient': 'Requester User (101)', + } + stream = GlpiPlugin().get_stream('tickets') + tool_model = stream.extract(raw, context) + assert tool_model is not None + assert tool_model.id == 1 + assert tool_model.category_name == 'Network' + assert tool_model.requester_name == 'Requester User' + + +def test_tickets_stream_new_status(context): + raw = { + 'id': 10, + 'name': 'Printer not working', + 'content': None, + 'date': '2024-02-01 09:00:00', + 'date_creation': None, + 'date_mod': '2024-02-01 09:30:00', + 'solvedate': None, + 'closedate': None, + 'status': 1, + 'type': 2, + 'urgency': 1, + 'impact': 1, + 'priority': 1, + 'entities_id': '2', + 'itilcategories_id': None, + 'users_id_recipient': None, + 'users_id_lastupdater': None, + 'requesttypes_id': None, + 'time_to_resolve': None, + 'actiontime': None, + 'solve_delay_stat': None, + 'takeintoaccount_delay_stat': None, + 'x_request_url': f'{GLPI_API_BASE_URL}/apirest.php/Ticket', + 'x_request_input': {'EntityId': '1'}, + } + + issue = ticket.Issue( + url=f'{GLPI_API_BASE_URL}/front/ticket.form.php?id=10', + issue_key='10', + title='Printer not working', + description=None, + type='TASK', + original_type='Request', + status='TODO', + original_status='New', + created_date='2024-02-01 09:00:00', + updated_date='2024-02-01 09:30:00', + resolution_date=None, + due_date=None, + creator_id=None, + creator_name=None, + assignee_id=None, + assignee_name=None, + parent_issue_id=None, + priority='Very Low', + urgency='Very Low', + severity='Very Low', + component=None, + original_project='2', + time_spent_minutes=None, + lead_time_minutes=None, + ) + expected = [issue, ticket.BoardIssue(board_id=context.scope.domain_id(), issue_id=issue.id)] + assert_stream_convert(GlpiPlugin, 'ticketdomain', raw, expected, context) + + +@pytest.mark.parametrize('stream_name,tool_model,assignee_model,assignee_id,assignee_name', [ + ( + 'ticketusers', + TicketUser(id=10, tickets_id=1, type=2, users_id=101, user_name='Tech User'), + User, 101, 'Tech User', + ), + ( + 'ticketgroups', + TicketGroup(id=11, tickets_id=1, type=2, groups_id=5, group_name='Support Team'), + Group, 5, 'Support Team', + ), +]) +def test_ticket_assignees_from_subitems( + context, stream_name, tool_model, assignee_model, assignee_id, assignee_name, +): + tool_model.connection_id = context.connection.id + expected = ticket.IssueAssignee( + issue_id=domain_id(Ticket, context.connection.id, 1), + assignee_id=domain_id(assignee_model, context.connection.id, assignee_id), + assignee_name=assignee_name, + ) + assert _convert_subitem(stream_name, tool_model, context) == [expected] + + +def _convert_subitem(stream_name, tool_model, context): + stream = GlpiPlugin().get_stream(stream_name) + return list(stream.convert(tool_model, context)) + + +def test_ticket_followups_from_subitems(context): + tool_model = Followup( + id=5, + items_id=1, + users_id=103, + content='Investigated the issue, awaiting vendor response.', + date=datetime.datetime(2024, 1, 16, 9, 0, 0), + date_mod=datetime.datetime(2024, 1, 16, 9, 30, 0), + is_private=0, + connection_id=context.connection.id, + ) + results = _convert_subitem('ticketfollowups', tool_model, context) + assert len(results) == 1 + assert results[0].issue_id == domain_id(Ticket, context.connection.id, 1) + assert results[0].body == 'Investigated the issue, awaiting vendor response.' + assert results[0].account_id == domain_id(User, context.connection.id, 103) + assert results[0].created_date == datetime.datetime(2024, 1, 16, 9, 0) + assert results[0].updated_date == datetime.datetime(2024, 1, 16, 9, 30) + + +def test_ticket_worklogs_from_subitems(context): + tool_model = TicketTask( + id=7, + tickets_id=1, + users_id=101, + content='Replaced the network cable.', + begin=datetime.datetime(2024, 1, 17, 8, 0, 0), + end=datetime.datetime(2024, 1, 17, 9, 0, 0), + actiontime=3600, + connection_id=context.connection.id, + ) + results = _convert_subitem('tickettasks', tool_model, context) + assert len(results) == 1 + assert results[0].issue_id == domain_id(Ticket, context.connection.id, 1) + assert results[0].author_id == domain_id(User, context.connection.id, 101) + assert results[0].comment == 'Replaced the network cable.' + assert results[0].time_spent_minutes == 60 + assert results[0].started_date == datetime.datetime(2024, 1, 17, 8, 0) + assert results[0].logged_date == datetime.datetime(2024, 1, 17, 8, 0) + + +def test_ticket_changelogs_from_subitems_smoke(context): + tool_model = TicketLog( + id=100, + tickets_id=1, + itemtype='Ticket', + itemtype_link='', + linked_action=0, + user_name='admin (1)', + date_mod=datetime.datetime(2024, 1, 16, 10, 0, 0), + id_search_option=12, + old_value='New', + new_value='Processing (assigned)', + connection_id=context.connection.id, + ) + expected = ticket.IssueChangelogs( + id=domain_id(TicketLog, context.connection.id, 100), + issue_id=domain_id(Ticket, context.connection.id, 1), + author_id=domain_id(User, context.connection.id, 1), + author_name='admin', + field_id='12', + field_name='status', + original_from_value='New', + original_to_value='Processing (assigned)', + from_value='TODO', + to_value='IN_PROGRESS', + created_date=datetime.datetime(2024, 1, 16, 10, 0), + ) + results = _convert_subitem('ticketlogs', tool_model, context) + assert len(results) == 1 + assert results[0] == expected + + +@pytest.mark.parametrize('tool_model', [ + TicketLog( + id=103, + tickets_id=1, + itemtype='Ticket', + itemtype_link='User', + linked_action=15, + user_name='admin (1)', + date_mod=datetime.datetime(2024, 1, 16, 11, 30, 0), + id_search_option=0, + old_value='', + new_value='Jane Smith (103)', + ), + TicketLog( + id=102, + tickets_id=1, + itemtype='Ticket', + itemtype_link='ITILFollowup', + linked_action=17, + user_name='admin (1)', + date_mod=datetime.datetime(2024, 1, 16, 12, 0, 0), + id_search_option=0, + old_value='', + new_value='Added follow-up', + ), +]) +def test_ticket_changelogs_skips_non_changelog_entries(context, tool_model): + tool_model.connection_id = context.connection.id + assert _convert_subitem('ticketlogs', tool_model, context) == [] + + +def test_ticket_links_from_subitems(context): + tool_model = TicketLink( + id=3, + tickets_id=1, + tickets_id_1=1, + tickets_id_2=99, + link=1, + connection_id=context.connection.id, + ) + expected = ticket.IssueRelationship( + source_issue_id=domain_id(Ticket, context.connection.id, 1), + target_issue_id=domain_id(Ticket, context.connection.id, 99), + original_type='linked', + ) + assert _convert_subitem('ticketlinks', tool_model, context) == [expected] + + +def test_groups_stream(context): + raw = { + 'id': 5, + 'name': 'Support', + 'completename': 'Root > Support', + 'x_request_url': f'{GLPI_API_BASE_URL}/apirest.php/Group', + } + plugin = GlpiPlugin() + stream = plugin.get_stream('groups') + tool_model = stream.extract(raw) + tool_model.connection_id = context.connection.id + account = list(stream.convert(tool_model, context))[0] + assert account.full_name == 'Root > Support' + assert account.user_name == 'Support' + assert account.email == 'group-5@glpi.local' + + +def test_users_stream(context): + raw = { + 'id': 7, + 'name': 'jdoe', + 'firstname': 'John', + 'realname': 'Doe', + 'email': 'john@example.com', + 'x_request_url': f'{GLPI_API_BASE_URL}/apirest.php/User', + } + + expected = crossdomain.Account( + email='john@example.com', + full_name='John Doe', + user_name='jdoe', + avatar_url='', + organization='', + created_date='2024-01-01 00:00:00', + status=1, + ) + plugin = GlpiPlugin() + stream = plugin.get_stream('users') + tool_model = stream.extract(raw) + tool_model.connection_id = context.connection.id + results = list(stream.convert(tool_model, context)) + account = results[0] + assert account.email == expected.email + assert account.full_name == expected.full_name + assert account.user_name == expected.user_name + assert account.status == expected.status + + +def test_users_stream_extracts_id_from_request_url(context): + raw = { + 'x_request_url': f'{GLPI_API_BASE_URL}/apirest.php/User/7', + } + plugin = GlpiPlugin() + stream = plugin.get_stream('users') + tool_model = stream.extract(raw) + assert tool_model.id == 7 + + +def test_ticket_worklogs_skip_entries_without_time(context): + tool_model = TicketTask( + id=8, + tickets_id=15, + users_id=None, + content=None, + begin=None, + end=None, + actiontime=None, + connection_id=context.connection.id, + ) + assert _convert_subitem('tickettasks', tool_model, context) == [] + + +def test_tickets_stream_converts_timezone(context): + context.connection.timezone = 'America/Sao_Paulo' + raw = { + 'id': 99, + 'name': 'Timezone test', + 'content': None, + 'date': '2026-06-02 00:00:00', + 'date_creation': None, + 'date_mod': '2026-06-02 01:00:00', + 'solvedate': None, + 'closedate': None, + 'status': 1, + 'type': 1, + 'urgency': 3, + 'impact': 3, + 'priority': 3, + 'entities_id': '1', + 'itilcategories_id': None, + 'users_id_recipient': None, + 'users_id_lastupdater': None, + 'requesttypes_id': None, + 'time_to_resolve': None, + 'actiontime': None, + 'solve_delay_stat': None, + 'takeintoaccount_delay_stat': None, + 'x_request_url': f'{GLPI_API_BASE_URL}/apirest.php/Ticket', + 'x_request_input': {'EntityId': '1'}, + } + + issue = ticket.Issue( + url=f'{GLPI_API_BASE_URL}/front/ticket.form.php?id=99', + issue_key='99', + title='Timezone test', + description=None, + type='INCIDENT', + original_type='Incident', + status='TODO', + original_status='New', + created_date='2026-06-02 03:00:00', + updated_date='2026-06-02 04:00:00', + resolution_date=None, + due_date=None, + creator_id=None, + creator_name=None, + assignee_id=None, + assignee_name=None, + parent_issue_id=None, + priority='Medium', + urgency='Medium', + severity='Medium', + component=None, + original_project='1', + time_spent_minutes=None, + lead_time_minutes=None, + ) + expected = [issue, ticket.BoardIssue(board_id=context.scope.domain_id(), issue_id=issue.id)] + assert_stream_convert(GlpiPlugin, 'ticketdomain', raw, expected, context) diff --git a/backend/python/plugins/glpi/tests/timezone_test.py b/backend/python/plugins/glpi/tests/timezone_test.py new file mode 100644 index 00000000000..6209dec3678 --- /dev/null +++ b/backend/python/plugins/glpi/tests/timezone_test.py @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from glpi.timezone import connection_timezone, glpi_search_time_from_iso + + +def test_glpi_search_time_from_iso_converts_to_connection_timezone(): + tz = connection_timezone('Europe/Paris') + assert glpi_search_time_from_iso('2024-06-01T00:00:00Z', tz) == '2024-06-01 02:00:00' diff --git a/backend/python/pydevlake/pydevlake/stream.py b/backend/python/pydevlake/pydevlake/stream.py index 6534aadb8e3..b376810285e 100644 --- a/backend/python/pydevlake/pydevlake/stream.py +++ b/backend/python/pydevlake/pydevlake/stream.py @@ -22,6 +22,8 @@ from pydevlake.model import RawModel, ToolModel, ToolScope, DomainModel, DomainType from pydevlake.extractor import autoextract +_raw_model_classes: dict[str, type] = {} + class Stream: def __init__(self, plugin_name: str): @@ -58,26 +60,38 @@ def domain_models(self) -> Optional[list[Type[DomainModel]]]: pass def raw_model(self, session) -> Type[RawModel]: + model = self._get_raw_model_class() + table = RawModel.metadata.tables[self.raw_model_table] + table.create(session.get_bind(), checkfirst=True) + return model + + def _get_raw_model_class(self) -> Type[RawModel]: if self._raw_model is not None: return self._raw_model table_name = self.raw_model_table + cached = _raw_model_classes.get(table_name) + if cached is not None: + self._raw_model = cached + return cached - # Look for existing raw model for mapper in RawModel._sa_registry.mappers: model = mapper.class_ - if model.__tablename__ == table_name: + if getattr(model, '__tablename__', None) == table_name: + _raw_model_classes[table_name] = model self._raw_model = model - return self._raw_model + return model + + table_args = {'extend_existing': True} if table_name in RawModel.metadata.tables else None - # Create raw model class StreamRawModel(RawModel, table=True): __tablename__ = table_name + if table_args is not None: + __table_args__ = table_args + _raw_model_classes[table_name] = StreamRawModel self._raw_model = StreamRawModel - table = RawModel.metadata.tables[table_name] - table.create(session.get_bind(), checkfirst=True) - return self._raw_model + return StreamRawModel @property def raw_model_table(self): diff --git a/config-ui/src/plugins/components/connection-form/fields/index.tsx b/config-ui/src/plugins/components/connection-form/fields/index.tsx index cb55f5751d8..42650e71930 100644 --- a/config-ui/src/plugins/components/connection-form/fields/index.tsx +++ b/config-ui/src/plugins/components/connection-form/fields/index.tsx @@ -25,6 +25,7 @@ import { ConnectionProxy } from './proxy'; import { ConnectionRateLimit } from './rate-limit'; import { ConnectionAppId } from './app-id'; import { ConnectionSecretKey } from './secret-key'; +import { ConnectionTimezone } from './timezone'; interface Props { type: 'create' | 'update'; @@ -86,6 +87,8 @@ export const Form = ({ type, name, fields, initialValues, values, errors, setVal return| + | Entity | +
|---|---|
| + { + if (e.target.checked) { + onChangeSelectedItems([...selectedItems, item]); + } else { + onChangeSelectedItems(selectedItems.filter((it) => it.id !== item.id)); + } + }} + /> + | +{entityLabel(item)} | +