Fix to_graphql method

Author: dgarros

backend/infrahub/core/timestamp.py

@@ -5,12 +5,12 @@
 from infrahub_sdk.timestamp import Timestamp as BaseTimestamp
 
 if TYPE_CHECKING:
-    from whenever import ZonedDateTime
+    from datetime import datetime
 
 
 class Timestamp(BaseTimestamp):
-    async def to_graphql(self, *args: Any, **kwargs: Any) -> ZonedDateTime:  # noqa: ARG002
-        return self.obj
+    async def to_graphql(self, *args: Any, **kwargs: Any) -> datetime:  # noqa: ARG002
+        return self.to_datetime()
 
     def get_query_filter_path(self, rel_name: str = "r") -> tuple[str, dict]:
         """

backend/tests/unit/graphql/diff/test_diff_tree_query.py

@@ -1,7 +1,6 @@
 from unittest.mock import AsyncMock
 
 import pytest
-from whenever import Instant
 
 from infrahub.core.branch import Branch
 from infrahub.core.diff.coordinator import DiffCoordinator
@@ -217,8 +216,8 @@ async def test_diff_tree_no_changes(
     enriched_diff_metadata = await diff_coordinator.update_branch_diff(
         base_branch=default_branch, diff_branch=diff_branch
     )
-    from_time = Instant.parse_common_iso(diff_branch.branched_from)
-    to_time = Instant.parse_common_iso(enriched_diff_metadata.to_time.to_string())
+    from_time = Timestamp(diff_branch.branched_from)
+    to_time = enriched_diff_metadata.to_time
 
     params = await prepare_graphql_params(
         db=db, include_mutation=False, include_subscription=False, branch=default_branch
@@ -235,8 +234,8 @@ async def test_diff_tree_no_changes(
     assert result.data["DiffTree"] == {
         "base_branch": default_branch.name,
         "diff_branch": diff_branch.name,
-        "from_time": from_time.isoformat(),
-        "to_time": to_time.isoformat(),
+        "from_time": from_time.to_datetime().isoformat(),
+        "to_time": to_time.to_datetime().isoformat(),
         "num_added": 0,
         "num_removed": 0,
         "num_updated": 0,
@@ -294,10 +293,10 @@ async def test_diff_tree_one_attr_change(
     main_crit.color.value = "#fedcba"
     branch_crit = await NodeManager.get_one(db=db, id=criticality_low.id, branch=diff_branch)
     branch_crit.color.value = "#abcdef"
-    before_change_datetime = Instant.now()
+    before_change_datetime = Timestamp()
     await main_crit.save(db=db)
     await branch_crit.save(db=db)
-    after_change_datetime = Instant.now()
+    after_change_datetime = Timestamp()
 
     enriched_diff_metadata = await diff_coordinator.update_branch_diff(
         base_branch=default_branch, diff_branch=diff_branch
@@ -329,29 +328,29 @@ async def test_diff_tree_one_attr_change(
         root_value=None,
         variable_values={"branch": diff_branch.name},
     )
-    from_time = Instant.parse_common_iso(diff_branch.branched_from)
-    to_time = Instant.parse_common_iso(enriched_diff_metadata.to_time.to_string())
+    from_time = Timestamp(diff_branch.branched_from)
+    to_time = enriched_diff_metadata.to_time
 
     assert result.errors is None
 
     assert result.data["DiffTree"]
     assert result.data["DiffTree"]["nodes"]
     node_diff = result.data["DiffTree"]["nodes"][0]
     node_changed_at = node_diff["last_changed_at"]
-    assert Instant.parse_common_iso(node_changed_at) < before_change_datetime
+    assert Timestamp(node_changed_at) < before_change_datetime
     assert node_diff["attributes"]
     attribute_diff = node_diff["attributes"][0]
     attribute_changed_at = attribute_diff["last_changed_at"]
-    assert Instant.parse_common_iso(attribute_changed_at) < before_change_datetime
+    assert Timestamp(attribute_changed_at) < before_change_datetime
     assert attribute_diff["properties"]
     property_diff = attribute_diff["properties"][0]
     property_changed_at = property_diff["last_changed_at"]
-    assert before_change_datetime < Instant.parse_common_iso(property_changed_at) < after_change_datetime
+    assert before_change_datetime < Timestamp(property_changed_at) < after_change_datetime
     assert result.data["DiffTree"] == {
         "base_branch": "main",
         "diff_branch": diff_branch.name,
-        "from_time": from_time.isoformat(),
-        "to_time": to_time.isoformat(),
+        "from_time": from_time.to_datetime().isoformat(),
+        "to_time": to_time.to_datetime().isoformat(),
         "num_added": 0,
         "num_removed": 0,
         "num_updated": 1,
@@ -426,9 +425,9 @@ async def test_diff_tree_one_relationship_change(
 ):
     branch_car = await NodeManager.get_one(db=db, id=car_accord_main.id, branch=diff_branch)
     await branch_car.owner.update(db=db, data=[person_jane_main])
-    before_change_datetime = Instant.now()
+    before_change_datetime = Timestamp()
     await branch_car.save(db=db)
-    after_change_datetime = Instant.now()
+    after_change_datetime = Timestamp()
     accord_label = await branch_car.render_display_label(db=db)
     john_label = await person_john_main.render_display_label(db=db)
     jane_label = await person_jane_main.render_display_label(db=db)
@@ -446,8 +445,8 @@ async def test_diff_tree_one_relationship_change(
         root_value=None,
         variable_values={"branch": diff_branch.name},
     )
-    from_time = Instant.parse_common_iso(diff_branch.branched_from)
-    to_time = Instant.parse_common_iso(enriched_diff_metadata.to_time.to_string())
+    from_time = Timestamp(diff_branch.branched_from)
+    to_time = enriched_diff_metadata.to_time
 
     assert result.errors is None
 
@@ -457,8 +456,8 @@ async def test_diff_tree_one_relationship_change(
     assert diff_tree_response == {
         "base_branch": "main",
         "diff_branch": diff_branch.name,
-        "from_time": from_time.format_common_iso(),
-        "to_time": to_time.format_common_iso(),
+        "from_time": from_time.to_datetime().isoformat(),
+        "to_time": to_time.to_datetime().isoformat(),
         "num_added": 0,
         "num_removed": 0,
         "num_updated": 3,
@@ -473,7 +472,7 @@ async def test_diff_tree_one_relationship_change(
     car_response = node_response_by_id[car_accord_main.id]
     car_relationship_response = car_response.pop("relationships")
     car_changed_at = car_response["last_changed_at"]
-    assert Instant.parse_common_iso(car_changed_at) < before_change_datetime
+    assert Timestamp(car_changed_at) < before_change_datetime
     assert car_response == {
         "uuid": car_accord_main.id,
         "kind": car_accord_main.get_kind(),
@@ -492,7 +491,7 @@ async def test_diff_tree_one_relationship_change(
     assert set(car_relationships_by_name.keys()) == {"owner"}
     owner_rel = car_relationships_by_name["owner"]
     owner_changed_at = owner_rel["last_changed_at"]
-    assert before_change_datetime < Instant.parse_common_iso(owner_changed_at) < after_change_datetime
+    assert before_change_datetime < Timestamp(owner_changed_at) < after_change_datetime
     owner_elements = owner_rel.pop("elements")
     assert owner_rel == {
         "name": "owner",
@@ -504,7 +503,7 @@ async def test_diff_tree_one_relationship_change(
     assert len(owner_elements) == 1
     owner_element = owner_elements[0]
     owner_element_changed_at = owner_element["last_changed_at"]
-    assert before_change_datetime < Instant.parse_common_iso(owner_element_changed_at) < after_change_datetime
+    assert before_change_datetime < Timestamp(owner_element_changed_at) < after_change_datetime
     owner_properties = owner_element.pop("properties")
     assert owner_element == {
         "status": UPDATED_ACTION,
@@ -517,7 +516,7 @@ async def test_diff_tree_one_relationship_change(
     assert set(owner_properties_by_type.keys()) == {IS_RELATED_TYPE, IS_PROTECTED_TYPE, IS_VISIBLE_TYPE}
     owner_prop = owner_properties_by_type[IS_RELATED_TYPE]
     owner_prop_changed_at = owner_prop["last_changed_at"]
-    assert before_change_datetime < Instant.parse_common_iso(owner_prop_changed_at) < after_change_datetime
+    assert before_change_datetime < Timestamp(owner_prop_changed_at) < after_change_datetime
     assert owner_prop == {
         "property_type": IS_RELATED_TYPE,
         "last_changed_at": owner_prop_changed_at,
@@ -530,7 +529,7 @@ async def test_diff_tree_one_relationship_change(
     }
     owner_prop = owner_properties_by_type[IS_RELATED_TYPE]
     owner_prop_changed_at = owner_prop["last_changed_at"]
-    assert before_change_datetime < Instant.parse_common_iso(owner_prop_changed_at) < after_change_datetime
+    assert before_change_datetime < Timestamp(owner_prop_changed_at) < after_change_datetime
     assert owner_prop == {
         "property_type": IS_RELATED_TYPE,
         "last_changed_at": owner_prop_changed_at,
@@ -545,7 +544,7 @@ async def test_diff_tree_one_relationship_change(
     john_response = node_response_by_id[person_john_main.id]
     john_relationship_response = john_response.pop("relationships")
     john_changed_at = john_response["last_changed_at"]
-    assert Instant.parse_common_iso(john_changed_at) < before_change_datetime
+    assert Timestamp(john_changed_at) < before_change_datetime
     assert john_response == {
         "uuid": person_john_main.id,
         "kind": person_john_main.get_kind(),
@@ -564,7 +563,7 @@ async def test_diff_tree_one_relationship_change(
     assert set(john_relationships_by_name.keys()) == {"cars"}
     cars_rel = john_relationships_by_name["cars"]
     cars_changed_at = cars_rel["last_changed_at"]
-    assert before_change_datetime < Instant.parse_common_iso(cars_changed_at) < after_change_datetime
+    assert before_change_datetime < Timestamp(cars_changed_at) < after_change_datetime
     cars_elements = cars_rel.pop("elements")
     assert cars_rel == {
         "name": "cars",
@@ -576,7 +575,7 @@ async def test_diff_tree_one_relationship_change(
     assert len(cars_elements) == 1
     cars_element = cars_elements[0]
     cars_element_changed_at = cars_element["last_changed_at"]
-    assert before_change_datetime < Instant.parse_common_iso(cars_element_changed_at) < after_change_datetime
+    assert before_change_datetime < Timestamp(cars_element_changed_at) < after_change_datetime
     cars_properties = cars_element.pop("properties")
     assert cars_element == {
         "status": REMOVED_ACTION,
@@ -594,7 +593,7 @@ async def test_diff_tree_one_relationship_change(
     ]:
         cars_prop = cars_properties_by_type[property_type]
         cars_prop_changed_at = cars_prop["last_changed_at"]
-        assert before_change_datetime < Instant.parse_common_iso(cars_prop_changed_at) < after_change_datetime
+        assert before_change_datetime < Timestamp(cars_prop_changed_at) < after_change_datetime
         assert cars_prop == {
             "property_type": property_type,
             "last_changed_at": cars_prop_changed_at,
@@ -609,7 +608,7 @@ async def test_diff_tree_one_relationship_change(
     jane_response = node_response_by_id[person_jane_main.id]
     jane_relationship_response = jane_response.pop("relationships")
     jane_changed_at = jane_response["last_changed_at"]
-    assert Instant.parse_common_iso(jane_changed_at) < before_change_datetime
+    assert Timestamp(jane_changed_at) < before_change_datetime
     assert jane_response == {
         "uuid": person_jane_main.id,
         "kind": person_jane_main.get_kind(),
@@ -628,7 +627,7 @@ async def test_diff_tree_one_relationship_change(
     assert set(jane_relationships_by_name.keys()) == {"cars"}
     cars_rel = jane_relationships_by_name["cars"]
     cars_changed_at = cars_rel["last_changed_at"]
-    assert before_change_datetime < Instant.parse_common_iso(cars_changed_at) < after_change_datetime
+    assert before_change_datetime < Timestamp(cars_changed_at) < after_change_datetime
     cars_elements = cars_rel.pop("elements")
     assert cars_rel == {
         "name": "cars",
@@ -640,7 +639,7 @@ async def test_diff_tree_one_relationship_change(
     assert len(cars_elements) == 1
     cars_element = cars_elements[0]
     cars_element_changed_at = cars_element["last_changed_at"]
-    assert before_change_datetime < Instant.parse_common_iso(cars_element_changed_at) < after_change_datetime
+    assert before_change_datetime < Timestamp(cars_element_changed_at) < after_change_datetime
     cars_properties = cars_element.pop("properties")
     assert cars_element == {
         "status": ADDED_ACTION,
@@ -658,7 +657,7 @@ async def test_diff_tree_one_relationship_change(
     ]:
         cars_prop = cars_properties_by_type[property_type]
         cars_prop_changed_at = cars_prop["last_changed_at"]
-        assert before_change_datetime < Instant.parse_common_iso(cars_prop_changed_at) < after_change_datetime
+        assert before_change_datetime < Timestamp(cars_prop_changed_at) < after_change_datetime
         assert cars_prop == {
             "property_type": property_type,
             "last_changed_at": cars_prop_changed_at,
@@ -745,8 +744,8 @@ async def test_diff_tree_summary_no_changes(
     enriched_diff_metadata = await diff_coordinator.update_branch_diff(
         base_branch=default_branch, diff_branch=diff_branch
     )
-    from_time = Instant.parse_common_iso(diff_branch.branched_from)
-    to_time = Instant.parse_common_iso(enriched_diff_metadata.to_time.to_string())
+    from_time = Timestamp(diff_branch.branched_from)
+    to_time = enriched_diff_metadata.to_time
 
     params = await prepare_graphql_params(
         db=db, include_mutation=False, include_subscription=False, branch=default_branch
@@ -763,8 +762,8 @@ async def test_diff_tree_summary_no_changes(
     assert result.data["DiffTreeSummary"] == {
         "base_branch": default_branch.name,
         "diff_branch": diff_branch.name,
-        "from_time": from_time.isoformat(),
-        "to_time": to_time.isoformat(),
+        "from_time": from_time.to_datetime().isoformat(),
+        "to_time": to_time.to_datetime().isoformat(),
         "num_added": 0,
         "num_removed": 0,
         "num_updated": 0,