From 7ca939ce6b3381647c31ed54310d15d9597f8d07 Mon Sep 17 00:00:00 2001
From: Dennis Weil <dennis.weil@backlight.co>
Date: Thu, 18 Dec 2025 11:48:09 +0100
Subject: [PATCH] Support date type

Properly convert date type to arrow object.
---
 source/ftrack_api/session.py |  2 ++
 test/unit/test_session.py    | 50 ++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/source/ftrack_api/session.py b/source/ftrack_api/session.py
index 4204de37..c0a4bcf2 100644
--- a/source/ftrack_api/session.py
+++ b/source/ftrack_api/session.py
@@ -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)
diff --git a/test/unit/test_session.py b/test/unit/test_session.py
index c587e220..b80e1615 100644
--- a/test/unit/test_session.py
+++ b/test/unit/test_session.py
@@ -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(