Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions source/ftrack_api/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -1797,6 +1797,8 @@ def _decode(self, item):
if "__type__" in item:
if item["__type__"] == "datetime":
item = arrow.get(item["value"])
elif item["__type__"] == "date":
item = arrow.get(item["value"])

elif "__entity_type__" in item:
item = self._create(item["__entity_type__"], item, reconstructing=True)
Expand Down
50 changes: 50 additions & 0 deletions test/unit/test_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,56 @@ def test_decode_partial_entity(session, new_task):
assert entity is not new_task


@pytest.mark.parametrize(
"encoded, decoded_expected",
[
pytest.param(
{"__type__": "datetime", "value": "2023-10-10T09:50:34"},
arrow.arrow.Arrow(2023, 10, 10, 9, 50, 34),
),
pytest.param(
{"__type__": "datetime", "value": "2023-10-10T09:50:34Z"},
arrow.arrow.Arrow(2023, 10, 10, 9, 50, 34),
),
pytest.param(
{"__type__": "datetime", "value": "2023-10-10T09:50:34-05:00"},
arrow.arrow.Arrow(2023, 10, 10, 14, 50, 34),
),
pytest.param(
{"__type__": "datetime", "value": "2023-10-10T03:00:00+05:00"},
arrow.arrow.Arrow(2023, 10, 9, 22, 0, 0),
),
pytest.param(
{"__type__": "date", "value": "2023-10-10"}, arrow.arrow.Arrow(2023, 10, 10)
),
],
)
def test_decode_date_and_datetime(session, encoded, decoded_expected):
"""Test proper decoding of date and datetime values."""
decoded = session.decode(
json.dumps(
[
{
"action": "query",
"data": [
{
"__entity_type__": "Task",
"id": "0004902a-a7bc-4363-8e3b-bd18c0bed594",
"created_at": encoded,
"context_type": "task",
"object_type_id": "11c137c0-ee7e-4f9c-91c5-8c77cec22b2c",
"project_id": "5d253dc2-ff1a-49ef-9646-d7fc1196e860",
}
],
"metadata": {"next": {"offset": 1}},
}
]
)
)

assert decoded[0]["data"][0]["created_at"] == decoded_expected


def test_reset(mocker):
"""Reset session."""
plugin_path = os.path.abspath(
Expand Down
Loading